openfox 2.0.93 → 2.0.95

package/dist/{chunk-GAIAJDPH.js → chunk-D6T3X22W.js}

@@ -1,22 +1,22 @@
 import {
   runAgentTurn,
   runChatTurn
-} from "./chunk-RJQDC2OO.js";
+} from "./chunk-OZD247P4.js";
 import {
   generateSessionNameForSession,
   getSessionMessageCount,
   needsNameGeneration
-} from "./chunk-NV63HYNR.js";
+} from "./chunk-5UFTFBNW.js";
 import {
   devServerManager,
   executeSubAgent,
   getToolRegistryForAgent
-} from "./chunk-FK6R2YTQ.js";
+} from "./chunk-6RHMIMID.js";
 import {
   checkAborted,
   onProcessEvent,
   spawnShellProcess
-} from "./chunk-U7D72C4O.js";
+} from "./chunk-HAFRPV7I.js";
 import {
   killProcessTree,
   terminateProcessTree
@@ -28,7 +28,7 @@ import {
   applyDynamicContext,
   computeSessionHash,
   computeUnifiedDiff
-} from "./chunk-NW2KP7PE.js";
+} from "./chunk-MB7STVMR.js";
 import {
   createChatErrorMessage,
   createChatMessageMessage,
@@ -43,14 +43,14 @@ import {
   parseClientMessage,
   serializeServerMessage,
   storedEventToServerMessage
-} from "./chunk-IAAHDCJN.js";
+} from "./chunk-27SDWNKL.js";
 import {
   getPendingQuestionsForSession,
   provideAnswer
 } from "./chunk-EU3WWTFH.js";
 import {
   appendCompactionPrompt
-} from "./chunk-ESJNJ5B6.js";
+} from "./chunk-W7P5P54O.js";
 import {
   TurnMetrics,
   createMessageStartEvent
@@ -59,15 +59,14 @@ import {
   combineEventsWithSnapshot,
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-PYJ2SRVC.js";
+} from "./chunk-7P7OKBYQ.js";
 import {
   getPlatformShell
-} from "./chunk-WWC3R3YL.js";
+} from "./chunk-NLN5LPQ4.js";
 import {
   buildMessagesFromStoredEvents,
-  foldPendingConfirmations,
-  foldWaitingWorkflow
-} from "./chunk-3QQKKZMF.js";
+  foldPendingConfirmations
+} from "./chunk-P637C6X3.js";
 import {
   deleteItemFromDir,
   findAgentById,
@@ -76,10 +75,10 @@ import {
   loadAllAgentsDefault,
   resolveDefaultAgentId,
   saveItemToDir
-} from "./chunk-NGN3Q26A.js";
+} from "./chunk-OHBY2673.js";
 import {
   getMaxVisibleItems
-} from "./chunk-54Q4TGG6.js";
+} from "./chunk-UEOEA6BB.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -88,7 +87,7 @@ import {
 } from "./chunk-VUQCQXXJ.js";
 import {
   createServerMessage
-} from "./chunk-TQATAKVV.js";
+} from "./chunk-4R7G5JB6.js";
 import {
   getGlobalConfigDir
 } from "./chunk-CQGTEGKL.js";
@@ -768,17 +767,6 @@ async function executeWorkflow(workflow, options, subGroup) {
         totalTime: (performance.now() - startTime) / 1e3
       };
     }
-    if (targetStep.type !== "user") {
-      return {
-        finalAction: {
-          type: "BLOCKED",
-          reason: `Cannot resume from step "${resumeFromStep}" (type: ${targetStep.type}): only user steps support resume`,
-          blockedCriteria: []
-        },
-        iterations: 0,
-        totalTime: (performance.now() - startTime) / 1e3
-      };
-    }
   }
   logger.debug("Workflow executor starting", { sessionId, workflow: workflow.metadata.id });
   if (workflow.startCondition && workflow.startCondition.type !== "always") {
@@ -801,6 +789,7 @@ async function executeWorkflow(workflow, options, subGroup) {
       };
     }
   }
+  let executionId;
   if (!isResume) {
     const startMsgId = crypto.randomUUID();
     const startWindowOpts = getCurrentWindowMessageOptions(sessionId);
@@ -818,17 +807,31 @@ async function executeWorkflow(workflow, options, subGroup) {
       )
     );
     eventStore.append(sessionId, { type: "message.done", data: { messageId: startMsgId } });
