openfox 2.0.105 → 2.0.107

package/dist/{chunk-DMI2BXHA.js → chunk-GXW4CRR5.js}

@@ -5,13 +5,13 @@ import {
   foldContextState,
   foldSessionState,
   spreadOptionalMessageFields
-} from "./chunk-S5HDT5RQ.js";
+} from "./chunk-3C73IUUL.js";
 import {
   updateSessionMessageCount
-} from "./chunk-OUMHR7LR.js";
+} from "./chunk-IA4Y3CKA.js";
 import {
   getRuntimeConfig
-} from "./chunk-6SIX7P6O.js";
+} from "./chunk-2GM6SUIQ.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -948,7 +948,7 @@ function emitRunningChanged(sessionId, isRunning) {
     data: { isRunning }
   });
 }
-function emitWorkflowExecutionChanged(sessionId, executionId, workflowId, workflowName, workflowColor, status, currentStepId, currentStepName) {
+function emitWorkflowExecutionChanged(sessionId, executionId, workflowId, workflowName, workflowColor, status, currentStepId, currentStepName, pendingChoices) {
   const eventStore = getEventStore();
   eventStore.append(sessionId, {
     type: "workflow.execution_changed",
@@ -959,7 +959,8 @@ function emitWorkflowExecutionChanged(sessionId, executionId, workflowId, workfl
       ...workflowColor ? { workflowColor } : {},
       status,
       ...currentStepId ? { currentStepId } : {},
-      ...currentStepName ? { currentStepName } : {}
+      ...currentStepName ? { currentStepName } : {},
+      ...pendingChoices !== void 0 ? { pendingChoices } : {}
     }
   });
 }
@@ -1175,4 +1176,4 @@ export {
   truncateSessionMessages,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-DMI2BXHA.js.map
+//# sourceMappingURL=chunk-GXW4CRR5.js.map

package/dist/{chunk-EIJFYENT.js → chunk-HU22EVEM.js}

@@ -1,17 +1,17 @@
 import {
   getAllInstructions,
   getEnabledSkillMetadata
-} from "./chunk-B76OP3OE.js";
+} from "./chunk-LOHVZGCM.js";
 import {
   buildTopLevelSystemPrompt
-} from "./chunk-J27BLIPY.js";
+} from "./chunk-SGJ3LSVA.js";
 import {
   findAgentById,
   getRuntimeConfig,
   getSubAgents,
   loadAllAgentsDefault,
   resolveDefaultAgentId
-} from "./chunk-6SIX7P6O.js";
+} from "./chunk-2GM6SUIQ.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -94,7 +94,7 @@ async function loadSessionContext(sessionManager, sessionId) {
   const { content: instructionContent } = await getAllInstructions(session.workdir, session.projectId);
   const runtimeConfig = getRuntimeConfig();
   const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
