openfox 1.6.75 → 1.6.77

package/dist/{chunk-ETIXH35K.js → chunk-EBQYRNNU.js}

@@ -3,13 +3,13 @@ import {
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-GQZGIMJO.js";
+} from "./chunk-OXI26S7U.js";
 import {
   getProject
-} from "./chunk-7JPKRM6M.js";
+} from "./chunk-CMQCO27Y.js";
 import {
   startInspectProxy
-} from "./chunk-RBPOAAIZ.js";
+} from "./chunk-XKIEDGQF.js";
 import {
   createProcess,
   getPlatformShell,
@@ -18,22 +18,22 @@ import {
   getSessionProcesses,
   startProcessCommand,
   stopProcess
-} from "./chunk-NBU6KIOD.js";
+} from "./chunk-PBGOZMVY.js";
 import {
   getMaxPerSession,
   getSessionProcessCount
-} from "./chunk-574HZVLE.js";
+} from "./chunk-VRGRAQDG.js";
 import {
   buildModelParams,
   getBackendCapabilities,
   getModelProfile,
   streamWithSegments
-} from "./chunk-J5DV33SS.js";
+} from "./chunk-CUDAT6SS.js";
 import {
   getContextMessages,
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-5UTTLO4D.js";
+} from "./chunk-UVN6AKIO.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
@@ -42,20 +42,20 @@ import {
   createChatToolOutputMessage,
   createChatVisionFallbackMessage,
   createQueueStateMessage
-} from "./chunk-KFBIHS3S.js";
+} from "./chunk-STYHKCG7.js";
 import {
   AskUserInterrupt,
   askUserTool
-} from "./chunk-22CTURMH.js";
+} from "./chunk-BJYPTN5S.js";
 import {
   getGlobalConfigDir
-} from "./chunk-R4HADRYO.js";
+} from "./chunk-CQGTEGKL.js";
 import {
   getRuntimeConfig
-} from "./chunk-AFATQ5LJ.js";
+} from "./chunk-B5AP3RSV.js";
 import {
   logger
-} from "./chunk-PNBH3RAX.js";
+} from "./chunk-K44MW7JJ.js";
 
 // src/server/context/instructions.ts
 import { readFile, access } from "fs/promises";
@@ -147,6 +147,13 @@ async function fileExists(path) {
     return false;
   }
 }
+function toInjectedFiles(files) {
+  return files.map((file) => ({
+    path: file.path,
+    content: file.content ?? "",
+    source: file.source
+  }));
+}
 
 // src/server/context/compactor.ts
 function shouldCompact(currentTokens, maxTokens, threshold) {
@@ -403,6 +410,7 @@ function minimalMessageToRequestContextMessage(message, source = "history") {
     role: message.role,
     content: message.content,
     source,
+    ...message.thinkingContent ? { thinkingContent: message.thinkingContent } : {},
     ...spreadMessageProps(message)
   };
 }
@@ -410,6 +418,7 @@ function messageToMinimal(message) {
   return {
     role: message.role,
     content: message.content,
+    ...message.thinkingContent ? { thinkingContent: message.thinkingContent } : {},
     ...spreadMessageProps(message)
   };
 }
