openfox 2.0.63 → 2.0.65

package/dist/{chat-handler-WNARPARQ.js → chat-handler-MC3XZ3OV.js}

@@ -5,8 +5,8 @@ import {
 } from "./chunk-QJ5FH5DP.js";
 import {
   runChatTurn
-} from "./chunk-IVJYQZSN.js";
-import "./chunk-5OPZLQDV.js";
+} from "./chunk-VWPY2KWH.js";
+import "./chunk-UEIQKG5P.js";
 import "./chunk-X5YCWKNS.js";
 import "./chunk-LBGHZLLH.js";
 import "./chunk-BGTEIA2S.js";
@@ -21,8 +21,8 @@ import {
   createPhaseChangedMessage,
   createSessionRunningMessage
 } from "./chunk-F4PMNP7S.js";
+import "./chunk-PXJ4NOP4.js";
 import "./chunk-EU3WWTFH.js";
-import "./chunk-SVSKQYFH.js";
 import "./chunk-YQ3SOPBI.js";
 import "./chunk-ZPIZLTWU.js";
 import "./chunk-J2GP3J3X.js";
@@ -154,4 +154,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-WNARPARQ.js.map
+//# sourceMappingURL=chat-handler-MC3XZ3OV.js.map

package/dist/{chunk-FGG4KRFX.js → chunk-4UYKN6JU.js}

@@ -208,7 +208,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-HB222ARV.js");
+      const { runServe } = await import("./serve-ZRTWVOL2.js");
       const serveOptions = { mode };
       if (values.port) serveOptions.port = parseInt(values.port);
       if (values["no-browser"] === true) serveOptions.openBrowser = false;