-  const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
+  const skills = await getEnabledSkillMetadata(configDir, sessionManager.getEffectiveWorkdir(sessionId));
   return { instructionContent: instructionContent ?? "", skills };
 }
 function resolveAgentDef(sessionManager, sessionId) {
@@ -105,7 +105,7 @@ function resolveAgentDef(sessionManager, sessionId) {
 }
 async function buildCachedPrompt(sessionManager, sessionId, agentDef, modelName) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
-  const { getToolRegistryForAgent } = await import("./tools-BG44DIYU.js");
+  const { getToolRegistryForAgent } = await import("./tools-Y4F4HJPO.js");
   const tools = getToolRegistryForAgent(agentDef, sessionId).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   const allAgents = await loadAllAgentsDefault();
@@ -124,7 +124,7 @@ async function buildCachedPrompt(sessionManager, sessionId, agentDef, modelName)
 async function computeSessionHash(sessionManager, sessionId, modelName) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
   const agentDef = await resolveAgentDef(sessionManager, sessionId);
-  const { getToolRegistryForAgent } = await import("./tools-BG44DIYU.js");
+  const { getToolRegistryForAgent } = await import("./tools-Y4F4HJPO.js");
   const tools = getToolRegistryForAgent(agentDef, sessionId).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   return computeDynamicContextHash(instructionContent, skills, toolFingerprint, modelName);
@@ -148,4 +148,4 @@ export {
   computeSessionHash,
   applyDynamicContext
 };
-//# sourceMappingURL=chunk-EIJFYENT.js.map
+//# sourceMappingURL=chunk-HU22EVEM.js.map

package/dist/{chunk-OUMHR7LR.js → chunk-IA4Y3CKA.js}

@@ -1,9 +1,9 @@
 import {
   resolveDefaultAgentId
-} from "./chunk-6SIX7P6O.js";
+} from "./chunk-2GM6SUIQ.js";
 import {
   getDatabase
-} from "./chunk-GLF65XDS.js";
+} from "./chunk-LCQ5AN6Y.js";
 
 // src/server/db/sessions.ts
 function getProjectDangerLevel(projectId) {
@@ -322,13 +322,14 @@ function createWorkflowExecution(id, sessionId, workflowId, workflowName, workfl
      VALUES (?, ?, ?, ?, ?, 'running', '{}', ?, ?, ?)`
   ).run(id, sessionId, workflowId, workflowName, workflowColor ?? null, JSON.stringify(params), now, now);
 }
-function updateWorkflowExecutionStatus(executionId, status, stepId, stepName, stepOutput) {
+function updateWorkflowExecutionStatus(executionId, status, stepId, stepName, stepOutput, pendingChoices) {
   const db = getDatabase();
   const now = Date.now();
   const stepOutputJson = stepOutput ? JSON.stringify(stepOutput) : void 0;
+  const pendingChoicesJson = pendingChoices ? JSON.stringify(pendingChoices) : void 0;
   db.prepare(
-    `UPDATE workflow_executions SET status = ?, current_step_id = COALESCE(?, current_step_id), current_step_name = COALESCE(?, current_step_name), step_output = COALESCE(?, step_output), updated_at = ? WHERE id = ?`
-  ).run(status, stepId ?? null, stepName ?? null, stepOutputJson ?? null, now, executionId);
+    `UPDATE workflow_executions SET status = ?, current_step_id = COALESCE(?, current_step_id), current_step_name = COALESCE(?, current_step_name), step_output = COALESCE(?, step_output), pending_choices = COALESCE(?, pending_choices), updated_at = ? WHERE id = ?`
+  ).run(status, stepId ?? null, stepName ?? null, stepOutputJson ?? null, pendingChoicesJson ?? null, now, executionId);
 }
 function getActiveWorkflowExecution(sessionId) {
   const db = getDatabase();
@@ -367,4 +368,4 @@ export {
   getActiveWorkflowExecution,
   clearWorkflowExecution
 };
-//# sourceMappingURL=chunk-OUMHR7LR.js.map
+//# sourceMappingURL=chunk-IA4Y3CKA.js.map

package/dist/{chunk-SPA7PQPJ.js → chunk-KIAKWUZ3.js}

@@ -1,6 +1,6 @@
 import {
   getDatabase
-} from "./chunk-GLF65XDS.js";
+} from "./chunk-LCQ5AN6Y.js";
 
 // src/server/db/settings.ts
 var SETTINGS_KEYS = {
@@ -119,4 +119,4 @@ export {
   getAllSettings,
   getMaxVisibleItems
 };
-//# sourceMappingURL=chunk-SPA7PQPJ.js.map
+//# sourceMappingURL=chunk-KIAKWUZ3.js.map

package/dist/{chunk-GLF65XDS.js → chunk-LCQ5AN6Y.js}

@@ -209,6 +209,7 @@ function runMigrations(db2) {
       current_step_name TEXT,
       step_output TEXT,
       params TEXT,
+      pending_choices TEXT,
       created_at INTEGER NOT NULL,
       updated_at INTEGER NOT NULL,
       FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
@@ -218,6 +219,12 @@ function runMigrations(db2) {
     CREATE INDEX IF NOT EXISTS idx_workflow_executions_session
     ON workflow_executions(session_id)
   `);
+  const workflowExecColumns = db2.prepare(`PRAGMA table_info(workflow_executions)`).all();
+  const workflowExecColumnNames = workflowExecColumns.map((c) => c.name);
+  if (!workflowExecColumnNames.includes("pending_choices")) {
+    logger.info("Migrating workflow_executions table: adding pending_choices column");
+    db2.exec(`ALTER TABLE workflow_executions ADD COLUMN pending_choices TEXT`);
+  }
   logger.info("Database migrations completed");
 }
 
@@ -225,4 +232,4 @@ export {
   initDatabase,
   getDatabase
 };
-//# sourceMappingURL=chunk-GLF65XDS.js.map
+//# sourceMappingURL=chunk-LCQ5AN6Y.js.map

package/dist/{chunk-B76OP3OE.js → chunk-LOHVZGCM.js}

