openfox 2.0.17 → 2.0.20

package/dist/{chunk-LX66KJPL.js → chunk-6PLAWCHQ.js}

@@ -210,7 +210,7 @@ function deepCloneMessage(msg) {
   return cloned;
 }
 
-// src/server/events/folding.ts
+// src/server/events/fold-messages.ts
 import stripAnsi from "strip-ansi";
 function cloneMessage(message) {
   return {
@@ -282,13 +282,9 @@ function appendSnapshotMessageContext(result, message) {
     contextMsg.attachments = message.attachments;
   }
   result.push(contextMsg);
-  if (!message.toolCalls) {
-    return;
-  }
+  if (!message.toolCalls) return;
   for (const toolCall of message.toolCalls) {
-    if (!toolCall.result) {
-      continue;
-    }
+    if (!toolCall.result) continue;
     result.push({
       role: "tool",
       content: stripAnsi(
@@ -303,9 +299,6 @@ Error: ${toolCall.result.error}` : `Error: ${toolCall.result.error}`
 function applyStoredMessageEvents(initialMessages, events) {
   return applyEvents(initialMessages, events, { timestampAsNumber: false });
 }
-function getTimestamp(event) {
-  return event.timestamp ?? Date.now();
-}
 function applyTurnEventsToSnapshotMessages(initialMessages, events) {
   const messages = applyEvents(initialMessages, events, {
     timestampAsNumber: true
@@ -435,9 +428,7 @@ function buildContextMessagesFromEventHistory(events, windowId, options) {
   }
   const snapshot = snapshotEvent.data;
   const snapshotMessages = snapshot.messages.reduce((result, message) => {
-    if (!shouldIncludeContextMessage(message, windowId, options)) {
-      return result;
-    }
+    if (!shouldIncludeContextMessage(message, windowId, options)) return result;
     appendSnapshotMessageContext(result, message);
     return result;
   }, []);
@@ -450,6 +441,21 @@ function foldTurnEventsToSnapshotMessages(events) {
 function foldTurnEventsToSnapshotMessagesFromInitial(events, initialMessages) {
   return applyTurnEventsToSnapshotMessages(initialMessages, events);
 }
+function getMessagesForWindow(messages, windowId) {
+  return messages.filter((m) => m.contextWindowId === windowId);
+}
+function buildContextMessagesFromMessages(messages, windowId) {
+  return getMessagesForWindow(messages, windowId).reduce((result, message) => {
+    if (!shouldIncludeContextMessage(message, windowId)) return result;
+    appendSnapshotMessageContext(result, message);
+    return result;
+  }, []);
+}
+
+// src/server/events/fold-state.ts
+function getTimestamp(event) {
+  return event.timestamp ?? Date.now();
+}
 function foldCriteria(events) {
   let criteria = [];
   for (const event of events) {
@@ -531,10 +537,7 @@ function foldContextState(events, initialWindowId) {
       case "file.read": {
         const data = event.data;
         if (data.contextWindowId === currentContextWindowId) {
-          readFilesMap.set(data.path, {
-            path: data.path,
-            tokenCount: data.tokenCount
-          });
+          readFilesMap.set(data.path, { path: data.path, tokenCount: data.tokenCount });
         }
         break;
       }
@@ -627,15 +630,10 @@ function foldSessionState(events, initialWindowId, maxTokens, initialMessages) {
     const event = events[i];
     if (event.type === "turn.snapshot") {
       const snapshotData = event.data;
-      if (snapshotData.cachedSystemPrompt && !cachedSystemPrompt) {
-        cachedSystemPrompt = snapshotData.cachedSystemPrompt;
-      }
-      if (snapshotData.dynamicContextHash && !dynamicContextHash) {
-        dynamicContextHash = snapshotData.dynamicContextHash;
-      }
-      if (snapshotData.metadataEntries && Object.keys(metadataEntries).length === 0) {
+      if (snapshotData.cachedSystemPrompt && !cachedSystemPrompt) cachedSystemPrompt = snapshotData.cachedSystemPrompt;
+      if (snapshotData.dynamicContextHash && !dynamicContextHash) dynamicContextHash = snapshotData.dynamicContextHash;
+      if (snapshotData.metadataEntries && Object.keys(metadataEntries).length === 0)
         metadataEntries = snapshotData.metadataEntries;
-      }
     }
   }
   let sessionInit;
@@ -678,18 +676,12 @@ function foldSessionState(events, initialWindowId, maxTokens, initialMessages) {
         const existing = visionFallbacks.find(
           (v) => v.messageId === data.messageId && v.attachmentId === data.attachmentId
         );
-        if (existing) {
-          existing.description = data.description;
-        }
+        if (existing) existing.description = data.description;
         break;
       }
       case "pattern.retry": {
         const data = event.data;
-        formatRetries.push({
-          attempt: data.attempt,
-          maxAttempts: data.maxAttempts,
-          timestamp: getTimestamp(event)
-        });
+        formatRetries.push({ attempt: data.attempt, maxAttempts: data.maxAttempts, timestamp: getTimestamp(event) });
         break;
       }
       case "chat.ask_user": {
@@ -713,10 +705,7 @@ function foldSessionState(events, initialWindowId, maxTokens, initialMessages) {
       }
       case "context.compacted": {
         const data = event.data;
-        contextWindows.push({
-          ...data,
-          timestamp: getTimestamp(event)
-        });
+        contextWindows.push({ ...data, timestamp: getTimestamp(event) });
         break;
       }
     }
@@ -782,9 +771,7 @@ function buildSnapshotFromSessionState(input) {
       break;
     }
   }
-  if (!initialWindowId) {
-    initialWindowId = "legacy-window-1";
-  }
+  if (!initialWindowId) initialWindowId = "legacy-window-1";
   const foldedState = foldSessionState(events, initialWindowId, maxTokens);
   const latestSnapshotIndex = events.map((event) => event.type).lastIndexOf("turn.snapshot");
   const latestSnapshotEvent = latestSnapshotIndex >= 0 ? events[latestSnapshotIndex] : void 0;
@@ -817,18 +804,6 @@ function buildSnapshotFromSessionState(input) {
     ...input.dynamicContextHash !== void 0 ? { dynamicContextHash: input.dynamicContextHash } : foldedState.dynamicContextHash !== void 0 ? { dynamicContextHash: foldedState.dynamicContextHash } : {}
   };
 }
-function getMessagesForWindow(messages, windowId) {
-  return messages.filter((m) => m.contextWindowId === windowId);
-}
-function buildContextMessagesFromMessages(messages, windowId) {
-  return getMessagesForWindow(messages, windowId).reduce((result, message) => {
-    if (!shouldIncludeContextMessage(message, windowId)) {
-      return result;
-    }
-    appendSnapshotMessageContext(result, message);
-    return result;
-  }, []);
-}
 
 export {
   spreadOptionalMessageFields,
@@ -842,6 +817,8 @@ export {
   buildContextMessagesFromEventHistory,
   foldTurnEventsToSnapshotMessages,
   foldTurnEventsToSnapshotMessagesFromInitial,
+  getMessagesForWindow,
+  buildContextMessagesFromMessages,
   foldCriteria,
   foldTodos,
   foldMetadata,
@@ -852,8 +829,6 @@ export {
   foldPendingConfirmations,
   foldSessionState,
   buildSnapshot,
-  buildSnapshotFromSessionState,
-  getMessagesForWindow,
-  buildContextMessagesFromMessages
+  buildSnapshotFromSessionState
 };
-//# sourceMappingURL=chunk-LX66KJPL.js.map
+//# sourceMappingURL=chunk-6PLAWCHQ.js.map

package/dist/{chunk-FWJ6YXGA.js → chunk-ASM2Z7JU.js}

@@ -1,10 +1,10 @@
 import {
   COMPACTION_PROMPT,
   createMessageStartEvent
-} from "./chunk-L7TDUIQY.js";
+} from "./chunk-DX37WNM7.js";
 import {
   getCurrentWindowMessageOptions
-} from "./chunk-SYG2ENUQ.js";
+} from "./chunk-YBWY4DKY.js";
 
 // src/server/context/compactor.ts
 function appendCompactionPrompt(sessionId, append) {
@@ -31,4 +31,4 @@ export {
   shouldCompact,
   getCompactionTarget
 };
-//# sourceMappingURL=chunk-FWJ6YXGA.js.map
+//# sourceMappingURL=chunk-ASM2Z7JU.js.map

package/dist/{chunk-L7TDUIQY.js → chunk-DX37WNM7.js}

@@ -8,6 +8,24 @@ import {
   logger
 } from "./chunk-K44MW7JJ.js";
 
+// src/server/tools/tool-policy.ts
+var ALWAYS_ALLOWED = /* @__PURE__ */ new Set(["step_done"]);
+var ALWAYS_ALLOWED_FOR_SUBAGENTS = /* @__PURE__ */ new Set(["return_value"]);
+var TOP_LEVEL_ONLY_TOOLS = /* @__PURE__ */ new Set(["call_sub_agent"]);
+function computeEffectiveTools(allowedTools, type) {
+  const tools = /* @__PURE__ */ new Set();
+  for (const entry of allowedTools) {
+    const baseName = entry.includes(":") ? entry.split(":")[0] : entry;
+    if (baseName === "return_value" && type === "agent") continue;
+    tools.add(baseName);
+  }
+  const alwaysAllowed = type === "sub-agent" ? ALWAYS_ALLOWED_FOR_SUBAGENTS : ALWAYS_ALLOWED;
+  for (const tool of alwaysAllowed) {
+    tools.add(tool);
+  }
+  return tools;
+}
+
 // src/server/chat/prompts.ts
 function buildBasePrompt(workdir, customInstructions, skills, modelName) {
   const instructionsSection = customInstructions ? `
@@ -199,8 +217,11 @@ function buildToolPermissionsSection(allowedTools, isSubAgent) {
       toolPermissions.set(toolName, [...existing, ...actions]);
     }
   }
-  if (isSubAgent && !baseTools.includes("return_value") && !toolPermissions.has("return_value")) {
-    baseTools.push("return_value");
+  const effectiveTools = computeEffectiveTools(allowedTools, isSubAgent ? "sub-agent" : "agent");
+  for (const tool of effectiveTools) {
+    if (!baseTools.includes(tool) && !toolPermissions.has(tool)) {
+      baseTools.push(tool);
+    }
   }
   const parts = [];
   for (const [toolName, actions] of toolPermissions) {
@@ -658,6 +679,10 @@ async function consumeStreamGenerator(gen, onEvent) {
 }
 
 export {
+  ALWAYS_ALLOWED,
+  ALWAYS_ALLOWED_FOR_SUBAGENTS,
+  TOP_LEVEL_ONLY_TOOLS,
+  computeEffectiveTools,
   buildBasePrompt,
   buildTopLevelSystemPrompt,
   buildSubAgentSystemPrompt,
@@ -674,4 +699,4 @@ export {
   createChatDoneEvent,
   consumeStreamGenerator
 };
-//# sourceMappingURL=chunk-L7TDUIQY.js.map
+//# sourceMappingURL=chunk-DX37WNM7.js.map

package/dist/{chunk-J7KOV4ST.js → chunk-GI24G4OW.js}

@@ -1,11 +1,11 @@
 import {
   getEventStore,
   updateSessionMetadata
-} from "./chunk-SYG2ENUQ.js";
+} from "./chunk-YBWY4DKY.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-LX66KJPL.js";
+} from "./chunk-6PLAWCHQ.js";
 import {
   createContextStateMessage,
   createSessionStateMessage
@@ -154,4 +154,4 @@ export {
   needsNameGenerationCheck,
   applyGeneratedSessionName
 };
-//# sourceMappingURL=chunk-J7KOV4ST.js.map
+//# sourceMappingURL=chunk-GI24G4OW.js.map

package/dist/{chunk-5ANV7YUX.js → chunk-T67KB6ZS.js}

@@ -1,11 +1,11 @@
 import {
   appendCompactionPrompt
-} from "./chunk-FWJ6YXGA.js";
+} from "./chunk-ASM2Z7JU.js";
 import {
   injectWorkflowKickoffIfNeeded,
   runAgentTurn,
   runChatTurn
-} from "./chunk-MS3PEYZK.js";
+} from "./chunk-VDC2QL2O.js";
 import {
   applyDynamicContext,
   checkAborted,
@@ -22,11 +22,11 @@ import {
   loadAllAgentsDefault,
   saveItemToDir,
   spawnShellProcess
-} from "./chunk-KYR4NVNX.js";
+} from "./chunk-TVQTTZYW.js";
 import {
   TurnMetrics,
   createMessageStartEvent
-} from "./chunk-L7TDUIQY.js";
+} from "./chunk-DX37WNM7.js";
 import {
   getPlatformShell,
   onProcessEvent
@@ -35,7 +35,7 @@ import {
   getCurrentContextWindowId,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-SYG2ENUQ.js";
+} from "./chunk-YBWY4DKY.js";
 import {
   createChatErrorMessage,
   createChatMessageMessage,
@@ -1775,7 +1775,7 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
             const runtimeConfig = getRuntimeConfig();
             const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
             const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
-            const { createToolRegistry } = await import("./tools-YWC3AJ66.js");
+            const { createToolRegistry } = await import("./tools-ZUOBYTVD.js");
             const allTools = createToolRegistry().definitions;
             const toolFingerprint = getToolFingerprint(allTools);
             const currentHash = computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -1848,7 +1848,7 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
           const runtimeConfig = getRuntimeConfig();
           const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
           const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
-          const { createToolRegistry } = await import("./tools-YWC3AJ66.js");
+          const { createToolRegistry } = await import("./tools-ZUOBYTVD.js");
           const allTools = createToolRegistry().definitions;
           const toolFingerprint = getToolFingerprint(allTools);
           const currentHash = computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -2069,4 +2069,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-5ANV7YUX.js.map
+//# sourceMappingURL=chunk-T67KB6ZS.js.map

package/dist/{chunk-KYR4NVNX.js → chunk-TVQTTZYW.js}

@@ -7,6 +7,7 @@ import {
   buildBasePrompt,
   buildSubAgentSystemPrompt,
   buildTopLevelSystemPrompt,
+  computeEffectiveTools,
   consumeStreamGenerator,
   createChatDoneEvent,
   createMessageDoneEvent,
@@ -14,7 +15,7 @@ import {
   createToolCallEvent,
   createToolResultEvent,
   streamLLMPure
-} from "./chunk-L7TDUIQY.js";
+} from "./chunk-DX37WNM7.js";
 import {
   startInspectProxy
 } from "./chunk-DL6ZILAF.js";
@@ -39,7 +40,7 @@ import {
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-SYG2ENUQ.js";
+} from "./chunk-YBWY4DKY.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -48,7 +49,7 @@ import {
   handleToolCall,
   handleToolResult,
   stripOrphanedToolCalls
-} from "./chunk-LX66KJPL.js";
+} from "./chunk-6PLAWCHQ.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
@@ -479,7 +480,7 @@ function validateAction(action, allowed, startTime) {
   return void 0;
 }
 function checkActionPermission(action, permittedActions, startTime) {
-  if (action && permittedActions && !permittedActions.includes(action)) {
+  if (action && permittedActions && permittedActions.length > 0 && !permittedActions.includes(action)) {
     return {
       success: false,
       error: `Action '${action}' not allowed. Available: ${permittedActions.join(", ")}`,
@@ -962,7 +963,8 @@ var readFileTool = createTool(
       metadata: {
         encoding,
         confidence: Math.round(confidence * 100) / 100,
-        lineCount: totalLines
+        lineCount: totalLines,
+        path: fullPath
       }
     });
   }
@@ -1059,7 +1061,10 @@ var writeFileTool = createTool(
     if (newHash) {
       context.sessionManager.updateFileHash(context.sessionId, fullPath, newHash);
     }
-    return helpers.success(output, false, diagnostics.length > 0 ? { diagnostics } : void 0);
+    return helpers.success(output, false, {
+      ...diagnostics.length > 0 && { diagnostics },
+      metadata: { path: fullPath }
+    });
   }
 );
 
@@ -1318,7 +1323,8 @@ Make sure whitespace and indentation match exactly.`
       }
       return helpers.success(output, false, {
         ...diagnostics.length > 0 && { diagnostics },
-        ...editContextRegions.length > 0 && { editContext: { regions: editContextRegions } }
+        ...editContextRegions.length > 0 && { editContext: { regions: editContextRegions } },
+        metadata: { path: fullPath }
       });
     });
   }
@@ -1496,16 +1502,15 @@ function executeCommand(command, cwd, timeout, signal, onProgress) {
     const proc = spawnShellProcess(command, cwd, signal, true);
     let stdout = "";
     let stderr = "";
-    let killed = false;
+    let timedOut = false;
     let aborted = false;
     let exited = false;
     const timer = setTimeout(() => {
-      killed = true;
+      timedOut = true;
       void terminateProcessTree(proc, { exited: () => exited });
-      reject(new Error(`Command timed out after ${timeout}ms`));
     }, timeout);
     const onAbort = () => {
-      if (!killed && !aborted) {
+      if (!timedOut && !aborted) {
         aborted = true;
         void terminateProcessTree(proc, { exited: () => exited });
       }
@@ -1525,7 +1530,16 @@ function executeCommand(command, cwd, timeout, signal, onProgress) {
       exited = true;
       clearTimeout(timer);
       signal?.removeEventListener("abort", onAbort);
-      if (killed) {
+      if (timedOut) {
+        let output = stdout.trim();
+        if (output) output += "\n\n";
+        output += `[Exit code: 124]
+[Process timed out after ${timeout}ms]`;
+        resolve6({
+          stdout: output,
+          stderr: stderr.trim(),
+          exitCode: 124
+        });
         return;
       }
       if (aborted) {
@@ -2536,7 +2550,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens);
     if (!compacting) {
       const contextState = sessionManager.getContextState(sessionId);
-      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-R7GRFBOU.js");
+      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-EOQYEOFS.js");
       if (shouldCompact(contextState.currentTokens, contextState.maxTokens, runtimeConfig.context.compactionThreshold)) {
         appendCompactionPrompt(sessionId, append);
         compacting = true;
@@ -3341,7 +3355,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-YWC3AJ66.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-ZUOBYTVD.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4147,7 +4161,7 @@ async function computeContextHash(sessionManager, sessionId) {
   const runtimeConfig = getRuntimeConfig();
   const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
   const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
-  const { createToolRegistry: createToolRegistry2 } = await import("./tools-YWC3AJ66.js");
+  const { createToolRegistry: createToolRegistry2 } = await import("./tools-ZUOBYTVD.js");
   const allTools = createToolRegistry2().definitions;
   const toolFingerprint = getToolFingerprint(allTools);
   const hash = computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -4260,7 +4274,7 @@ var mcpConfigTool = createTool(
       await saveGlobalConfig(mcpConfigMode, { ...globalConfig, mcpServers: updated });
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-YWC3AJ66.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-ZUOBYTVD.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -4361,6 +4375,37 @@ var mcpConfigTool = createTool(
 );
 
 // src/server/tools/index.ts
+var _builtInTools;
+function getBuiltInTools() {
+  if (!_builtInTools) {
+    _builtInTools = [
+      readFileTool,
+      writeFileTool,
+      editFileTool,
+      runCommandTool,
+      askUserTool,
+      sessionMetadataTool,
+      callSubAgentTool,
+      loadSkillTool,
+      returnValueTool,
+      webFetchTool,
+      devServerTool,
+      stepDoneTool,
+      backgroundProcessTool,
+      mcpConfigTool
+    ];
+  }
+  return _builtInTools;
+}
+function getBuiltInToolNames() {
+  if (BUILT_IN_TOOL_NAMES_CACHE.size === 0) {
+    for (const t of getBuiltInTools()) {
+      BUILT_IN_TOOL_NAMES_CACHE.add(t.name);
+    }
+  }
+  return BUILT_IN_TOOL_NAMES_CACHE;
+}
+var BUILT_IN_TOOL_NAMES_CACHE = /* @__PURE__ */ new Set();
 function parseToolPermissions(allowedTools) {
   const result = {};
   for (const entry of allowedTools) {
@@ -4396,9 +4441,8 @@ function validateToolAction(toolName, action, permissions) {
 function extractSubAgentPrompt(args) {
   return args["prompt"] || args["query"] || args["task"] || "";
 }
-function createRegistryFromTools(tools, allowedTools, toolPermissions) {
+function createRegistryFromTools(tools, allowedTools, toolPermissions, agentId, isSubAgent) {
   const toolMap = /* @__PURE__ */ new Map();
-  const allowedToolsSet = new Set(allowedTools || []);
   for (const tool of tools) {
     toolMap.set(tool.name, tool);
   }
@@ -4431,18 +4475,22 @@ function createRegistryFromTools(tools, allowedTools, toolPermissions) {
           truncated: false
         };
       }
-      const hasBaseToolPermission = allowedToolsSet.has(name) || [...allowedToolsSet].some((entry) => entry.startsWith(`${name}:`));
-      if (allowedTools && allowedTools.length > 0 && !hasBaseToolPermission) {
-        logger.debug("Permission denied: tool not in allowed list", {
-          tool: name,
-          allowedTools
-        });
-        return {
-          success: false,
-          error: createPermissionErrorMessage(name, allowedTools),
-          durationMs: 0,
-          truncated: false
-        };
+      const isMcpTool = !getBuiltInToolNames().has(name);
+      const hasRestrictions = allowedTools !== void 0;
+      if (!isMcpTool && hasRestrictions) {
+        const effectiveTools = computeEffectiveTools(allowedTools, isSubAgent ? "sub-agent" : "agent");
+        if (!effectiveTools.has(name)) {
+          logger.debug("Permission denied: tool not in allowed list", {
+            tool: name,
+            allowedTools
+          });
+          return {
+            success: false,
+            error: createPermissionErrorMessage(name, allowedTools, agentId, isSubAgent),
+            durationMs: 0,
+            truncated: false
+          };
+        }
       }
       if (toolPermissions) {
         const action = args["action"];
@@ -4503,30 +4551,20 @@ function setMcpTools(tools) {
   mcpToolsOverride = tools;
 }
 function getAllToolsMap() {
-  const builtInTools = [
-    readFileTool,
-    writeFileTool,
-    editFileTool,
-    runCommandTool,
-    askUserTool,
-    sessionMetadataTool,
-    callSubAgentTool,
-    loadSkillTool,
-    returnValueTool,
-    webFetchTool,
-    devServerTool,
-    stepDoneTool,
-    backgroundProcessTool,
-    mcpConfigTool
-  ].map((t) => [t.name, t]);
+  const builtInEntries = getBuiltInTools().map((t) => [t.name, t]);
   const mcpEntries = mcpToolsOverride.map((t) => [t.name, t]);
-  return new Map([...builtInTools, ...mcpEntries]);
+  return new Map([...builtInEntries, ...mcpEntries]);
 }
-function createPermissionErrorMessage(toolName, allowedTools) {
-  if (allowedTools.length === 0) {
+function createPermissionErrorMessage(toolName, allowedTools, agentId, isSubAgent) {
+  const effectiveTools = computeEffectiveTools(allowedTools, isSubAgent ? "sub-agent" : "agent");
+  const available = [...effectiveTools].sort();
+  if (agentId) {
+    return `Tool '${toolName}' is not available in '${agentId}' mode. Available: ${available.join(", ")}`;
+  }
+  if (available.length === 0) {
     return `Tool '${toolName}' is not in your allowed tools list. No tools are allowed.`;
   }
-  return `Tool '${toolName}' is not in your allowed tools list. Available: ${allowedTools.join(", ")}`;
+  return `Tool '${toolName}' is not in your allowed tools list. Available: ${available.join(", ")}`;
 }
 function addReturnValueToAllowedTools(allowedTools) {
   if (!allowedTools.includes("return_value")) {
@@ -4552,7 +4590,7 @@ function getToolRegistryForSubAgent(toolNames) {
     if (rv) tools.push(rv);
   }
   const allowedToolsWithReturnValue = addReturnValueToAllowedTools(toolNames);
-  return createRegistryFromTools(tools, allowedToolsWithReturnValue, toolPermissions);
+  return createRegistryFromTools(tools, allowedToolsWithReturnValue, toolPermissions, void 0, true);
 }
 function getToolRegistryForAgent(agentDef) {
   if (agentDef.metadata.subagent) {
@@ -4560,15 +4598,15 @@ function getToolRegistryForAgent(agentDef) {
   }
   const allTools = getAllToolsMap();
   const tools = [];
-  const allowedTools = [];
   for (const [name, tool] of allTools.entries()) {
     if (name === "return_value") {
       continue;
     }
     tools.push(tool);
-    allowedTools.push(name);
   }
-  return createRegistryFromTools(tools, allowedTools);
+  const allowedTools = agentDef.metadata.allowedTools;
+  const toolPermissions = parseToolPermissions(allowedTools);
+  return createRegistryFromTools(tools, allowedTools, toolPermissions, agentDef.metadata.id, false);
 }
 function createToolRegistry() {
   return createRegistryFromTools(Array.from(getAllToolsMap().values()));
@@ -4640,4 +4678,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-KYR4NVNX.js.map
+//# sourceMappingURL=chunk-TVQTTZYW.js.map

package/dist/{chunk-MS3PEYZK.js → chunk-VDC2QL2O.js}

@@ -14,7 +14,7 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-KYR4NVNX.js";
+} from "./chunk-TVQTTZYW.js";
 import {
   TurnMetrics,
   WORKFLOW_KICKOFF_PROMPT,
@@ -22,16 +22,16 @@ import {
   buildAgentSmallReminder,
   createChatDoneEvent,
   createMessageStartEvent
-} from "./chunk-L7TDUIQY.js";
+} from "./chunk-DX37WNM7.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-SYG2ENUQ.js";
+} from "./chunk-YBWY4DKY.js";
 import {
   buildSnapshotFromSessionState
-} from "./chunk-LX66KJPL.js";
+} from "./chunk-6PLAWCHQ.js";
 import {
   getGlobalConfigDir
 } from "./chunk-CQGTEGKL.js";
@@ -320,4 +320,4 @@ export {
   runAgentTurn,
   injectWorkflowKickoffIfNeeded
 };
-//# sourceMappingURL=chunk-MS3PEYZK.js.map
+//# sourceMappingURL=chunk-VDC2QL2O.js.map

package/dist/{chunk-SYG2ENUQ.js → chunk-YBWY4DKY.js}

@@ -5,7 +5,7 @@ import {
   foldContextState,
   foldSessionState,
   spreadOptionalMessageFields
-} from "./chunk-LX66KJPL.js";
+} from "./chunk-6PLAWCHQ.js";
 import {
   getDatabase
 } from "./chunk-FBGWG4N6.js";
@@ -1397,4 +1397,4 @@ export {
   truncateSessionMessages,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-SYG2ENUQ.js.map
+//# sourceMappingURL=chunk-YBWY4DKY.js.map