@@ -475,12 +484,7 @@ function buildAssemblyInput(systemPrompt, baseInput) {
 function assembleAgentRequest(input) {
   const { agentDef, subAgentDefs, ...baseInput } = input;
   if (agentDef.metadata.subagent) {
-    const systemPrompt2 = buildSubAgentSystemPrompt(
-      baseInput.workdir,
-      agentDef,
-      baseInput.skills,
-      baseInput.modelName
-    );
+    const systemPrompt2 = buildSubAgentSystemPrompt(baseInput.workdir, agentDef, baseInput.skills, baseInput.modelName);
     return buildAssemblyInput(systemPrompt2, baseInput);
   }
   const systemPrompt = buildTopLevelSystemPrompt(
@@ -495,7 +499,16 @@ function assembleAgentRequest(input) {
 
 // src/server/chat/stream-utils.ts
 function buildStreamRequestObject(params) {
-  const { messages, tools, toolChoice, disableThinking, signal, modelSettings, onVisionFallbackStart, onVisionFallbackDone } = params;
+  const {
+    messages,
+    tools,
+    toolChoice,
+    disableThinking,
+    signal,
+    modelSettings,
+    onVisionFallbackStart,
+    onVisionFallbackDone
+  } = params;
   const streamRequest = {
     messages,
     ...tools && { tools },
@@ -515,7 +528,17 @@ function buildStreamRequest(client, options) {
 // src/server/chat/stats.ts
 var roundTo1 = (n) => Math.round(n * 10) / 10;
 function computeAggregatedStats(input) {
-  const { identity, mode, totalPrefillTokens, totalGenTokens, totalPrefillTime, totalGenTime, totalToolTime, totalTime, llmCalls } = input;
+  const {
+    identity,
+    mode,
+    totalPrefillTokens,
+    totalGenTokens,
+    totalPrefillTime,
+    totalGenTime,
+    totalToolTime,
+    totalTime,
+    llmCalls
+  } = input;
   return {
     ...identity,
     mode,
@@ -530,6 +553,25 @@ function computeAggregatedStats(input) {
 }
 
 // src/server/chat/stream-pure.ts
+function toStreamMessages(messages) {
+  return messages.map((m) => ({
+    role: m.role,
+    content: m.content,
+    ...m.thinkingContent ? { thinkingContent: m.thinkingContent } : {},
+    ...m.toolCalls?.length ? { toolCalls: m.toolCalls.map((tc) => ({ id: tc.id, name: tc.name, arguments: tc.arguments })) } : {},
+    ...m.toolCallId ? { toolCallId: m.toolCallId } : {},
+    ...m.attachments?.length ? { attachments: m.attachments } : {}
+  }));
+}
+function createAssistantMessage(content, thinkingContent, toolCalls) {
+  return {
+    role: "assistant",
+    content,
+    source: "history",
+    ...thinkingContent ? { thinkingContent } : {},
+    ...toolCalls.length > 0 ? { toolCalls } : {}
+  };
+}
 function createEmptyStreamResult(aborted, xmlFormatError, modelParams) {
   return {
     content: "",
@@ -543,7 +585,18 @@ function createEmptyStreamResult(aborted, xmlFormatError, modelParams) {
   };
 }
 async function* streamLLMPure(options) {
-  const { messageId, systemPrompt, llmClient, messages, tools, toolChoice, signal, disableThinking, onVisionFallbackStart, onVisionFallbackDone } = options;
+  const {
+    messageId,
+    systemPrompt,
+    llmClient,
+    messages,
+    tools,
+    toolChoice,
+    signal,
+    disableThinking,
+    onVisionFallbackStart,
+    onVisionFallbackDone
+  } = options;
   const llmMessages = [{ role: "system", content: systemPrompt }, ...messages];
   const profile = getModelProfile(llmClient.getModel());
   const backend = getBackendCapabilities(llmClient.getBackend());
@@ -584,6 +637,7 @@ async function* streamLLMPure(options) {
   const toolNames = /* @__PURE__ */ new Map();
   const toolIds = /* @__PURE__ */ new Map();
   const returnValueArgs = /* @__PURE__ */ new Map();
+  const toolArgs = /* @__PURE__ */ new Map();
   let result = null;
   let aborted = false;
   let xmlFormatError = false;
@@ -619,13 +673,34 @@ async function* streamLLMPure(options) {
           if (value.id) {
             toolIds.set(value.index, value.id);
           }
+          if (value.arguments) {
+            const existingArgs = toolArgs.get(value.index) ?? "";
+            toolArgs.set(value.index, existingArgs + value.arguments);
+          }
           const fullName = toolNames.get(value.index);
           if (!seenToolIndices.has(value.index) && fullName) {
             seenToolIndices.add(value.index);
+            const accumulatedArgs = toolArgs.get(value.index);
             yield {
               type: "tool.preparing",
-              data: { messageId, index: value.index, name: fullName }
+              data: {
+                messageId,
+                index: value.index,
+                name: fullName,
+                ...accumulatedArgs ? { arguments: accumulatedArgs } : {}
+              }
             };
+          } else if (seenToolIndices.has(value.index) && value.arguments) {
+            const name = toolNames.get(value.index);
+            if (name === "run_command" || name === "return_value") {
+              const accumulatedArgs = toolArgs.get(value.index);
+              if (accumulatedArgs) {
+                yield {
+                  type: "tool.preparing",
+                  data: { messageId, index: value.index, name, arguments: accumulatedArgs }
+                };
+              }
+            }
           }
           if (fullName === "return_value" && value.arguments) {
             const toolCallId = toolIds.get(value.index);
@@ -884,10 +959,12 @@ async function consumeStreamWithToolLoop(options) {
     turnMetrics.addLLMCall(result.timing, result.usage.promptTokens, result.usage.completionTokens, result.modelParams);
     if (result.toolCalls.length > 0) {
       const stats = turnMetrics.buildStats(statsIdentity, "compaction");
-      onEvent(createMessageDoneEvent(messageId, {
-        segments: result.segments,
-        stats
-      }));
+      onEvent(
+        createMessageDoneEvent(messageId, {
+          segments: result.segments,
+          stats
+        })
+      );
       const toolContext = {
         sessionId,
         workdir,
@@ -910,6 +987,7 @@ async function consumeStreamWithToolLoop(options) {
       currentMessages.push({
         role: "assistant",
         content: result.content,
+        ...result.thinkingContent ? { thinkingContent: result.thinkingContent } : {},
         toolCalls: result.toolCalls
       });
       continue;
@@ -1036,10 +1114,7 @@ async function loadUserAgents(configDir) {
   return loadAgentsFromDir(getAgentsDir(configDir));
 }
 async function loadAllAgents(configDir) {
-  const [defaultAgents, userAgents] = await Promise.all([
-    loadDefaultAgents(),
-    loadUserAgents(configDir)
-  ]);
+  const [defaultAgents, userAgents] = await Promise.all([loadDefaultAgents(), loadUserAgents(configDir)]);
   const agentMap = /* @__PURE__ */ new Map();
   for (const agent of defaultAgents) {
     agentMap.set(agent.metadata.id, agent);
@@ -1077,10 +1152,7 @@ async function isDefaultAgent(agentId) {
 }
 function getAgentFilePaths(agentsDir, agentId) {
   const hyphenated = agentId.replace(/_/g, "-");
-  return [
-    join2(agentsDir, `${agentId}${AGENT_EXTENSION}`),
-    join2(agentsDir, `${hyphenated}${AGENT_EXTENSION}`)
-  ];
+  return [join2(agentsDir, `${agentId}${AGENT_EXTENSION}`), join2(agentsDir, `${hyphenated}${AGENT_EXTENSION}`)];
 }
 function findAgentById(agentId, agents) {
   return agents.find((a) => a.metadata.id === agentId);
@@ -1171,11 +1243,7 @@ var SAFE_PATHS = /* @__PURE__ */ new Set([
   "/dev/fd/1",
   "/dev/fd/2"
 ]);
-var ALLOWED_ROOTS = [
-  "/tmp",
-  "/var/tmp",
-  tmpdir()
-];
+var ALLOWED_ROOTS = ["/tmp", "/var/tmp", tmpdir()];
 var SENSITIVE_FILE_PATTERNS = [
   // Dotenv files (but not .envrc, .env-example, .env.example)
   /^\.env$/,
@@ -1261,7 +1329,7 @@ function extractAbsolutePathsFromCommand(command) {
   const paths = [];
   const home = homedir();
   let sanitized = command.replace(/https?:\/\/[^\s'"]+/g, " __URL__ ").replace(/ftp:\/\/[^\s'"]+/g, " __URL__ ");
-  sanitized = sanitized.replace(/s\/[^\/]*\/[^\/]*\/[gip]*/g, " __SED__ ");
+  sanitized = sanitized.replace(/s\/[^/]*\/[^/]*\/[gip]*/g, " __SED__ ");
   sanitized = sanitized.replace(/s\|[^|]*\|[^|]*\|[gip]*/g, " __SED__ ");
   sanitized = sanitized.replace(/s:[^:]*:[^:]*:[gip]*/g, " __SED__ ");
   const fileUrlMatches = command.matchAll(/file:\/\/([^\s'"]+)/g);
@@ -1371,7 +1439,7 @@ async function checkPathsAccess(paths, workdir, sessionId) {
 }
 var DANGEROUS_PATTERNS = [
   /sudo\s/,
-  /rm\s+(-rf?|--recursive)\s+[\/~]/,
+  /rm\s+(-rf?|--recursive)\s+[~]/,
   /chmod\s+777/,
   />\s*\/dev\/sd/,
   /mkfs\s/,
@@ -1387,9 +1455,20 @@ function extractDangerousPatterns(command) {
   }
   return dangerous;
 }
-var GIT_NO_VERIFY_PATTERN = /\bgit\s+\w+\s+.*(?:--no-verify|-n)/;
 function extractGitNoVerify(command) {
-  return GIT_NO_VERIFY_PATTERN.test(command);
+  const parts = command.split(/\s+/);
+  for (let i = 0; i < parts.length - 1; i++) {
+    if (parts[i] === "git") {
+      const sub = parts[i + 1];
+      if (sub && !sub.startsWith("-")) {
+        const args = parts.slice(i + 2);
+        if (args.includes("--no-verify") || args.includes("-n")) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
 }
 async function requestPathAccess(paths, workdir, sessionId, callId, tool, onEvent, dangerLevel, command) {
   const emitPendingEvent = (confirmationPaths, confirmationReason) => {
@@ -1421,7 +1500,9 @@ async function requestPathAccess(paths, workdir, sessionId, callId, tool, onEven
     if (dangerousPatterns.length > 0) {
       emitPendingEvent([workdir], "dangerous_command");
       const confirmationPromise2 = registerPathConfirmation(callId, [workdir], sessionId);
-      onEvent(createChatPathConfirmationMessage(callId, tool, [dangerousPatterns.join(", ")], workdir, "dangerous_command"));
+      onEvent(
+        createChatPathConfirmationMessage(callId, tool, [dangerousPatterns.join(", ")], workdir, "dangerous_command")
+      );
       const approved2 = await confirmationPromise2;
       if (!approved2) {
         throw new PathAccessDeniedError(dangerousPatterns, tool, "dangerous_command");
@@ -1477,7 +1558,7 @@ function providePathConfirmation(callId, approved, alwaysAllow) {
       type: "path.confirmation_responded",
       data: { callId, approved, alwaysAllow: alwaysAllow ?? false }
     });
-  } catch (error) {
+  } catch {
   }
   if (approved) {
     if (alwaysAllow) {
@@ -1602,7 +1683,9 @@ var FileNotReadError = class extends Error {
 };
 var FileChangedExternallyError = class extends Error {
   constructor(path) {
-    super(`File "${path}" was modified externally and must be read before writing. Use read_file to see current contents.`);
+    super(
+      `File "${path}" was modified externally and must be read before writing. Use read_file to see current contents.`
+    );
     this.name = "FileChangedExternallyError";
   }
 };
@@ -1655,7 +1738,11 @@ var IMAGE_MIME_TYPES = {
   ".svg": "image/svg+xml"
 };
 var IMAGE_SIGNATURES = [
-  { mimeType: "image/png", signature: Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]), extension: ".png" },
+  {
+    mimeType: "image/png",
+    signature: Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]),
+    extension: ".png"
+  },
   { mimeType: "image/jpeg", signature: Buffer.from([255, 216, 255]), extension: ".jpg" },
   { mimeType: "image/gif", signature: Buffer.from([71, 73, 70, 56]), extension: ".gif" },
   { mimeType: "image/webp", signature: Buffer.from([]), extension: ".webp" },
@@ -1723,10 +1810,7 @@ var readFileTool = createTool(
   },
   async (args, context, helpers) => {
     const offset = args.offset ?? 1;
-    const limit = Math.min(
-      args.limit ?? OUTPUT_LIMITS.read_file.maxLines,
-      OUTPUT_LIMITS.read_file.maxLines
-    );
+    const limit = Math.min(args.limit ?? OUTPUT_LIMITS.read_file.maxLines, OUTPUT_LIMITS.read_file.maxLines);
     const fullPath = helpers.resolvePath(args.path);
     await helpers.checkPathAccess([fullPath]);
     try {
@@ -1735,7 +1819,9 @@ var readFileTool = createTool(
         return helpers.error(`Path is a directory, not a file: ${args.path}`);
       }
       if (stats.size > OUTPUT_LIMITS.read_file.maxImageBytes) {
-        return helpers.error(`File size (${stats.size} bytes) exceeds image size limit (2MB). Use shell command to process large files.`);
+        return helpers.error(
+          `File size (${stats.size} bytes) exceeds image size limit (2MB). Use shell command to process large files.`
+        );
       }
     } catch {
       return helpers.error(`File not found: ${args.path}`);
@@ -1749,19 +1835,15 @@ var readFileTool = createTool(
       if (contentHash2) {
         context.sessionManager.recordFileRead(context.sessionId, fullPath, contentHash2);
       }
-      return helpers.success(
-        `[Image: ${args.path} (${mimeType}, ${rawBuffer.length} bytes)]`,
-        false,
-        {
-          metadata: {
-            mimeType,
-            size: rawBuffer.length,
-            base64Data,
-            dataUrl,
-            path: fullPath
-          }
+      return helpers.success(`[Image: ${args.path} (${mimeType}, ${rawBuffer.length} bytes)]`, false, {
+        metadata: {
+          mimeType,
+          size: rawBuffer.length,
+          base64Data,
+          dataUrl,
+          path: fullPath
         }
-      );
+      });
     }
     const content = rawBuffer.toString("utf-8");
     const lines = content.split("\n");
@@ -1865,11 +1947,7 @@ var writeFileTool = createTool(
     if (newHash) {
       context.sessionManager.updateFileHash(context.sessionId, fullPath, newHash);
     }
-    return helpers.success(
-      output,
-      false,
-      diagnostics.length > 0 ? { diagnostics } : void 0
-    );
+    return helpers.success(output, false, diagnostics.length > 0 ? { diagnostics } : void 0);
   }
 );
 
@@ -2054,7 +2132,12 @@ Make sure whitespace and indentation match exactly.`
         `Found ${occurrences} matches for old_string. Use replace_all: true to replace all, or provide more context to make the match unique.`
       );
     }
-    const contextResult = extractEditContext(normalizedContent, normalizedOldString, normalizeToLF(args.new_string), replaceAll);
+    const contextResult = extractEditContext(
+      normalizedContent,
+      normalizedOldString,
+      normalizeToLF(args.new_string),
+      replaceAll
+    );
     const editContextRegions = contextResult.regions.map((region) => ({
       beforeContext: region.beforeContext.map((line) => ({
         lineNumber: line.lineNumber,
@@ -2086,7 +2169,10 @@ Make sure whitespace and indentation match exactly.`
       }
       replacedContent = normalizedContent.slice(0, index) + normalizedNewString + normalizedContent.slice(index + normalizedOldString.length);
     }
-    const newContent = replacedContent.replace(/\n/g, fileLineEnding === "crlf" ? "\r\n" : fileLineEnding === "cr" ? "\r" : "\n");
+    const newContent = replacedContent.replace(
+      /\n/g,
+      fileLineEnding === "crlf" ? "\r\n" : fileLineEnding === "cr" ? "\r" : "\n"
+    );
     await writeFile3(fullPath, newContent, "utf-8");
     let output = `Successfully replaced ${replaceAll ? occurrences : 1} occurrence(s) in ${args.path}`;
     let diagnostics = [];
@@ -2359,12 +2445,21 @@ var criterionTool = createTool(
     }
   },
   async (args, context, helpers) => {
-    const actionError = validateActionWithPermission(args.action, ["get", "add", "update", "remove", "complete", "pass", "fail"], "criterion", context.permittedActions);
+    const actionError = validateActionWithPermission(
+      args.action,
+      ["get", "add", "update", "remove", "complete", "pass", "fail"],
+      "criterion",
+      context.permittedActions
+    );
     if (actionError) return actionError;
     const session = requireSession(context.sessionManager, context.sessionId);
     if (args.action === "get") {
       return helpers.success(
-        session.criteria.length === 0 ? "No criteria defined yet." : JSON.stringify(session.criteria.map((c) => ({ id: c.id, description: c.description })), null, 2)
+        session.criteria.length === 0 ? "No criteria defined yet." : JSON.stringify(
+          session.criteria.map((c) => ({ id: c.id, description: c.description })),
+          null,
+          2
+        )
       );
     }
     if (args.action === "add") {
@@ -2377,14 +2472,18 @@ var criterionTool = createTool(
       };
       const result = context.sessionManager.addCriterion(context.sessionId, criterion);
       if ("error" in result) return helpers.error(result.error);
-      return helpers.success(`Added criterion "${result.actualId}". Current criteria:
-${formatCriteriaList(result.criteria)}`);
+      return helpers.success(
+        `Added criterion "${result.actualId}". Current criteria:
+${formatCriteriaList(result.criteria)}`
+      );
     }
     if (args.action === "update") {
       if (!args.id) return helpers.error("Missing required field: id");
       if (!args.description) return helpers.error("Missing required field: description");
       if (!session.criteria.find((c) => c.id === args.id)) return helpers.error(`Criterion "${args.id}" not found`);
-      const criteria = context.sessionManager.updateCriterionFull(context.sessionId, args.id, { description: args.description });
+      const criteria = context.sessionManager.updateCriterionFull(context.sessionId, args.id, {
+        description: args.description
+      });
       return helpers.success(`Updated criterion "${args.id}". Current criteria:
 ${formatCriteriaList(criteria)}`);
     }
@@ -2400,13 +2499,18 @@ ${formatCriteriaList(criteria)}`
     if (args.action === "complete") {
       if (!args.id) return helpers.error("Missing required field: id");
       const criterion = session.criteria.find((c) => c.id === args.id);
-      if (!criterion) return helpers.error(`Criterion "${args.id}" not found. Available: ${session.criteria.map((c) => c.id).join(", ")}`);
+      if (!criterion)
+        return helpers.error(
+          `Criterion "${args.id}" not found. Available: ${session.criteria.map((c) => c.id).join(", ")}`
+        );
       context.sessionManager.updateCriterionStatus(context.sessionId, args.id, {
         type: "completed",
         completedAt: (/* @__PURE__ */ new Date()).toISOString(),
         ...args.reason ? { reason: args.reason } : {}
       });
-      return helpers.success(`Criterion "${args.id}" marked as completed.${args.reason ? ` Reason: ${args.reason}` : ""}`);
+      return helpers.success(
+        `Criterion "${args.id}" marked as completed.${args.reason ? ` Reason: ${args.reason}` : ""}`
+      );
     }
     if (args.action === "pass") {
       if (!args.id) return helpers.error("Missing required field: id");
@@ -2485,13 +2589,16 @@ var todoTool = createTool(
     }
   },
   async (args, context, helpers) => {
-    const actionError = validateActionWithPermission(args.action, ["list", "write", "add", "update", "remove"], "todo", context.permittedActions);
+    const actionError = validateActionWithPermission(
+      args.action,
+      ["list", "write", "add", "update", "remove"],
+      "todo",
+      context.permittedActions
+    );
     if (actionError) return actionError;
     if (args.action === "list") {
       const todosList = sessionTodos.get(context.sessionId) ?? [];
-      return helpers.success(
-        todosList.length === 0 ? "No tasks defined yet." : JSON.stringify(todosList, null, 2)
-      );
+      return helpers.success(todosList.length === 0 ? "No tasks defined yet." : JSON.stringify(todosList, null, 2));
     }
     if (args.action === "write") {
       if (!args.todos) return helpers.error("Missing required field: todos");
@@ -2504,7 +2611,9 @@ var todoTool = createTool(
       }
       sessionTodos.set(context.sessionId, args.todos);
       if (onTodoUpdate) onTodoUpdate(context.sessionId, args.todos);
-      return helpers.success(`${args.todos.filter((t) => t.status === "completed").length} completed, ${args.todos.filter((t) => t.status === "in_progress").length} in progress, ${args.todos.filter((t) => t.status === "pending").length} pending`);
+      return helpers.success(
+        `${args.todos.filter((t) => t.status === "completed").length} completed, ${args.todos.filter((t) => t.status === "in_progress").length} in progress, ${args.todos.filter((t) => t.status === "pending").length} pending`
+      );
     }
     if (args.action === "add") {
       if (!args.content) return helpers.error("Missing required field: content");
@@ -2650,10 +2759,7 @@ async function loadUserSkills(configDir) {
   });
 }
 async function loadAllSkills(configDir) {
-  const [defaultSkills, userSkills] = await Promise.all([
-    loadDefaultSkills(),
-    loadUserSkills(configDir)
-  ]);
+  const [defaultSkills, userSkills] = await Promise.all([loadDefaultSkills(), loadUserSkills(configDir)]);
   const skillMap = /* @__PURE__ */ new Map();
   for (const skill of defaultSkills) {
     skillMap.set(skill.metadata.id, skill);
@@ -2726,11 +2832,14 @@ async function deleteSkill(configDir, skillId) {
 import stripAnsi from "strip-ansi";
 function emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, promptContext, eventStore) {
   const stats = turnMetrics.buildStats(statsIdentity, mode);
-  eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-    stats,
-    partial: true,
-    promptContext
-  }));
+  eventStore.append(
+    sessionId,
+    createMessageDoneEvent(assistantMsgId, {
+      stats,
+      partial: true,
+      promptContext
+    })
+  );
   eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "stopped", stats));
 }
 function getCurrentWindowMessageOptions(sessionId) {
@@ -2798,7 +2907,7 @@ async function executeToolBatch(assistantMsgId, toolCalls, ctx) {
           type: "chat.ask_user",
           data: { callId: error.callId, question: error.question }
         });
-        const { awaitAnswer } = await import("./ask-3RK5YJZE.js");
+        const { awaitAnswer } = await import("./ask-5SSOA6SZ.js");
         const answerPromise = awaitAnswer(error.callId);
         if (!answerPromise) {
           throw new Error(`No pending question found for callId: ${error.callId}`);
@@ -2823,9 +2932,11 @@ async function executeToolBatch(assistantMsgId, toolCalls, ctx) {
     }
     toolMessages.push({
       role: "tool",
-      content: stripAnsi(toolResult.success ? toolResult.output ?? "Success" : toolResult.output ? `${toolResult.output}
+      content: stripAnsi(
+        toolResult.success ? toolResult.output ?? "Success" : toolResult.output ? `${toolResult.output}
 
-Error: ${toolResult.error}` : `Error: ${toolResult.error}`),
+Error: ${toolResult.error}` : `Error: ${toolResult.error}`
+      ),
       source: "history",
       toolCallId: toolCall.id
     });
@@ -2845,7 +2956,14 @@ function toRequestContextMessages(messages) {
     role: message.role,
     content: message.content,
     source: "history",
-    ...message.toolCalls ? { toolCalls: message.toolCalls.map((toolCall) => ({ id: toolCall.id, name: toolCall.name, arguments: toolCall.arguments })) } : {},
+    ...message.thinkingContent ? { thinkingContent: message.thinkingContent } : {},
+    ...message.toolCalls ? {
+      toolCalls: message.toolCalls.map((toolCall) => ({
+        id: toolCall.id,
+        name: toolCall.name,
+        arguments: toolCall.arguments
+      }))
+    } : {},
     ...message.toolCallId ? { toolCallId: message.toolCallId } : {},
     ...message.attachments ? { attachments: message.attachments } : {}
   }));
@@ -2881,11 +2999,14 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
     const requestMessages = toRequestContextMessages(getContextMessages(sessionId));
     if (formatRetryCount > 0) {
       const correctionMsgId = crypto.randomUUID();
-      eventStore.append(sessionId, createMessageStartEvent(correctionMsgId, "user", FORMAT_CORRECTION_PROMPT2, {
-        ...currentWindowMessageOptions ?? {},
-        isSystemGenerated: true,
-        messageKind: "correction"
-      }));
+      eventStore.append(
+        sessionId,
+        createMessageStartEvent(correctionMsgId, "user", FORMAT_CORRECTION_PROMPT2, {
+          ...currentWindowMessageOptions ?? {},
+          isSystemGenerated: true,
+          messageKind: "correction"
+        })
+      );
       eventStore.append(sessionId, createFormatRetryEvent(formatRetryCount, MAX_FORMAT_RETRIES));
       requestMessages.push({ role: "user", content: FORMAT_CORRECTION_PROMPT2, source: "runtime" });
     }
@@ -2902,7 +3023,10 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
       ...skills.length > 0 ? { skills } : {}
     });
     const assistantMsgId = crypto.randomUUID();
-    eventStore.append(sessionId, createMessageStartEvent(assistantMsgId, "assistant", void 0, currentWindowMessageOptions));
+    eventStore.append(
+      sessionId,
+      createMessageStartEvent(assistantMsgId, "assistant", void 0, currentWindowMessageOptions)
+    );
     const doOnMessage = (msg) => {
       onMessage?.(msg);
     };
@@ -2933,7 +3057,9 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
         type: "vision_fallback.done",
         data: { messageId: assistantMsgId, attachmentId, description }
       });
-      doOnMessage(createChatVisionFallbackMessage({ type: "done", messageId: assistantMsgId, attachmentId, description }));
+      doOnMessage(
+        createChatVisionFallbackMessage({ type: "done", messageId: assistantMsgId, attachmentId, description })
+      );
     };
     const modelSettings = sessionManager.getCurrentModelSettings();
     const streamGen = streamLLMPure({
@@ -2965,16 +3091,27 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
       }
     }
     if (result.aborted) {
-      emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, assembledRequest.promptContext, eventStore);
+      emitPartialDoneEvents(
+        sessionId,
+        assistantMsgId,
+        statsIdentity,
+        mode,
+        turnMetrics,
+        assembledRequest.promptContext,
+        eventStore
+      );
       throw new Error("Aborted");
     }
     turnMetrics.addLLMCall(result.timing, result.usage.promptTokens, result.usage.completionTokens, result.modelParams);
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens);
     if (result.toolCalls.length > 0) {
-      eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-        segments: result.segments,
-        promptContext: assembledRequest.promptContext
-      }));
+      eventStore.append(
+        sessionId,
+        createMessageDoneEvent(assistantMsgId, {
+          segments: result.segments,
+          promptContext: assembledRequest.promptContext
+        })
+      );
       try {
         const batchContext = {
           toolRegistry,
@@ -3000,22 +3137,41 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
         }
       } catch (error) {
         if (error instanceof Error && error.message === "Aborted") {
-          emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, assembledRequest.promptContext, eventStore);
+          emitPartialDoneEvents(
+            sessionId,
+            assistantMsgId,
+            statsIdentity,
+            mode,
+            turnMetrics,
+            assembledRequest.promptContext,
+            eventStore
+          );
           throw error;
         }
         throw error;
       }
       if (signal?.aborted) {
-        emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, assembledRequest.promptContext, eventStore);
+        emitPartialDoneEvents(
+          sessionId,
+          assistantMsgId,
+          statsIdentity,
+          mode,
+          turnMetrics,
+          assembledRequest.promptContext,
+          eventStore
+        );
         throw new Error("Aborted");
       }
       const asapMessages = sessionManager.drainAsapMessages(sessionId);
       for (const asap of asapMessages) {
         const asapMsgId = crypto.randomUUID();
-        eventStore.append(sessionId, createMessageStartEvent(asapMsgId, "user", asap.content, {
-          ...getCurrentWindowMessageOptions(sessionId),
-          ...asap.attachments ? { attachments: asap.attachments } : {}
-        }));
+        eventStore.append(
+          sessionId,
+          createMessageStartEvent(asapMsgId, "user", asap.content, {
+            ...getCurrentWindowMessageOptions(sessionId),
+            ...asap.attachments ? { attachments: asap.attachments } : {}
+          })
+        );
         eventStore.append(sessionId, { type: "message.done", data: { messageId: asapMsgId } });
       }
       if (asapMessages.length > 0) {
@@ -3025,11 +3181,14 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
       continue;
     }
     const stats = turnMetrics.buildStats(statsIdentity, mode);
-    eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-      segments: result.segments,
-      stats,
-      promptContext: assembledRequest.promptContext
-    }));
+    eventStore.append(
+      sessionId,
+      createMessageDoneEvent(assistantMsgId, {
+        segments: result.segments,
+        stats,
+        promptContext: assembledRequest.promptContext
+      })
+    );
     eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "complete", stats));
     const currentWindowMessages = sessionManager.getCurrentWindowMessages(sessionId);
     const lastUserMessage = [...currentWindowMessages].reverse().find((m) => m.role === "user");
@@ -3045,15 +3204,36 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
 }
 
 // src/server/context/nudge-helpers.ts
+function buildPromptContextForNudge(systemPrompt, injectedFiles, userMessage, messages, tools) {
+  return {
+    systemPrompt,
+    injectedFiles,
+    userMessage,
+    messages: messages.map((m) => ({
+      role: m.role,
+      content: m.content,
+      source: m.source
+    })),
+    tools: tools.map((t) => ({
+      name: t.function.name,
+      description: t.function.description,
+      parameters: t.function.parameters
+    })),
+    requestOptions: { toolChoice: "auto", disableThinking: true }
+  };
+}
 function appendNudgeMessage(eventStore, sessionId, content, currentWindowMessageOptions, options) {
   const msgId = crypto.randomUUID();
-  eventStore.append(sessionId, createMessageStartEvent(msgId, "user", content, {
-    ...currentWindowMessageOptions ?? {},
-    isSystemGenerated: true,
-    messageKind: "correction",
-    subAgentId: options.subAgentId,
-    subAgentType: options.subAgentType
-  }));
+  eventStore.append(
+    sessionId,
+    createMessageStartEvent(msgId, "user", content, {
+      ...currentWindowMessageOptions ?? {},
+      isSystemGenerated: true,
+      messageKind: "correction",
+      subAgentId: options.subAgentId,
+      subAgentType: options.subAgentType
+    })
+  );
   eventStore.append(sessionId, { type: "message.done", data: { messageId: msgId } });
 }
 
@@ -3104,40 +3284,26 @@ async function executeSubAgent(options) {
   const subAgentId = crypto.randomUUID();
   let session = sessionManager.requireSession(sessionId);
   const currentWindowMessageOptions = getCurrentWindowMessageOptions2(sessionId);
-  const contextMessages = [
-    { role: "user", content: prompt, source: "runtime" }
-  ];
+  const contextMessages = [{ role: "user", content: prompt, source: "runtime" }];
   logger.debug("Sub-agent starting", { subAgentType, subAgentId, sessionId });
   const resetMsgId = crypto.randomUUID();
-  eventStore.append(sessionId, createMessageStartEvent(resetMsgId, "user", `Fresh Context - ${agentDef.metadata.name} Sub-Agent`, {
-    ...currentWindowMessageOptions ?? {},
-    isSystemGenerated: true,
-    messageKind: "context-reset",
-    subAgentId,
-    subAgentType
-  }));
-  eventStore.append(sessionId, { type: "message.done", data: { messageId: resetMsgId } });
-  for (const msg of contextMessages) {
-    const msgId = crypto.randomUUID();
-    eventStore.append(sessionId, createMessageStartEvent(msgId, "user", msg.content, {
+  eventStore.append(
+    sessionId,
+    createMessageStartEvent(resetMsgId, "user", `Fresh Context - ${agentDef.metadata.name} Sub-Agent`, {
       ...currentWindowMessageOptions ?? {},
       isSystemGenerated: true,
-      messageKind: "auto-prompt",
+      messageKind: "context-reset",
       subAgentId,
-      subAgentType,
-      metadata: {
-        type: "subagent",
-        name: agentDef.metadata.name,
-        color: agentDef.metadata.color ?? "#6b7280"
-      }
-    }));
-    eventStore.append(sessionId, { type: "message.done", data: { messageId: msgId } });
-    if (onMessage) {
-      onMessage(createChatMessageMessage({
-        id: msgId,
-        role: "user",
-        content: msg.content,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      subAgentType
+    })
+  );
+  eventStore.append(sessionId, { type: "message.done", data: { messageId: resetMsgId } });
+  for (const msg of contextMessages) {
+    const msgId = crypto.randomUUID();
+    eventStore.append(
+      sessionId,
+      createMessageStartEvent(msgId, "user", msg.content, {
+        ...currentWindowMessageOptions ?? {},
         isSystemGenerated: true,
         messageKind: "auto-prompt",
         subAgentId,
@@ -3147,15 +3313,31 @@ async function executeSubAgent(options) {
           name: agentDef.metadata.name,
           color: agentDef.metadata.color ?? "#6b7280"
         }
-      }));
+      })
+    );
+    eventStore.append(sessionId, { type: "message.done", data: { messageId: msgId } });
+    if (onMessage) {
+      onMessage(
+        createChatMessageMessage({
+          id: msgId,
+          role: "user",
+          content: msg.content,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          isSystemGenerated: true,
+          messageKind: "auto-prompt",
+          subAgentId,
+          subAgentType,
+          metadata: {
+            type: "subagent",
+            name: agentDef.metadata.name,
+            color: agentDef.metadata.color ?? "#6b7280"
+          }
+        })
+      );
     }
   }
   const { files } = await getAllInstructions(session.workdir, session.projectId);
-  const injectedFiles = files.map((file) => ({
-    path: file.path,
-    content: file.content ?? "",
-    source: file.source
-  }));
+  const injectedFiles = toInjectedFiles(files);
   const configDir = getGlobalConfigDir(getRuntimeConfig().mode ?? "production");
   const skills = await getEnabledSkillMetadata(configDir);
   const systemPrompt = buildSubAgentSystemPrompt(
@@ -3166,7 +3348,7 @@ async function executeSubAgent(options) {
   );
   let customMessages = [...contextMessages];
   let consecutiveEmptyStops = 0;
-  let finalContent = "";
+  let finalContent;
   let returnValueContent = null;
   let returnValueResult = void 0;
   let returnValueNudged = false;
@@ -3182,29 +3364,26 @@ async function executeSubAgent(options) {
       ...signal ? { signal } : {}
     });
     const assistantMsgId = crypto.randomUUID();
-    eventStore.append(sessionId, createMessageStartEvent(assistantMsgId, "assistant", void 0, {
-      ...currentWindowMessageOptions ?? {},
-      subAgentId,
-      subAgentType
-    }));
-    const promptContext = {
+    eventStore.append(
+      sessionId,
+      createMessageStartEvent(assistantMsgId, "assistant", void 0, {
+        ...currentWindowMessageOptions ?? {},
+        subAgentId,
+        subAgentType
+      })
+    );
+    const promptContext = buildPromptContextForNudge(
       systemPrompt,
       injectedFiles,
-      userMessage: prompt,
-      messages: customMessages.map((m) => ({ role: m.role, content: m.content, source: m.source })),
-      tools: toolRegistry.definitions.map((t) => ({ name: t.function.name, description: t.function.description, parameters: t.function.parameters })),
-      requestOptions: { toolChoice: "auto", disableThinking: true }
-    };
+      prompt,
+      customMessages,
+      toolRegistry.definitions
+    );
     const streamGen = streamLLMPure({
       messageId: assistantMsgId,
       systemPrompt: systemPrompt + RETURN_VALUE_INSTRUCTION,
       llmClient,
-      messages: customMessages.map((m) => ({
-        role: m.role,
-        content: m.content,
-        ...m.toolCalls ? { toolCalls: m.toolCalls.map((tc) => ({ id: tc.id, name: tc.name, arguments: tc.arguments })) } : {},
-        ...m.toolCallId ? { toolCallId: m.toolCallId } : {}
-      })),
+      messages: toStreamMessages(customMessages),
       tools: toolRegistry.definitions,
       toolChoice: "auto",
       signal,
@@ -3215,23 +3394,21 @@ async function executeSubAgent(options) {
     });
     if (result.aborted) {
       const stats = turnMetrics.buildStats(statsIdentity, "verifier");
-      eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-        stats,
-        partial: true,
-        promptContext
-      }));
+      eventStore.append(
+        sessionId,
+        createMessageDoneEvent(assistantMsgId, {
+          stats,
+          partial: true,
+          promptContext
+        })
+      );
       eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "stopped", stats));
       throw new Error("Aborted");
     }
     turnMetrics.addLLMCall(result.timing, result.usage.promptTokens, result.usage.completionTokens, result.modelParams);
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens, subAgentId);
     finalContent = result.content;
-    customMessages.push({
-      role: "assistant",
-      content: result.content,
-      source: "history",
-      ...result.toolCalls.length > 0 && { toolCalls: result.toolCalls }
-    });
+    customMessages.push(createAssistantMessage(result.content, result.thinkingContent, result.toolCalls));
     session = sessionManager.requireSession(sessionId);
     if (result.toolCalls.length === 0) {
       if (nudgeConfig) {
@@ -3240,48 +3417,69 @@ async function executeSubAgent(options) {
           if (consecutiveEmptyStops < nudgeConfig.maxConsecutiveNudges) {
             consecutiveEmptyStops += 1;
             const nudgeContent = nudgeConfig.buildNudgeContent(criteriaAwaiting);
-            eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-              segments: result.segments,
-              promptContext
-            }));
-            appendNudgeMessage(eventStore, sessionId, nudgeContent, currentWindowMessageOptions, { subAgentId, subAgentType });
+            eventStore.append(
+              sessionId,
+              createMessageDoneEvent(assistantMsgId, {
+                segments: result.segments,
+                promptContext
+              })
+            );
+            appendNudgeMessage(eventStore, sessionId, nudgeContent, currentWindowMessageOptions, {
+              subAgentId,
+              subAgentType
+            });
             customMessages = [...customMessages, { role: "user", content: nudgeContent, source: "runtime" }];
             continue;
           }
           const stalledMsgId = crypto.randomUUID();
-          eventStore.append(sessionId, createMessageStartEvent(stalledMsgId, "user", nudgeConfig.buildRestartContent(criteriaAwaiting), {
-            ...currentWindowMessageOptions ?? {},
-            isSystemGenerated: true,
-            messageKind: "correction",
-            subAgentId,
-            subAgentType
-          }));
+          eventStore.append(
+            sessionId,
+            createMessageStartEvent(stalledMsgId, "user", nudgeConfig.buildRestartContent(criteriaAwaiting), {
+              ...currentWindowMessageOptions ?? {},
+              isSystemGenerated: true,
+              messageKind: "correction",
+              subAgentId,
+              subAgentType
+            })
+          );
           eventStore.append(sessionId, { type: "message.done", data: { messageId: stalledMsgId } });
         }
       }
       if (!returnValueContent && !returnValueNudged) {
         returnValueNudged = true;
-        eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-          segments: result.segments,
-          promptContext
-        }));
-        appendNudgeMessage(eventStore, sessionId, RETURN_VALUE_NUDGE, currentWindowMessageOptions, { subAgentId, subAgentType });
+        eventStore.append(
+          sessionId,
+          createMessageDoneEvent(assistantMsgId, {
+            segments: result.segments,
+            promptContext
+          })
+        );
+        appendNudgeMessage(eventStore, sessionId, RETURN_VALUE_NUDGE, currentWindowMessageOptions, {
+          subAgentId,
+          subAgentType
+        });
         customMessages = [...customMessages, { role: "user", content: RETURN_VALUE_NUDGE, source: "runtime" }];
         continue;
       }
       const stats = turnMetrics.buildStats(statsIdentity, "verifier");
-      eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-        segments: result.segments,
-        stats,
-        promptContext
-      }));
+      eventStore.append(
+        sessionId,
+        createMessageDoneEvent(assistantMsgId, {
+          segments: result.segments,
+          stats,
+          promptContext
+        })
+      );
       eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "complete", stats));
       break;
     }
-    eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-      segments: result.segments,
-      promptContext
-    }));
+    eventStore.append(
+      sessionId,
+      createMessageDoneEvent(assistantMsgId, {
+        segments: result.segments,
+        promptContext
+      })
+    );
     const batchResult = await executeToolBatch(assistantMsgId, result.toolCalls, {
       toolRegistry,
       sessionManager,
@@ -3294,13 +3492,15 @@ async function executeSubAgent(options) {
     if (batchResult.returnValueContent) {
       returnValueContent = batchResult.returnValueContent;
       returnValueResult = batchResult.returnValueResult;
-      customMessages = [...customMessages, ...batchResult.toolMessages];
       const stats = turnMetrics.buildStats(statsIdentity, subAgentType);
-      eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-        segments: result.segments,
-        stats,
-        promptContext
-      }));
+      eventStore.append(
+        sessionId,
+        createMessageDoneEvent(assistantMsgId, {
+          segments: result.segments,
+          stats,
+          promptContext
+        })
+      );
       if (onMessage) {
         onMessage(createChatMessageUpdatedMessage(assistantMsgId, { isStreaming: false, stats, promptContext }));
       }
@@ -3323,7 +3523,13 @@ async function executeSubAgent(options) {
   });
   const failed = session.criteria.filter((c) => c.status.type === "failed").map((c) => ({ id: c.id, reason: c.status.reason ?? "unknown" }));
   const remaining = nudgeConfig?.getCriteriaAwaiting(session.criteria) ?? [];
-  return buildSubAgentResult(returnValueContent ?? void 0, returnValueResult ?? (subAgentType !== "verifier" ? "success" : void 0), subAgentType, failed, remaining);
+  return buildSubAgentResult(
+    returnValueContent ?? void 0,
+    returnValueResult ?? (subAgentType !== "verifier" ? "success" : void 0),
+    subAgentType,
+    failed,
+    remaining
+  );
 }
 
 // src/server/tools/sub-agent.ts
@@ -3391,7 +3597,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-RUAY6EVI.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-QJ5K5IJP.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -3580,14 +3786,11 @@ var webFetchTool = createTool(
     if (!url.startsWith("http://") && !url.startsWith("https://")) {
       return helpers.error("URL must start with http:// or https://");
     }
-    const timeoutMs = Math.min(
-      (args.timeout ?? DEFAULT_TIMEOUT_MS / 1e3) * 1e3,
-      MAX_TIMEOUT_MS
-    );
+    const timeoutMs = Math.min((args.timeout ?? DEFAULT_TIMEOUT_MS / 1e3) * 1e3, MAX_TIMEOUT_MS);
     const signal = buildSignal(timeoutMs, context.signal);
     const headers = {
       "User-Agent": USER_AGENT,
-      "Accept": buildAcceptHeader(format),
+      Accept: buildAcceptHeader(format),
       "Accept-Language": "en-US,en;q=0.9"
     };
     const initial = await fetch(url, { signal, headers });
@@ -3919,16 +4122,20 @@ var devServerTool = createTool(
       const offset = args.offset ?? 0;
       const limit = args.limit ?? 100;
       const result = devServerManager.getLogsSlice(workdir, offset, limit);
-      const formattedLogs = result.logs.map(
-        (entry) => `${entry.stream === "stderr" ? "[stderr] " : ""}${entry.content}`
-      ).join("");
-      return helpers.success(JSON.stringify({
-        logs: formattedLogs,
-        total: result.total,
-        offset,
-        limit,
-        hasMore: offset + limit < result.total
-      }, null, 2));
+      const formattedLogs = result.logs.map((entry) => `${entry.stream === "stderr" ? "[stderr] " : ""}${entry.content}`).join("");
+      return helpers.success(
+        JSON.stringify(
+          {
+            logs: formattedLogs,
+            total: result.total,
+            offset,
+            limit,
+            hasMore: offset + limit < result.total
+          },
+          null,
+          2
+        )
+      );
     }
     let status;
     switch (args.action) {
@@ -3958,12 +4165,18 @@ var devServerTool = createTool(
         'No .openfox/dev-dev.json (dev mode) or .openfox/dev.json (prod) config found. Create one with:\n\n{\n  "command": "npm run dev",\n  "url": "http://localhost:3000",\n  "hotReload": true\n}'
       );
     }
-    return helpers.success(JSON.stringify({
-      state: status.state,
-      url: status.url,
-      hotReload: status.hotReload,
-      ...status.errorMessage ? { error: status.errorMessage } : {}
-    }, null, 2));
+    return helpers.success(
+      JSON.stringify(
+        {
+          state: status.state,
+          url: status.url,
+          hotReload: status.hotReload,
+          ...status.errorMessage ? { error: status.errorMessage } : {}
+        },
+        null,
+        2
+      )
+    );
   }
 );
 
@@ -4064,7 +4277,9 @@ These processes run independently of agent turns and persist across session comp
         const count = getSessionProcessCount(sessionId);
         const maxPerSession = getMaxPerSession();
         if (count >= maxPerSession) {
-          return helpers.error(`Maximum number of background processes (${maxPerSession}) reached. Stop existing processes before starting new ones.`);
+          return helpers.error(
+            `Maximum number of background processes (${maxPerSession}) reached. Stop existing processes before starting new ones.`
+          );
         }
         const name = args.name ?? args.command?.split(" ")[0] ?? "process";
         const process2 = createProcess(sessionId, name, args.command, cwd, args.timeout);
@@ -4075,13 +4290,19 @@ These processes run independently of agent turns and persist across session comp
         if (!pid) {
           return helpers.error(`Failed to start process.`);
         }
-        return helpers.success(JSON.stringify({
-          processId: process2.id,
-          name: process2.name,
-          pid,
-          status: "running",
-          maxReached: count + 1 >= maxPerSession
-        }, null, 2));
+        return helpers.success(
+          JSON.stringify(
+            {
+              processId: process2.id,
+              name: process2.name,
+              pid,
+              status: "running",
+              maxReached: count + 1 >= maxPerSession
+            },
+            null,
+            2
+          )
+        );
       }
       case "stop": {
         const proc = getProcessStatus(args.processId, sessionId);
@@ -4092,19 +4313,31 @@ These processes run independently of agent turns and persist across session comp
           return helpers.error(`Process is not running (status: ${proc.status}). Cannot stop.`);
         }
         await stopProcess(args.processId, sessionId);
-        return helpers.success(JSON.stringify({
-          processId: args.processId,
-          status: "removed"
-        }, null, 2));
+        return helpers.success(
+          JSON.stringify(
+            {
+              processId: args.processId,
+              status: "removed"
+            },
+            null,
+            2
+          )
+        );
       }
       case "list": {
         const processes = getSessionProcesses(sessionId);
         const maxPerSession = getMaxPerSession();
-        return helpers.success(JSON.stringify({
-          processes,
-          maxPerSession,
-          currentCount: processes.filter((p) => p.status !== "exited").length
-        }, null, 2));
+        return helpers.success(
+          JSON.stringify(
+            {
+              processes,
+              maxPerSession,
+              currentCount: processes.filter((p) => p.status !== "exited").length
+            },
+            null,
+            2
+          )
+        );
       }
       case "status": {
         const proc = getProcessStatus(args.processId, sessionId);
@@ -4112,10 +4345,16 @@ These processes run independently of agent turns and persist across session comp
           return helpers.error(`Process not found: ${args.processId}`);
         }
         const uptime = proc.startedAt ? Date.now() - proc.startedAt : null;
-        return helpers.success(JSON.stringify({
-          process: proc,
-          uptime
-        }, null, 2));
+        return helpers.success(
+          JSON.stringify(
+            {
+              process: proc,
+              uptime
+            },
+            null,
+            2
+          )
+        );
       }
       case "logs": {
         const proc = getProcessStatus(args.processId, sessionId);
@@ -4125,14 +4364,20 @@ These processes run independently of agent turns and persist across session comp
         const since = args.since ?? 0;
         const maxLines = Math.min(args.maxLines ?? 500, 2e3);
         const { lines, totalLines, nextOffset, hasMore } = getProcessLogs(args.processId, since, maxLines);
-        return helpers.success(JSON.stringify({
-          processId: args.processId,
-          lines,
-          totalLines,
-          nextOffset,
-          hasMore,
-          truncated: hasMore
-        }, null, 2));
+        return helpers.success(
+          JSON.stringify(
+            {
+              processId: args.processId,
+              lines,
+              totalLines,
+              nextOffset,
+              hasMore,
+              truncated: hasMore
+            },
+            null,
+            2
+          )
+        );
       }
       default:
         return helpers.error(`Unknown action: ${args.action}`);
@@ -4384,11 +4629,7 @@ async function performContextCompaction(options) {
   const eventStore = getEventStore();
   const session = sessionManager.requireSession(sessionId);
   const { content: instructions, files } = await getAllInstructions(session.workdir, session.projectId);
-  const injectedFiles = files.map((file) => ({
-    path: file.path,
-    content: file.content ?? "",
-    source: file.source
-  }));
+  const injectedFiles = toInjectedFiles(files);
   const requestMessages = toRequestContextMessages2(getContextMessages(sessionId));
   const config = getRuntimeConfig();
   const allAgents = await loadAllAgentsDefault();
@@ -4414,20 +4655,23 @@ async function performContextCompaction(options) {
   const compactionReminder = `<system-reminder>
 ${COMPACTION_PROMPT}
 </system-reminder>`;
-  const llmMessages = [
-    ...assembledRequest.messages,
-    { role: "user", content: compactionReminder }
-  ];
+  const llmMessages = [...assembledRequest.messages, { role: "user", content: compactionReminder }];
   const compactPromptMsgId = crypto.randomUUID();
-  eventStore.append(sessionId, createMessageStartEvent(compactPromptMsgId, "user", COMPACTION_PROMPT, {
-    ...getCurrentWindowMessageOptions3(sessionId) ?? {},
-    isSystemGenerated: true,
-    messageKind: "auto-prompt",
-    metadata: { type: "compaction", name: "Compaction", color: "#64748b" }
-  }));
+  eventStore.append(
+    sessionId,
+    createMessageStartEvent(compactPromptMsgId, "user", COMPACTION_PROMPT, {
+      ...getCurrentWindowMessageOptions3(sessionId) ?? {},
+      isSystemGenerated: true,
+      messageKind: "auto-prompt",
+      metadata: { type: "compaction", name: "Compaction", color: "#64748b" }
+    })
+  );
   eventStore.append(sessionId, { type: "message.done", data: { messageId: compactPromptMsgId } });
   const assistantMsgId = crypto.randomUUID();
-  eventStore.append(sessionId, createMessageStartEvent(assistantMsgId, "assistant", void 0, getCurrentWindowMessageOptions3(sessionId)));
+  eventStore.append(
+    sessionId,
+    createMessageStartEvent(assistantMsgId, "assistant", void 0, getCurrentWindowMessageOptions3(sessionId))
+  );
   const turnMetrics = new TurnMetrics();
   const compactionToolRegistry = {
     execute: async (name, args, ctx) => {
@@ -4545,4 +4789,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-ETIXH35K.js.map
+//# sourceMappingURL=chunk-EBQYRNNU.js.map