@@ -220,4 +220,4 @@ async function runCli(options) {
 export {
   runCli
 };
-//# sourceMappingURL=chunk-FGG4KRFX.js.map
+//# sourceMappingURL=chunk-4UYKN6JU.js.map

package/dist/{chunk-W4PUAODY.js → chunk-N4K3PNOS.js}

@@ -7,7 +7,7 @@ import {
   injectWorkflowKickoffIfNeeded,
   runAgentTurn,
   runChatTurn
-} from "./chunk-IVJYQZSN.js";
+} from "./chunk-VWPY2KWH.js";
 import {
   checkAborted,
   deleteItemFromDir,
@@ -19,7 +19,7 @@ import {
   loadAllAgentsDefault,
   saveItemToDir,
   spawnShellProcess
-} from "./chunk-5OPZLQDV.js";
+} from "./chunk-UEIQKG5P.js";
 import {
   TurnMetrics,
   createMessageStartEvent
@@ -2092,4 +2092,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-W4PUAODY.js.map
+//# sourceMappingURL=chunk-N4K3PNOS.js.map

package/dist/{chunk-SVSKQYFH.js → chunk-PXJ4NOP4.js}

@@ -24,7 +24,8 @@ var SETTINGS_KEYS = {
   SEARCH_ENGINE: "search.engine",
   SEARCH_TAVILY_API_KEY: "search.tavilyApiKey",
   SEARCH_SEARXNG_URL: "search.searxngUrl",
-  SEARCH_SEARXNG_API_KEY: "search.searxngApiKey"
+  SEARCH_SEARXNG_API_KEY: "search.searxngApiKey",
+  TOOLS_USE_RTK: "tools.useRtk"
 };
 var SETTINGS_DEFAULTS = {
   [SETTINGS_KEYS.DISPLAY_SHOW_THINKING]: "true",
@@ -49,7 +50,8 @@ var SETTINGS_DEFAULTS = {
       { type: "chord", key: "3", modifiers: ["ctrl"] },
       { type: "chord", key: "4", modifiers: ["ctrl"] }
     ]
-  })
+  }),
+  [SETTINGS_KEYS.TOOLS_USE_RTK]: "false"
 };
 function getSetting(key) {
   try {
@@ -97,4 +99,4 @@ export {
   deleteSetting,
   getAllSettings
 };
-//# sourceMappingURL=chunk-SVSKQYFH.js.map
+//# sourceMappingURL=chunk-PXJ4NOP4.js.map

package/dist/{chunk-5OPZLQDV.js → chunk-UEIQKG5P.js}

@@ -54,16 +54,16 @@ import {
   createChatPathConfirmationMessage,
   createQueueStateMessage
 } from "./chunk-F4PMNP7S.js";
-import {
-  AskUserInterrupt,
-  askUserTool
-} from "./chunk-EU3WWTFH.js";
 import {
   SETTINGS_KEYS,
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-SVSKQYFH.js";
+} from "./chunk-PXJ4NOP4.js";
+import {
+  AskUserInterrupt,
+  askUserTool
+} from "./chunk-EU3WWTFH.js";
 import {
   getProject
 } from "./chunk-YQ3SOPBI.js";
@@ -380,7 +380,21 @@ function extractGitNoVerify(command) {
   }
   return false;
 }
-async function requestPathAccess(paths, workdir, sessionId, callId, tool, onEvent, dangerLevel, command) {
+async function requestPathAccess(paths, workdir, sessionId, callId, tool, onEvent, dangerLevel, command, isSubAgent) {
+  if (isSubAgent) {
+    const result2 = await checkPathsAccess(paths, workdir, sessionId);
+    if (!result2.needsConfirmation) return;
+    if (dangerLevel === "dangerous") {
+      const allPaths2 = [.../* @__PURE__ */ new Set([...result2.deniedPaths, ...result2.sensitivePaths])];
+      addAllowedPaths(sessionId, allPaths2);
+      return;
+    }
+    const allPaths = [.../* @__PURE__ */ new Set([...result2.deniedPaths, ...result2.sensitivePaths])];
+    const hasDenied2 = result2.deniedPaths.length > 0;
+    const hasSensitive2 = result2.sensitivePaths.length > 0;
+    const reason2 = hasDenied2 && hasSensitive2 ? "both" : hasDenied2 ? "outside_workdir" : "sensitive_file";
+    throw new PathAccessDeniedError(allPaths, tool, reason2);
+  }
   const emitPendingEvent = (confirmationPaths, confirmationReason) => {
     try {
       const eventStore = getEventStore();
@@ -553,7 +567,8 @@ function createTool(name, definition, handler2) {
               name,
               context.onEvent,
               context.dangerLevel,
-              command
+              command,
+              context.isSubAgent
             );
           }
         },
@@ -1433,7 +1448,9 @@ Make sure whitespace and indentation match exactly.`
 );
 
 // src/server/tools/shell.ts
+import { spawn as spawn2 } from "child_process";
 import { resolve as resolve4, isAbsolute as isAbsolute2 } from "path";
+import { access } from "fs/promises";
 
 // src/server/utils/shell.ts
 import { spawn } from "child_process";
@@ -1465,6 +1482,33 @@ function stripTailPipe(command) {
 }
 
 // src/server/tools/shell.ts
+var rtkAvailable;
+async function checkRtkAvailability() {
+  if (rtkAvailable !== void 0) return rtkAvailable;
+  try {
+    await access("/usr/local/bin/rtk");
+    rtkAvailable = true;
+  } catch {
+    try {
+      const out = await new Promise((resolve6, reject) => {
+        const proc = spawn2("rtk", ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
+        let output = "";
+        proc.stdout?.on("data", (d) => {
+          output += d.toString();
+        });
+        proc.on("error", reject);
+        proc.on("close", (code) => {
+          if (code === 0) resolve6(output.trim());
+          else reject(new Error(`exit ${code}`));
+        });
+      });
+      rtkAvailable = out.startsWith("rtk ");
+    } catch {
+      rtkAvailable = false;
+    }
+  }
+  return rtkAvailable;
+}
 function hasBackgroundAmpersand(command) {
   const trimmed = command.replace(/[;\s]+$/, "");
   if (trimmed.endsWith("&")) {
@@ -1523,7 +1567,9 @@ var runCommandTool = createTool(
     await helpers.checkPathAccess(pathsToCheck, args.command);
     const tailInfo = stripTailPipe(args.command);
     const execCommand = tailInfo ? tailInfo.command : args.command;
-    const result = await executeCommand(execCommand, workingDir, timeout, context.signal, context.onProgress);
+    const useRtk = getSetting(SETTINGS_KEYS.TOOLS_USE_RTK) === "true";
+    const finalCommand = useRtk ? await tryRtkRewrite(execCommand) : execCommand;
+    const result = await executeCommand(finalCommand, workingDir, timeout, context.signal, context.onProgress);
     let output = "";
     if (result.stdout) {
       output += result.stdout;
@@ -1561,6 +1607,29 @@ ${result.stderr}`;
     });
   }
 );