@@ -1,17 +1,17 @@
 import {
   getProject
-} from "./chunk-WWFH5GAR.js";
+} from "./chunk-6FPGJR7O.js";
 import {
   deleteItemFromDir,
   loadItemsFromDir,
   pathExists
-} from "./chunk-6SIX7P6O.js";
+} from "./chunk-2GM6SUIQ.js";
 import {
   SETTINGS_KEYS,
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-SPA7PQPJ.js";
+} from "./chunk-KIAKWUZ3.js";
 
 // src/server/context/instructions.ts
 import { readFile, access } from "fs/promises";
@@ -440,4 +440,4 @@ export {
   deleteSkill,
   deleteProjectSkill
 };
-//# sourceMappingURL=chunk-B76OP3OE.js.map
+//# sourceMappingURL=chunk-LOHVZGCM.js.map

package/dist/{chunk-UADZ2LZJ.js → chunk-OEPRHAIO.js}

@@ -1,9 +1,9 @@
 import {
   updateSessionMcpDisabledServers
-} from "./chunk-OUMHR7LR.js";
+} from "./chunk-IA4Y3CKA.js";
 import {
   getDatabase
-} from "./chunk-GLF65XDS.js";
+} from "./chunk-LCQ5AN6Y.js";
 
 // src/server/mcp/session-overrides.ts
 var sessionOverrides = /* @__PURE__ */ new Map();
@@ -62,4 +62,4 @@ export {
   clearSessionOverrides,
   getAllSessionOverrides
 };
-//# sourceMappingURL=chunk-UADZ2LZJ.js.map
+//# sourceMappingURL=chunk-OEPRHAIO.js.map

package/dist/{chunk-SGGFVTMP.js → chunk-P4APMCTX.js}

@@ -2,24 +2,24 @@ import {
   generateSessionNameForSession,
   getSessionMessageCount,
   needsNameGeneration
-} from "./chunk-6IXRISXA.js";
+} from "./chunk-SUTJJWUK.js";
 import {
   runAgentTurn,
   runChatTurn
-} from "./chunk-KDJZGHSZ.js";
+} from "./chunk-AYUUGKZU.js";
 import {
   applyDynamicContext,
   computeSessionHash,
   computeUnifiedDiff
-} from "./chunk-EIJFYENT.js";
+} from "./chunk-HU22EVEM.js";
 import {
   appendCompactionPrompt
-} from "./chunk-FGYOSQUR.js";
+} from "./chunk-26DEYDYV.js";
 import {
   devServerManager,
   executeSubAgent,
   getToolRegistryForAgent
-} from "./chunk-AKUTOOSV.js";
+} from "./chunk-6M44ZHQA.js";
 import {
   TurnMetrics,
   createMessageStartEvent
@@ -28,7 +28,7 @@ import {
   checkAborted,
   onProcessEvent,
   spawnShellProcess
-} from "./chunk-TFQSCHVU.js";
+} from "./chunk-6VNB4L4V.js";
 import {
   killProcessTree,
   terminateProcessTree
@@ -40,7 +40,7 @@ import {
   combineEventsWithSnapshot,
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-DMI2BXHA.js";
+} from "./chunk-GXW4CRR5.js";
 import {
   createChatErrorMessage,
   createChatMessageMessage,
@@ -62,11 +62,11 @@ import {
 } from "./chunk-JAX5OEMM.js";
 import {
   getPlatformShell
-} from "./chunk-EF7KGWF6.js";
+} from "./chunk-UXQN7FGB.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-S5HDT5RQ.js";
+} from "./chunk-3C73IUUL.js";
 import {
   deleteItemFromDir,
   findAgentById,
@@ -75,10 +75,10 @@ import {
   loadAllAgentsDefault,
   resolveDefaultAgentId,
   saveItemToDir
-} from "./chunk-6SIX7P6O.js";
+} from "./chunk-2GM6SUIQ.js";
 import {
   getMaxVisibleItems
-} from "./chunk-SPA7PQPJ.js";
+} from "./chunk-KIAKWUZ3.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -686,6 +686,25 @@ function evaluateTransitions(transitions, stepOutcome, metadataEntries) {
   }
   return TERMINAL_BLOCKED;
 }
