openfox 2.0.76 → 2.0.78

package/dist/{chunk-D6CI2B7B.js → chunk-SGBXBP3S.js}

@@ -1,13 +1,31 @@
+import {
+  checkAborted,
+  createProcess,
+  getProcessLogs,
+  getProcessStatus,
+  getSessionProcesses,
+  spawnShell,
+  spawnShellProcess,
+  startProcessCommand,
+  stopProcess
+} from "./chunk-5CQRB7AD.js";
 import {
   createMcpTools
 } from "./chunk-NWO6GRYE.js";
 import {
   applyMcpServerUpdate
-} from "./chunk-KVRSAC4Z.js";
+} from "./chunk-VPFUXGMM.js";
 import {
   getGitBranch,
   listWorkspaces
-} from "./chunk-MF3UW36X.js";
+} from "./chunk-37WF2Z3T.js";
+import {
+  PathAccessDeniedError,
+  extractAbsolutePathsFromCommand,
+  extractSensitivePathsFromCommand,
+  registerPathConfirmation,
+  requestPathAccess
+} from "./chunk-NZIYELSQ.js";
 import {
   AskUserInterrupt,
   askUserTool
@@ -24,47 +42,30 @@ import {
   createToolCallEvent,
   createToolResultEvent,
   streamLLMPure
-} from "./chunk-7772ENZN.js";
-import {
-  startInspectProxy
-} from "./chunk-DH3SSBZN.js";
-import {
-  getProject
-} from "./chunk-LXFLRM7M.js";
-import {
-  checkAborted,
-  createProcess,
-  getProcessLogs,
-  getProcessStatus,
-  getSessionProcesses,
-  spawnShell,
-  spawnShellProcess,
-  startProcessCommand,
-  stopProcess
-} from "./chunk-OBQPXUXI.js";
+} from "./chunk-EHVDAVYG.js";
 import {
   SETTINGS_KEYS,
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-YMFCFMMB.js";
+} from "./chunk-AFJLY43Z.js";
+import {
+  startInspectProxy
+} from "./chunk-EYIWUONA.js";
+import {
+  getProject
+} from "./chunk-6AE3JPDJ.js";
 import {
   getMaxPerSession,
   getSessionProcessCount,
   terminateProcessTree
 } from "./chunk-I72ACQ6R.js";
-import {
-  PathAccessDeniedError,
-  extractAbsolutePathsFromCommand,
-  extractSensitivePathsFromCommand,
-  requestPathAccess
-} from "./chunk-46RORSKU.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-NGJ5XJ7D.js";
+} from "./chunk-M7EFXRDS.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -74,30 +75,35 @@ import {
   handleToolResult,
   reorderToolMessages,
   stripOrphanedToolCalls
-} from "./chunk-DJASQ2ZB.js";
+} from "./chunk-TSVFRWSG.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
   createChatMessageUpdatedMessage,
+  createChatPathConfirmationMessage,
   createQueueStateMessage
-} from "./chunk-O3NUNU4H.js";
+} from "./chunk-SJTG56CH.js";
 import {
   modelSupportsVision
 } from "./chunk-V4IE7HJY.js";
 import {
   OUTPUT_LIMITS,
+  cacheSet,
+  contentHash,
+  decodeDataUrl,
+  extractPdfContent,
   extractPdfText,
   formatPdfErrorMessage,
   isPdfBuffer,
   processPdfContent
-} from "./chunk-EZK7CGJ7.js";
+} from "./chunk-RMXPVQP4.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
 import {
   loadGlobalConfig,
   saveGlobalConfig
-} from "./chunk-WGAAQASA.js";
+} from "./chunk-YFVSSMA3.js";
 import {
   getGlobalConfigDir
 } from "./chunk-CQGTEGKL.js";
@@ -107,7 +113,34 @@ import { readFile as readFile2, stat, readdir } from "fs/promises";
 import { extname, join } from "path";
 
 // src/server/tools/tool-helpers.ts
+import { randomUUID } from "crypto";
 import { resolve, isAbsolute } from "path";
