openfox 2.0.81 → 2.0.83

package/dist/{chunk-EZDTCQMR.js → chunk-D324ULDG.js}

@@ -9,10 +9,10 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-D25OSL6V.js";
+} from "./chunk-OBQN5ATP.js";
 import {
   PathAccessDeniedError
-} from "./chunk-4GMRZU7A.js";
+} from "./chunk-3D3N2PXI.js";
 import {
   TurnMetrics,
   buildAgentReminder,
@@ -20,7 +20,7 @@ import {
   buildTopLevelSystemPrompt,
   createChatDoneEvent,
   createMessageStartEvent
-} from "./chunk-QHLWWQRC.js";
+} from "./chunk-FVY2JOTO.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
@@ -66,7 +66,7 @@ function resolveAgentDef(sessionManager, sessionId) {
 }
 async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-FZ7HWHOW.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-X4YLRR2Y.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   const allAgents = await loadAllAgentsDefault();
@@ -79,7 +79,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-FZ7HWHOW.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-X4YLRR2Y.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   return computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -97,7 +97,7 @@ async function applyDynamicContext(sessionManager, sessionId) {
 
 // src/server/chat/orchestrator.ts
 async function buildRetryPatterns() {
-  const { getSetting, SETTINGS_KEYS } = await import("./settings-DMYBLBDQ.js");
+  const { getSetting, SETTINGS_KEYS } = await import("./settings-6TJIHDVX.js");
   const raw = getSetting(SETTINGS_KEYS.RETRY_PATTERNS);
   if (!raw) {
     const oldXmlProtection = getSetting("llm.disableXmlProtection");
@@ -149,18 +149,6 @@ async function runChatTurn(options) {
   const mode = session.mode;
   logger.debug("Starting chat turn", { sessionId, mode });
   sessionManager.setRunning(sessionId, true);
-  const branchWarning = await sessionManager.checkBranchConsistency(sessionId);
-  if (branchWarning) {
-    logger.warn("Branch consistency check failed", { sessionId, warning: branchWarning });
-    sessionManager.addMessage(sessionId, {
-      role: "user",
-      content: `<system-reminder>
-${branchWarning}
-</system-reminder>`,
-      isSystemGenerated: true,
-      messageKind: "auto-prompt"
-    });
-  }
   const append = (event) => {
     try {
       eventStore.append(sessionId, event);
@@ -371,4 +359,4 @@ export {
   runChatTurn,
   runAgentTurn
 };
-//# sourceMappingURL=chunk-EZDTCQMR.js.map
+//# sourceMappingURL=chunk-D324ULDG.js.map

package/dist/{chunk-E3MS5CF7.js → chunk-DQP5HSDS.js}

@@ -1,7 +1,7 @@
 import {
   COMPACTION_PROMPT,
   createMessageStartEvent
-} from "./chunk-QHLWWQRC.js";
+} from "./chunk-FVY2JOTO.js";
 import {
   getCurrentWindowMessageOptions
 } from "./chunk-BUXIESO5.js";
@@ -34,4 +34,4 @@ export {
   COMPACTION_MAX_RATIO,
   shouldCompact
 };
-//# sourceMappingURL=chunk-E3MS5CF7.js.map
+//# sourceMappingURL=chunk-DQP5HSDS.js.map

package/dist/{chunk-QHLWWQRC.js → chunk-FVY2JOTO.js}

@@ -1,6 +1,6 @@
 import {
   getPlatformShell
-} from "./chunk-VZYC5OLW.js";
+} from "./chunk-5ZHVQOI3.js";
 import {
   streamWithSegments
 } from "./chunk-J2GP3J3X.js";
@@ -680,4 +680,4 @@ export {
   createChatDoneEvent,
   consumeStreamGenerator
 };
-//# sourceMappingURL=chunk-QHLWWQRC.js.map
+//# sourceMappingURL=chunk-FVY2JOTO.js.map

package/dist/{chunk-XW7BCI3O.js → chunk-HLZUN7OR.js}

@@ -163,7 +163,7 @@ async function runCli(options) {
       break;
     }
     case "provider": {
-      const { runProviderCommand } = await import("./provider-TIZV4IFE.js");
+      const { runProviderCommand } = await import("./provider-QVVJ6XNZ.js");
       const [, subcommand] = positionals;
       await runProviderCommand(mode, subcommand);
       break;
@@ -200,7 +200,7 @@ async function runCli(options) {
       break;
     }
     case "update": {
-      const { runUpdate } = await import("./update-SVJRA6YZ.js");
+      const { runUpdate } = await import("./update-MFOCAROI.js");
       const code = await runUpdate();
       if (code !== 0) {
         process.exit(code);
@@ -213,7 +213,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-PESDYZZP.js");
+      const { runServe } = await import("./serve-HXV2RX3Q.js");
       const serveOptions = { mode };
       if (values.port) serveOptions.port = parseInt(values.port);
       if (values["no-browser"] === true) serveOptions.openBrowser = false;
@@ -225,4 +225,4 @@ async function runCli(options) {
 export {
   runCli
 };
-//# sourceMappingURL=chunk-XW7BCI3O.js.map
+//# sourceMappingURL=chunk-HLZUN7OR.js.map

package/dist/{chunk-ZO5EXQMG.js → chunk-IIRXKSB5.js}

@@ -1,3 +1,7 @@
+import {
+  SETTINGS_KEYS,
+  getSetting
+} from "./chunk-CNJ63FXJ.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -24,6 +28,52 @@ var LLMError = class extends OpenFoxError {
   }
 };
 
+// src/server/llm/proxy.ts
+import { fetch as undiciFetch, ProxyAgent } from "undici";
+var _cachedProxyUrl;
+var _cachedAgent;
+function getProxyAgent() {
+  const proxyUrl = getSetting(SETTINGS_KEYS.PROXY_URL) ?? void 0;
+  if (!proxyUrl) {
+    if (_cachedAgent) {
+      _cachedAgent.destroy().catch((err) => {
+        logger.warn("[proxy] Failed to destroy old proxy agent", { error: err });
+      });
+      _cachedAgent = void 0;
+      _cachedProxyUrl = void 0;
+    }
+    return void 0;
+  }
+  if (proxyUrl !== _cachedProxyUrl) {
+    if (_cachedAgent) {
+      _cachedAgent.destroy().catch((err) => {
+        logger.warn("[proxy] Failed to destroy old proxy agent", { error: err });
+      });
+    }
+    _cachedProxyUrl = proxyUrl;
+    try {
+      _cachedAgent = new ProxyAgent({
+        uri: proxyUrl,
+        requestTls: { rejectUnauthorized: true }
+      });
+      logger.info("[proxy] Proxy agent created", { proxyUrl });
+    } catch (err) {
+      logger.error("[proxy] Failed to create proxy agent", { proxyUrl, error: err });
+      _cachedAgent = void 0;
+      _cachedProxyUrl = void 0;
+      return void 0;
+    }
+  }
+  return _cachedAgent;
+}
+async function proxyFetch(url, options) {
+  const agent = getProxyAgent();
+  if (agent) {
+    return undiciFetch(url, { ...options, dispatcher: agent });
+  }
+  return fetch(url, options);
+}
+
 // src/server/llm/http-client.ts
 var OpenAIHttpClient = class {
   baseURL;
@@ -40,7 +90,7 @@ var OpenAIHttpClient = class {
     };
     const bodyStr = JSON.stringify(params);
     logger.debug("HTTP request to LLM", { url, bodyKeys: Object.keys(params) });
-    const response = await fetch(url, {
+    const response = await proxyFetch(url, {
       method: "POST",
       headers,
       body: bodyStr,
@@ -110,6 +160,7 @@ var OpenAIHttpClient = class {
 export {
   SessionNotFoundError,
   LLMError,
+  proxyFetch,
   OpenAIHttpClient
 };
-//# sourceMappingURL=chunk-ZO5EXQMG.js.map
+//# sourceMappingURL=chunk-IIRXKSB5.js.map

package/dist/chunk-J7GAZGZT.js

@@ -0,0 +1,57 @@
+// src/server/git/env.ts
+var GIT_ENV_VARS = [
+  "GIT_DIR",
+  "GIT_INDEX_FILE",
+  "GIT_WORK_TREE",
+  "GIT_PREFIX",
+  "GIT_OBJECT_DIRECTORY",
+  "GIT_ALTERNATE_OBJECT_DIRECTORIES",
+  "GIT_COMMON_DIR",
+  "GIT_CEILING_DIRECTORIES",
+  "GIT_DISCOVERY_ACROSS_FILESYSTEM",
+  "GIT_NAMESPACE",
+  "GIT_SHALLOW_FILE",
+  "GIT_CONFIG_SYSTEM",
+  "GIT_CONFIG_GLOBAL",
+  "GIT_CONFIG_NOSYSTEM",
+  "GIT_CONFIG_COUNT",
+  "GIT_SSH",
+  "GIT_SSH_COMMAND",
+  "GIT_SSL_NO_VERIFY",
+  "GIT_TERMINAL_PROMPT",
+  "GIT_PROTOCOL_FROM_USER",
+  "GIT_ALLOW_PROTOCOL",
+  "GIT_LITERAL_PATHSPECS",
+  "GIT_GLOB_PATHSPECS",
+  "GIT_NOGLOB_PATHSPECS",
+  "GIT_ICASE_PATHSPECS",
+  "GIT_FLUSH",
+  "GIT_REFLOG_ACTION",
+  "GIT_SEQUENCE_EDITOR",
+  "GIT_EDITOR",
+  "GIT_PAGER",
+  "GIT_EXTERNAL_DIFF",
+  "GIT_DIFF_OPTS",
+  "GIT_NOTES_REF",
+  "GIT_NOTES_DISPLAY_REF",
+  "GIT_NOTES_REWRITE_MODE",
+  "GIT_NOTES_REWRITE_REF",
+  "GIT_MERGE_AUTOEDIT"
+];
+function gitSpawnEnv() {
+  const env = { ...process.env };
+  for (const key of GIT_ENV_VARS) {
+    delete env[key];
+  }
+  for (const key of Object.keys(env)) {
+    if (/^GIT_CONFIG_(KEY|VALUE)_\d+$/.test(key)) {
+      delete env[key];
+    }
+  }
+  return env;
+}
+
+export {
+  gitSpawnEnv
+};
+//# sourceMappingURL=chunk-J7GAZGZT.js.map

package/dist/{chunk-AIIFQYU5.js → chunk-JKZPMRH2.js}

@@ -1,6 +1,6 @@
 import {
   getPlatformShell
-} from "./chunk-VZYC5OLW.js";
+} from "./chunk-5ZHVQOI3.js";
 import {
   appendLog,
   createProcess,
@@ -153,4 +153,4 @@ export {
   getSessionProcesses2 as getSessionProcesses,
   getProcessLogs
 };
-//# sourceMappingURL=chunk-AIIFQYU5.js.map
+//# sourceMappingURL=chunk-JKZPMRH2.js.map

package/dist/{chunk-37WF2Z3T.js → chunk-JXTHW3YX.js}

@@ -1,6 +1,6 @@
 import {
   gitSpawnEnv
-} from "./chunk-WGMJCFCE.js";
+} from "./chunk-J7GAZGZT.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -288,4 +288,4 @@ export {
   ensureWorkspace,
   deleteWorkspace
 };
-//# sourceMappingURL=chunk-37WF2Z3T.js.map
+//# sourceMappingURL=chunk-JXTHW3YX.js.map

package/dist/{chunk-NLMT2HII.js → chunk-KMGVUOLT.js}

@@ -3,7 +3,7 @@ import {
   computeSessionHash,
   runAgentTurn,
   runChatTurn
-} from "./chunk-EZDTCQMR.js";
+} from "./chunk-D324ULDG.js";
 import {
   deleteItemFromDir,
   devServerManager,
@@ -13,32 +13,44 @@ import {
   jsonSerializer,
   loadAllAgentsDefault,
   saveItemToDir
-} from "./chunk-D25OSL6V.js";
+} from "./chunk-OBQN5ATP.js";
 import {
   checkAborted,
   onProcessEvent,
   spawnShellProcess
-} from "./chunk-AIIFQYU5.js";
+} from "./chunk-JKZPMRH2.js";
 import {
   gitSpawnEnv
-} from "./chunk-WGMJCFCE.js";
+} from "./chunk-J7GAZGZT.js";
+import {
+  createChatErrorMessage,
+  createChatMessageMessage,
+  createContextStateMessage,
+  createErrorMessage,
+  createGitStatusMessage,
+  createQueueStateMessage,
+  createSessionRunningMessage,
+  createSessionStateMessage,
+  isAskAnswerPayload,
+  isSessionLoadPayload,
+  parseClientMessage,
+  serializeServerMessage,
+  storedEventToServerMessage
+} from "./chunk-SJTG56CH.js";
 import {
   getPendingQuestionsForSession,
   provideAnswer
 } from "./chunk-EU3WWTFH.js";
 import {
   appendCompactionPrompt
-} from "./chunk-E3MS5CF7.js";
+} from "./chunk-DQP5HSDS.js";
 import {
   TurnMetrics,
   createMessageStartEvent
-} from "./chunk-QHLWWQRC.js";
+} from "./chunk-FVY2JOTO.js";
 import {
   getPlatformShell
-} from "./chunk-VZYC5OLW.js";
-import {
-  getMaxVisibleItems
-} from "./chunk-WYJTY63G.js";
+} from "./chunk-5ZHVQOI3.js";
 import {
   killProcessTree,
   terminateProcessTree
@@ -54,20 +66,8 @@ import {
   foldPendingConfirmations
 } from "./chunk-A2IZ4PWQ.js";
 import {
-  createChatErrorMessage,
-  createChatMessageMessage,
-  createContextStateMessage,
-  createErrorMessage,
-  createGitStatusMessage,
-  createQueueStateMessage,
-  createSessionRunningMessage,
-  createSessionStateMessage,
-  isAskAnswerPayload,
-  isSessionLoadPayload,
-  parseClientMessage,
-  serializeServerMessage,
-  storedEventToServerMessage
-} from "./chunk-SJTG56CH.js";
+  getMaxVisibleItems
+} from "./chunk-CNJ63FXJ.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -628,9 +628,8 @@ function formatCriteriaList(entries) {
     return `- **${e.id}** ${status}: ${e.description}`;
   }).join("\n");
 }
-async function formatModifiedFiles(session) {
-  const effectiveWorkdir = session.workspace ?? session.workdir;
-  return formatGitDiffFiles(effectiveWorkdir);
+async function formatModifiedFiles(workdir) {
+  return formatGitDiffFiles(workdir);
 }
 function resolveTemplate(template, ctx) {
   let result = template;
@@ -806,14 +805,14 @@ async function executeWorkflow(workflow, options, subGroup) {
     const currentWindowMessageOptions = getCurrentWindowMessageOptions(sessionId);
     const criteriaEntries = session.metadataEntries["criteria"] ?? [];
     const templateCtx = {
-      workdir: session.workspace ?? session.workdir,
+      workdir: sessionManager.getEffectiveWorkdir(sessionId),
       reason: buildReason(session.metadataEntries),
       verifierFindings: lastStepOutput["content"] ?? "",
       previousStepOutput: lastStepOutput["stdout"] ?? "",
       criteriaCount: criteriaEntries.length,
       pendingCount: criteriaEntries.filter((e) => e.status !== "passed").length,
       criteriaList: formatCriteriaList(criteriaEntries),
-      modifiedFiles: await formatModifiedFiles(session),
+      modifiedFiles: await formatModifiedFiles(sessionManager.getEffectiveWorkdir(sessionId)),
       stepOutput: lastStepOutput
     };
     sessionManager.setPhase(sessionId, step.phase);
@@ -978,7 +977,12 @@ async function executeWorkflow(workflow, options, subGroup) {
             })
           );
         }
-        const result = await executeShellCommand(command, session.workspace ?? session.workdir, timeout, signal);
+        const result = await executeShellCommand(
+          command,
+          sessionManager.getEffectiveWorkdir(sessionId),
+          timeout,
+          signal
+        );
         const output = [result.stdout, result.stderr].filter(Boolean).join("\n").trim();
         lastStepOutput = { stdout: result.stdout ?? "", stderr: result.stderr ?? "", exitCode: String(result.exitCode) };
         const outputContent = output ? `Exit code: ${result.exitCode}
@@ -1887,7 +1891,7 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
         return;
       }
       client.activeSessionId = session.id;
-      const effectiveWorkdir = session.workspace ?? session.workdir;
+      const effectiveWorkdir = sessionManager.getEffectiveWorkdir(session.id);
       client.activeWorkdir = effectiveWorkdir;
       if (effectiveWorkdir) {
         const branch = await moduleGitBranch(effectiveWorkdir);
@@ -2213,4 +2217,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-NLMT2HII.js.map
+//# sourceMappingURL=chunk-KMGVUOLT.js.map

package/dist/{chunk-D25OSL6V.js → chunk-OBQN5ATP.js}

@@ -8,7 +8,7 @@ import {
   spawnShellProcess,
   startProcessCommand,
   stopProcess
-} from "./chunk-AIIFQYU5.js";
+} from "./chunk-JKZPMRH2.js";
 import {
   createMcpTools
 } from "./chunk-NWO6GRYE.js";
@@ -18,14 +18,21 @@ import {
 import {
   getGitBranch,
   listWorkspaces
-} from "./chunk-37WF2Z3T.js";
+} from "./chunk-JXTHW3YX.js";
 import {
   PathAccessDeniedError,
   extractAbsolutePathsFromCommand,
   extractSensitivePathsFromCommand,
   registerPathConfirmation,
   requestPathAccess
-} from "./chunk-4GMRZU7A.js";
+} from "./chunk-3D3N2PXI.js";
+import {
+  createChatDoneMessage,
+  createChatMessageMessage,
+  createChatMessageUpdatedMessage,
+  createChatPathConfirmationMessage,
+  createQueueStateMessage
+} from "./chunk-SJTG56CH.js";
 import {
   AskUserInterrupt,
   askUserTool
@@ -42,13 +49,7 @@ import {
   createToolCallEvent,
   createToolResultEvent,
   streamLLMPure
-} from "./chunk-QHLWWQRC.js";
-import {
-  SETTINGS_KEYS,
-  deleteSetting,
-  getSetting,
-  setSetting
-} from "./chunk-WYJTY63G.js";
+} from "./chunk-FVY2JOTO.js";
 import {
   startInspectProxy
 } from "./chunk-EYIWUONA.js";
@@ -76,13 +77,6 @@ import {
   reorderToolMessages,
   stripOrphanedToolCalls
 } from "./chunk-A2IZ4PWQ.js";
-import {
-  createChatDoneMessage,
-  createChatMessageMessage,
-  createChatMessageUpdatedMessage,
-  createChatPathConfirmationMessage,
-  createQueueStateMessage
-} from "./chunk-SJTG56CH.js";
 import {
   modelSupportsVision
 } from "./chunk-V4IE7HJY.js";
@@ -97,6 +91,12 @@ import {
   isPdfBuffer,
   processPdfContent
 } from "./chunk-RMXPVQP4.js";
+import {
+  SETTINGS_KEYS,
+  deleteSetting,
+  getSetting,
+  setSetting
+} from "./chunk-CNJ63FXJ.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -114,13 +114,13 @@ import { extname, join } from "path";
 
 // src/server/tools/tool-helpers.ts
 import { randomUUID } from "crypto";
-import { resolve, isAbsolute } from "path";
+import { resolve } from "path";
 var confirmationSeqCounter = 0;
 async function requestUserConfirmation(context, toolLabel, desc) {
   if (context.dangerLevel === "dangerous") return Promise.resolve(true);
   if (toolLabel === "workspace" || toolLabel === "command") {
     try {
-      const { getSetting: getSetting2, SETTINGS_KEYS: SETTINGS_KEYS2 } = await import("./settings-DMYBLBDQ.js");
+      const { getSetting: getSetting2, SETTINGS_KEYS: SETTINGS_KEYS2 } = await import("./settings-6TJIHDVX.js");
       if (getSetting2(SETTINGS_KEYS2.CONFIRM_ON_WORKSPACE_ACTIONS) !== "true") {
         return Promise.resolve(true);
       }
@@ -199,7 +199,7 @@ function createTool(name, definition, handler2) {
     async execute(args, context) {
       const startTime = Date.now();
       const helpers = {
-        resolvePath: (path) => isAbsolute(path) ? path : resolve(context.workdir, path),
+        resolvePath: (path) => resolve(context.workdir, path),
         checkPathAccess: async (paths, command) => {
           if (context.onEvent) {
             await requestPathAccess(
@@ -1031,7 +1031,7 @@ Make sure whitespace and indentation match exactly.`
 
 // src/server/tools/shell.ts
 import { spawn } from "child_process";
-import { resolve as resolve3, isAbsolute as isAbsolute2 } from "path";
+import { resolve as resolve3, isAbsolute } from "path";
 import { access } from "fs/promises";
 import stripAnsi from "strip-ansi";
 
@@ -1143,12 +1143,12 @@ var runCommandTool = createTool(
     const pathsToCheck = [workingDir];
     const commandPaths = extractAbsolutePathsFromCommand(args.command);
     for (const cmdPath of commandPaths) {
-      const resolved = isAbsolute2(cmdPath) ? cmdPath : resolve3(workingDir, cmdPath);
+      const resolved = isAbsolute(cmdPath) ? cmdPath : resolve3(workingDir, cmdPath);
       pathsToCheck.push(resolved);
     }
     const sensitivePaths = extractSensitivePathsFromCommand(args.command);
     for (const sensitivePath of sensitivePaths) {
-      const resolved = isAbsolute2(sensitivePath) ? sensitivePath : resolve3(workingDir, sensitivePath);
+      const resolved = isAbsolute(sensitivePath) ? sensitivePath : resolve3(workingDir, sensitivePath);
       pathsToCheck.push(resolved);
     }
     await helpers.checkPathAccess(pathsToCheck, args.command);
@@ -1469,7 +1469,7 @@ ${Object.entries(schema.fields).map(([f, t]) => `  ${f}: ${t}`).join("\n")}`
 
 // src/server/sub-agents/manager.ts
 import { readFile as readFile8, access as access5 } from "fs/promises";
-import { join as join6, dirname as dirname5, isAbsolute as isAbsolute3 } from "path";
+import { join as join6, dirname as dirname5, isAbsolute as isAbsolute2 } from "path";
 
 // src/server/agents/registry.ts
 import { readdir as readdir3, readFile as readFile5, writeFile as writeFile4, mkdir as mkdir3, access as access3, unlink as unlink2 } from "fs/promises";
@@ -2576,7 +2576,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-3UHLN554.js");
+      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-YKESKGHL.js");
       if (shouldCompact(
         contextState2.currentTokens,
         contextState2.maxTokens,
@@ -2661,7 +2661,7 @@ ${COMPACTION_PROMPT}`,
           toolRegistry,
           sessionManager,
           sessionId,
-          workdir: session.workspace ?? session.workdir,
+          workdir: sessionManager.getEffectiveWorkdir(sessionId),
           turnMetrics,
           signal,
           onMessage,
@@ -3307,7 +3307,7 @@ function getWindowOptions(sessionId) {
   return id ? { contextWindowId: id } : void 0;
 }
 async function loadGitIgnoreRules(workdir) {
-  if (!isAbsolute3(workdir)) return "";
+  if (!isAbsolute2(workdir)) return "";
   let currentDir = workdir;
   while (true) {
     const gitignorePath = join6(currentDir, ".gitignore");
@@ -3400,7 +3400,7 @@ async function executeSubAgent(options) {
       })
     );
   }
-  const effectiveWorkdir = session.workspace ?? session.workdir;
+  const effectiveWorkdir = sessionManager.getEffectiveWorkdir(session.id);
   const { content: instructionContent } = await getAllInstructions(effectiveWorkdir, session.projectId);
   const config = getRuntimeConfig();
   const configDir = getGlobalConfigDir(config.mode ?? "production");
@@ -3515,7 +3515,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-FZ7HWHOW.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-X4YLRR2Y.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4518,7 +4518,7 @@ var mcpConfigTool = createTool(
       mcpNotifyChanged?.(sessionId);
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-FZ7HWHOW.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-X4YLRR2Y.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -4861,7 +4861,7 @@ var workspaceTool = createTool(
         if (!session) return helpers.error("Session not found");
         const project = sessionManager.getProject(session.projectId);
         if (!project) return helpers.error("Project not found");
-        const currentBranch = await getGitBranch(session.workspace ?? session.workdir);
+        const currentBranch = await getGitBranch(sessionManager.getEffectiveWorkdir(session.id));
         const named = await listWorkspaces(project.name, project.workdir);
         const activeWsName = session.workspace?.split("/").pop() ?? null;
         const workspaces = [
@@ -5181,4 +5181,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-D25OSL6V.js.map
+//# sourceMappingURL=chunk-OBQN5ATP.js.map

package/dist/{chunk-WL2WEJAK.js → chunk-SBSQD7MG.js}

@@ -17,7 +17,7 @@ import {
 import {
   LLMError,
   OpenAIHttpClient
-} from "./chunk-ZO5EXQMG.js";
+} from "./chunk-IIRXKSB5.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -268,4 +268,4 @@ function createLLMClient(config, initialBackend = "unknown") {
 export {
   createLLMClient
 };
-//# sourceMappingURL=chunk-WL2WEJAK.js.map
+//# sourceMappingURL=chunk-SBSQD7MG.js.map