openfox 2.0.64 → 2.0.66

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

@@ -1,6 +1,6 @@
 import {
   getDatabase
-} from "./chunk-ZPIZLTWU.js";
+} from "./chunk-GMXKJGJ2.js";
 
 // src/server/db/settings.ts
 var SETTINGS_KEYS = {
@@ -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-PVRSNXD4.js.map

package/dist/{chunk-X5YCWKNS.js → chunk-R4UTFE63.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-YHEQTVFV.js";
 import {
   buildModelParams
-} from "./chunk-Z6W4YHJB.js";
+} from "./chunk-BL5LOLVA.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -50,117 +50,87 @@ Working directory: ${workdir}
 Platform: ${process.platform} (${process.arch})${modelLine}
 
 ## CORE BEHAVIOR
-- Help the user complete any tasks safely and efficiently.
-- Do everything in your capacity to satisfy user requirements.
-- Read code before changing it.
-- Prefer precise, minimal changes.
-- Use available tools when needed.
-- Explain tradeoffs clearly when requirements are ambiguous.
-- Follow repository and project instructions exactly.
+Help user complete tasks safely and efficiently.
+Do everything to satisfy user requirements.
+Read file before editing.
+Prefer precise, minimal changes.
+Use available tools when needed.
+Explain tradeoffs clearly when requirements are ambiguous.
+Follow repository and project instructions exactly.
 
 ## MODE CONTROL
-- OpenFox may append system-generated runtime control messages as USER-role messages wrapped in <system-reminder>...</system-reminder>.
-- These reminders are authoritative framework instructions from OpenFox.
-- Treat them as higher-priority operational constraints than normal user task wording for the current turn.
-- Do not describe them as "the user reminded me"; they are runtime mode/control metadata injected by OpenFox.
+OpenFox appends runtime control as USER-role messages wrapped in <system-reminder>...</system-reminder>.
+These reminders are authoritative, treat them as higher-priority operational constraints.
+Never say "user reminded me"; they are runtime mode injected by OpenFox.
 
 ## WORKFLOW
-- If the current runtime reminder says planning mode, focus on understanding, exploration, clarification, and criteria quality.
-- If the current runtime reminder says build mode, focus on implementation, verification, and completing approved criteria.
-- Respect tool and permission constraints enforced by the server even if the conversation suggests otherwise.
-
-## FILE REFERENCES
-- The user may reference files or directories with an @ prefix, e.g. @src/index.ts or @web/components/.
-- These are paths relative to the working directory above. Strip the leading @ and resolve against the working directory \u2014 never treat an @-reference as an absolute path.
-
-## IMPORTANT GUARDRAILS
-- NEVER delete/git checkout an already modified file: that would result in a data loss.
-
-
-# Tone and style
-You should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).
-Remember that your output will be displayed on a command line interface. Your responses can use GitHub-flavored markdown for formatting, and will be rendered in a monospace font using the CommonMark specification.
-Output text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.
-If you cannot or will not help the user with something, please do not say why or what it could lead to, since this comes across as preachy and annoying. Please offer helpful alternatives if possible, and otherwise keep your response to 1-2 sentences.
-Only use emojis if the user explicitly requests it. Avoid using emojis in all communication unless asked.
-IMPORTANT: You should minimize output tokens as much as possible while maintaining helpfulness, quality, and accuracy. Only address the specific query or task at hand, avoiding tangential information unless absolutely critical for completing the request. If you can answer in 1-3 sentences or a short paragraph, please do.
-IMPORTANT: You should NOT answer with unnecessary preamble or postamble (such as explaining your code or summarizing your action), unless the user asks you to.
-IMPORTANT: Keep your responses short, since they will be displayed on a command line interface. You MUST answer concisely with fewer than 4 lines (not including tool use or code generation), unless user asks for detail. Answer the user's question directly, without elaboration, explanation, or details. One word answers are best. Avoid introductions, conclusions, and explanations. You MUST avoid text before/after your response, such as "The answer is <answer>.", "Here is the content of the file..." or "Based on the information provided, the answer is..." or "Here is what I will do next...". Here are some examples to demonstrate appropriate verbosity:
-<example>
+Reminder = planning mode: focus on understanding, exploration, clarification, criteria quality.
+Reminder = build mode: focus on implementation, verification, completing approved criteria.
+
+## TONE AND STYLE
+Be concise, direct, and to the point.
+Explain non-trivial bash commands (what & why).
+Output renders as CLI markdown (CommonMark).
+Only use tools for tasks, not communication.
+No emojis unless asked.
+Minimize tokens, stay on-topic.
+No preamble/postamble.
+Keep responses under ~4 lines unless detail requested.
+
+### Examples
 user: 2 + 2
 assistant: 4