-    if (options.userMessage) {
-      sessionManager.addMessage(sessionId, {
-        role: "user",
-        content: options.userMessage.content,
-        ...options.userMessage.attachments ? { attachments: options.userMessage.attachments } : {}
-      });
+    executionId = crypto.randomUUID();
+    sessionManager.startWorkflow(
+      sessionId,
+      executionId,
+      workflow.metadata.id,
+      workflow.metadata.name,
+      workflow.metadata.color,
+      options.params ?? {}
+    );
+  } else {
+    const activeExec = sessionManager.getActiveWorkflowExecution(sessionId);
+    if (activeExec) {
+      executionId = activeExec.id;
     }
   }
+  if (options.userMessage) {
+    sessionManager.addMessage(sessionId, {
+      role: "user",
+      content: options.userMessage.content,
+      ...options.userMessage.attachments ? { attachments: options.userMessage.attachments } : {}
+    });
+  }
   while (iterations < workflow.settings.maxIterations) {
     if (signal?.aborted) {
-      logger.debug("Workflow executor aborted", { sessionId, iterations });
+      logger.debug("Workflow executor aborted \u2014 preserving execution", { sessionId, iterations });
       return {
         finalAction: { type: "RUN_BUILDER", reason: "Aborted" },
         iterations,
@@ -861,6 +864,17 @@ async function executeWorkflow(workflow, options, subGroup) {
       params: options.params ?? {}
     };
     sessionManager.setPhase(sessionId, step.phase);
+    if (executionId) {
+      sessionManager.updateWorkflowStep(
+        sessionId,
+        executionId,
+        step.id,
+        step.name,
+        workflow.metadata.id,
+        workflow.metadata.name,
+        workflow.metadata.color
+      );
+    }
     if (step.type === "agent") {
       const agentStep = step;
       sessionManager.setMode(sessionId, agentStep.agentId ?? resolveDefaultAgentId());
@@ -874,7 +888,8 @@ async function executeWorkflow(workflow, options, subGroup) {
         const STEP_DONE_NUDGE = "You haven't called step_done(). If you haven't finished the task, continue and when you're finished call step_done()";
         let promptContent;
         let nudgeContent;
-        if (!firstEntryForStep.has(step.id) && agentStep.prompt) {
+        const isResumingCurrentStep = isResume && step.id === resumeFromStep;
+        if (!firstEntryForStep.has(step.id) && agentStep.prompt && !isResumingCurrentStep) {
           const resolvedPrompt = resolveTemplate(agentStep.prompt, templateCtx);
           promptContent = resolvedPrompt + STEP_DONE_PROMPT;
           const promptMsgId = crypto.randomUUID();
@@ -902,7 +917,7 @@ async function executeWorkflow(workflow, options, subGroup) {
               })
             );
           }
-        } else if (firstEntryForStep.has(step.id)) {
+        } else if (firstEntryForStep.has(step.id) && !isResumingCurrentStep) {
           const parts = [];
           if (agentStep.nudgePrompt) {
             const resolvedNudge = resolveTemplate(agentStep.nudgePrompt, templateCtx);
@@ -929,7 +944,7 @@ async function executeWorkflow(workflow, options, subGroup) {
           agentStep.agentId ?? resolveDefaultAgentId(),
           append,
           {
-            ...!firstEntryForStep.has(step.id) && !agentStep.prompt ? { injectKickoff: () => injectGenericKickoff(sessionId) } : {},
+            ...!firstEntryForStep.has(step.id) && !agentStep.prompt && !isResumingCurrentStep ? { injectKickoff: () => injectGenericKickoff(sessionId) } : {},
             onToolExecuted: (toolCall, toolResult) => {
               if (toolCall.name === "step_done" && toolResult.success) {
                 stepDoneCalled = true;
@@ -1065,17 +1080,18 @@ ${output.slice(0, 1e4)}
           stepOutcome = { result: "continue", output: lastStepOutput };
           break;
         }
-        eventStore.append(sessionId, {
-          type: "workflow.waiting",
-          data: {
-            workflowId: workflow.metadata.id,
-            workflowName: workflow.metadata.name,
-            stepId: step.id,
-            stepName: step.name,
-            stepOutput: lastStepOutput
-          }
-        });
-        sessionManager.setPhase(sessionId, "waiting");
+        if (executionId) {
+          sessionManager.waitAtStep(
+            sessionId,
+            executionId,
+            step.id,
+            step.name,
+            lastStepOutput,
+            workflow.metadata.id,
+            workflow.metadata.name,
+            workflow.metadata.color
+          );
+        }
         logger.debug("Workflow paused at user step", { sessionId, stepId: step.id, stepName: step.name });
         return {
           finalAction: {
@@ -1096,6 +1112,15 @@ ${output.slice(0, 1e4)}
     const nextStepId = subGroup && rawNextStepId !== TERMINAL_DONE && rawNextStepId !== TERMINAL_BLOCKED && !activeStepIds.has(rawNextStepId) ? TERMINAL_DONE : rawNextStepId;
     if (nextStepId === TERMINAL_DONE) {
       sessionManager.setPhase(sessionId, "done");
+      if (executionId) {
+        sessionManager.completeWorkflow(
+          sessionId,
+          executionId,
+          workflow.metadata.id,
+          workflow.metadata.name,
+          workflow.metadata.color
+        );
+      }
       const totalTimeSeconds = Math.round((performance.now() - startTime) / 100) / 10;
       const completedSession = sessionManager.requireSession(sessionId);
       const workflowMessages = completedSession.messages.slice(messagesBeforeWorkflow);
@@ -1136,6 +1161,15 @@ ${output.slice(0, 1e4)}
     }
     if (nextStepId === TERMINAL_BLOCKED) {
       sessionManager.setPhase(sessionId, "blocked");
+      if (executionId) {
+        sessionManager.blockWorkflow(
+          sessionId,
+          executionId,
+          workflow.metadata.id,
+          workflow.metadata.name,
+          workflow.metadata.color
+        );
+      }
       const reason = "No matching transition";
       emitWorkflowMessage(eventStore, sessionId, `Runner blocked: ${reason}`, currentWindowMessageOptions, onMessage);
       logger.warn("Workflow executor blocked", { sessionId, iterations, reason });
@@ -1742,7 +1776,7 @@ function createWebSocketServer(httpServer, _config, getLLMClient, getActiveProvi
       const { messages, hiddenCount } = buildMessagesFromStoredEvents(events, maxVisible || void 0);
       const pendingConfirmations = foldPendingConfirmations(events);
       const pendingQuestions = getPendingQuestionsForSession(updatedSession.id);
-      const waitingWorkflow = foldWaitingWorkflow(events);
+      const activeWorkflowExecution = sessionManager.getActiveWorkflowExecution(updatedSession.id);
       const effectiveWorkdir = updatedSession.workspace ?? updatedSession.workdir;
       for (const [, client] of clients) {
         if (client.activeSessionId === updatedSession.id && client.activeWorkdir !== effectiveWorkdir) {
@@ -1767,7 +1801,7 @@ function createWebSocketServer(httpServer, _config, getLLMClient, getActiveProvi
           void 0,
           void 0,
           hiddenCount,
-          waitingWorkflow
+          activeWorkflowExecution ?? void 0
         )
       );
       if (effectiveWorkdir) {
@@ -2127,8 +2161,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-4UPNVL3N.js");
-        const allAgents = await import("./registry-ERUV33AP.js");
+        const { buildCachedPrompt } = await import("./dynamic-context-CJFDFUJF.js");
+        const allAgents = await import("./registry-XBEHPY7C.js");
         const agentDef = allAgents.findAgentById(session.mode, await allAgents.loadAllAgentsDefault()) ?? allAgents.findAgentById("planner", await allAgents.loadAllAgentsDefault());
         const { systemPrompt: newPrompt, hash: newHash } = await buildCachedPrompt(sessionManager, sessionId, agentDef);
         const oldCached = sessionManager.getCachedPrompt(sessionId);
@@ -2281,6 +2315,32 @@ ${content}` : workflowInfo;
         ...isResume && launchPayload?.resumeFrom ? { resumeFromStep: launchPayload.resumeFrom } : {},
         ...isResume && launchPayload?.stepOutput ? { initialStepOutput: launchPayload.stepOutput } : {},
         ...launchPayload?.params ? { params: launchPayload.params } : {},
+        // On resume, prefer params/stepOutput from the persisted workflow execution
+        ...isResume ? (() => {
+          const exec = sessionManager.getActiveWorkflowExecution(sessionId);
+          if (!exec) return {};
+          if (exec.status === "waiting") {
+            const resumed = sessionManager.resumeWorkflow(
+              sessionId,
+              exec.id,
+              exec.workflowId,
+              exec.workflowName,
+              exec.workflowColor
+            );
+            if (resumed) {
+              return {
+                params: resumed.params,
+                initialStepOutput: resumed.stepOutput,
+                ...exec.currentStepId ? { resumeFromStep: exec.currentStepId } : {}
+              };
+            }
+          }
+          return {
+            ...Object.keys(exec.params).length > 0 ? { params: exec.params } : {},
+            ...Object.keys(exec.stepOutput).length > 0 ? { initialStepOutput: exec.stepOutput } : {},
+            ...exec.currentStepId ? { resumeFromStep: exec.currentStepId } : {}
+          };
+        })() : {},
         ...hasUserMessage ? {
           userMessage: {
             content: hasUserContent ? launchPayload.content : "",
@@ -2349,6 +2409,43 @@ ${content}` : workflowInfo;
       send({ type: "ack", payload: {}, id: message.id });
       break;
     }
+    // =========================================================================
+    // Workflow
+    // =========================================================================
+    case "workflow.exit": {
+      if (!client.activeSessionId) {
+        send(createErrorMessage("NO_SESSION", "No active session", message.id));
+        return;
+      }
+      const exitSessionId = client.activeSessionId;
+      const exitSession = sessionManager.getSession(exitSessionId);
+      if (!exitSession) {
+        send(createErrorMessage("NOT_FOUND", "Session not found", message.id));
+        return;
+      }
+      const activeExec = sessionManager.getActiveWorkflowExecution(exitSessionId);
+      if (activeExec) {
+        sessionManager.cancelWorkflow(
+          exitSessionId,
+          activeExec.id,
+          activeExec.workflowId,
+          activeExec.workflowName,
+          activeExec.workflowColor
+        );
+      } else {
+        sessionManager.setPhase(exitSessionId, "build");
+      }
+      const controller = activeAgents.get(exitSessionId);
+      if (controller) {
+        activeAgents.delete(exitSessionId);
+        controller.abort();
+      }
+      if (exitSession.isRunning) {
+        sessionManager.setRunning(exitSessionId, false);
+      }
+      send({ type: "ack", payload: {}, id: message.id });
+      break;
+    }
     default: {
       send(createErrorMessage("UNKNOWN_MESSAGE", `Unknown message type: ${message.type}`, message.id));
     }
@@ -2380,4 +2477,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-GAIAJDPH.js.map
+//# sourceMappingURL=chunk-D6T3X22W.js.map

package/dist/{chunk-6OAJNCRY.js → chunk-GLF65XDS.js}

@@ -197,6 +197,27 @@ function runMigrations(db2) {
     logger.info("Migrating sessions table: adding branch column");
     db2.exec(`ALTER TABLE sessions ADD COLUMN branch TEXT`);
   }
+  db2.exec(`
+    CREATE TABLE IF NOT EXISTS workflow_executions (
+      id TEXT PRIMARY KEY,
+      session_id TEXT NOT NULL,
+      workflow_id TEXT NOT NULL,
+      workflow_name TEXT NOT NULL,
+      workflow_color TEXT,
+      status TEXT NOT NULL DEFAULT 'running',
+      current_step_id TEXT,
+      current_step_name TEXT,
+      step_output TEXT,
+      params TEXT,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
+    )
+  `);
+  db2.exec(`
+    CREATE INDEX IF NOT EXISTS idx_workflow_executions_session
+    ON workflow_executions(session_id)
+  `);
   logger.info("Database migrations completed");
 }
 
@@ -204,4 +225,4 @@ export {
   initDatabase,
   getDatabase
 };
-//# sourceMappingURL=chunk-6OAJNCRY.js.map
+//# sourceMappingURL=chunk-GLF65XDS.js.map

package/dist/{chunk-U7D72C4O.js → chunk-HAFRPV7I.js}

@@ -11,7 +11,11 @@ import {
 } from "./chunk-I72ACQ6R.js";
 import {
   getPlatformShell
-} from "./chunk-WWC3R3YL.js";
+} from "./chunk-NLN5LPQ4.js";
+import {
+  SETTINGS_KEYS,
+  getSetting
+} from "./chunk-UEOEA6BB.js";
 
 // src/server/utils/shell.ts
 import { spawn } from "child_process";
@@ -22,10 +26,16 @@ function spawnShell(command, options) {
   const shell = getPlatformShell();
   const isCmd = shell.command === "cmd.exe";
   const args = isCmd ? ["/d", "/s", "/c", `"${command}"`] : [...shell.args, command];
+  const proxyUrl = getSetting(SETTINGS_KEYS.PROXY_URL);
+  const proxyEnv = {};
+  if (proxyUrl) {
+    proxyEnv["HTTP_PROXY"] = proxyUrl;
+    proxyEnv["HTTPS_PROXY"] = proxyUrl;
+  }
   return spawn(shell.command, args, {
     ...isCmd ? { windowsVerbatimArguments: true } : {},
     cwd: options.cwd,
-    env: { ...process.env },
+    env: { ...process.env, ...proxyEnv },
     stdio: options.stdio ?? ["ignore", "pipe", "pipe"],
     windowsHide: true,
     // detached is only useful for Unix process-group semantics; on win32 it
@@ -153,4 +163,4 @@ export {
   getSessionProcesses2 as getSessionProcesses,
   getProcessLogs
 };
-//# sourceMappingURL=chunk-U7D72C4O.js.map
+//# sourceMappingURL=chunk-HAFRPV7I.js.map