+async function tryRtkRewrite(command) {
+  if (!await checkRtkAvailability()) return command;
+  try {
+    const result = await new Promise((resolve6, reject) => {
+      const proc = spawn2("rtk", ["rewrite", command], {
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 2e3
+      });
+      let stdout = "";
+      proc.stdout?.on("data", (data) => {
+        stdout += data.toString();
+      });
+      proc.on("error", reject);
+      proc.on("close", (code) => {
+        if (code === 0 || code === 3) resolve6(stdout.trim());
+        else reject(new Error(`exit ${code}`));
+      });
+    });
+    if (result && result !== command) return result;
+  } catch {
+  }
+  return command;
+}
 function executeCommand(command, cwd, timeout, signal, onProgress) {
   return new Promise((resolve6, reject) => {
     if (checkAborted(signal)) {
@@ -1785,24 +1854,24 @@ ${Object.entries(schema.fields).map(([f, t]) => `  ${f}: ${t}`).join("\n")}`
 );
 
 // src/server/sub-agents/manager.ts
-import { readFile as readFile8, access as access4 } from "fs/promises";
+import { readFile as readFile8, access as access5 } from "fs/promises";
 import { join as join7, dirname as dirname5, isAbsolute as isAbsolute3 } from "path";
 
 // src/server/agents/registry.ts
-import { readdir as readdir3, readFile as readFile5, writeFile as writeFile4, mkdir as mkdir3, access as access2, unlink as unlink2 } from "fs/promises";
+import { readdir as readdir3, readFile as readFile5, writeFile as writeFile4, mkdir as mkdir3, access as access3, unlink as unlink2 } from "fs/promises";
 import { join as join4, dirname as dirname2 } from "path";
 import { constants as constants2 } from "fs";
 import { fileURLToPath } from "url";
 import matter2 from "gray-matter";
 
 // src/server/shared/item-loader.ts
-import { readdir as readdir2, readFile as readFile4, access, writeFile as writeFile3, mkdir as mkdir2, unlink } from "fs/promises";
+import { readdir as readdir2, readFile as readFile4, access as access2, writeFile as writeFile3, mkdir as mkdir2, unlink } from "fs/promises";
 import { join as join3 } from "path";
 import { constants } from "fs";
 import matter from "gray-matter";
 async function pathExists(path) {
   try {
-    await access(path, constants.R_OK);
+    await access2(path, constants.R_OK);
     return true;
   } catch {
     return false;
@@ -1880,7 +1949,7 @@ function getProjectAgentsDir(projectDir) {
 }
 async function pathExists2(path) {
   try {
-    await access2(path, constants2.R_OK);
+    await access3(path, constants2.R_OK);
     return true;
   } catch {
     return false;
@@ -2059,7 +2128,7 @@ async function deleteAgent(configDir, agentId) {
 }
 
 // src/server/context/instructions.ts
-import { readFile as readFile6, access as access3 } from "fs/promises";
+import { readFile as readFile6, access as access4 } from "fs/promises";
 import { join as join5, dirname as dirname3 } from "path";
 import { constants as constants3 } from "fs";
 var INSTRUCTION_FILENAMES = ["AGENTS.md", "CLAUDE.md"];
@@ -2142,7 +2211,7 @@ ${agentContent}`);
 }
 async function fileExists(path) {
   try {
-    await access3(path, constants3.R_OK);
+    await access4(path, constants3.R_OK);
     return true;
   } catch {
     return false;
@@ -2579,6 +2648,9 @@ async function executeTools(assistantMsgId, toolCalls, ctx, append) {
     if (ctx.dangerLevel) {
       toolContext.dangerLevel = ctx.dangerLevel;
     }
+    if (ctx.isSubAgent) {
+      toolContext.isSubAgent = true;
+    }
     const startTime = Date.now();
     let toolResult;
     try {
@@ -2957,6 +3029,9 @@ ${COMPACTION_PROMPT}`,
         if (session.dangerLevel) {
           batchContext.dangerLevel = session.dangerLevel;
         }
+        if (config.subAgentMetadata) {
+          batchContext.isSubAgent = true;
+        }
         batchContext.agentTimeout = getRuntimeConfig().agent.toolTimeout;
         const batchResult = await executeTools(assistantMsgId, result.toolCalls, batchContext, append);
         if (batchResult.stepDoneCalled) {
@@ -3564,7 +3639,7 @@ async function loadGitIgnoreRules(workdir) {
   while (true) {
     const gitignorePath = join7(currentDir, ".gitignore");
     try {
-      await access4(gitignorePath);
+      await access5(gitignorePath);
       const content = await readFile8(gitignorePath, "utf-8");
       const trimmed = content.trim();
       if (!trimmed) return "";
@@ -3766,7 +3841,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-W2FFSF4N.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-ZZM36DAZ.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4050,7 +4125,7 @@ var webFetchTool = createTool(
 );
 
 // src/server/dev-server/manager.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { readFile as readFile9, writeFile as writeFile6, mkdir as mkdir5 } from "fs/promises";
 import { resolve as resolve5, join as join8 } from "path";
 var MAX_LOG_LINES = 2e3;
@@ -4164,7 +4239,7 @@ var DevServerManager = class {
     }
     const resolved = this.resolveWorkdir(workdir);
     const shell = getPlatformShell();
-    const proc = spawn2(shell.command, [...shell.args, config.command], {
+    const proc = spawn3(shell.command, [...shell.args, config.command], {
       cwd: resolved,
       env: { ...process.env, FORCE_COLOR: "1" },
       stdio: ["ignore", "pipe", "pipe"],
@@ -4688,7 +4763,7 @@ var mcpConfigTool = createTool(
       mcpNotifyChanged?.(sessionId);
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-W2FFSF4N.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-ZZM36DAZ.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -5259,103 +5334,114 @@ function createRegistryFromTools(tools, allowedTools, toolPermissions, agentId,
   for (const tool of tools) {
     toolMap.set(tool.name, tool);
   }
+  async function trySubAgentAlias(name, args, context) {
+    if (!toolMap.has("call_sub_agent")) {
+      return null;
+    }
+    try {
+      const agents = await loadAllAgentsDefault();
+      const agentDef = findAgentById(name, agents);
+      if (!agentDef?.metadata.subagent) {
+        return null;
+      }
+      const prompt = extractSubAgentPrompt(args);
+      logger.info("Sub-agent alias transformation", {
+        from: name,
+        to: "call_sub_agent",
+        subAgentType: name
+      });
+      return callSubAgentTool.execute({ subAgentType: name, prompt }, context);
+    } catch (err) {
+      logger.warn("Sub-agent alias resolution failed", {
+        tool: name,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      return null;
+    }
+  }
   return {
     tools,
     definitions: tools.map((t) => t.definition),
     async execute(name, args, context) {
       const tool = toolMap.get(name);
-      if (!tool) {
-        if (toolMap.has("call_sub_agent")) {
-          try {
-            const agents = await loadAllAgentsDefault();
-            const agentDef = findAgentById(name, agents);
-            if (agentDef?.metadata.subagent) {
-              const prompt = extractSubAgentPrompt(args);
-              logger.warn("Sub-agent alias redirect", { from: name, to: "call_sub_agent", subAgentType: name });
-              return callSubAgentTool.execute({ subAgentType: name, prompt }, context);
-            }
-          } catch (err) {
-            logger.warn("Sub-agent alias resolution failed", {
+      if (tool) {
+        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,
-              error: err instanceof Error ? err.message : String(err)
+              allowedTools
             });
+            return {
+              success: false,
+              error: createPermissionErrorMessage(name, allowedTools, agentId, isSubAgent),
+              durationMs: 0,
+              truncated: false
+            };
           }
         }
-        return {
-          success: false,
-          error: `Unknown tool: ${name}. Available tools: ${tools.map((t) => t.name).join(", ")}`,
-          durationMs: 0,
-          truncated: false
+        if (toolPermissions) {
+          const action = args["action"];
+          if (action) {
+            const actionError = validateToolAction(name, action, toolPermissions);
+            if (actionError) {
+              logger.debug("Permission denied: action not allowed", {
+                tool: name,
+                action,
+                toolPermissions
+              });
+              return {
+                success: false,
+                error: actionError,
+                durationMs: 0,
+                truncated: false
+              };
+            }
+          }
+        }
+        const permittedActionsArray = {};
+        for (const [key, value] of Object.entries(toolPermissions || {})) {
+          permittedActionsArray[key] = [...value];
+        }
+        const contextWithPerms = {
+          ...context,
+          permittedActions: Object.keys(permittedActionsArray).length > 0 ? permittedActionsArray : void 0
         };
-      }
-      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", {
+        logger.debug("Executing tool", { tool: name, args });
+        try {
+          const result = await tool.execute(args, contextWithPerms);
+          logger.debug("Tool completed", {
             tool: name,
-            allowedTools
+            success: result.success,
+            durationMs: result.durationMs
           });
+          return result;
+        } catch (error) {
+          if (error instanceof AskUserInterrupt) {
+            throw error;
+          }
+          if (error instanceof PathAccessDeniedError) {
+            throw error;
+          }
+          logger.error("Tool execution error", { tool: name, error });
           return {
             success: false,
-            error: createPermissionErrorMessage(name, allowedTools, agentId, isSubAgent),
+            error: error instanceof Error ? error.message : "Unknown error",
             durationMs: 0,
             truncated: false
           };
         }
       }
-      if (toolPermissions) {
-        const action = args["action"];
-        if (action) {
-          const actionError = validateToolAction(name, action, toolPermissions);
-          if (actionError) {
-            logger.debug("Permission denied: action not allowed", {
-              tool: name,
-              action,
-              toolPermissions
-            });
-            return {
-              success: false,
-              error: actionError,
-              durationMs: 0,
-              truncated: false
-            };
-          }
-        }
-      }
-      const permittedActionsArray = {};
-      for (const [key, value] of Object.entries(toolPermissions || {})) {
-        permittedActionsArray[key] = [...value];
-      }
-      const contextWithPerms = {
-        ...context,
-        permittedActions: Object.keys(permittedActionsArray).length > 0 ? permittedActionsArray : void 0
+      const aliasResult = await trySubAgentAlias(name, args, context);
+      if (aliasResult) return aliasResult;
+      return {
+        success: false,
+        error: `Unknown tool: ${name}. Available tools: ${tools.map((t) => t.name).join(", ")}`,
+        durationMs: 0,
+        truncated: false
       };
-      logger.debug("Executing tool", { tool: name, args });
-      try {
-        const result = await tool.execute(args, contextWithPerms);
-        logger.debug("Tool completed", {
-          tool: name,
-          success: result.success,
-          durationMs: result.durationMs
-        });
-        return result;
-      } catch (error) {
-        if (error instanceof AskUserInterrupt) {
-          throw error;
-        }
-        if (error instanceof PathAccessDeniedError) {
-          throw error;
-        }
-        logger.error("Tool execution error", { tool: name, error });
-        return {
-          success: false,
-          error: error instanceof Error ? error.message : "Unknown error",
-          durationMs: 0,
-          truncated: false
-        };
-      }
     }
   };
 }
@@ -5492,4 +5578,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-5OPZLQDV.js.map
+//# sourceMappingURL=chunk-UEIQKG5P.js.map

package/dist/{chunk-IVJYQZSN.js → chunk-VWPY2KWH.js}

@@ -10,7 +10,7 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-5OPZLQDV.js";
+} from "./chunk-UEIQKG5P.js";
 import {
   TurnMetrics,
   WORKFLOW_KICKOFF_PROMPT,
@@ -65,7 +65,7 @@ function resolveAgentDef(sessionManager, sessionId) {
 }
 async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-W2FFSF4N.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-ZZM36DAZ.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   const allAgents = await loadAllAgentsDefault();
@@ -78,7 +78,7 @@ async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
 async function computeSessionHash(sessionManager, sessionId) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
   const agentDef = await resolveAgentDef(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-W2FFSF4N.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-ZZM36DAZ.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   return computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -96,7 +96,7 @@ async function applyDynamicContext(sessionManager, sessionId) {
 
 // src/server/chat/orchestrator.ts
 async function buildRetryPatterns() {
-  const { getSetting, SETTINGS_KEYS } = await import("./settings-ASLTSUE2.js");
+  const { getSetting, SETTINGS_KEYS } = await import("./settings-JA4XUR3W.js");
   const raw = getSetting(SETTINGS_KEYS.RETRY_PATTERNS);
   if (!raw) {
     const oldXmlProtection = getSetting("llm.disableXmlProtection");
@@ -383,4 +383,4 @@ export {
   runAgentTurn,
   injectWorkflowKickoffIfNeeded
 };
-//# sourceMappingURL=chunk-IVJYQZSN.js.map
+//# sourceMappingURL=chunk-VWPY2KWH.js.map