-</example>
-
-<example>
-user: what is 2+2?
-assistant: 4
-</example>
-
-<example>
-user: is 11 a prime number?
-assistant: Yes
-</example>
 
-<example>
 user: what command should I run to list files in the current directory?
 assistant: ls
-</example>
 
-<example>
 user: what command should I run to watch files in the current directory?
 assistant: [use the ls tool to list the files in the current directory, then read docs/commands in the relevant file to find out how to watch files]
-npm run dev
-</example>
+  npm run dev
 
-<example>
-user: How many golf balls fit inside a jetta?
-assistant: 150000
-</example>
-
-<example>
 user: what files are in the directory src/?
 assistant: [runs ls and sees foo.c, bar.c, baz.c]
 user: which file contains the implementation of foo?
 assistant: src/foo.c
-</example>
 
-<example>
 user: write tests for new feature
-assistant: [uses grep and glob search tools to find where similar tests are defined, uses concurrent read file tool use blocks in one tool call to read relevant files at the same time, uses edit file tool to write new tests]
-</example>
+assistant: [uses run_command tool to find where similar tests are defined, uses concurrent read file tool use blocks in one tool call to read relevant files at the same time, uses edit file tool to write new tests]
+
+## FILE REFERENCES
+@ prefix, e.g. @src/index.ts or @web/components/.
+Relative to the working directory above. Strip leading @ and resolve against working directory, never treat as absolute path.
+
+## IMPORTANT GUARDRAILS
+NEVER delete/git checkout already modified file: would result in data loss.
 
 # Proactiveness
-You are allowed to be proactive, but only when the user asks you to do something. You should strive to strike a balance between:
+Allowed to be proactive, but only when user asks you to do something. Balance:
 1. Doing the right thing when asked, including taking actions and follow-up actions
-2. Not surprising the user with actions you take without asking
-For example, if the user asks you how to approach something, you should do your best to answer their question first, and not immediately jump into taking actions.
-3. Do not add additional code explanation summary unless requested by the user. After working on a file, just stop, rather than providing an explanation of what you did.
+2. Not surprising user with actions you take without asking
+For example, if user asks you how to approach something, you should do your best to answer their question first, and not immediately jump into taking actions.
+3. Do not add additional code explanation summary unless requested by user. After working on a file, just stop, rather than providing an explanation of what you did.
 
 # Following conventions
-When making changes to files, first understand the file's code conventions. Mimic code style, use existing libraries and utilities, and follow existing patterns.
-- NEVER assume that a given library is available, even if it is well known. Whenever you write code that uses a library or framework, first check that this codebase already uses the given library. For example, you might look at neighboring files, or check the package.json (or cargo.toml, and so on depending on the language).
-- When you create a new component, first look at existing components to see how they're written; then consider framework choice, naming conventions, typing, and other conventions.
-- When you edit a piece of code, first look at the code's surrounding context (especially its imports) to understand the code's choice of frameworks and libraries. Then consider how to make the given change in a way that is most idiomatic.
-- Always follow security best practices. Never introduce code that exposes or logs secrets and keys. Never commit secrets or keys to the repository.
+Understand file's code conventions. Mimic code style, use existing libraries and utilities, follow existing patterns.
+NEVER assume that a given library is available. To use library or framework, first check that codebase already uses given library.
+When you create new component, first look at existing components to see how written; then consider framework choice, naming conventions, typing, other conventions.
+When you edit code, look at code's surrounding context (imports) to understand code's choice of frameworks and libraries. Then consider how to make given change in way that is most idiomatic.
+Always follow security best practices. Never introduce code that exposes or logs secrets and keys. Never commit secrets or keys to the repository.
 
 # Code style
-- IMPORTANT: DO NOT ADD ***ANY*** COMMENTS unless asked
+IMPORTANT: DO NOT ADD ***ANY*** COMMENTS unless asked
 
 # Doing tasks
