openfox 0.1.0 → 0.2.0

package/dist/{chunk-YQ36AK5A.js → chunk-JFQEATRC.js}

@@ -31,6 +31,7 @@ import {
   createToolRegistry,
   deleteAgent,
   deleteSkill,
+  devServerManager,
   emitAssistantMessageStart,
   emitContextCompacted,
   emitContextState,
@@ -95,7 +96,7 @@ import {
   setSkillEnabled,
   skillExists,
   storedEventToServerMessage
-} from "./chunk-IKAWIOXM.js";
+} from "./chunk-FUUYYDVG.js";
 import {
   getSetting,
   setSetting
@@ -114,9 +115,12 @@ import {
 import {
   computeSessionStats
 } from "./chunk-QY7BMXWT.js";
+import {
+  createServerMessage
+} from "./chunk-ARFK3RZW.js";
 import {
   createProviderManager
-} from "./chunk-6MOGZMGX.js";
+} from "./chunk-L4XDA3V7.js";
 import {
   SessionNotFoundError,
   createLLMClient,
@@ -125,7 +129,7 @@ import {
   getBackendDisplayName,
   getLlmStatus,
   getModelProfile
-} from "./chunk-FF6Z2MC3.js";
+} from "./chunk-5ZUU23XF.js";
 import {
   logger,
   setLogLevel
@@ -749,7 +753,8 @@ function getPromptAwareToolResponse(prompt) {
       tools: [
         { name: "get_criteria", arguments: {} },
         { name: "write_file", arguments: { path: "src/test.ts", content: "export const created = true" } },
-        { name: "complete_criterion", arguments: { id: "test-file", reason: "Created the requested file" } }
+        { name: "complete_criterion", arguments: { id: "test-file", reason: "Created the requested file" } },
+        { name: "step_done", arguments: {} }
       ],
       response: "Reviewed the criteria, created the file, and completed the criterion."
     };
@@ -758,7 +763,8 @@ function getPromptAwareToolResponse(prompt) {
     return {
       tools: [
         { name: "write_file", arguments: { path: "src/utils.ts", content: "export const created = true" } },
-        { name: "complete_criterion", arguments: { id: "file-created", reason: "Created the requested file" } }
+        { name: "complete_criterion", arguments: { id: "file-created", reason: "Created the requested file" } },
+        { name: "step_done", arguments: {} }
       ],
       response: "Created the file and completed the criterion."
     };
@@ -865,12 +871,48 @@ function getConversationAwareToolResponse(request) {
       );
       completedCriteria.push("file-created");
     }
-    if (tools.length > 0) {
-      return {
-        tools,
-        response: `Completed builder work for: ${completedCriteria.join(", ")}.`
-      };
+    if (tools.length === 0) {
+      tools.push({ name: "complete_criterion", arguments: { id: "mock-crit", reason: "Completed for testing" } });
+      completedCriteria.push("mock-crit");
     }
+    tools.push({ name: "step_done", arguments: {} });
+    return {
+      tools,
+      response: `Completed builder work for: ${completedCriteria.join(", ")}.`
+    };
+  }
+  if (/fulfil the \d+ criteria/i.test(prompt)) {
+    return {
+      tools: [
+        { name: "complete_criterion", arguments: { id: "mock-crit", reason: "Completed for testing" } },
+        { name: "step_done", arguments: {} }
+      ],
+      response: "Completed criterion and finished step."
+    };
+  }
+  if (/Continue working on the acceptance criteria/i.test(prompt)) {
+    const tools = [];
+    if (conversationText.includes("file-created")) {
+      tools.push(
+        { name: "write_file", arguments: { path: "src/utils.ts", content: "export const created = true" } },
+        { name: "complete_criterion", arguments: { id: "file-created", reason: "Created the requested file" } }
+      );
+    } else if (conversationText.includes("trivial-pass")) {
+      tools.push({ name: "complete_criterion", arguments: { id: "trivial-pass", reason: "Trivial criterion passes immediately" } });
+    } else if (conversationText.includes("verify-fail")) {
+      tools.push({ name: "complete_criterion", arguments: { id: "verify-fail", reason: "Prepared criterion for verification" } });
+    } else {
+      if (/1 criteria remaining/i.test(prompt)) {
+        tools.push({ name: "complete_criterion", arguments: { id: "trivial-pass", reason: "Trivial criterion passes immediately" } });
+      } else {
+        tools.push({ name: "complete_criterion", arguments: { id: "mock-crit", reason: "Completed for testing" } });
+      }
+    }
+    tools.push({ name: "step_done", arguments: {} });
+    return {
+      tools,
+      response: "Completed builder work."
+    };
   }
   if (/Verify each criterion marked \[NEEDS VERIFICATION\]\./i.test(prompt)) {
     const alreadyVerified = request.messages.some(
@@ -1199,43 +1241,60 @@ async function runBuilderTurn(options, turnMetrics) {
   const allAgents = await loadAllAgentsDefault();
   const builderDef = findAgentById("builder", allAgents);
   const subAgentDefs = getSubAgents(allAgents);
-  await runTopLevelAgentLoop({
-    mode: "builder",
-    sessionManager: sessionManager2,
-    sessionId,
-    llmClient: options.llmClient,
-    statsIdentity,
-    signal: options.signal,
-    onMessage: options.onMessage,
-    assembleRequest: (input) => assembleAgentRequest({ ...input, agentDef: builderDef, subAgentDefs }),
-    getToolRegistry: () => getToolRegistryForAgent(builderDef),
-    onToolExecuted: (toolCall, toolResult) => {
-      if (toolResult.success && ["write_file", "edit_file"].includes(toolCall.name)) {
-        const path = toolCall.arguments["path"];
-        sessionManager2.addModifiedFile(sessionId, path);
-      }
-    },
-    injectKickoff: () => {
-      if (options.injectBuilderKickoff !== true) return;
-      const session = sessionManager2.requireSession(sessionId);
-      const events = eventStore.getEvents(sessionId);
-      const hasBuilderKickoff = events.some((e) => {
-        if (e.type !== "message.start") return false;
-        const data = e.data;
-        return data.messageKind === "auto-prompt" && data.content?.includes("fulfil the");
-      });
-      if (!hasBuilderKickoff) {
-        const kickoffMsgId = crypto.randomUUID();
-        const kickoffContent = BUILDER_KICKOFF_PROMPT(session.criteria.length);
-        eventStore.append(sessionId, createMessageStartEvent(kickoffMsgId, "user", kickoffContent, {
-          ...getCurrentWindowMessageOptions(sessionId) ?? {},
-          isSystemGenerated: true,
-          messageKind: "auto-prompt"
-        }));
-        eventStore.append(sessionId, { type: "message.done", data: { messageId: kickoffMsgId } });
+  let stepDoneCalled = false;
+  return {
+    ...await runTopLevelAgentLoop({
+      mode: "builder",
+      sessionManager: sessionManager2,
+      sessionId,
+      llmClient: options.llmClient,
+      statsIdentity,
+      signal: options.signal,
+      onMessage: options.onMessage,
+      assembleRequest: (input) => assembleAgentRequest({ ...input, agentDef: builderDef, subAgentDefs }),
+      getToolRegistry: () => {
+        const baseRegistry = getToolRegistryForAgent(builderDef);
+        if (options.injectStepDone === true) {
+          return baseRegistry;
+        }
+        return {
+          tools: baseRegistry.tools.filter((t) => t.name !== "step_done"),
+          definitions: baseRegistry.definitions.filter((d) => d.type === "function" && d.function.name !== "step_done"),
+          execute: baseRegistry.execute
+        };
+      },
+      onToolExecuted: (toolCall, toolResult) => {
+        if (toolCall.name === "step_done" && toolResult.success) {
+          stepDoneCalled = true;
+        }
+        if (toolResult.success && ["write_file", "edit_file"].includes(toolCall.name)) {
+          const path = toolCall.arguments["path"];
+          sessionManager2.addModifiedFile(sessionId, path);
+        }
+      },
+      injectKickoff: () => {
+        if (options.injectBuilderKickoff !== true) return;
+        const session = sessionManager2.requireSession(sessionId);
+        const events = eventStore.getEvents(sessionId);
+        const hasBuilderKickoff = events.some((e) => {
+          if (e.type !== "message.start") return false;
+          const data = e.data;
+          return data.messageKind === "auto-prompt" && data.content?.includes("fulfil the");
+        });
+        if (!hasBuilderKickoff) {
+          const kickoffMsgId = crypto.randomUUID();
+          const kickoffContent = BUILDER_KICKOFF_PROMPT(session.criteria.length);
+          eventStore.append(sessionId, createMessageStartEvent(kickoffMsgId, "user", kickoffContent, {
+            ...getCurrentWindowMessageOptions(sessionId) ?? {},
+            isSystemGenerated: true,
+            messageKind: "auto-prompt"
+          }));
+          eventStore.append(sessionId, { type: "message.done", data: { messageId: kickoffMsgId } });
+        }
       }
-    }
-  }, turnMetrics);
+    }, turnMetrics),
+    stepDoneCalled
+  };
 }
 function buildSnapshot(sessionManager2, sessionId, lastStats) {
   const eventStore = getEventStore();
@@ -1467,6 +1526,18 @@ function executeShellCommand(command, cwd, timeout, signal) {
 }
 
 // src/server/workflows/executor.ts
+var TEMPLATE_VARIABLES = [
+  { name: "workdir", description: "Working directory of the session" },
+  { name: "reason", description: 'Human-readable reason (e.g. "2 criteria remaining")' },
+  { name: "stepOutput", description: "Structured output from the previous step (content, stdout, stderr, exitCode, etc.)" },
+  { name: "verifierFindings", description: "@deprecated Use stepOutput.content instead. Output from the last sub-agent step" },
+  { name: "previousStepOutput", description: "@deprecated Use stepOutput.stdout instead. Output from the last shell step" },
+  { name: "criteriaCount", description: "Total number of criteria" },
+  { name: "pendingCount", description: "Number of pending/failed criteria" },
+  { name: "summary", description: "Session summary generated by planner" },
+  { name: "criteriaList", description: "Formatted list of all criteria with status" },
+  { name: "modifiedFiles", description: "List of modified files" }
+];
 function formatCriteriaList(criteria) {
   if (criteria.length === 0) return "(none)";
   return criteria.map((c) => {
@@ -1479,7 +1550,16 @@ function formatModifiedFiles(session) {
   return files.length > 0 ? files.map((f) => `- ${f}`).join("\n") : "(none)";
 }
 function resolveTemplate(template, ctx) {
-  return template.replace(/\{\{workdir\}\}/g, ctx.workdir).replace(/\{\{reason\}\}/g, ctx.reason).replace(/\{\{verifierFindings\}\}/g, ctx.verifierFindings).replace(/\{\{previousStepOutput\}\}/g, ctx.previousStepOutput).replace(/\{\{criteriaCount\}\}/g, String(ctx.criteriaCount)).replace(/\{\{pendingCount\}\}/g, String(ctx.pendingCount)).replace(/\{\{summary\}\}/g, ctx.summary).replace(/\{\{criteriaList\}\}/g, ctx.criteriaList).replace(/\{\{modifiedFiles\}\}/g, ctx.modifiedFiles);
+  let result = template;
+  for (const { name } of TEMPLATE_VARIABLES) {
+    if (name === "stepOutput" || name === "verifierFindings" || name === "previousStepOutput") continue;
+    const value = String(ctx[name]);
+    result = result.replace(new RegExp(`\\{\\{${name}\\}\\}`, "g"), value);
+  }
+  result = result.replace(/\{\{stepOutput\.(\w+)\}\}/g, (_, key) => ctx.stepOutput[key] ?? "");
+  result = result.replace(/\{\{verifierFindings\}\}/g, ctx.stepOutput["content"] ?? "");
+  result = result.replace(/\{\{previousStepOutput\}\}/g, ctx.stepOutput["stdout"] ?? "");
+  return result;
 }
 function evaluateCondition(condition, criteria, stepOutcome) {
   switch (condition.type) {
@@ -1495,7 +1575,7 @@ function evaluateCondition(condition, criteria, stepOutcome) {
       return criteria.some((c) => c.status.type !== "passed");
     case "step_result":
       if (!stepOutcome) return false;
-      return condition.result === "success" ? stepOutcome.success : !stepOutcome.success;
+      return stepOutcome.result === condition.result;
     case "always":
       return true;
   }
@@ -1522,8 +1602,7 @@ async function executeWorkflow(workflow, options) {
   const startTime = performance.now();
   let iterations = 0;
   let currentStepId = workflow.entryStep;
-  let lastSubAgentContent = "";
-  let lastShellOutput = "";
+  let lastStepOutput = {};
   let isFirstBuilderEntry = true;
   const messagesBeforeWorkflow = sessionManager2.requireSession(sessionId).messages.length;
   const stepsById = /* @__PURE__ */ new Map();
@@ -1557,6 +1636,13 @@ async function executeWorkflow(workflow, options) {
     { ...startWindowOpts ?? {}, isSystemGenerated: true, messageKind: "workflow-started" }
   ));
   eventStore.append(sessionId, { type: "message.done", data: { messageId: startMsgId } });
+  if (options.userMessage) {
+    sessionManager2.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 });
@@ -1582,13 +1668,14 @@ async function executeWorkflow(workflow, options) {
     const templateCtx = {
       workdir: session.workdir,
       reason: buildReason(criteria),
-      verifierFindings: lastSubAgentContent,
-      previousStepOutput: lastShellOutput,
+      verifierFindings: lastStepOutput["content"] ?? "",
+      previousStepOutput: lastStepOutput["stdout"] ?? "",
       criteriaCount: criteria.length,
       pendingCount: criteria.filter((c) => c.status.type !== "passed").length,
       summary: session.summary ?? "No summary available",
       criteriaList: formatCriteriaList(criteria),
-      modifiedFiles: formatModifiedFiles(session)
+      modifiedFiles: formatModifiedFiles(session),
+      stepOutput: lastStepOutput
     };
     sessionManager2.setPhase(sessionId, step.phase);
     logger.debug("Workflow step executing", { sessionId, iteration: iterations, stepId: step.id, stepType: step.type });
@@ -1596,8 +1683,13 @@ async function executeWorkflow(workflow, options) {
     switch (step.type) {
       case "agent": {
         const agentStep = step;
+        const STEP_DONE_PROMPT = "\n\nOnce you're done, call step_done()";
+        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 = null;
+        let nudgeContent = null;
         if (isFirstBuilderEntry && agentStep.prompt) {
-          const promptContent = resolveTemplate(agentStep.prompt, templateCtx);
+          const resolvedPrompt = resolveTemplate(agentStep.prompt, templateCtx);
+          promptContent = resolvedPrompt + STEP_DONE_PROMPT;
           const promptMsgId = crypto.randomUUID();
           eventStore.append(sessionId, createMessageStartEvent(promptMsgId, "user", promptContent, {
             ...currentWindowMessageOptions ?? {},
@@ -1605,8 +1697,14 @@ async function executeWorkflow(workflow, options) {
             messageKind: "auto-prompt"
           }));
           eventStore.append(sessionId, { type: "message.done", data: { messageId: promptMsgId } });
-        } else if (!isFirstBuilderEntry && agentStep.nudgePrompt) {
-          const nudgeContent = resolveTemplate(agentStep.nudgePrompt, templateCtx);
+        } else if (!isFirstBuilderEntry) {
+          const parts = [];
+          if (agentStep.nudgePrompt) {
+            const resolvedNudge = resolveTemplate(agentStep.nudgePrompt, templateCtx);
+            parts.push(resolvedNudge);
+          }
+          parts.push(STEP_DONE_NUDGE);
+          nudgeContent = parts.join("\n\n");
           const nudgeMsgId = crypto.randomUUID();
           eventStore.append(sessionId, createMessageStartEvent(nudgeMsgId, "user", nudgeContent, {
             ...currentWindowMessageOptions ?? {},
@@ -1616,17 +1714,25 @@ async function executeWorkflow(workflow, options) {
           eventStore.append(sessionId, { type: "message.done", data: { messageId: nudgeMsgId } });
         }
         const turnMetrics = new TurnMetrics();
-        await runBuilderTurn({
+        const agentResult = await runBuilderTurn({
           sessionManager: sessionManager2,
           sessionId,
           llmClient,
+          injectStepDone: true,
           ...options.statsIdentity ? { statsIdentity: options.statsIdentity } : {},
           ...isFirstBuilderEntry && !agentStep.prompt && options.injectBuilderKickoff === true ? { injectBuilderKickoff: true } : {},
           ...signal ? { signal } : {},
           ...onMessage ? { onMessage } : {}
         }, turnMetrics);
         isFirstBuilderEntry = false;
-        stepOutcome = { success: true };
+        const agentReturnValue = agentResult.returnValueResult ?? "completed";
+        const stepDoneCalled = agentResult.stepDoneCalled ?? false;
+        lastStepOutput = { ...agentResult.returnValueContent ? { content: agentResult.returnValueContent } : {}, ...agentResult.returnValueResult ? { result: agentResult.returnValueResult } : {}, stepDoneCalled: String(stepDoneCalled) };
+        stepOutcome = { result: agentReturnValue, output: lastStepOutput };
+        if (!stepDoneCalled) {
+          logger.debug("step_done not called, looping agent step", { sessionId, stepId: step.id, iteration: iterations });
+          continue;
+        }
         break;
       }
       case "sub_agent": {
@@ -1638,10 +1744,15 @@ async function executeWorkflow(workflow, options) {
         const agentDef = findAgentById(subStep.subAgentType, allAgents);
         if (!agentDef) {
           logger.error("Sub-agent definition not found", { subAgentType: subStep.subAgentType });
-          stepOutcome = { success: false };
+          stepOutcome = { result: "error", output: {} };
           break;
         }
         const toolRegistry = getToolRegistryForAgent(agentDef);
+        const filteredToolRegistry = {
+          tools: toolRegistry.tools.filter((t) => t.name !== "step_done"),
+          definitions: toolRegistry.definitions.filter((d) => d.type === "function" && d.function.name !== "step_done"),
+          execute: toolRegistry.execute
+        };
         const nudgeConfig = subStep.subAgentType === "verifier" && !subStep.nudgePrompt ? createVerifierNudgeConfig() : void 0;
         const result = await executeSubAgent({
           subAgentType: subStep.subAgentType,
@@ -1649,15 +1760,15 @@ async function executeWorkflow(workflow, options) {
           sessionManager: sessionManager2,
           sessionId,
           llmClient,
-          toolRegistry,
+          toolRegistry: filteredToolRegistry,
           turnMetrics,
           statsIdentity: options.statsIdentity ?? { providerId: "", providerName: "", backend: "unknown", model: llmClient.getModel() },
           ...signal ? { signal } : {},
           ...onMessage ? { onMessage } : {},
           nudgeConfig
         });
-        lastSubAgentContent = result.content ?? "";
-        stepOutcome = { success: result.allPassed ?? true };
+        lastStepOutput = { content: result.content ?? "", ...result.result ? { result: result.result } : {} };
+        stepOutcome = { result: result.result ?? "success", output: lastStepOutput };
         break;
       }
       case "shell": {
@@ -1673,7 +1784,7 @@ async function executeWorkflow(workflow, options) {
         }));
         const result = await executeShellCommand(command, session.workdir, timeout, signal);
         const output = [result.stdout, result.stderr].filter(Boolean).join("\n").trim();
-        lastShellOutput = output;
+        lastStepOutput = { stdout: result.stdout ?? "", stderr: result.stderr ?? "", exitCode: String(result.exitCode) };
         const outputContent = output ? `Exit code: ${result.exitCode}
 \`\`\`
 ${output.slice(0, 1e4)}
@@ -1686,7 +1797,7 @@ ${output.slice(0, 1e4)}
           messageKind: "correction"
         }));
         eventStore.append(sessionId, { type: "message.done", data: { messageId: outputMsgId } });
-        stepOutcome = { success: successCodes.includes(result.exitCode) };
+        stepOutcome = { result: successCodes.includes(result.exitCode) ? "success" : "failure", output: lastStepOutput };
         break;
       }
     }
@@ -1898,7 +2009,22 @@ function listSessions() {
       s.updated_at,
       s.title,
       s.provider_id,
-      s.provider_model
+      s.provider_model,
+      COALESCE(
+        (SELECT COUNT(*) FROM events e 
+         WHERE e.session_id = s.id 
+         AND e.event_type = 'message.start'
+         AND json_extract(e.payload, '$.role') IN ('user', 'assistant'))
+        +
+        COALESCE(
+          (SELECT SUM(json_array_length(json_extract(e.payload, '$.messages'))) FROM events e
+           WHERE e.session_id = s.id
+           AND e.event_type = 'turn.snapshot'
+           AND json_extract(e.payload, '$.messages') IS NOT NULL),
+          0
+        ),
+        0
+      ) as message_count
     FROM sessions s
     ORDER BY s.updated_at DESC
   `).all();
@@ -1916,8 +2042,9 @@ function listSessions() {
     updatedAt: row.updated_at,
     criteriaCount: 0,
     // Derived from events
-    criteriaCompleted: 0
+    criteriaCompleted: 0,
     // Derived from events
+    messageCount: row.message_count
   }));
 }
 function listSessionsByProject(projectId) {
@@ -1934,7 +2061,22 @@ function listSessionsByProject(projectId) {
       s.updated_at,
       s.title,
       s.provider_id,
-      s.provider_model
+      s.provider_model,
+      COALESCE(
+        (SELECT COUNT(*) FROM events e 
+         WHERE e.session_id = s.id 
+         AND e.event_type = 'message.start'
+         AND json_extract(e.payload, '$.role') IN ('user', 'assistant'))
+        +
+        COALESCE(
+          (SELECT SUM(json_array_length(json_extract(e.payload, '$.messages'))) FROM events e
+           WHERE e.session_id = s.id
+           AND e.event_type = 'turn.snapshot'
+           AND json_extract(e.payload, '$.messages') IS NOT NULL),
+          0
+        ),
+        0
+      ) as message_count
     FROM sessions s
     WHERE s.project_id = ?
     ORDER BY s.updated_at DESC
@@ -1953,8 +2095,9 @@ function listSessionsByProject(projectId) {
     updatedAt: row.updated_at,
     criteriaCount: 0,
     // Derived from events
-    criteriaCompleted: 0
+    criteriaCompleted: 0,
     // Derived from events
+    messageCount: row.message_count
   }));
 }
 function deleteSession(id) {
@@ -1973,7 +2116,7 @@ Example inputs and outputs:
 
 User message: {message}`;
 async function generateSessionName(options) {
-  const { userMessage, llmClient } = options;
+  const { userMessage, llmClient, signal } = options;
   try {
     const prompt = SESSION_NAME_PROMPT.replace("{message}", userMessage);
     const messages = [
@@ -1982,10 +2125,12 @@ async function generateSessionName(options) {
         content: prompt
       }
     ];
+    const timeoutSignal = AbortSignal.timeout(6e4);
+    const composedSignal = signal ? AbortSignal.any([timeoutSignal, signal]) : timeoutSignal;
     const response = await llmClient.complete({
       messages,
       tools: [],
-      signal: AbortSignal.timeout(6e4),
+      signal: composedSignal,
       disableThinking: true
     });
     let name = response.content.trim();
@@ -2187,6 +2332,28 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
       }
     }
   });
+  const broadcastAll = (msg) => {
+    const serialized = serializeServerMessage(msg);
+    for (const [clientWs] of clients) {
+      if (clientWs.readyState === WebSocket.OPEN) {
+        clientWs.send(serialized);
+      }
+    }
+  };
+  devServerManager.onOutput((workdir, chunk) => {
+    broadcastAll(createServerMessage("devServer.output", {
+      workdir,
+      stream: chunk.stream,
+      content: chunk.content
+    }));
+  });
+  devServerManager.onStateChange((workdir, state, errorMessage) => {
+    broadcastAll(createServerMessage("devServer.state", {
+      workdir,
+      state,
+      errorMessage
+    }));
+  });
   wss.on("connection", (ws) => {
     logger.debug("WebSocket client connected");
     clients.set(ws, { ws, activeSessionId: null, subscribedSessions: /* @__PURE__ */ new Map(), eventStoreSubscriptions: /* @__PURE__ */ new Map() });
@@ -2247,6 +2414,7 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
     controller.abort();
     cancelQuestionsForSession(sessionId, reason);
     cancelPathConfirmationsForSession(sessionId, reason);
+    sessionManager2.clearMessageQueue(sessionId);
     sessionManager2.setRunning(sessionId, false);
     sendForSession(sessionId, createSessionRunningMessage(false));
     const contextState = sessionManager2.getContextState(sessionId);
@@ -2461,8 +2629,7 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
       ensureEventStoreSubscription(session.id);
       const eventStore = getEventStore();
       const events = eventStore.getEvents(session.id);
-      let messages;
-      messages = buildMessagesFromStoredEvents(events);
+      const messages = buildMessagesFromStoredEvents(events);
       logger.debug("Loaded messages from EventStore", { sessionId: session.id, eventCount: events.length, messageCount: messages.length });
       sendForSession(session.id, createSessionStateMessage(session, messages, message.id));
       const contextState = sessionManager2.getContextState(session.id);
@@ -2558,46 +2725,6 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
       const sessionId = client.activeSessionId;
       const eventStore = getEventStore();
       ensureEventStoreSubscription(sessionId);
-      await maybeAutoCompactContext({
-        sessionManager: sessionManager2,
-        sessionId,
-        llmClient: llmForSession(sessionId),
-        statsIdentity: statsForSession(sessionId)
-      });
-      const userMessage = sessionManager2.addMessage(sessionId, {
-        role: "user",
-        content: message.payload.content,
-        ...message.payload.attachments && { attachments: message.payload.attachments },
-        ...message.payload.messageKind && { messageKind: message.payload.messageKind },
-        ...message.payload.isSystemGenerated && { isSystemGenerated: message.payload.isSystemGenerated }
-      });
-      const messageCount = getSessionMessageCount(sessionId);
-      if (needsNameGeneration(currentSession.metadata.title, messageCount)) {
-        generateSessionName({
-          userMessage: message.payload.content,
-          llmClient: llmForSession(sessionId)
-        }).then(async (result) => {
-          if (result.success && result.name) {
-            updateSessionMetadata(sessionId, { title: result.name });
-            eventStore.append(sessionId, {
-              type: "session.name_generated",
-              data: { name: result.name }
-            });
-            const updatedSession = sessionManager2.getSession(sessionId);
-            if (updatedSession) {
-              const events = eventStore.getEvents(sessionId);
-              const messages = buildMessagesFromStoredEvents(events);
-              broadcastForSession(sessionId, createSessionStateMessage(updatedSession, messages));
-            }
-            logger.info("Session name generated", { sessionId, name: result.name });
-          }
-        }).catch((error) => {
-          logger.warn("Session name generation failed", { sessionId, error: error instanceof Error ? error.message : error });
-        });
-      }
-      sessionManager2.setRunning(sessionId, true);
-      sendForSession(sessionId, createChatMessageMessage(userMessage));
-      sendForSession(sessionId, createSessionRunningMessage(true));
       const controller = new AbortController();
       const existingController = activeAgents.get(sessionId);
       if (existingController) {
@@ -2605,8 +2732,66 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
         existingController.abort();
       }
       activeAgents.set(sessionId, controller);
+      sessionManager2.setRunning(sessionId, true);
+      sendForSession(sessionId, createSessionRunningMessage(true));
       send({ type: "ack", payload: {}, id: message.id });
-      startTurnWithCompletionChain(sessionId, controller);
+      try {
+        await maybeAutoCompactContext({
+          sessionManager: sessionManager2,
+          sessionId,
+          llmClient: llmForSession(sessionId),
+          statsIdentity: statsForSession(sessionId),
+          signal: controller.signal
+        });
+        if (controller.signal.aborted) {
+          break;
+        }
+        const userMessage = sessionManager2.addMessage(sessionId, {
+          role: "user",
+          content: message.payload.content,
+          ...message.payload.attachments && { attachments: message.payload.attachments },
+          ...message.payload.messageKind && { messageKind: message.payload.messageKind },
+          ...message.payload.isSystemGenerated && { isSystemGenerated: message.payload.isSystemGenerated }
+        });
+        sendForSession(sessionId, createChatMessageMessage(userMessage));
+        const messageCount = getSessionMessageCount(sessionId);
+        if (needsNameGeneration(currentSession.metadata.title, messageCount)) {
+          generateSessionName({
+            userMessage: message.payload.content,
+            llmClient: llmForSession(sessionId),
+            signal: controller.signal
+          }).then(async (result) => {
+            if (result.success && result.name) {
+              updateSessionMetadata(sessionId, { title: result.name });
+              eventStore.append(sessionId, {
+                type: "session.name_generated",
+                data: { name: result.name }
+              });
+              const updatedSession = sessionManager2.getSession(sessionId);
+              if (updatedSession) {
+                const events = eventStore.getEvents(sessionId);
+                const messages = buildMessagesFromStoredEvents(events);
+                broadcastForSession(sessionId, createSessionStateMessage(updatedSession, messages));
+              }
+              logger.info("Session name generated", { sessionId, name: result.name });
+            }
+          }).catch((error) => {
+            logger.warn("Session name generation failed", { sessionId, error: error instanceof Error ? error.message : error });
+          });
+        }
+        startTurnWithCompletionChain(sessionId, controller);
+      } catch (error) {
+        if (activeAgents.get(sessionId) === controller) {
+          activeAgents.delete(sessionId);
+        }
+        sessionManager2.setRunning(sessionId, false);
+        sendForSession(sessionId, createSessionRunningMessage(false));
+        const contextState = sessionManager2.getContextState(sessionId);
+        sendForSession(sessionId, createContextStateMessage(contextState));
+        if (!(error instanceof Error && error.message === "Aborted")) {
+          logger.error("Chat send pre-turn error", { sessionId, error });
+        }
+      }
       break;
     }
     case "chat.stop": {
@@ -2750,7 +2935,8 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
         send(createErrorMessage("ALREADY_RUNNING", "Session is already running", message.id));
         return;
       }
-      if (session.criteria.length === 0) {
+      const acceptPayloadEarly = message.payload;
+      if (!acceptPayloadEarly?.workflowId && session.criteria.length === 0) {
         send(createErrorMessage("NO_CRITERIA", "Cannot accept: no criteria defined", message.id));
         return;
       }
@@ -2815,13 +3001,18 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
           }
           activeAgents.set(sessionId, controller);
           const acceptPayload = message.payload;
+          const acceptAttachments = acceptPayload?.attachments;
+          const hasAcceptContent = acceptPayload?.content && typeof acceptPayload.content === "string" && acceptPayload.content.trim();
+          const hasAcceptAttachments = acceptAttachments && acceptAttachments.length > 0;
+          const hasAcceptMessage = hasAcceptContent || hasAcceptAttachments;
           await runOrchestrator({
             sessionManager: sessionManager2,
             sessionId,
             llmClient: llmForSession(sessionId),
             statsIdentity: statsForSession(sessionId),
-            injectBuilderKickoff: true,
+            injectBuilderKickoff: !hasAcceptMessage,
             ...acceptPayload?.workflowId ? { workflowId: acceptPayload.workflowId } : {},
+            ...hasAcceptMessage ? { userMessage: { content: hasAcceptContent ? acceptPayload.content : "", ...hasAcceptAttachments ? { attachments: acceptAttachments } : {} } } : {},
             signal: controller.signal,
             onMessage: (msg) => sendForSession(sessionId, msg)
             // For path confirmation dialogs
@@ -2911,7 +3102,6 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
       }
       const contextState = sessionManager2.getContextState(sessionId);
       const tokensBefore = contextState.currentTokens;
-      const eventStore = getEventStore();
       send({ type: "ack", payload: {}, id: message.id });
       (async () => {
         try {
@@ -2956,28 +3146,23 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
         send(createErrorMessage("INVALID_MODE", "Runner can only be launched in builder mode", message.id));
         return;
       }
+      const launchPayloadEarly = message.payload;
       const pendingCriteria = session.criteria.filter((c) => c.status.type !== "passed");
-      if (pendingCriteria.length === 0) {
+      if (!launchPayloadEarly?.workflowId && pendingCriteria.length === 0) {
         send(createErrorMessage("NO_WORK", "No pending criteria to work on", message.id));
         return;
       }
       const sessionId = client.activeSessionId;
-      const eventStore = getEventStore();
       if (session.phase === "blocked") {
         logger.info("User launched runner - resetting blocked state", { sessionId });
         sessionManager2.setPhase(sessionId, "build");
         sessionManager2.resetAllCriteriaAttempts(sessionId);
       }
       const launchPayload = message.payload;
-      const hasUserMessage = launchPayload?.content && typeof launchPayload.content === "string" && launchPayload.content.trim();
-      if (hasUserMessage) {
-        const attachments = launchPayload.attachments;
-        sessionManager2.addMessage(sessionId, {
-          role: "user",
-          content: launchPayload.content,
-          ...attachments ? { attachments } : {}
-        });
-      }
+      const launchAttachments = launchPayload?.attachments;
+      const hasUserContent = launchPayload?.content && typeof launchPayload.content === "string" && launchPayload.content.trim();
+      const hasUserAttachments = launchAttachments && launchAttachments.length > 0;
+      const hasUserMessage = hasUserContent || hasUserAttachments;
       sessionManager2.setRunning(sessionId, true);
       sendForSession(sessionId, createSessionRunningMessage(true));
       const controller = new AbortController();
@@ -2997,6 +3182,7 @@ async function handleClientMessage(ws, client, message, config, getLLMClient, ge
         statsIdentity: statsForSession(sessionId),
         injectBuilderKickoff: !hasUserMessage,
         ...launchPayload?.workflowId ? { workflowId: launchPayload.workflowId } : {},
+        ...hasUserMessage ? { userMessage: { content: hasUserContent ? launchPayload.content : "", ...hasUserAttachments ? { attachments: launchAttachments } : {} } } : {},
         signal: controller.signal,
         onMessage: (msg) => sendForSession(sessionId, msg)
         // For path confirmation dialogs
@@ -4931,153 +5117,11 @@ async function deleteCommand(configDir, commandId) {
   }
 }
 
-// src/server/index.ts
-var __dirname2 = dirname4(fileURLToPath4(import.meta.url));
-async function createServerHandle(config) {
-  setRuntimeConfig(config);
-  setLogLevel(config.logging?.level ?? void 0, config.mode);
-  const db = initDatabase(config);
-  initEventStore(db);
-  const configDir = getGlobalConfigDir(config.mode ?? "production");
-  await ensureDefaultSkills(configDir);
-  await ensureDefaultCommands(configDir);
-  await ensureDefaultAgents(configDir);
-  await ensureDefaultWorkflows(configDir);
-  const sessionManager2 = new SessionManager();
-  const providerManager = createProviderManager(config);
-  const useMock = process.env["OPENFOX_MOCK_LLM"] === "true";
-  const getMockClient = useMock ? createMockLLMClient : null;
-  const getLLMClient = () => getMockClient ? getMockClient() : providerManager.getLLMClient();
-  if (useMock) {
-    logger.info("Using MOCK LLM client - deterministic responses for testing");
-  }
-  async function initLLM() {
-    const llmClient = getLLMClient();
-    let backend = "unknown";
-    const useMock2 = process.env["OPENFOX_MOCK_LLM"] === "true";
-    if (config.llm.backend === "auto") {
-      backend = await detectBackend(config.llm.baseUrl, void 0, useMock2);
-      llmClient.setBackend(backend);
-      if (!useMock2) {
-        logger.info("Auto-detected LLM backend", { backend: getBackendDisplayName(backend) });
-      }
-    } else {
-      backend = config.llm.backend;
-      llmClient.setBackend(backend);
-      if (!useMock2) {
-        logger.info("Using configured LLM backend", { backend: getBackendDisplayName(backend) });
-      }
-    }
-    const detected = await detectModel(config.llm.baseUrl);
-    if (detected) {
-      llmClient.setModel(detected);
-      if (!useMock2) {
-        logger.info("Auto-detected LLM model", { model: detected, backend: getBackendDisplayName(backend) });
-      }
-    } else {
-      if (!useMock2) {
-        logger.warn("Could not auto-detect model, using config", { model: config.llm.model });
-      }
-    }
-  }
-  initLLM().catch((err) => logger.error("LLM initialization failed", { error: err instanceof Error ? err.message : String(err) }));
-  const toolRegistry = createToolRegistry();
-  const app = express();
-  app.use(cors());
-  app.use(express.json());
-  app.get("/api/health", (_req, res) => {
-    res.json({ status: "ok", timestamp: (/* @__PURE__ */ new Date()).toISOString() });
-  });
-  app.post("/api/sessions", async (req, res) => {
-    const { workdir, title } = req.body;
-    const session = sessionManager2.createSession(workdir, title);
-    res.status(201).json({ session });
-  });
-  app.get("/api/sessions/:id", (req, res) => {
-    const session = sessionManager2.getSession(req.params.id);
-    if (!session) {
-      return res.status(404).json({ error: "Session not found" });
-    }
-    res.json({ session });
-  });
-  app.delete("/api/sessions/:id", (req, res) => {
-    sessionManager2.deleteSession(req.params["id"]);
-    res.json({ success: true });
-  });
-  app.delete("/api/projects/:projectId/sessions", (req, res) => {
-    const projectId = req.params["projectId"];
-    const project = sessionManager2.getProject(projectId);
-    if (!project) {
-      return res.status(404).json({ error: "Project not found" });
-    }
-    sessionManager2.deleteAllSessions(projectId, project.workdir);
-    res.json({ success: true });
-  });
-  app.get("/api/config", (_req, res) => {
-    const llmClient = getLLMClient();
-    const activeProvider = providerManager.getActiveProvider();
-    res.json({
-      model: llmClient.getModel(),
-      maxContext: config.context.maxTokens,
-      llmUrl: activeProvider?.url ?? config.llm.baseUrl,
-      llmStatus: getLlmStatus(),
-      backend: llmClient.getBackend(),
-      workdir: config.workdir,
-      // Include provider info
-      providers: providerManager.getProviders(),
-      activeProviderId: providerManager.getActiveProviderId(),
-      defaultModelSelection: config.defaultModelSelection
-    });
-  });
-  app.post("/api/model/refresh", async (_req, res) => {
-    const llmClient = getLLMClient();
-    const currentModel = providerManager.getCurrentModel();
-    if (currentModel === "auto") {
-      const activeProvider = providerManager.getActiveProvider();
-      const baseUrl = activeProvider?.url ?? config.llm.baseUrl;
-      const detected = await detectModel(baseUrl);
-      if (detected) {
-        llmClient.setModel(detected);
-        return res.json({ model: detected, source: "detected", llmStatus: getLlmStatus(), backend: llmClient.getBackend() });
-      }
-    }
-    res.json({ model: llmClient.getModel(), source: "cached", llmStatus: getLlmStatus(), backend: llmClient.getBackend() });
-  });
-  app.get("/api/providers", (_req, res) => {
-    const providers = providerManager.getProviders().map((p) => ({
-      ...p,
-      status: providerManager.getProviderStatus(p.id)
-    }));
-    res.json({
-      providers,
-      activeProviderId: providerManager.getActiveProviderId()
-    });
-  });
-  app.get("/api/providers/:id/models", async (req, res) => {
-    const { id } = req.params;
-    const models = await providerManager.getProviderModels(id);
-    res.json({ models });
-  });
-  app.post("/api/providers/:id/activate", async (req, res) => {
-    const { id } = req.params;
-    const body = req.body;
-    const result = await providerManager.activateProvider(id, body.model ? { model: body.model } : void 0);
-    if (!result.success) {
-      return res.status(400).json({ error: result.error });
-    }
-    const llmClient = getLLMClient();
-    const { loadGlobalConfig, saveGlobalConfig, setDefaultModelSelection } = await import("./config-6GJ4SVFH.js");
-    const globalConfig = await loadGlobalConfig(config.mode ?? "production");
-    const updatedConfig = setDefaultModelSelection(globalConfig, id, llmClient.getModel());
-    await saveGlobalConfig(config.mode ?? "production", updatedConfig);
-    res.json({
-      success: true,
-      activeProviderId: id,
-      model: llmClient.getModel(),
-      backend: llmClient.getBackend()
-    });
-  });
-  app.get("/api/skills", async (_req, res) => {
+// src/server/routes/skills.ts
+import { Router } from "express";
+function createSkillRoutes(configDir) {
+  const router = Router();
+  router.get("/", async (_req, res) => {
     const [skills, defaultIds, modifiedIds] = await Promise.all([
       loadAllSkills(configDir),
       getDefaultSkillIds(),
@@ -5092,15 +5136,15 @@ async function createServerHandle(config) {
       modifiedIds
     });
   });
-  app.get("/api/skills/default-ids", async (_req, res) => {
+  router.get("/default-ids", async (_req, res) => {
     const ids = await getDefaultSkillIds();
     res.json({ ids });
   });
-  app.post("/api/skills/restore-all-defaults", async (_req, res) => {
+  router.post("/restore-all-defaults", async (_req, res) => {
     const count = await restoreAllDefaultSkills(configDir);
     res.json({ success: true, count });
   });
-  app.post("/api/skills/:id/restore-default", async (req, res) => {
+  router.post("/:id/restore-default", async (req, res) => {
     const { id } = req.params;
     const restored = await restoreDefaultSkill(configDir, id);
     if (!restored) {
@@ -5108,13 +5152,13 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.post("/api/skills/:id/toggle", (req, res) => {
+  router.post("/:id/toggle", (req, res) => {
     const { id } = req.params;
     const currentlyEnabled = isSkillEnabled(id);
     setSkillEnabled(id, !currentlyEnabled);
     res.json({ id, enabled: !currentlyEnabled });
   });
-  app.get("/api/skills/:id", async (req, res) => {
+  router.get("/:id", async (req, res) => {
     const { id } = req.params;
     const skills = await loadAllSkills(configDir);
     const skill = findSkillById(id, skills);
@@ -5123,7 +5167,7 @@ async function createServerHandle(config) {
     }
     res.json(skill);
   });
-  app.post("/api/skills", async (req, res) => {
+  router.post("/", async (req, res) => {
     const body = req.body;
     if (!body.metadata?.id || !body.metadata?.name || !body.prompt) {
       return res.status(400).json({ error: "Missing required fields: metadata.id, metadata.name, prompt" });
@@ -5137,7 +5181,7 @@ async function createServerHandle(config) {
     await saveSkill(configDir, body);
     res.status(201).json(body);
   });
-  app.put("/api/skills/:id", async (req, res) => {
+  router.put("/:id", async (req, res) => {
     const { id } = req.params;
     if (!await skillExists(configDir, id)) {
       return res.status(404).json({ error: "Skill not found" });
@@ -5155,7 +5199,7 @@ async function createServerHandle(config) {
     await saveSkill(configDir, updated);
     res.json(updated);
   });
-  app.delete("/api/skills/:id", async (req, res) => {
+  router.delete("/:id", async (req, res) => {
     const { id } = req.params;
     const deleted = await deleteSkill(configDir, id);
     if (!deleted) {
@@ -5163,7 +5207,14 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.get("/api/commands", async (_req, res) => {
+  return router;
+}
+
+// src/server/routes/commands.ts
+import { Router as Router2 } from "express";
+function createCommandRoutes(configDir) {
+  const router = Router2();
+  router.get("/", async (_req, res) => {
     const [commands, defaultIds, modifiedIds] = await Promise.all([
       loadAllCommands(configDir),
       getDefaultCommandIds(),
@@ -5175,15 +5226,15 @@ async function createServerHandle(config) {
       modifiedIds
     });
   });
-  app.get("/api/commands/default-ids", async (_req, res) => {
+  router.get("/default-ids", async (_req, res) => {
     const ids = await getDefaultCommandIds();
     res.json({ ids });
   });
-  app.post("/api/commands/restore-all-defaults", async (_req, res) => {
+  router.post("/restore-all-defaults", async (_req, res) => {
     const count = await restoreAllDefaultCommands(configDir);
     res.json({ success: true, count });
   });
-  app.post("/api/commands/:id/restore-default", async (req, res) => {
+  router.post("/:id/restore-default", async (req, res) => {
     const { id } = req.params;
     const restored = await restoreDefaultCommand(configDir, id);
     if (!restored) {
@@ -5191,7 +5242,7 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.get("/api/commands/:id", async (req, res) => {
+  router.get("/:id", async (req, res) => {
     const { id } = req.params;
     const commands = await loadAllCommands(configDir);
     const command = findCommandById(id, commands);
@@ -5200,7 +5251,7 @@ async function createServerHandle(config) {
     }
     res.json(command);
   });
-  app.post("/api/commands", async (req, res) => {
+  router.post("/", async (req, res) => {
     const body = req.body;
     if (!body.metadata?.id || !body.metadata?.name || !body.prompt) {
       return res.status(400).json({ error: "Missing required fields: metadata.id, metadata.name, prompt" });
@@ -5214,7 +5265,7 @@ async function createServerHandle(config) {
     await saveCommand(configDir, body);
     res.status(201).json(body);
   });
-  app.put("/api/commands/:id", async (req, res) => {
+  router.put("/:id", async (req, res) => {
     const { id } = req.params;
     if (!await commandExists(configDir, id)) {
       return res.status(404).json({ error: "Command not found" });
@@ -5232,7 +5283,7 @@ async function createServerHandle(config) {
     await saveCommand(configDir, updated);
     res.json(updated);
   });
-  app.delete("/api/commands/:id", async (req, res) => {
+  router.delete("/:id", async (req, res) => {
     const { id } = req.params;
     const deleted = await deleteCommand(configDir, id);
     if (!deleted) {
@@ -5240,7 +5291,14 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.get("/api/agents", async (_req, res) => {
+  return router;
+}
+
+// src/server/routes/agents.ts
+import { Router as Router3 } from "express";
+function createAgentRoutes(configDir) {
+  const router = Router3();
+  router.get("/", async (_req, res) => {
     const [agents, defaultIds, modifiedIds] = await Promise.all([
       loadAllAgents(configDir),
       getDefaultAgentIds(),
@@ -5252,15 +5310,15 @@ async function createServerHandle(config) {
       modifiedIds
     });
   });
-  app.get("/api/agents/default-ids", async (_req, res) => {
+  router.get("/default-ids", async (_req, res) => {
     const ids = await getDefaultAgentIds();
     res.json({ ids });
   });
-  app.post("/api/agents/restore-all-defaults", async (_req, res) => {
+  router.post("/restore-all-defaults", async (_req, res) => {
     const count = await restoreAllDefaultAgents(configDir);
     res.json({ success: true, count });
   });
-  app.post("/api/agents/:id/restore-default", async (req, res) => {
+  router.post("/:id/restore-default", async (req, res) => {
     const { id } = req.params;
     const restored = await restoreDefaultAgent(configDir, id);
     if (!restored) {
@@ -5268,7 +5326,7 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.get("/api/agents/:id", async (req, res) => {
+  router.get("/:id", async (req, res) => {
     const { id } = req.params;
     const agents = await loadAllAgents(configDir);
     const agent = findAgentById(id, agents);
@@ -5277,7 +5335,7 @@ async function createServerHandle(config) {
     }
     res.json(agent);
   });
-  app.post("/api/agents", async (req, res) => {
+  router.post("/", async (req, res) => {
     const body = req.body;
     if (!body?.metadata?.id || !body?.prompt) {
       return res.status(400).json({ error: "Missing required fields: metadata.id, prompt" });
@@ -5288,7 +5346,7 @@ async function createServerHandle(config) {
     await saveAgent(configDir, body);
     res.status(201).json(body);
   });
-  app.put("/api/agents/:id", async (req, res) => {
+  router.put("/:id", async (req, res) => {
     const { id } = req.params;
     if (!id) {
       return res.status(400).json({ error: "Missing agent ID" });
@@ -5306,7 +5364,7 @@ async function createServerHandle(config) {
     await saveAgent(configDir, updated);
     res.json(updated);
   });
-  app.delete("/api/agents/:id", async (req, res) => {
+  router.delete("/:id", async (req, res) => {
     const { id } = req.params;
     const deleted = await deleteAgent(configDir, id);
     if (!deleted) {
@@ -5314,28 +5372,38 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.get("/api/workflows", async (_req, res) => {
+  return router;
+}
+
+// src/server/routes/workflows.ts
+import { Router as Router4 } from "express";
+function createWorkflowRoutes(configDir, config) {
+  const router = Router4();
+  router.get("/", async (_req, res) => {
     const [workflows, defaultIds, modifiedIds] = await Promise.all([
       loadAllWorkflows(configDir),
       getDefaultWorkflowIds(),
       getModifiedDefaultWorkflowIds(configDir)
     ]);
     res.json({
-      workflows: workflows.map((p) => p.metadata),
+      workflows: workflows.map((p) => ({ ...p.metadata, startCondition: p.startCondition })),
       activeWorkflowId: config.activeWorkflowId ?? "default",
       defaultIds,
       modifiedIds
     });
   });
-  app.get("/api/workflows/default-ids", async (_req, res) => {
+  router.get("/template-variables", (_req, res) => {
+    res.json({ variables: TEMPLATE_VARIABLES });
+  });
+  router.get("/default-ids", async (_req, res) => {
     const ids = await getDefaultWorkflowIds();
     res.json({ ids });
   });
-  app.post("/api/workflows/restore-all-defaults", async (_req, res) => {
+  router.post("/restore-all-defaults", async (_req, res) => {
     const count = await restoreAllDefaultWorkflows(configDir);
     res.json({ success: true, count });
   });
-  app.post("/api/workflows/:id/restore-default", async (req, res) => {
+  router.post("/:id/restore-default", async (req, res) => {
     const { id } = req.params;
     const restored = await restoreDefaultWorkflow(configDir, id);
     if (!restored) {
@@ -5343,7 +5411,7 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
-  app.get("/api/workflows/:id", async (req, res) => {
+  router.get("/:id", async (req, res) => {
     const { id } = req.params;
     const workflows = await loadAllWorkflows(configDir);
     const workflow = findWorkflowById(id, workflows);
@@ -5352,7 +5420,7 @@ async function createServerHandle(config) {
     }
     res.json(workflow);
   });
-  app.post("/api/workflows", async (req, res) => {
+  router.post("/", async (req, res) => {
     const body = req.body;
     if (!body?.metadata?.id || !body?.steps?.length) {
       return res.status(400).json({ error: "Missing required fields: metadata.id, steps" });
@@ -5363,7 +5431,7 @@ async function createServerHandle(config) {
     await saveWorkflow(configDir, body);
     res.status(201).json(body);
   });
-  app.put("/api/workflows/:id", async (req, res) => {
+  router.put("/:id", async (req, res) => {
     const { id } = req.params;
     if (!await workflowExists(configDir, id)) {
       return res.status(404).json({ error: "Workflow not found" });
@@ -5376,7 +5444,7 @@ async function createServerHandle(config) {
     await saveWorkflow(configDir, updated);
     res.json(updated);
   });
-  app.delete("/api/workflows/:id", async (req, res) => {
+  router.delete("/:id", async (req, res) => {
     const { id } = req.params;
     if (id === "default") {
       return res.status(400).json({ error: "Cannot delete the default workflow" });
@@ -5387,6 +5455,241 @@ async function createServerHandle(config) {
     }
     res.json({ success: true });
   });
+  return router;
+}
+
+// src/server/routes/dev-server.ts
+import { Router as Router5 } from "express";
+function createDevServerRoutes() {
+  const router = Router5();
+  router.get("/", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    const status = devServerManager.getStatus(workdir);
+    if (!status.config) {
+      const config = await devServerManager.loadConfig(workdir);
+      if (config) {
+        status.config = config;
+        status.url = config.url;
+        status.hotReload = config.hotReload;
+      }
+    }
+    res.json(status);
+  });
+  router.post("/start", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    try {
+      const status = await devServerManager.start(workdir);
+      res.json(status);
+    } catch (err) {
+      res.status(500).json({ error: err instanceof Error ? err.message : "Failed to start" });
+    }
+  });
+  router.post("/stop", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    try {
+      const status = await devServerManager.stop(workdir);
+      res.json(status);
+    } catch (err) {
+      res.status(500).json({ error: err instanceof Error ? err.message : "Failed to stop" });
+    }
+  });
+  router.post("/restart", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    try {
+      const status = await devServerManager.restart(workdir);
+      res.json(status);
+    } catch (err) {
+      res.status(500).json({ error: err instanceof Error ? err.message : "Failed to restart" });
+    }
+  });
+  router.get("/logs", (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    const logs = devServerManager.getLogs(workdir);
+    res.json({ logs });
+  });
+  router.get("/config", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    const config = await devServerManager.loadConfig(workdir);
+    res.json({ config });
+  });
+  router.post("/config", async (req, res) => {
+    const workdir = req.query["workdir"];
+    if (!workdir) return res.status(400).json({ error: "workdir required" });
+    const { command, url, hotReload } = req.body;
+    if (!command || !url) {
+      return res.status(400).json({ error: "command and url are required" });
+    }
+    try {
+      const config = { command, url, hotReload: hotReload ?? false };
+      await devServerManager.saveConfig(workdir, config);
+      res.json({ config });
+    } catch (err) {
+      res.status(500).json({ error: err instanceof Error ? err.message : "Failed to save config" });
+    }
+  });
+  return router;
+}
+
+// src/server/index.ts
+var __dirname2 = dirname4(fileURLToPath4(import.meta.url));
+async function createServerHandle(config) {
+  setRuntimeConfig(config);
+  setLogLevel(config.logging?.level ?? void 0, config.mode);
+  const db = initDatabase(config);
+  initEventStore(db);
+  const configDir = getGlobalConfigDir(config.mode ?? "production");
+  await ensureDefaultSkills(configDir);
+  await ensureDefaultCommands(configDir);
+  await ensureDefaultAgents(configDir);
+  await ensureDefaultWorkflows(configDir);
+  const sessionManager2 = new SessionManager();
+  const providerManager = createProviderManager(config);
+  const useMock = process.env["OPENFOX_MOCK_LLM"] === "true";
+  const getMockClient = useMock ? createMockLLMClient : null;
+  const getLLMClient = () => getMockClient ? getMockClient() : providerManager.getLLMClient();
+  if (useMock) {
+    logger.info("Using MOCK LLM client - deterministic responses for testing");
+  }
+  async function initLLM() {
+    const llmClient = getLLMClient();
+    let backend;
+    const useMock2 = process.env["OPENFOX_MOCK_LLM"] === "true";
+    if (config.llm.backend === "auto") {
+      backend = await detectBackend(config.llm.baseUrl, void 0, useMock2);
+      llmClient.setBackend(backend);
+      if (!useMock2) {
+        logger.info("Auto-detected LLM backend", { backend: getBackendDisplayName(backend) });
+      }
+    } else {
+      backend = config.llm.backend;
+      llmClient.setBackend(backend);
+      if (!useMock2) {
+        logger.info("Using configured LLM backend", { backend: getBackendDisplayName(backend) });
+      }
+    }
+    const detected = await detectModel(config.llm.baseUrl);
+    if (detected) {
+      llmClient.setModel(detected);
+      if (!useMock2) {
+        logger.info("Auto-detected LLM model", { model: detected, backend: getBackendDisplayName(backend) });
+      }
+    } else {
+      if (!useMock2) {
+        logger.warn("Could not auto-detect model, using config", { model: config.llm.model });
+      }
+    }
+  }
+  initLLM().catch((err) => logger.error("LLM initialization failed", { error: err instanceof Error ? err.message : String(err) }));
+  const toolRegistry = createToolRegistry();
+  const app = express();
+  app.use(cors());
+  app.use(express.json());
+  app.get("/api/health", (_req, res) => {
+    res.json({ status: "ok", timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+  });
+  app.get("/api/tools", (_req, res) => {
+    res.json({ tools: toolRegistry.tools.map((t) => t.name) });
+  });
+  app.post("/api/sessions", async (req, res) => {
+    const { workdir, title } = req.body;
+    const session = sessionManager2.createSession(workdir, title);
+    res.status(201).json({ session });
+  });
+  app.get("/api/sessions/:id", (req, res) => {
+    const session = sessionManager2.getSession(req.params.id);
+    if (!session) {
+      return res.status(404).json({ error: "Session not found" });
+    }
+    res.json({ session });
+  });
+  app.delete("/api/sessions/:id", (req, res) => {
+    sessionManager2.deleteSession(req.params["id"]);
+    res.json({ success: true });
+  });
+  app.delete("/api/projects/:projectId/sessions", (req, res) => {
+    const projectId = req.params["projectId"];
+    const project = sessionManager2.getProject(projectId);
+    if (!project) {
+      return res.status(404).json({ error: "Project not found" });
+    }
+    sessionManager2.deleteAllSessions(projectId, project.workdir);
+    res.json({ success: true });
+  });
+  app.get("/api/config", (_req, res) => {
+    const llmClient = getLLMClient();
+    const activeProvider = providerManager.getActiveProvider();
+    res.json({
+      model: llmClient.getModel(),
+      maxContext: config.context.maxTokens,
+      llmUrl: activeProvider?.url ?? config.llm.baseUrl,
+      llmStatus: getLlmStatus(),
+      backend: llmClient.getBackend(),
+      workdir: config.workdir,
+      // Include provider info
+      providers: providerManager.getProviders(),
+      activeProviderId: providerManager.getActiveProviderId(),
+      defaultModelSelection: config.defaultModelSelection
+    });
+  });
+  app.post("/api/model/refresh", async (_req, res) => {
+    const llmClient = getLLMClient();
+    const currentModel = providerManager.getCurrentModel();
+    if (currentModel === "auto") {
+      const activeProvider = providerManager.getActiveProvider();
+      const baseUrl = activeProvider?.url ?? config.llm.baseUrl;
+      const detected = await detectModel(baseUrl);
+      if (detected) {
+        llmClient.setModel(detected);
+        return res.json({ model: detected, source: "detected", llmStatus: getLlmStatus(), backend: llmClient.getBackend() });
+      }
+    }
+    res.json({ model: llmClient.getModel(), source: "cached", llmStatus: getLlmStatus(), backend: llmClient.getBackend() });
+  });
+  app.get("/api/providers", (_req, res) => {
+    const providers = providerManager.getProviders().map((p) => ({
+      ...p,
+      status: providerManager.getProviderStatus(p.id)
+    }));
+    res.json({
+      providers,
+      activeProviderId: providerManager.getActiveProviderId()
+    });
+  });
+  app.get("/api/providers/:id/models", async (req, res) => {
+    const { id } = req.params;
+    const models = await providerManager.getProviderModels(id);
+    res.json({ models });
+  });
+  app.post("/api/providers/:id/activate", async (req, res) => {
+    const { id } = req.params;
+    const body = req.body;
+    const result = await providerManager.activateProvider(id, body.model ? { model: body.model } : void 0);
+    if (!result.success) {
+      return res.status(400).json({ error: result.error });
+    }
+    const llmClient = getLLMClient();
+    const { loadGlobalConfig, saveGlobalConfig, setDefaultModelSelection } = await import("./config-BMXSDOZB.js");
+    const globalConfig = await loadGlobalConfig(config.mode ?? "production");
+    const updatedConfig = setDefaultModelSelection(globalConfig, id, llmClient.getModel());
+    await saveGlobalConfig(config.mode ?? "production", updatedConfig);
+    res.json({
+      success: true,
+      activeProviderId: id,
+      model: llmClient.getModel(),
+      backend: llmClient.getBackend()
+    });
+  });
+  app.use("/api/skills", createSkillRoutes(configDir));
+  app.use("/api/commands", createCommandRoutes(configDir));
+  app.use("/api/agents", createAgentRoutes(configDir));
+  app.use("/api/workflows", createWorkflowRoutes(configDir, config));
+  app.use("/api/dev-server", createDevServerRoutes());
   const { getCurrentBranch } = await import("./branch.api-WDHKZJS6.js");
   app.get("/api/branch", async (req, res) => {
     await getCurrentBranch(req, res);
@@ -5432,7 +5735,7 @@ async function createServerHandle(config) {
       logLevel: "warn"
     });
     app.use(viteServer.middlewares);
-    app.get("/src/styles/*.css", async (req, res) => {
+    app.get("/src/styles/{*path}", async (req, res) => {
       try {
         const result = await viteServer.transformRequest(req.path.substring(1));
         if (!result) {
@@ -5453,16 +5756,12 @@ async function createServerHandle(config) {
         res.status(404).send("Not found");
       });
     });
-    app.get("/sounds/*", (req, res) => {
-      const fullPath = join4(webDir, req.path.substring(1));
-      readFile3(fullPath).then((content) => {
+    app.use("/sounds", express.static(join4(webDir, "public", "sounds"), {
+      setHeaders: (res) => {
         res.set("Content-Type", "audio/mpeg");
-        res.send(content);
-      }).catch(() => {
-        res.status(404).send("Not found");
-      });
-    });
-    app.get("*", (req, res) => {
+      }
+    }));
+    app.get("/{*path}", (req, res) => {
       if (req.path.startsWith("/api/")) {
         return;
       }
@@ -5490,21 +5789,17 @@ async function createServerHandle(config) {
         res.status(404).send("Not found");
       });
     });
-    app.get("/sounds/*", (req, res) => {
-      const fullPath = join4(distWebDir, req.path.substring(1));
-      readFile3(fullPath).then((content) => {
+    app.use("/sounds", express.static(join4(distWebDir, "sounds"), {
+      setHeaders: (res) => {
         res.set("Content-Type", "audio/mpeg");
-        res.send(content);
-      }).catch(() => {
-        res.status(404).send("Not found");
-      });
-    });
+      }
+    }));
     app.get("/", (_req, res) => {
       readFile3(join4(distWebDir, "index.html"), "utf-8").then((content) => res.send(content)).catch(() => {
         res.status(404).send("Web UI not built. Run `npm run build:web`");
       });
     });
-    app.get("*", (req, res) => {
+    app.get("(*)", (req, res) => {
       if (req.path.startsWith("/api/") || req.path.startsWith("/assets/") || req.path.startsWith("/sounds/") || req.path === "/fox.svg") {
         return;
       }
@@ -5535,6 +5830,7 @@ async function createServerHandle(config) {
     close: () => new Promise((resolve2) => {
       logger.info("Shutting down...");
       void (async () => {
+        await devServerManager.stopAll();
         viteServer?.close();
         for (const client of wss.clients) {
           client.terminate();
@@ -5567,4 +5863,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-YQ36AK5A.js.map
+//# sourceMappingURL=chunk-JFQEATRC.js.map