+function requestUserConfirmation(context, toolLabel, desc) {
+  if (context.dangerLevel === "dangerous") return Promise.resolve(true);
+  if (context.isSubAgent) return Promise.resolve(false);
+  if (typeof context.onEvent !== "function") return Promise.resolve(false);
+  const callId = context.toolCallId ?? randomUUID();
+  try {
+    const eventStore = getEventStore();
+    eventStore.append(context.sessionId, {
+      type: "path.confirmation_pending",
+      data: { callId, tool: toolLabel, paths: [desc], workdir: context.workdir, reason: "dangerous_command" }
+    });
+  } catch {
+  }
+  const promise = registerPathConfirmation(
+    callId,
+    [desc],
+    context.sessionId,
+    toolLabel,
+    context.workdir,
+    "dangerous_command"
+  );
+  context.onEvent(
+    createChatPathConfirmationMessage(callId, toolLabel, [desc], context.workdir, "dangerous_command")
+  );
+  return promise;
+}
 function buildSignal(timeoutMs, contextSignal) {
   const timeoutSignal = AbortSignal.timeout(timeoutMs);
   if (contextSignal) {
@@ -188,7 +221,7 @@ function createTool(name, definition, handler2) {
       try {
         return await handler2(args, context, helpers);
       } catch (error) {
-        if (error instanceof PathAccessDeniedError) {
+        if (error instanceof PathAccessDeniedError || error instanceof AskUserInterrupt) {
           throw error;
         }
         return {
@@ -1005,6 +1038,47 @@ function stripTailPipe(command) {
 }
 
 // src/server/tools/shell.ts
+var ESCAPE_PATTERNS = [
+  /\bcd\s+['"]?(?:\.\.|\/|~)/,
+  /\bcd\s+\$/,
+  // cd with variable expansion ($HOME, ${HOME})
+  /\bcd\s+\$\(/,
+  // cd with command substitution $(...)
+  /\bcd\s+`/,
+  // cd with backtick substitution
+  /\bgit\s+-C\s+/,
+  /GIT_DIR=/,
+  /\bgit\s+--work-tree[\s=]/,
+  /\bgit\s+--git-dir[\s=]/
+];
+function detectEscapePattern(command) {
+  const normalized = command.replace(/'[^']*'/g, " ").replace(/"[^"]*"/g, " ");
+  for (const pattern of ESCAPE_PATTERNS) {
+    const match = normalized.match(pattern);
+    if (match) {
+      return match[0].trim();
+    }
+  }
+  const segments = command.split(/[;&|]|&&|\|\|/);
+  for (const segment of segments) {
+    const trimmed = segment.trim();
+    if (/^cd\s+.+\.\./.test(trimmed) || /^cd\s+['"]?\//.test(trimmed) || /^cd\s+['"]?~/.test(trimmed) || /^cd\s+['"]?\.\./.test(trimmed) || /^cd\s+.*\$\(/.test(trimmed) || // cd with $(...) substitution
+    /^cd\s+.*`/.test(trimmed) || // cd with backtick substitution
+    /^cd\s+.*\$\{?[A-Za-z_]/.test(trimmed)) {
+      return trimmed;
+    }
+  }
+  return null;
+}
+function detectGitMutation(command) {
+  const gitMatch = command.match(
+    /\bgit\s+['"]?(?:checkout|switch|branch\s+(-[dDmcMC]|--delete|--move|--copy|--force|-f)|-b\s+\S+|merge|rebase|reset|cherry-pick|worktree|clone|pull|push|fetch|update-ref|symbolic-ref)/
+  );
+  if (gitMatch) {
+    return gitMatch[0].trim();
+  }
+  return null;
+}
 var rtkAvailable;
 async function checkRtkAvailability() {
   if (rtkAvailable !== void 0) return rtkAvailable;
@@ -1048,7 +1122,7 @@ var runCommandTool = createTool(
     type: "function",
     function: {
       name: "run_command",
-      description: 'Execute a shell command. Returns stdout, stderr, and exit code. Does NOT support trailing "&" for backgrounding \u2014 use background_process tool instead.',
+      description: 'Execute a shell command. Returns stdout, stderr, and exit code. Does NOT support trailing "&" for backgrounding \u2014 use background_process tool instead.\nCommands run from your working directory automatically \u2014 do NOT prepend "cd /path/" to change to a directory you are already in. Doing so triggers unnecessary security confirmations.',
       parameters: {
         type: "object",
         properties: {
@@ -1076,6 +1150,26 @@ var runCommandTool = createTool(
         `Use background_process tool (action: "start") for background/long-running commands instead of '&'. See the tool description for details.`
       );
     }
+    const escapeMatch = detectEscapePattern(args.command);
+    if (escapeMatch) {
+      const desc = `Command "${args.command}" contains workspace escape pattern "${escapeMatch}". Allow this command?`;
+      const approved = await requestUserConfirmation(context, "command", desc);
+      if (!approved) {
+        return helpers.error(
+          `User denied: command "${escapeMatch}" would escape the workspace. Use the workspace tool to switch workspaces directly.`
+        );
+      }
+    }
+    const mutationMatch = detectGitMutation(args.command);
+    if (mutationMatch) {
+      const desc = `Command "${args.command}" modifies Git state (${mutationMatch}). Allow this Git operation?`;
+      const approved = await requestUserConfirmation(context, "command", desc);
+      if (!approved) {
+        return helpers.error(
+          `User denied: "${mutationMatch}" modifies Git state. Use the workspace tool to switch workspaces or branches.`
+        );
+      }
+    }
     const workingDir = args.cwd ? helpers.resolvePath(args.cwd) : context.workdir;
     const pathsToCheck = [workingDir];
     const commandPaths = extractAbsolutePathsFromCommand(args.command);
@@ -2208,7 +2302,7 @@ async function executeTools(assistantMsgId, toolCalls, ctx, append) {
     const onProgress = ctx.onMessage ? createToolProgressHandler(append, assistantMsgId, toolCall.id, ctx.sessionId) : void 0;
     const toolContext = {
       sessionManager: ctx.sessionManager,
-      workdir: ctx.workdir,
+      workdir: ctx.sessionManager.getEffectiveWorkdir(ctx.sessionId),
       sessionId: ctx.sessionId,
       signal: ctx.signal,
       llmClient: ctx.llmClient,
@@ -2513,7 +2607,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens, config.subAgentMetadata?.subAgentId);
     if (!compacting) {
       const contextState2 = sessionManager.getContextState(sessionId);
-      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-BB3YYVRP.js");
+      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-G7B3V24F.js");
       if (shouldCompact(contextState2.currentTokens, contextState2.maxTokens, runtimeConfig.context.compactionThreshold)) {
         appendCompactionPrompt(sessionId, append);
         compacting = true;
@@ -2870,10 +2964,9 @@ async function describeImageFromDataUrl(dataUrl, visionModel, options) {
 }
 
 // src/server/context/image-processor.ts
-import { createHash as createHash2 } from "crypto";
 async function loadVisionModelFromGlobalConfig() {
   try {
-    const { loadGlobalConfig: loadGlobalConfig2, getVisionFallback } = await import("./config-EUMVEFHU.js");
+    const { loadGlobalConfig: loadGlobalConfig2, getVisionFallback } = await import("./config-MD74ETY5.js");
     const runtimeConfig = getRuntimeConfig();
     const mode = runtimeConfig.mode ?? "production";
     const globalConfig = await loadGlobalConfig2(mode);
@@ -2891,12 +2984,12 @@ async function loadVisionModelFromGlobalConfig() {
   return void 0;
 }
 var descriptionCache = /* @__PURE__ */ new Map();
-function contentHash(data) {
-  return createHash2("sha256").update(data).digest("hex").slice(0, 16);
-}
 function isImageAttachment(att) {
   return att.mimeType.startsWith("image/");
 }
+function isPdfAttachment(att) {
+  return att.mimeType === "application/pdf";
+}
 function hasImageMetadata(result) {
   const meta = result.metadata;
   if (!meta) return false;
@@ -2904,46 +2997,17 @@ function hasImageMetadata(result) {
   const mimeType = meta["mimeType"];
   return typeof dataUrl === "string" && typeof mimeType === "string" && mimeType.startsWith("image/");
 }
-async function describeAttachment(att, messageId, options, descriptions) {
-  const cacheKey = contentHash(att.data);
-  if (descriptionCache.has(cacheKey)) {
-    const cached = descriptionCache.get(cacheKey);
-    descriptions.set(att.id, cached);
-    return cached;
-  }
-  if (options.visionModel) {
-    const startData = {
-      messageId,
-      attachmentId: att.id
-    };
-    if (att.filename !== void 0) {
-      startData.filename = att.filename;
-    }
-    options.onEvent?.({ type: "vision_fallback.start", data: startData });
-    const description = await describeImageFromDataUrl(att.data, options.visionModel, {
-      context: att.filename ? `File: ${att.filename}` : void 0,
-      signal: options.signal
-    });
-    descriptionCache.set(cacheKey, description);
-    descriptions.set(att.id, description);
-    options.onEvent?.({ type: "vision_fallback.done", data: { messageId, attachmentId: att.id, description } });
-    return description;
-  }
-  const placeholder = `[Image: ${att.filename || "image"}]`;
-  descriptions.set(att.id, placeholder);
-  return placeholder;
-}
-async function describeToolResultImage(dataUrl, filename, toolCallId, messageId, options, descriptions) {
+async function describeImageDataUrl(dataUrl, attachmentId, messageId, options, descriptions, filename) {
   const cacheKey = contentHash(dataUrl);
   if (descriptionCache.has(cacheKey)) {
     const cached = descriptionCache.get(cacheKey);
-    descriptions.set(toolCallId, cached);
+    descriptions.set(attachmentId, cached);
     return cached;
   }
   if (options.visionModel) {
     const startData = {
       messageId,
-      attachmentId: toolCallId
+      attachmentId
     };
     if (filename !== void 0) {
       startData.filename = filename;
@@ -2953,18 +3017,61 @@ async function describeToolResultImage(dataUrl, filename, toolCallId, messageId,
       context: filename ? `File: ${filename}` : void 0,
       signal: options.signal
     });
-    descriptionCache.set(cacheKey, description);
-    descriptions.set(toolCallId, description);
-    options.onEvent?.({
-      type: "vision_fallback.done",
-      data: { messageId, attachmentId: toolCallId, description }
-    });
+    cacheSet(descriptionCache, cacheKey, description);
+    descriptions.set(attachmentId, description);
+    options.onEvent?.({ type: "vision_fallback.done", data: { messageId, attachmentId, description } });
     return description;
   }
-  const placeholder = `[Image: ${filename || "image"}]`;
-  descriptions.set(toolCallId, placeholder);
+  const placeholder = filename ? `[Image: ${filename}]` : "[Image]";
+  descriptions.set(attachmentId, placeholder);
   return placeholder;
 }
+async function describeAttachment(att, messageId, options, descriptions) {
+  return describeImageDataUrl(att.data, att.id, messageId, options, descriptions, att.filename);
+}
+async function describePdfAttachment(att, messageId, options, descriptions) {
+  const hasVision = !!options.visionModel;
+  const cacheKey = `pdf:${hasVision}:${contentHash(att.data)}`;
+  const filenameLabel = att.filename || "document.pdf";
+  if (descriptionCache.has(cacheKey)) {
+    const cached = descriptionCache.get(cacheKey);
+    const output2 = `[PDF: ${filenameLabel}]${cached}`;
+    descriptions.set(att.id, output2);
+    return output2;
+  }
+  const buffer = decodeDataUrl(att.data);
+  if (!buffer) {
+    const fallback = `[PDF: ${filenameLabel}] (could not decode)`;
+    cacheSet(descriptionCache, cacheKey, fallback);
+    descriptions.set(att.id, fallback);
+    return fallback;
+  }
+  let blocks;
+  try {
+    const result = await extractPdfContent(buffer);
+    blocks = result.blocks;
+  } catch {
+    const errorText = `[PDF: ${filenameLabel}] (could not extract content)`;
+    descriptions.set(att.id, errorText);
+    return errorText;
+  }
+  let body = "";
+  let imageIndex = 0;
+  for (const block of blocks) {
+    if (block.type === "text" && block.content) {
+      body += "\n\n" + block.content;
+    } else if (block.type === "image" && block.dataUrl) {
+      const imgAttachmentId = `${att.id}/image-${imageIndex}`;
+      const description = await describeImageDataUrl(block.dataUrl, imgAttachmentId, messageId, options, descriptions);
+      body += "\n\n" + description;
+      imageIndex++;
+    }
+  }
+  const output = `[PDF: ${filenameLabel}]${body}`;
+  cacheSet(descriptionCache, cacheKey, body);
+  descriptions.set(att.id, output);
+  return output;
+}
 async function processContextImages(events, options) {
   if (options.modelSupportsVision) {
     return { events, descriptions: /* @__PURE__ */ new Map() };
@@ -2975,9 +3082,8 @@ async function processContextImages(events, options) {
     if (event.type === "message.start") {
       const data = event.data;
       if (!data.attachments || data.attachments.length === 0) continue;
-      const imageAtts = data.attachments.filter(isImageAttachment);
-      if (imageAtts.length === 0) continue;
       let enriched = false;
+      const imageAtts = data.attachments.filter(isImageAttachment);
       for (const att of imageAtts) {
         if (att.description) {
           descriptions.set(att.id, att.description);
@@ -2987,6 +3093,16 @@ async function processContextImages(events, options) {
         att.description = description;
         enriched = true;
       }
+      const pdfAtts = data.attachments.filter(isPdfAttachment);
+      for (const att of pdfAtts) {
+        if (att.pdfContent) {
+          descriptions.set(att.id, att.pdfContent);
+          continue;
+        }
+        const pdfContent = await describePdfAttachment(att, data.messageId, options, descriptions);
+        att.pdfContent = pdfContent;
+        enriched = true;
+      }
       if (enriched && options.persistEvent) {
         options.persistEvent(event.sessionId, event.seq, data);
       }
@@ -3001,13 +3117,13 @@ async function processContextImages(events, options) {
       }
       const dataUrl = meta["dataUrl"];
       const path = meta["path"];
-      const description = await describeToolResultImage(
+      const description = await describeImageDataUrl(
         dataUrl,
-        path,
         data.toolCallId,
         data.messageId,
         options,
-        descriptions
+        descriptions,
+        path
       );
       meta["description"] = description;
       if (options.persistEvent) {
@@ -3019,16 +3135,24 @@ async function processContextImages(events, options) {
       let enriched = false;
       for (const message of snapshot.messages) {
         if (message.role === "user" && message.attachments && message.attachments.length > 0) {
-          const imageAtts = message.attachments.filter(isImageAttachment);
-          if (imageAtts.length === 0) continue;
-          for (const att of imageAtts) {
-            if (att.description) {
-              descriptions.set(att.id, att.description);
-              continue;
+          for (const att of message.attachments) {
+            if (isImageAttachment(att)) {
+              if (att.description) {
+                descriptions.set(att.id, att.description);
+                continue;
+              }
+              const description = await describeAttachment(att, message.id, options, descriptions);
+              att.description = description;
+              enriched = true;
+            } else if (isPdfAttachment(att)) {
+              if (att.pdfContent) {
+                descriptions.set(att.id, att.pdfContent);
+                continue;
+              }
+              const pdfContent = await describePdfAttachment(att, message.id, options, descriptions);
+              att.pdfContent = pdfContent;
+              enriched = true;
             }
-            const description = await describeAttachment(att, message.id, options, descriptions);
-            att.description = description;
-            enriched = true;
           }
         }
         if (message.role === "assistant" && message.toolCalls) {
@@ -3041,13 +3165,13 @@ async function processContextImages(events, options) {
             }
             const dataUrl = meta["dataUrl"];
             const path = meta["path"];
-            const description = await describeToolResultImage(
+            const description = await describeImageDataUrl(
               dataUrl,
-              path,
               toolCall.id,
               message.id,
               options,
-              descriptions
+              descriptions,
+              path
             );
             meta["description"] = description;
             enriched = true;
@@ -3418,7 +3542,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-JRCUWPJO.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-HGKUD327.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4388,6 +4512,10 @@ var mcpConfigTool = createTool(
           enabled: {
             type: "boolean",
             description: "Whether the tool should be enabled (required for: toggle-tool)"
+          },
+          timeout: {
+            type: "number",
+            description: "Timeout in seconds for MCP tool calls (optional)"
           }
         },
         required: ["action"]
@@ -4417,7 +4545,7 @@ var mcpConfigTool = createTool(
       mcpNotifyChanged?.(sessionId);
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-JRCUWPJO.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-HGKUD327.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -4454,13 +4582,17 @@ var mcpConfigTool = createTool(
       } else if (!args.command) {
         return helpers.error("command is required for stdio transport");
       }
+      if (args.timeout !== void 0 && (typeof args.timeout !== "number" || args.timeout <= 0)) {
+        return helpers.error("timeout must be a positive number");
+      }
       const serverCfg = {
         transport: args.transport ?? "stdio",
         ...args.command ? { command: args.command } : {},
         ...args.args && args.args.length > 0 ? { args: args.args } : {},
         ...args.env && Object.keys(args.env).length > 0 ? { env: args.env } : {},
         ...args.url ? { url: args.url } : {},
-        ...args.headers && Object.keys(args.headers).length > 0 ? { headers: args.headers } : {}
+        ...args.headers && Object.keys(args.headers).length > 0 ? { headers: args.headers } : {},
+        ...args.timeout !== void 0 ? { timeout: args.timeout } : {}
       };
       await persistAndRebuild((mcpServers) => {
         mcpServers[args.name] = serverCfg;
@@ -4485,7 +4617,8 @@ var mcpConfigTool = createTool(
         ...args.args !== void 0 ? { args: args.args } : {},
         ...args.env !== void 0 ? { env: args.env } : {},
         ...args.url !== void 0 ? { url: args.url } : {},
-        ...args.headers !== void 0 ? { headers: args.headers } : {}
+        ...args.headers !== void 0 ? { headers: args.headers } : {},
+        ...args.timeout !== void 0 ? { timeout: args.timeout } : {}
       };
       const { error: updateError } = await applyMcpServerUpdate({
         name: args.name,
@@ -4691,7 +4824,7 @@ var workspaceTool = createTool(
     type: "function",
     function: {
       name: "workspace",
-      description: 'Manage workspaces for the current session. A workspace is a cloned copy of the project.\n\nUse "switch" to move between workspaces. Target "original" for the project root, or a workspace name.\nIf the workspace does not exist yet, it is created automatically.\n\nSetup commands (e.g. npm install) are configured via .openfox/workspace.json.\n\nActions:\n- switch: Switch to a workspace (target: "original" or a name, optional branch for new workspaces)\n- list: List all workspaces with their current branch and active status\n- delete: Delete a workspace by name (cannot delete "original")',
+      description: 'Manage workspaces for the current session. A workspace is a cloned copy of the project.\n\nUse "switch" to move between workspaces. Target "original" for the project root, or a workspace name.\nIf the workspace does not exist yet, it is created automatically.\n\nYou can also change the branch of the current workspace by calling switch with the current\nworkspace name and a branch parameter. The branch will be checked out without recreating\nthe workspace and without losing uncommitted changes.\n\nIf the requested branch does not exist, it will be created. By default it is based on the\ndefault branch of the project (origin/HEAD). You can specify sourceBranch to base the new\nbranch on a different existing branch.\n\nActions that change the workspace (switch, delete) require explicit user approval via a confirmation dialog.\n\nSetup commands (e.g. npm install) are configured via .openfox/workspace.json.\n\nActions:\n- switch: Switch to a workspace (target: "original" or a name, optional branch for new workspaces)\n- list: List all workspaces with their current branch and active status\n- delete: Delete a workspace by name (cannot delete "original")',
       parameters: {
         type: "object",
         properties: {
@@ -4706,7 +4839,11 @@ var workspaceTool = createTool(
           },
           branch: {
             type: "string",
-            description: "Optional git branch to check out when creating a new workspace"
+            description: "Optional git branch to check out when creating or switching to a workspace"
+          },
+          sourceBranch: {
+            type: "string",
+            description: "If branch does not exist, base the new branch on this existing branch. Default: origin/HEAD."
           }
         },
         required: ["action"]
@@ -4724,7 +4861,13 @@ var workspaceTool = createTool(
         if (!args.target || typeof args.target !== "string") {
           return helpers.error('Parameter "target" is required for action=switch ("original" or a workspace name)');
         }
-        const updated = await sessionManager.switchWorkspace(sessionId, args.target, args.branch);
+        const currentSession = sessionManager.getSession(sessionId);
+        const isBranchChange = args.branch !== void 0 && currentSession != null && args.target !== "original" && currentSession.workspace?.split("/").pop() === args.target;
+        const label = args.target === "original" ? "original project" : `workspace "${args.target}"`;
+        const desc = isBranchChange ? `Change branch to "${args.branch}" on ${label}` : `Switch to ${label}${args.branch ? ` on branch "${args.branch}"` : ""}`;
+        const approved = await requestUserConfirmation(context, "workspace", desc);
+        if (!approved) return helpers.error(`User denied: ${isBranchChange ? "branch change" : `switch to ${label}`}`);
+        const updated = await sessionManager.switchWorkspace(sessionId, args.target, args.branch, args.sourceBranch);
         const wsName = args.target === "original" ? "original" : updated.workspace?.split("/").pop() ?? args.target;
         const branch = await getGitBranch(updated.workspace ?? updated.workdir);
         return helpers.success(
@@ -4746,7 +4889,7 @@ var workspaceTool = createTool(
         const project = sessionManager.getProject(session.projectId);
         if (!project) return helpers.error("Project not found");
         const currentBranch = await getGitBranch(session.workspace ?? session.workdir);
-        const named = await listWorkspaces(project.name);
+        const named = await listWorkspaces(project.name, project.workdir);
         const activeWsName = session.workspace?.split("/").pop() ?? null;
         const workspaces = [
           { name: "original", branch: currentBranch, active: !session.workspace },
@@ -4762,9 +4905,9 @@ var workspaceTool = createTool(
         if (!args.target || typeof args.target !== "string") {
           return helpers.error('Parameter "target" is required for action=delete (the workspace name)');
         }
-        if (args.target === "original") {
-          return helpers.error("Cannot delete the original workspace");
-        }
+        if (args.target === "original") return helpers.error("Cannot delete the original workspace");
+        const approved = await requestUserConfirmation(context, "workspace", `Delete workspace "${args.target}"`);
+        if (!approved) return helpers.error(`User denied: delete workspace "${args.target}"`);
         await sessionManager.deleteWorkspace(sessionId, args.target);
         return helpers.success(
           JSON.stringify(
@@ -5065,4 +5208,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-D6CI2B7B.js.map
+//# sourceMappingURL=chunk-SGBXBP3S.js.map

package/dist/{chunk-O3NUNU4H.js → chunk-SJTG56CH.js}

@@ -1,7 +1,7 @@
 import {
   createServerMessage,
   isClientMessage
-} from "./chunk-5GOOSZX7.js";
+} from "./chunk-X6BXZFO7.js";
 
 // src/server/ws/protocol.ts
 function enrichMessagesWithToolResults(messages) {
@@ -43,7 +43,7 @@ function serializeServerMessage(message) {
 function createErrorMessage(code, message, correlationId) {
   return createServerMessage("error", { code, message }, correlationId);
 }
-function createSessionStateMessage(session, messages, pendingConfirmations = [], pendingQuestions, gitStatus, correlationId) {
+function createSessionStateMessage(session, messages, pendingConfirmations = [], pendingQuestions, gitStatus, correlationId, hiddenCount) {
   const enrichedMessages = enrichMessagesWithToolResults(messages);
   return createServerMessage(
     "session.state",
@@ -52,7 +52,8 @@ function createSessionStateMessage(session, messages, pendingConfirmations = [],
       messages: enrichedMessages,
       pendingConfirmations,
       ...pendingQuestions ? { pendingQuestions } : {},
-      ...gitStatus ? { gitStatus } : {}
+      ...gitStatus ? { gitStatus } : {},
+      ...hiddenCount !== void 0 ? { hiddenCount } : {}
     },
     correlationId
   );
@@ -343,4 +344,4 @@ export {
   createQueueStateMessage,
   storedEventToServerMessage
 };
-//# sourceMappingURL=chunk-O3NUNU4H.js.map
+//# sourceMappingURL=chunk-SJTG56CH.js.map