-The user will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
-- Use the available search tools to understand the codebase and the user's query. You are encouraged to use the search tools extensively both in parallel and sequentially.
-- Implement the solution using all tools available to you
-- Verify the solution if possible with tests. NEVER assume specific test framework or test script. Check the README or search codebase to determine the testing approach.
-- VERY IMPORTANT: When you have completed a task, you MUST run the lint and typecheck commands (e.g. npm run lint, npm run typecheck, ruff, etc.) with Bash if they were provided to you to ensure your code is correct. If you are unable to find the correct command, ask the user for the command to run and if they supply it, proactively suggest writing it to AGENTS.md so that you will know to run it next time.
-NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTANT to only commit when explicitly asked, otherwise the user will feel that you are being too proactive.
-
-- Tool results and user messages may include <system-reminder> tags. <system-reminder> tags contain useful information and reminders. They are NOT part of the user's provided input or the tool result.
+User will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
+Use run_command or Explorer sub-agent to understand the codebase and user's query.
+Implement solution using all tools available to you.
+Verify the solution if possible with tests. NEVER assume specific test framework or test script. Check README or search codebase to determine testing approach.
+VERY IMPORTANT: When you have completed a task, you MUST run lint and typecheck commands (e.g. npm run lint, npm run typecheck, ruff, etc.) with run_command to ensure your code is correct.
+NEVER commit changes unless user explicitly asks you to. VERY IMPORTANT only commit when explicitly asked, otherwise user will feel that you are being too proactive.
 
 # Tool usage policy
-- When doing file search, prefer to use the Task tool in order to reduce context usage.
-- You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. When making multiple bash tool calls, you MUST send a single message with multiple tools calls to run the calls in parallel. For example, if you need to run "git status" and "git diff", send a single message with two tool calls to run the calls in parallel.
-
-You MUST answer concisely with fewer than 4 lines of text (not including tool use or code generation), unless user asks for detail.
+When doing file search, prefer to use the call_sub_agent tool with the "explorer" in order to reduce context usage, except if this would take less than 3 calls to get the information.
+You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance.
 
 ${instructionsSection}
 ${buildSkillsSection(skills)}
@@ -705,4 +675,4 @@ export {
   createChatDoneEvent,
   consumeStreamGenerator
 };
-//# sourceMappingURL=chunk-X5YCWKNS.js.map
+//# sourceMappingURL=chunk-R4UTFE63.js.map

package/dist/{chunk-O3G6X5CT.js → chunk-R7EED6ZU.js}

@@ -164,7 +164,7 @@ async function runCli(options) {
       break;
     }
     case "provider": {
-      const { runProviderCommand } = await import("./provider-GYOW4OWQ.js");
+      const { runProviderCommand } = await import("./provider-BDH6JGZB.js");
       const [, subcommand] = positionals;
       await runProviderCommand(mode, subcommand);
       break;
@@ -208,7 +208,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-54KALE6R.js");
+      const { runServe } = await import("./serve-HGHFN3D2.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-O3G6X5CT.js.map
+//# sourceMappingURL=chunk-R7EED6ZU.js.map

package/dist/{chunk-AIJE3RYH.js → chunk-TFDK6VSG.js}

@@ -5,10 +5,10 @@ import {
   foldContextState,
   foldSessionState,
   spreadOptionalMessageFields
-} from "./chunk-TMUBLQFC.js";
+} from "./chunk-C3VLGVSQ.js";
 import {
   getDatabase
-} from "./chunk-ZPIZLTWU.js";
+} from "./chunk-GMXKJGJ2.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -680,21 +680,33 @@ function getProjectDangerLevel(projectId) {
     return "normal";
   }
 }