+var DEFAULT_USER_RESULT = "continue";
+var CONTINUE_CHOICE_ID = "continue";
+function userStepChoices(step) {
+  const seen = /* @__PURE__ */ new Set();
+  const choices = [];
+  for (const t of step.transitions) {
+    if (t.when.type === "step_result") {
+      const id = t.when.result;
+      if (seen.has(id)) continue;
+      seen.add(id);
+      choices.push({ id, label: id, goto: t.goto });
+    } else if (t.when.type === "always") {
+      if (seen.has(CONTINUE_CHOICE_ID)) continue;
+      seen.add(CONTINUE_CHOICE_ID);
+      choices.push({ id: CONTINUE_CHOICE_ID, label: "Continue", goto: t.goto });
+    }
+  }
+  return choices;
+}
 function emitWorkflowMessage(eventStore, sessionId, content, windowOptions, onMessage) {
   const msgId = crypto.randomUUID();
   eventStore.append(
@@ -770,6 +789,49 @@ async function executeWorkflow(workflow, options, subGroup) {
     }
   }
   logger.debug("Workflow executor starting", { sessionId, workflow: workflow.metadata.id });
+  let executionId;
+  if (isResume) {
+    const activeExec = sessionManager.getActiveWorkflowExecution(sessionId);
+    if (activeExec) {
+      executionId = activeExec.id;
+    }
+  }
+  const ctxCheck = await sessionManager.assertExecutionGitContext(sessionId);
+  if (!ctxCheck.ok) {
+    logger.warn("Workflow blocked: git context drift detected", {
+      sessionId,
+      workflow: workflow.metadata.id,
+      workdir: ctxCheck.workdir,
+      expectedBranch: ctxCheck.expectedBranch,
+      actualBranch: ctxCheck.actualBranch
+    });
+    emitWorkflowMessage(
+      eventStore,
+      sessionId,
+      `Runner blocked: ${ctxCheck.reason}`,
+      getCurrentWindowMessageOptions(sessionId),
+      onMessage
+    );
+    if (executionId) {
+      sessionManager.blockWorkflow(
+        sessionId,
+        executionId,
+        workflow.metadata.id,
+        workflow.metadata.name,
+        workflow.metadata.color
+      );
+    }
+    sessionManager.setPhase(sessionId, "blocked");
+    return {
+      finalAction: {
+        type: "BLOCKED",
+        reason: ctxCheck.reason,
+        blockedCriteria: []
+      },
+      iterations: 0,
+      totalTime: (performance.now() - startTime) / 1e3
+    };
+  }
   if (workflow.startCondition && workflow.startCondition.type !== "always") {
     const session = sessionManager.requireSession(sessionId);
     const conditionMet = evaluateCondition(
@@ -790,7 +852,6 @@ async function executeWorkflow(workflow, options, subGroup) {
       };
     }
   }
-  let executionId;
   if (!isResume) {
     const startMsgId = crypto.randomUUID();
     const startWindowOpts = getCurrentWindowMessageOptions(sessionId);
@@ -817,11 +878,6 @@ async function executeWorkflow(workflow, options, subGroup) {
       workflow.metadata.color,
       options.params ?? {}
     );
-  } else {
-    const activeExec = sessionManager.getActiveWorkflowExecution(sessionId);
-    if (activeExec) {
-      executionId = activeExec.id;
-    }
   }
   if (options.userMessage) {
     sessionManager.addMessage(sessionId, {
@@ -1079,7 +1135,9 @@ ${output.slice(0, 1e4)}
       }
       case "user": {
         if (resumeFromStep === step.id) {
-          stepOutcome = { result: "continue", output: lastStepOutput };
+          const choice = options.userChoice;
+          const result = choice === void 0 || choice === CONTINUE_CHOICE_ID ? DEFAULT_USER_RESULT : choice;
+          stepOutcome = { result, output: lastStepOutput };
           break;
         }
         if (executionId) {
@@ -1091,7 +1149,8 @@ ${output.slice(0, 1e4)}
             lastStepOutput,
             workflow.metadata.id,
             workflow.metadata.name,
-            workflow.metadata.color
+            workflow.metadata.color,
+            userStepChoices(step)
           );
         }
         logger.debug("Workflow paused at user step", { sessionId, stepId: step.id, stepName: step.name });
@@ -1225,14 +1284,14 @@ async function runOrchestrator(options) {
 
 // src/server/auth.ts
 import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
-import { join as join2, dirname as dirname2 } from "path";
+import { join as join2, dirname as dirname2, basename } from "path";
 import { createHash, privateDecrypt, createPublicKey } from "crypto";
 function getAuthConfigPath() {
   const configDir = getRuntimeConfig();
   const mode = configDir.mode === "development" ? "development" : configDir.mode === "test" ? "test" : "production";
   if (mode === "test") {
     const cwd = process.cwd();
-    const base = cwd.endsWith("/e2e") ? cwd : join2(cwd, "e2e");
+    const base = basename(cwd) === "e2e" ? cwd : join2(cwd, "e2e");
     const testAuthPath = join2(base, ".openfox-test", "auth.json");
     return testAuthPath;
   }
@@ -2166,8 +2225,8 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
       const sessionId = client.activeSessionId;
       const session = sessionManager.requireSession(sessionId);
       try {
-        const { buildCachedPrompt } = await import("./dynamic-context-UJE6F7XT.js");
-        const allAgents = await import("./registry-M2QVGRNK.js");
+        const { buildCachedPrompt } = await import("./dynamic-context-ZUXI5UTW.js");
+        const allAgents = await import("./registry-BDSTPV65.js");
         const agentDef = allAgents.findAgentById(session.mode, await allAgents.loadAllAgentsDefault()) ?? allAgents.findAgentById("planner", await allAgents.loadAllAgentsDefault());
         const modelName = session.providerModel ?? _providerManager?.getCurrentModel();
         const { systemPrompt: newPrompt, hash: newHash } = await buildCachedPrompt(
@@ -2326,6 +2385,7 @@ ${content}` : workflowInfo;
         ...launchPayload?.subGroup ? { subGroup: launchPayload.subGroup } : {},
         ...isResume && launchPayload?.resumeFrom ? { resumeFromStep: launchPayload.resumeFrom } : {},
         ...isResume && launchPayload?.stepOutput ? { initialStepOutput: launchPayload.stepOutput } : {},
+        ...isResume && launchPayload?.userChoice ? { userChoice: launchPayload.userChoice } : {},
         ...launchPayload?.params ? { params: launchPayload.params } : {},
         // On resume, prefer params/stepOutput from the persisted workflow execution
         ...isResume ? (() => {
@@ -2489,4 +2549,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-SGGFVTMP.js.map
+//# sourceMappingURL=chunk-P4APMCTX.js.map

package/dist/{chunk-D3SXT3BL.js → chunk-RRTKVJMF.js}

@@ -4,14 +4,14 @@ import {
 import {
   getProjectByWorkdir,
   updateProject
-} from "./chunk-WWFH5GAR.js";
+} from "./chunk-6FPGJR7O.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
 
 // src/server/git/workspace.ts
-import { spawn, execSync, execFileSync } from "child_process";
-import { mkdir as mkdir2 } from "fs/promises";
+import { spawn, execSync } from "child_process";
+import { mkdir as mkdir2, rm } from "fs/promises";
 import { resolve as resolve2, join as join2, isAbsolute } from "path";
 import { homedir, platform } from "os";
 
@@ -273,12 +273,7 @@ async function deleteWorkspace(projectName, name, projectDir) {
   if (!st?.isDirectory()) {
     throw new Error(`Workspace "${name}" does not exist`);
   }
-  try {
-    execFileSync("rm", ["-rf", wsPath], { stdio: "ignore" });
-  } catch {
-    const { rm } = await import("fs/promises");
-    await rm(wsPath, { recursive: true, force: true });
-  }
+  await rm(wsPath, { recursive: true, force: true, maxRetries: 3 });
   logger.info("Deleted workspace", { projectName, name, path: wsPath });
 }
 async function isGitRepository(cwd) {
@@ -324,4 +319,4 @@ export {
   deleteWorkspace,
   isGitRepository
 };
-//# sourceMappingURL=chunk-D3SXT3BL.js.map
+//# sourceMappingURL=chunk-RRTKVJMF.js.map

package/dist/{chunk-J27BLIPY.js → chunk-SGJ3LSVA.js}

@@ -1,6 +1,6 @@
 import {
   getPlatformShell
-} from "./chunk-EF7KGWF6.js";
+} from "./chunk-UXQN7FGB.js";
 
 // src/server/tools/tool-policy.ts
 var ALWAYS_ALLOWED = /* @__PURE__ */ new Set(["step_done"]);
@@ -36,6 +36,7 @@ Today's date is ${(/* @__PURE__ */ new Date()).toISOString().split("T")[0].repla
 
 ## ENVIRONMENT
 Working directory: ${workdir}
+The working directory may change during a session; if a later <system-reminder> names a workspace, trust that value over this one.
 Platform: ${process.platform} (${process.arch})
 Shell (run_command): ${basename(getPlatformShell().command)}${modelLine}
 
@@ -245,4 +246,4 @@ export {
   buildAgentSmallReminder,
   COMPACTION_PROMPT
 };
-//# sourceMappingURL=chunk-J27BLIPY.js.map
+//# sourceMappingURL=chunk-SGJ3LSVA.js.map