workspaces to dashboards, imap email sync, ffmpeg tool, tts fix, file browser refresh, automation sidebar reorder

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

src/servers/api/pi/pi-bridge.ts

@@ -4,7 +4,7 @@ import { readdirSync, existsSync, mkdirSync, writeFileSync, readFileSync } from
 import type { Subprocess } from "bun";
 import type { PiEvent, MessageCost } from "./types";
 import { readSearxngConfig } from "../server-settings/searxng";
-import { PI_CONFIG_DIR, DATA_PATH, SERVER_CONFIG_DIR, getHomeDir, getGlobalSkillsDir, getUserSkillsDir, getGlobalExtensionsDir, getUserExtensionsDir, getGlobalToolsDir, getUserToolsDir, getNativeResourcesDir, getGlobalResourcesDir } from "../../data-path";
+import { PI_CONFIG_DIR, DATA_PATH, getHomeDir, getGlobalSkillsDir, getUserSkillsDir, getGlobalExtensionsDir, getUserExtensionsDir, getGlobalToolsDir, getUserToolsDir, getNativeResourcesDir, getGlobalResourcesDir } from "../../data-path";
 import { ensureDockerContainer } from "../terminal/websocket";
 import { getServerIntegration, getUserIntegration } from "officerdb";
 import { logger } from "./logger";
@@ -161,34 +161,6 @@ function buildResourcesEnv(): string {
   return JSON.stringify(result);
 }
 
-async function ensureGoogleConfigFile(): Promise<string> {
-  const filePath = join(SERVER_CONFIG_DIR, 'google-oauth.json');
-  try {
-    const integration = await getServerIntegration('google');
-    if (integration?.config) {
-      mkdirSync(SERVER_CONFIG_DIR, { recursive: true });
-      writeFileSync(filePath, JSON.stringify(integration.config, null, 2));
-    }
-  } catch {
-    // No google config available
-  }
-  return filePath;
-}
-
-async function ensureGoogleTokenFile(userId: number, email: string): Promise<string> {
-  const dir = join(DATA_PATH, email, 'integrations');
-  const filePath = join(dir, 'google.json');
-  try {
-    const integration = await getUserIntegration(userId, 'google');
-    if (integration?.config) {
-      mkdirSync(dir, { recursive: true });
-      writeFileSync(filePath, JSON.stringify(integration.config, null, 2));
-    }
-  } catch {
-    // No user google integration available
-  }
-  return filePath;
-}
 
 async function getApifyToken(): Promise<string> {
   try {
@@ -217,6 +189,19 @@ async function getBrowserRelayEnv(userId: number): Promise<Record<string, string
   }
 }
 
+async function resolveApiKeyForModel(model: string): Promise<string | null> {
+  const provider = model.split('/')[0];
+  if (!provider) return null;
+  try {
+    const authFile = Bun.file(join(PI_CONFIG_DIR, 'auth.json'));
+    if (!(await authFile.exists())) return null;
+    const auth = await authFile.json() as Record<string, { key?: string }>;
+    return auth[provider]?.key?.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
 type SandboxOptions = {
   userId: number;
   username: string;
@@ -270,10 +255,12 @@ export async function spawnPi(
     if (model) piArgs.push('--model', model);
     if (options?.sessionFile) piArgs.push('--session', options.sessionFile);
 
+    // Pass API key for the model's provider so the container doesn't need auth.json
+    const apiKey = await resolveApiKeyForModel(model);
+    if (apiKey) piArgs.push('--api-key', apiKey);
+
     const resourcesEnv = buildResourcesEnv();
 
-    const googleConfigHost = await ensureGoogleConfigFile();
-    await ensureGoogleTokenFile(sandbox.userId, sandbox.email);
     const browserRelayEnv = await getBrowserRelayEnv(sandbox.userId);
     const apifyToken = await getApifyToken();
 
@@ -284,8 +271,6 @@ export async function spawnPi(
       '-e', `PI_TOOLS_DIRS=/officer/tools:/officer/user/tools`,
       '-e', `PI_SEARXNG_URL=${searxng.url}`,
       '-e', `OFFICER_RESOURCES=${resourcesEnv}`,
-      '-e', `OFFICER_GOOGLE_CONFIG_PATH=/officer/google-oauth.json`,
-      '-e', `OFFICER_GOOGLE_TOKEN_PATH=/officer/user/integrations/google.json`,
       '-e', `OFFICER_EMAIL_DB=/officer/emails.db`,
       ...(apifyToken ? ['-e', `OFFICER_APIFY_TOKEN=${apifyToken}`] : []),
       ...Object.entries(browserRelayEnv).flatMap(([k, v]) => ['-e', `${k}=${v}`]),
@@ -330,8 +315,6 @@ export async function spawnPi(
     }
 
     const toolsDirs = [getGlobalToolsDir(), getUserToolsDir(email)].join(':');
-    const googleConfigPath = await ensureGoogleConfigFile();
-    const googleTokenPath = await ensureGoogleTokenFile(userId, email);
     const browserRelayEnv = await getBrowserRelayEnv(userId);
     const apifyTokenLocal = await getApifyToken();
 
@@ -349,8 +332,6 @@ export async function spawnPi(
         PI_TOOLS_DIRS: toolsDirs,
         PI_SEARXNG_URL: searxng.url,
         OFFICER_RESOURCES: buildResourcesEnv(),
-        OFFICER_GOOGLE_CONFIG_PATH: googleConfigPath,
-        OFFICER_GOOGLE_TOKEN_PATH: googleTokenPath,
         OFFICER_EMAIL_DB: join(DATA_PATH, email, 'emails.db'),
         ...(apifyTokenLocal ? { OFFICER_APIFY_TOKEN: apifyTokenLocal } : {}),
         ...browserRelayEnv,

src/servers/api/pi/storage.ts

@@ -533,6 +533,9 @@ export async function listUserSessions(baseCwd: string, filter?: SessionFilter):
     if (filter.context === 'chat') {
       // 'chat' matches sessions with no context or context='chat'
       sessions = sessions.filter((s) => !s.context || s.context === 'chat');
+    } else if (filter.context === 'dashboard') {
+      // 'dashboard' matches both old 'workspace' and new 'dashboard' context
+      sessions = sessions.filter((s) => (s.context === 'dashboard' || s.context === 'workspace') && s.contextId === filter.contextId);
     } else {
       sessions = sessions.filter((s) => s.context === filter.context && s.contextId === filter.contextId);
     }