-function createSession(projectId, workdir, title, providerId, providerModel) {
+function createSession(projectId, workdir, title, providerId, providerModel, worktree) {
   const db = getDatabase();
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const id = crypto.randomUUID();
   const dangerLevel = getProjectDangerLevel(projectId);
   db.prepare(
     `
-    INSERT INTO sessions (id, project_id, workdir, phase, mode, workflow_phase, is_running, created_at, updated_at, title, provider_id, provider_model, danger_level)
-    VALUES (?, ?, ?, 'idle', 'planner', 'plan', 0, ?, ?, ?, ?, ?, ?)
+    INSERT INTO sessions (id, project_id, workdir, worktree, phase, mode, workflow_phase, is_running, created_at, updated_at, title, provider_id, provider_model, danger_level)
+    VALUES (?, ?, ?, ?, 'idle', 'planner', 'plan', 0, ?, ?, ?, ?, ?, ?)
   `
-  ).run(id, projectId, workdir, now, now, title ?? null, providerId ?? null, providerModel ?? null, dangerLevel);
+  ).run(
+    id,
+    projectId,
+    workdir,
+    worktree ?? null,
+    now,
+    now,
+    title ?? null,
+    providerId ?? null,
+    providerModel ?? null,
+    dangerLevel
+  );
   return {
     id,
     projectId,
     workdir,
+    ...worktree ? { worktree } : {},
     mode: "planner",
     phase: "plan",
     isRunning: false,
@@ -843,6 +855,7 @@ function listSessions() {
       s.id,
       s.project_id,
       s.workdir,
+      s.worktree,
       s.mode,
       s.workflow_phase,
       s.is_running,
@@ -866,6 +879,7 @@ function listSessionsByProject(projectId, limit = 20, offset = 0) {
       s.id,
       s.project_id,
       s.workdir,
+      s.worktree,
       s.mode,
       s.workflow_phase,
       s.is_running,
@@ -885,6 +899,16 @@ function listSessionsByProject(projectId, limit = 20, offset = 0) {
   const sessions = rows.slice(0, limit).map(mapSessionSummaryRow);
   return { sessions, hasMore };
 }
+function updateSessionWorkdir(id, workdir, worktree) {
+  const db = getDatabase();
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  db.prepare("UPDATE sessions SET workdir = ?, worktree = ?, updated_at = ? WHERE id = ?").run(
+    workdir,
+    worktree,
+    now,
+    id
+  );
+}
 function deleteSession(id) {
   const db = getDatabase();
   db.prepare("DELETE FROM sessions WHERE id = ?").run(id);
@@ -894,6 +918,7 @@ function mapSessionBase(row) {
     id: row.id,
     projectId: row.project_id,
     workdir: row.workdir,
+    ...row.worktree ? { worktree: row.worktree } : {},
     mode: row.mode ?? "planner",
     phase: row.workflow_phase ?? "plan",
     isRunning: Boolean(row.is_running),
@@ -1396,6 +1421,7 @@ export {
   getSessionCachedPrompt,
   listSessions,
   listSessionsByProject,
+  updateSessionWorkdir,
   deleteSession,
   loadConfig,
   setRuntimeConfig,
@@ -1434,4 +1460,4 @@ export {
   truncateSessionMessages,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-AIJE3RYH.js.map
+//# sourceMappingURL=chunk-TFDK6VSG.js.map

package/dist/{chunk-QJ5FH5DP.js → chunk-TMHWQYWE.js}

@@ -2,11 +2,11 @@ import {
   getEventStore,
   getRuntimeConfig,
   updateSessionMetadata
-} from "./chunk-AIJE3RYH.js";
+} from "./chunk-TFDK6VSG.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-TMUBLQFC.js";
+} from "./chunk-C3VLGVSQ.js";
 import {
   createContextStateMessage,
   createSessionStateMessage
@@ -135,7 +135,7 @@ async function generateSessionNameForSession(sessionId, userMessage, deps, signa
       client = deps.getLLMClient();
       client.setModel(providerConfig.model);
     } else if (providerConfig) {
-      const { createLLMClient } = await import("./client-LAKW7TA5.js");
+      const { createLLMClient } = await import("./client-BUX62J2K.js");
       client = createLLMClient({
         llm: {
           baseUrl: providerConfig.baseUrl,
@@ -184,4 +184,4 @@ export {
   buildRunChatTurnParams,
   generateSessionNameForSession
 };
-//# sourceMappingURL=chunk-QJ5FH5DP.js.map
+//# sourceMappingURL=chunk-TMHWQYWE.js.map

package/dist/{chunk-73N5CJH3.js → chunk-UBIHP5Z7.js}

@@ -10,7 +10,7 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-WD75RSGR.js";
+} from "./chunk-3ACDQKK6.js";
 import {
   TurnMetrics,
   WORKFLOW_KICKOFF_PROMPT,
@@ -19,16 +19,16 @@ import {
   buildTopLevelSystemPrompt,
   createChatDoneEvent,
   createMessageStartEvent
-} from "./chunk-X5YCWKNS.js";
+} from "./chunk-R4UTFE63.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-AIJE3RYH.js";
+} from "./chunk-TFDK6VSG.js";
 import {
   buildSnapshotFromSessionState
-} from "./chunk-TMUBLQFC.js";
+} from "./chunk-C3VLGVSQ.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -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-R6LPK6OS.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-2EB7C6H2.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-R6LPK6OS.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-2EB7C6H2.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-ZZ6AKFPD.js");
   const raw = getSetting(SETTINGS_KEYS.RETRY_PATTERNS);
   if (!raw) {
     const oldXmlProtection = getSetting("llm.disableXmlProtection");
@@ -383,4 +383,4 @@ export {
   runAgentTurn,
   injectWorkflowKickoffIfNeeded
 };
-//# sourceMappingURL=chunk-73N5CJH3.js.map
+//# sourceMappingURL=chunk-UBIHP5Z7.js.map

package/dist/chunk-WGMJCFCE.js

@@ -0,0 +1,14 @@
+// src/server/git/env.ts
+function gitSpawnEnv() {
+  const env = { ...process.env };
+  delete env["GIT_DIR"];
+  delete env["GIT_INDEX_FILE"];
+  delete env["GIT_WORK_TREE"];
+  delete env["GIT_PREFIX"];
+  return env;
+}
+
+export {
+  gitSpawnEnv
+};
+//# sourceMappingURL=chunk-WGMJCFCE.js.map

package/dist/{chunk-LBGHZLLH.js → chunk-WNA5VPZG.js}

@@ -1,6 +1,6 @@
 import {
   getProjectByWorkdir
-} from "./chunk-YQ3SOPBI.js";
+} from "./chunk-KXVFHMSM.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -340,4 +340,4 @@ export {
   startInspectProxy,
   stopAllInspectProxies
 };
-//# sourceMappingURL=chunk-LBGHZLLH.js.map
+//# sourceMappingURL=chunk-WNA5VPZG.js.map

package/dist/{chunk-HZNY77HZ.js → chunk-ZUM2ZJOX.js}

@@ -1,13 +1,13 @@
 import {
   appendCompactionPrompt
-} from "./chunk-OESYKZCM.js";
+} from "./chunk-5V5DM5E4.js";
 import {
   applyDynamicContext,
   computeSessionHash,
   injectWorkflowKickoffIfNeeded,
   runAgentTurn,
   runChatTurn
-} from "./chunk-73N5CJH3.js";
+} from "./chunk-UBIHP5Z7.js";
 import {
   checkAborted,
   deleteItemFromDir,
@@ -19,20 +19,27 @@ import {
   loadAllAgentsDefault,
   saveItemToDir,
   spawnShellProcess
-} from "./chunk-WD75RSGR.js";
+} from "./chunk-3ACDQKK6.js";
 import {
   TurnMetrics,
   createMessageStartEvent
-} from "./chunk-X5YCWKNS.js";
+} from "./chunk-R4UTFE63.js";
 import {
   getPlatformShell,
   onProcessEvent
 } from "./chunk-BGTEIA2S.js";
+import {
+  gitSpawnEnv
+} from "./chunk-WGMJCFCE.js";
 import {
   getCurrentContextWindowId,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-AIJE3RYH.js";
+} from "./chunk-TFDK6VSG.js";
+import {
+  buildMessagesFromStoredEvents,
+  foldPendingConfirmations
+} from "./chunk-C3VLGVSQ.js";
 import {
   createChatErrorMessage,
   createChatMessageMessage,
@@ -41,6 +48,7 @@ import {
   createGitStatusMessage,
   createQueueStateMessage,
   createSessionRunningMessage,
+  createSessionStateMessage,
   isAskAnswerPayload,
   isSessionLoadPayload,
   parseClientMessage,
@@ -48,6 +56,7 @@ import {
   storedEventToServerMessage
 } from "./chunk-F4PMNP7S.js";
 import {
+  getPendingQuestionsForSession,
   provideAnswer
 } from "./chunk-EU3WWTFH.js";
 import {
@@ -446,13 +455,16 @@ var TERMINAL_BLOCKED = "$blocked";
 import { spawn as spawn2 } from "child_process";
 function getGitDiffFiles(cwd) {
   return new Promise((resolve) => {
+    const env = gitSpawnEnv();
     const diffProc = spawn2("git", ["diff", "--name-status", "HEAD"], {
       cwd,
+      env,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
     const statusProc = spawn2("git", ["status", "--porcelain"], {
       cwd,
+      env,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
@@ -595,7 +607,8 @@ function formatCriteriaList(entries) {
   }).join("\n");
 }
 async function formatModifiedFiles(session) {
-  return formatGitDiffFiles(session.workdir);
+  const effectiveWorkdir = session.worktree ?? session.workdir;
+  return formatGitDiffFiles(effectiveWorkdir);
 }
 function resolveTemplate(template, ctx) {
   let result = template;
@@ -756,7 +769,7 @@ async function executeWorkflow(workflow, options, subGroup) {
     const currentWindowMessageOptions = getCurrentWindowMessageOptions(sessionId);
     const criteriaEntries = session.metadataEntries["criteria"] ?? [];
     const templateCtx = {
-      workdir: session.workdir,
+      workdir: session.worktree ?? session.workdir,
       reason: buildReason(session.metadataEntries),
       verifierFindings: lastStepOutput["content"] ?? "",
       previousStepOutput: lastStepOutput["stdout"] ?? "",
@@ -840,10 +853,6 @@ async function executeWorkflow(workflow, options, subGroup) {
               if (toolCall.name === "step_done" && toolResult.success) {
                 stepDoneCalled = true;
               }
-              if (toolResult.success && ["write_file", "edit_file"].includes(toolCall.name)) {
-                const path = toolCall.arguments["path"];
-                sessionManager.addModifiedFile(sessionId, path);
-              }
             }
           }
         );
@@ -932,7 +941,7 @@ async function executeWorkflow(workflow, options, subGroup) {
             })
           );
         }
-        const result = await executeShellCommand(command, session.workdir, timeout, signal);
+        const result = await executeShellCommand(command, session.worktree ?? session.workdir, 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}
@@ -1189,6 +1198,7 @@ function moduleGitBranch(cwd) {
   return new Promise((resolve) => {
     const proc = spawn3("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
       cwd,
+      env: gitSpawnEnv(),
       stdio: ["ignore", "pipe", "ignore"],
       windowsHide: true
     });
@@ -1211,13 +1221,16 @@ function hashContent(content) {
 }
 function moduleGitDiff(cwd) {
   return new Promise((resolve) => {
+    const env = gitSpawnEnv();
     const diffProc = spawn3("git", ["diff", "--name-status", "HEAD"], {
       cwd,
+      env,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
     const statusProc = spawn3("git", ["status", "--porcelain"], {
       cwd,
+      env,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
@@ -1570,6 +1583,20 @@ function createWebSocketServer(httpServer, _config, getLLMClient, getActiveProvi
       })
     );
   });
+  sessionManager.subscribe((event) => {
+    if (event.type === "session_updated") {
+      const updatedSession = event.session;
+      const eventStore = getEventStore();
+      const events = eventStore.getEvents(updatedSession.id);
+      const messages = buildMessagesFromStoredEvents(events);
+      const pendingConfirmations = foldPendingConfirmations(events);
+      const pendingQuestions = getPendingQuestionsForSession(updatedSession.id);
+      broadcastForSession(
+        updatedSession.id,
+        createSessionStateMessage(updatedSession, messages, pendingConfirmations, pendingQuestions)
+      );
+    }
+  });
   onProcessEvent((_processId, msg) => {
     const sessionId = msg.sessionId;
     if (!sessionId) return;
@@ -1766,13 +1793,14 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
         return;
       }
       client.activeSessionId = session.id;
-      client.activeWorkdir = session.workdir;
-      if (session.workdir) {
-        const branch = await moduleGitBranch(session.workdir);
-        const { files } = await moduleGitDiff(session.workdir);
+      const effectiveWorkdir = session.worktree ?? session.workdir;
+      client.activeWorkdir = effectiveWorkdir;
+      if (effectiveWorkdir) {
+        const branch = await moduleGitBranch(effectiveWorkdir);
+        const { files } = await moduleGitDiff(effectiveWorkdir);
         const msg = createGitStatusMessage(branch, files);
         send(msg);
-        if (branch) moduleStartGitPolling(session.workdir);
+        if (branch) moduleStartGitPolling(effectiveWorkdir);
       }
       ensureEventStoreSubscription(session.id);
       send({ type: "ack", payload: { sessionId: session.id }, id: message.id });
@@ -2092,4 +2120,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-HZNY77HZ.js.map
+//# sourceMappingURL=chunk-ZUM2ZJOX.js.map