@nomad-e/bluma-cli 0.6.8 → 0.7.0

package/dist/main.js

@@ -12575,7 +12575,7 @@ var getInstance = (stdout, createInstance) => {
 
 // src/main.ts
 import { EventEmitter as EventEmitter7 } from "events";
-import fs45 from "fs";
+import fs46 from "fs";
 import path49 from "path";
 import { fileURLToPath as fileURLToPath7 } from "url";
 import { spawn as spawn6 } from "child_process";
@@ -12638,9 +12638,9 @@ var BLUMA_TERMINAL = {
   // red-500
   warn: "#eab308",
   // yellow-500
-  diffAdded: "#14532d",
+  diffAdded: "#203a2b",
   // green-900
-  diffRemoved: "#7f1d1d",
+  diffRemoved: "#4a221d",
   // red-900
   diffAddedWord: "#22c55e",
   diffRemovedWord: "#ef4444",
@@ -12686,14 +12686,18 @@ var HeaderComponent = ({ workdir, cliVersion = "?" }) => /* @__PURE__ */ jsxs2(
   Box_default,
   {
     flexDirection: "column",
-    padding: 1,
+    marginBottom: 1,
+    width: "100%",
     children: [
       /* @__PURE__ */ jsxs2(Box_default, { flexDirection: "row", flexWrap: "wrap", children: [
-        /* @__PURE__ */ jsx9(Text, { color: BLUMA_TERMINAL.orange, children: "\u273B " }),
+        /* @__PURE__ */ jsxs2(Text, { color: BLUMA_TERMINAL.dim, children: [
+          "$_",
+          " "
+        ] }),
         /* @__PURE__ */ jsx9(Text, { color: BLUMA_TERMINAL.m3OnSurface, bold: true, children: "Blu" }),
         /* @__PURE__ */ jsx9(Text, { color: BLUMA_TERMINAL.m3OnSurface, bold: true, children: "Ma" })
       ] }),
-      /* @__PURE__ */ jsx9(Box_default, { flexDirection: "row", flexWrap: "wrap", marginTop: 0, children: /* @__PURE__ */ jsx9(Text, { color: BLUMA_TERMINAL.dim, children: "  Base Language Unit \xB7 Model Agent" }) })
+      /* @__PURE__ */ jsx9(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", children: /* @__PURE__ */ jsx9(Text, { color: BLUMA_TERMINAL.dim, children: "Base Language Unit \xB7 Model Agent" }) })
     ]
   }
 );
@@ -12701,7 +12705,7 @@ var Header = memo(HeaderComponent);
 var SessionInfoComponent = ({
   toolsCount,
   mcpStatus
-}) => /* @__PURE__ */ jsxs2(Box_default, { paddingX: 1, children: [
+}) => /* @__PURE__ */ jsxs2(Box_default, { children: [
   /* @__PURE__ */ jsx9(Text, { dimColor: true, children: "mcp " }),
   /* @__PURE__ */ jsx9(Text, { color: mcpStatus === "connected" ? BLUMA_TERMINAL.success : BLUMA_TERMINAL.warn, children: mcpStatus === "connected" ? "on" : "\u2026" }),
   toolsCount !== null ? /* @__PURE__ */ jsxs2(Text, { dimColor: true, children: [
@@ -12721,7 +12725,7 @@ var TaskStatusBarComponent = ({
     EXECUTION: BLUMA_TERMINAL.magenta,
     VERIFICATION: BLUMA_TERMINAL.orange
   };
-  return /* @__PURE__ */ jsxs2(Box_default, { paddingX: 1, children: [
+  return /* @__PURE__ */ jsxs2(Box_default, { children: [
     /* @__PURE__ */ jsxs2(Text, { color: modeColors[mode], bold: true, children: [
       "[",
       mode.charAt(0),
@@ -15362,7 +15366,7 @@ function createDiff(filename, oldContent, newContent) {
       const prefix = part.added ? "+" : part.removed ? "-" : " ";
       const lines = part.value.split("\n").slice(0, -1);
       for (const line of lines) {
-        if (line === "\") continue;
+        if (line === "") continue;
         diffString += `${prefix}${line}
 `;
         lineCount++;
@@ -17828,9 +17832,6 @@ async function exitPlanMode(args) {
 // src/app/agent/tools/TaskToolsTool/TaskToolsTool.ts
 var bySession = /* @__PURE__ */ new Map();
 var currentSessionId = "";
-function setTaskToolSessionContext(sessionId) {
-  currentSessionId = String(sessionId || "").trim() || "default";
-}
 function sessionMap() {
   const sid2 = currentSessionId || "default";
   let m = bySession.get(sid2);
@@ -18366,6 +18367,14 @@ async function fileWrite(args) {
         error: `File already exists and overwrite=false: ${resolvedPath}`
       };
     }
+    let previousContent = "";
+    if (existed) {
+      try {
+        previousContent = await fs17.readFile(resolvedPath, "utf-8");
+      } catch {
+        previousContent = "";
+      }
+    }
     if (create_directories) {
       await fs17.mkdir(dir, { recursive: true });
     }
@@ -18374,7 +18383,9 @@ async function fileWrite(args) {
     return {
       success: true,
       filepath: resolvedPath,
+      content: String(content),
       bytes_written: bytes,
+      previous_content: existed ? previousContent : "",
       created: !existed,
       overwritten: existed
     };
@@ -24540,8 +24551,7 @@ Rules:
     ],
     temperature: 0,
     max_tokens: 4096,
-    userContext,
-    response_format: { type: "json_object" }
+    userContext
   };
   const resp = await llmService.chatCompletion(requestBase);
   const text = resp.choices[0]?.message?.content;
@@ -24836,6 +24846,39 @@ function sanitizeConversationForProvider(conversationHistory) {
         droppingCorruptTurn = true;
         continue;
       }
+      const expectedToolIds = new Set(
+        toolCalls.map((call) => String(call?.id ?? "").trim()).filter(Boolean)
+      );
+      const turnBuffer = [conversationHistory[index]];
+      const seenToolIds = /* @__PURE__ */ new Set();
+      let j = index + 1;
+      let turnValid = true;
+      while (j < conversationHistory.length) {
+        const next = conversationHistory[j];
+        if (next?.role !== "tool") {
+          break;
+        }
+        const toolCallId = String(next?.tool_call_id ?? "").trim();
+        if (!toolCallId || !expectedToolIds.has(toolCallId) || seenToolIds.has(toolCallId)) {
+          issues.push({
+            index,
+            reason: "assistant tool_calls were not followed by a valid tool turn",
+            toolNames: toolCalls.map((call) => String(call?.function?.name ?? "unknown"))
+          });
+          droppingCorruptTurn = true;
+          turnValid = false;
+          break;
+        }
+        seenToolIds.add(toolCallId);
+        turnBuffer.push(conversationHistory[j]);
+        j += 1;
+      }
+      if (turnValid) {
+        cleaned.push(...turnBuffer);
+        index = j - 1;
+        continue;
+      }
+      continue;
     }
     cleaned.push(conversationHistory[index]);
   }
@@ -24858,50 +24901,9 @@ function partitionConversationIntoTurnSlices(conversationHistory) {
   }
   return turns;
 }
-var MODEL_CONTEXT_WINDOW_DEFAULT = 2e5;
-var MODEL_CONTEXT_WINDOWS = {
-  "gpt-4o": 2e5,
-  "gpt-4o-2024-08-06": 128e3,
-  "gpt-4-turbo": 128e3,
-  "gpt-4-0125-preview": 128e3,
-  "gpt-4-1106-preview": 128e3,
-  "claude-3-5-sonnet": 2e5,
-  "claude-3-opus": 2e5,
-  "claude-3-sonnet": 2e5,
-  "claude-3-haiku": 2e5,
-  "claude-sonnet-4-6-1m": 1e6,
-  "claude-opus-4-6-1m": 1e6
-};
-function getContextWindowForModel(modelName = "") {
-  if (!modelName) {
-    return MODEL_CONTEXT_WINDOW_DEFAULT;
-  }
-  const normalizedModel = modelName.toLowerCase();
-  const envOverride = process.env.BLUMA_CONTEXT_WINDOW_OVERRIDE;
-  if (envOverride) {
-    const override = parseInt(envOverride, 10);
-    if (!isNaN(override) && override > 0) {
-      return override;
-    }
-  }
-  for (const [modelPattern, contextWindow] of Object.entries(MODEL_CONTEXT_WINDOWS)) {
-    if (normalizedModel.includes(modelPattern)) {
-      return contextWindow;
-    }
-  }
-  if (normalizedModel.includes("[1m]") || normalizedModel.includes("1m")) {
-    return 1e6;
-  }
-  return MODEL_CONTEXT_WINDOW_DEFAULT;
-}
-function getContextInputBudgetForModel(modelName = "") {
-  const contextWindow = getContextWindowForModel(modelName);
-  const outputReserve = Math.max(8e3, Math.floor(contextWindow * 0.1));
-  const effectiveContextPercent = 0.95;
-  const inputBudget = Math.floor(
-    (contextWindow - outputReserve) * effectiveContextPercent
-  );
-  return Math.max(inputBudget, 32e3);
+var STATIC_CONTEXT_INPUT_BUDGET = 96e3;
+function getContextInputBudgetForModel(_modelName = "") {
+  return STATIC_CONTEXT_INPUT_BUDGET;
 }
 
 // src/app/agent/core/llm/llm.ts
@@ -24932,6 +24934,8 @@ function extractStreamingDelta(previous, next) {
 }
 
 // src/app/agent/core/llm/llm.ts
+init_logger();
+var llmLog = logger.child("llm");
 function defaultBlumaUserContextInput(sessionId, userMessage) {
   const msg = String(userMessage || "").slice(0, 300);
   return {
@@ -25009,6 +25013,7 @@ var THINKING_TOKEN_BUDGET_BY_EFFORT = {
   medium: 1024,
   high: 2048
 };
+var DEFAULT_REQUEST_MAX_TOKENS = 8192;
 function getThinkingTokenBudgetForEffort(effort) {
   if (!effort) return void 0;
   return THINKING_TOKEN_BUDGET_BY_EFFORT[effort];
@@ -25022,6 +25027,13 @@ function buildVllmReasoningPayload(effort) {
     }
   };
 }
+function resolveRequestMaxTokens(params) {
+  const requested = params.max_tokens;
+  if (typeof requested === "number" && Number.isFinite(requested) && requested > 0) {
+    return Math.floor(requested);
+  }
+  return DEFAULT_REQUEST_MAX_TOKENS;
+}
 function resolveReasoningEffortForRequest(params, runtimeConfig = getRuntimeConfig()) {
   const policy = getSandboxPolicy();
   if (policy.isSandbox) {
@@ -25029,24 +25041,188 @@ function resolveReasoningEffortForRequest(params, runtimeConfig = getRuntimeConf
   }
   return params.reasoning?.effort ?? runtimeConfig.reasoningEffort;
 }
-function buildChatCompletionRequestBody(params, runtimeConfig = getRuntimeConfig(), stream = false) {
+function buildChatCompletionRequestBody(params, runtimeConfig = getRuntimeConfig(), stream = false, options) {
   const tools = params.tools;
   const hasTools = Array.isArray(tools) && tools.length > 0;
   const effort = resolveReasoningEffortForRequest(params, runtimeConfig);
-  const reasoningPayload = buildVllmReasoningPayload(effort);
+  const reasoningPayload = options?.disableReasoning ? void 0 : buildVllmReasoningPayload(effort);
+  const messages = sanitizeMessagesForRequest(params.messages, options);
   return {
     model: params.model || runtimeConfig.model || "auto",
-    messages: params.messages,
-    tools: hasTools ? tools : void 0,
-    tool_choice: hasTools ? "auto" : void 0,
-    parallel_tool_calls: params.parallel_tool_calls ?? false,
+    messages,
+    tools: hasTools && !options?.disableTools ? tools : void 0,
+    tool_choice: hasTools && !options?.disableTools ? "auto" : void 0,
+    parallel_tool_calls: options?.disableParallelToolCalls ? void 0 : params.parallel_tool_calls ?? false,
     temperature: params.temperature ?? 0,
     ...reasoningPayload ?? {},
-    max_tokens: params.max_tokens,
+    max_tokens: resolveRequestMaxTokens(params),
     response_format: params.response_format,
     ...stream ? { stream: true } : {}
   };
 }
+function isBadRequestLike(error) {
+  const anyError = error;
+  if (anyError && typeof anyError.status === "number" && anyError.status === 400) {
+    return true;
+  }
+  const message2 = String(anyError?.message ?? error ?? "").toLowerCase();
+  return message2.includes("400 status code") || message2.includes("bad request");
+}
+function describeFallback(options) {
+  const parts = [];
+  if (options.disableReasoning) parts.push("no_reasoning");
+  if (options.disableParallelToolCalls) parts.push("no_parallel");
+  if (options.disableTools) parts.push("no_tools");
+  if (options.stripToolTurns) parts.push("no_tool_turns");
+  if (options.stripImages) parts.push("no_images");
+  return parts.length > 0 ? parts.join("+") : "base";
+}
+function summarizeError(error) {
+  if (!error || typeof error !== "object") {
+    return { message: String(error) };
+  }
+  const anyError = error;
+  return {
+    name: typeof anyError.name === "string" ? anyError.name : void 0,
+    message: typeof anyError.message === "string" ? anyError.message : String(error),
+    status: typeof anyError.status === "number" ? anyError.status : void 0,
+    code: typeof anyError.code === "string" || typeof anyError.code === "number" ? anyError.code : void 0,
+    type: typeof anyError.type === "string" ? anyError.type : void 0
+  };
+}
+function summarizeRequestForLog(params, runtimeConfig = getRuntimeConfig()) {
+  const messageCounts = {
+    total: params.messages.length,
+    system: 0,
+    user: 0,
+    assistant: 0,
+    tool: 0,
+    function: 0
+  };
+  let toolCallMessages = 0;
+  let imageMessages = 0;
+  for (const message2 of params.messages) {
+    if (message2.role in messageCounts) {
+      messageCounts[message2.role] += 1;
+    }
+    if (message2.role === "assistant" && Array.isArray(message2.tool_calls) && message2.tool_calls.length > 0) {
+      toolCallMessages += 1;
+    }
+    if (Array.isArray(message2.content)) {
+      imageMessages += 1;
+    }
+  }
+  const messagePreview = params.messages.slice(0, 8).map((message2) => {
+    const content = message2.content;
+    const toolCalls = Array.isArray(message2.tool_calls) ? message2.tool_calls : [];
+    const preview = typeof content === "string" ? content.slice(0, 120) : Array.isArray(content) ? content.filter((part) => part && typeof part === "object" && part.type === "text" && typeof part.text === "string").map((part) => part.text).join(" ").slice(0, 120) : null;
+    return {
+      role: message2.role,
+      name: message2.name ?? null,
+      content_type: Array.isArray(content) ? "array" : typeof content,
+      preview: preview || null,
+      tool_calls: toolCalls.length,
+      tool_call_id: message2.tool_call_id ?? null
+    };
+  });
+  return {
+    model: params.model || runtimeConfig.model || "auto",
+    temperature: params.temperature ?? 0,
+    max_tokens: resolveRequestMaxTokens(params),
+    parallel_tool_calls: params.parallel_tool_calls ?? false,
+    has_tools: Boolean(params.tools?.length),
+    tool_count: params.tools?.length ?? 0,
+    message_counts: messageCounts,
+    assistant_tool_call_messages: toolCallMessages,
+    multimodal_messages: imageMessages,
+    reasoning: params.reasoning?.effort ?? runtimeConfig.reasoningEffort,
+    message_preview: messagePreview
+  };
+}
+function logLLMRetry(stage, params, fallbackIndex, totalFallbacks, error, stream) {
+  llmLog.warn("LLM request fallback failed", {
+    stage,
+    fallback: `${fallbackIndex + 1}/${totalFallbacks}`,
+    stream,
+    request: summarizeRequestForLog(params),
+    error: summarizeError(error)
+  });
+}
+function getRequestFallbacks() {
+  return [
+    {},
+    { disableReasoning: true },
+    { disableReasoning: true, disableParallelToolCalls: true },
+    { disableReasoning: true, disableParallelToolCalls: true, disableTools: true },
+    {
+      disableReasoning: true,
+      disableParallelToolCalls: true,
+      disableTools: true,
+      stripToolTurns: true,
+      stripImages: true
+    }
+  ];
+}
+function sanitizeTextOnlyMessageContent(content) {
+  if (typeof content === "string") {
+    const trimmed = content.trim();
+    return trimmed || void 0;
+  }
+  if (!Array.isArray(content)) {
+    return void 0;
+  }
+  const parts = [];
+  for (const part of content) {
+    if (!part || typeof part !== "object") continue;
+    if (part.type === "text" && typeof part.text === "string") {
+      const text = part.text.trim();
+      if (text) parts.push(text);
+    }
+  }
+  const joined = parts.join("\n").trim();
+  return joined || void 0;
+}
+function sanitizeMessagesForRequest(messages, options) {
+  if (!options?.stripToolTurns && !options?.stripImages) {
+    return messages;
+  }
+  const out = [];
+  for (const msg of messages) {
+    if (options.stripToolTurns && (msg.role === "tool" || msg.role === "function")) {
+      continue;
+    }
+    if (options.stripToolTurns && msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
+      const textOnly = sanitizeTextOnlyMessageContent(msg.content);
+      if (!textOnly) {
+        continue;
+      }
+      out.push({
+        role: "assistant",
+        content: textOnly
+      });
+      continue;
+    }
+    if (options.stripImages && msg.role === "user" && Array.isArray(msg.content)) {
+      const textOnly = sanitizeTextOnlyMessageContent(msg.content);
+      out.push({
+        ...msg,
+        content: textOnly || "(image omitted)"
+      });
+      continue;
+    }
+    if (options.stripImages && msg.role === "assistant" && Array.isArray(msg.content)) {
+      const textOnly = sanitizeTextOnlyMessageContent(msg.content);
+      if (!textOnly) continue;
+      out.push({
+        ...msg,
+        content: textOnly
+      });
+      continue;
+    }
+    out.push(msg);
+  }
+  return out;
+}
 function applyDeltaToolCallsToAccumulator(toolCallsAccumulator, deltaToolCalls) {
   if (!deltaToolCalls?.length) {
     return false;
@@ -25128,11 +25304,43 @@ var LLMService = class {
       throw new Error("LLMService.chatCompletion: userContext \xE9 obrigat\xF3rio");
     }
     const runtimeConfig = getRuntimeConfig();
-    const resp = await this.client.chat.completions.create(
-      buildChatCompletionRequestBody(params, runtimeConfig, false),
-      { headers: this.requestHeaders(params.userContext) }
+    const requestHeaders = this.requestHeaders(params.userContext);
+    let lastError = null;
+    const fallbacks = getRequestFallbacks();
+    for (let i = 0; i < fallbacks.length; i += 1) {
+      const fallback = fallbacks[i];
+      const stage = describeFallback(fallback);
+      try {
+        llmLog.debug("LLM request attempt", {
+          stream: false,
+          stage,
+          fallback: `${i + 1}/${fallbacks.length}`,
+          request: summarizeRequestForLog(params, runtimeConfig)
+        });
+        const resp = await this.client.chat.completions.create(
+          buildChatCompletionRequestBody(params, runtimeConfig, false, fallback),
+          { headers: requestHeaders }
+        );
+        return resp;
+      } catch (error) {
+        lastError = error;
+        logLLMRetry(stage, params, i, fallbacks.length, error, false);
+        if (!isBadRequestLike(error)) {
+          throw error;
+        }
+      }
+    }
+    const lastStage = describeFallback(fallbacks[fallbacks.length - 1] ?? {});
+    llmLog.error("LLM request failed after retries", {
+      stream: false,
+      last_stage: lastStage,
+      attempts: fallbacks.length,
+      request: summarizeRequestForLog(params, runtimeConfig),
+      error: summarizeError(lastError)
+    });
+    throw new Error(
+      `LLM request failed after ${fallbacks.length} attempts [last_stage=${lastStage}]: ${lastError instanceof Error ? lastError.message : String(lastError ?? "unknown error")}`
     );
-    return resp;
   }
   /**
    * Streaming — mesmo turnId em todas as chamadas do loop de tools (via params.userContext).
@@ -25142,10 +25350,46 @@ var LLMService = class {
       throw new Error("LLMService.chatCompletionStream: userContext \xE9 obrigat\xF3rio");
     }
     const runtimeConfig = getRuntimeConfig();
-    const stream = await this.client.chat.completions.create(
-      buildChatCompletionRequestBody(params, runtimeConfig, true),
-      { headers: this.requestHeaders(params.userContext) }
-    );
+    const requestHeaders = this.requestHeaders(params.userContext);
+    let stream = null;
+    let lastError = null;
+    const fallbacks = getRequestFallbacks();
+    for (let i = 0; i < fallbacks.length; i += 1) {
+      const fallback = fallbacks[i];
+      const stage = describeFallback(fallback);
+      try {
+        llmLog.debug("LLM stream request attempt", {
+          stream: true,
+          stage,
+          fallback: `${i + 1}/${fallbacks.length}`,
+          request: summarizeRequestForLog(params, runtimeConfig)
+        });
+        stream = await this.client.chat.completions.create(
+          buildChatCompletionRequestBody(params, runtimeConfig, true, fallback),
+          { headers: requestHeaders }
+        );
+        break;
+      } catch (error) {
+        lastError = error;
+        logLLMRetry(stage, params, i, fallbacks.length, error, true);
+        if (!isBadRequestLike(error)) {
+          throw error;
+        }
+      }
+    }
+    if (!stream) {
+      const lastStage = describeFallback(fallbacks[fallbacks.length - 1] ?? {});
+      llmLog.error("LLM stream request failed after retries", {
+        stream: true,
+        last_stage: lastStage,
+        attempts: fallbacks.length,
+        request: summarizeRequestForLog(params, runtimeConfig),
+        error: summarizeError(lastError)
+      });
+      throw new Error(
+        `LLM request failed after ${fallbacks.length} attempts [last_stage=${lastStage}]: ${lastError instanceof Error ? lastError.message : String(lastError ?? "unknown error")}`
+      );
+    }
     const toolCallsAccumulator = /* @__PURE__ */ new Map();
     let reasoningSnapshot = "";
     for await (const chunk of stream) {
@@ -25184,231 +25428,37 @@ var LLMService = class {
   }
 };
 
-// src/app/agent/core/llm/llm_errors.ts
-function formatLlmUiError(error) {
-  const rawMessage = error instanceof Error ? error.message : typeof error === "string" ? error : "Unknown error during LLM request.";
-  const lower = rawMessage.toLowerCase();
-  let message2 = "Ocorreu um erro inesperado ao contactar o modelo.";
-  if (lower.includes("timeout") || lower.includes("etimedout") || lower.includes("upstream_timeout")) {
-    message2 = "O BluMa demorou demasiado a responder.";
-  } else if (lower.includes("connection") || lower.includes("econnrefused") || lower.includes("ehostunreach") || lower.includes("enotfound")) {
-    message2 = "N\xE3o foi poss\xEDvel conectar ao servi\xE7o do modelo.";
-  } else if (lower.includes("401") || lower.includes("403") || lower.includes("unauthorized") || lower.includes("forbidden")) {
-    message2 = "Falha de autentica\xE7\xE3o/autoriza\xE7\xE3o ao contactar o modelo.";
-  } else if (lower.includes("api")) {
-    message2 = "Erro de comunica\xE7\xE3o com a API do modelo.";
-  }
-  return {
-    message: message2,
-    rawMessage
-  };
+// src/app/agent/runtime/tool_execution_policy.ts
+init_sandbox_policy();
+init_runtime_config();
+init_permission_rules();
+import path38 from "path";
+var LOCAL_EDIT_TOOL_NAMES = /* @__PURE__ */ new Set(["edit_tool", "file_write", "notebook_edit"]);
+function getToolPermissionLayer(metadata) {
+  if (metadata.riskLevel === "safe") return "read";
+  if (metadata.riskLevel === "write") return "write";
+  if (metadata.riskLevel === "network") return "network";
+  return "execute";
 }
-
-// src/app/agent/core/llm/tool_call_normalizer.ts
-import { randomUUID } from "crypto";
-var ToolCallNormalizer = class {
-  /**
-   * Com tool_calls e sem texto visível: content deve ser null (API OpenAI-compatible), nunca "" nem undefined.
-   */
-  static assistantContentWithToolCalls(content) {
-    if (content === void 0 || content === null) return null;
-    if (typeof content === "string") return content.trim() === "" ? null : content;
-    return null;
+function isLocalEditTool(toolName) {
+  return LOCAL_EDIT_TOOL_NAMES.has(toolName);
+}
+function checkFilePermissionRules(toolName, filePath, policy) {
+  if (!filePath) {
+    return { allowed: false, reason: "No file path provided for permission check." };
   }
-  /**
-   * Normaliza a mensagem do assistant, convertendo diferentes formatos de tool calls
-   */
-  static normalizeAssistantMessage(message2) {
-    if (message2.tool_calls && this.isOpenAIFormat(message2.tool_calls)) {
-      return {
-        ...message2,
-        content: this.assistantContentWithToolCalls(message2.content)
-      };
-    }
-    const toolCalls = this.extractToolCalls(message2);
-    if (toolCalls.length > 0) {
-      return {
-        role: message2.role || "assistant",
-        content: this.assistantContentWithToolCalls(message2.content),
-        tool_calls: toolCalls
-      };
-    }
-    return message2;
+  const resolvedPath = path38.resolve(filePath);
+  if (!isPathInsideWorkspace(resolvedPath, policy)) {
+    return { allowed: false, reason: `File path "${filePath}" is outside workspace root.` };
   }
-  /**
-   * Verifica se já está no formato OpenAI
-   */
-  static isOpenAIFormat(toolCalls) {
-    if (!Array.isArray(toolCalls) || toolCalls.length === 0) return false;
-    const firstCall = toolCalls[0];
-    return typeof firstCall.id === "string" && firstCall.type === "function" && typeof firstCall.function?.name === "string" && typeof firstCall.function?.arguments === "string";
+  const relativePath = path38.relative(policy.workspaceRoot, resolvedPath);
+  const toolPattern = `${toolName}(${relativePath})`;
+  const ruleDecision = permissionRulesEngine.checkPermission(toolPattern, { filepath: filePath });
+  if (ruleDecision === "deny") {
+    return { allowed: false, reason: `File "${filePath}" denied by permission rules.` };
   }
-  /**
-   * Extrai tool calls de diversos formatos possíveis
-   */
-  static extractToolCalls(message2) {
-    const results = [];
-    if (message2.tool_calls && Array.isArray(message2.tool_calls)) {
-      for (const call of message2.tool_calls) {
-        const normalized = this.normalizeToolCall(call);
-        if (normalized) results.push(normalized);
-      }
-    }
-    if (typeof message2.content === "string" && message2.content.trim()) {
-      const extracted = this.extractFromContent(message2.content);
-      results.push(...extracted);
-    }
-    if (message2.function_call) {
-      const normalized = this.normalizeToolCall(message2.function_call);
-      if (normalized) results.push(normalized);
-    }
-    return results;
-  }
-  /**
-   * Normaliza um único tool call para o formato OpenAI
-   */
-  static normalizeToolCall(call) {
-    try {
-      if (call.id && call.function?.name) {
-        return {
-          id: call.id,
-          type: "function",
-          function: {
-            name: call.function.name,
-            arguments: typeof call.function.arguments === "string" ? call.function.arguments : JSON.stringify(call.function.arguments)
-          }
-        };
-      }
-      if (call.name) {
-        return {
-          id: call.id || randomUUID(),
-          type: "function",
-          function: {
-            name: call.name,
-            arguments: typeof call.arguments === "string" ? call.arguments : JSON.stringify(call.arguments || {})
-          }
-        };
-      }
-      if (call.function && typeof call.function === "object") {
-        return {
-          id: call.id || randomUUID(),
-          type: "function",
-          function: {
-            name: call.function.name,
-            arguments: typeof call.function.arguments === "string" ? call.function.arguments : JSON.stringify(call.function.arguments || {})
-          }
-        };
-      }
-      return null;
-    } catch (error) {
-      console.error("Error normalizing tool call:", error, call);
-      return null;
-    }
-  }
-  /**
-   * Extrai tool calls do content (pode estar em markdown, JSON, etc)
-   */
-  static extractFromContent(content) {
-    const results = [];
-    const cleanContent2 = content.replace(/```(?:json)?\s*([\s\S]*?)```/g, "$1");
-    const jsonMatches = this.extractJsonObjects(cleanContent2);
-    for (const jsonStr of jsonMatches) {
-      try {
-        const parsed = JSON.parse(jsonStr);
-        if (Array.isArray(parsed)) {
-          for (const call of parsed) {
-            const normalized = this.normalizeToolCall(call);
-            if (normalized) results.push(normalized);
-          }
-        } else if (parsed.name || parsed.function) {
-          const normalized = this.normalizeToolCall(parsed);
-          if (normalized) results.push(normalized);
-        } else if (parsed.tool_calls && Array.isArray(parsed.tool_calls)) {
-          for (const call of parsed.tool_calls) {
-            const normalized = this.normalizeToolCall(call);
-            if (normalized) results.push(normalized);
-          }
-        }
-      } catch (e) {
-      }
-    }
-    return results;
-  }
-  /**
-   * Extrai objetos JSON de uma string (suporta múltiplos objetos)
-   */
-  static extractJsonObjects(text) {
-    const results = [];
-    let depth = 0;
-    let start = -1;
-    for (let i = 0; i < text.length; i++) {
-      if (text[i] === "{") {
-        if (depth === 0) start = i;
-        depth++;
-      } else if (text[i] === "}") {
-        depth--;
-        if (depth === 0 && start !== -1) {
-          results.push(text.substring(start, i + 1));
-          start = -1;
-        }
-      }
-    }
-    return results;
-  }
-  /**
-   * Valida se um tool call normalizado é válido
-   * Validação dupla:
-   * 1. JSON dos argumentos é válido
-   * 2. A ferramenta existe no catálogo de ferramentas nativas
-   */
-  static isValidToolCall(call) {
-    if (!(call.id && call.type === "function" && call.function?.name && typeof call.function.arguments === "string")) {
-      return false;
-    }
-    try {
-      JSON.parse(call.function.arguments);
-    } catch {
-      return false;
-    }
-    const toolMetadata = getNativeToolMetadata(call.function.name);
-    if (!toolMetadata) {
-      return false;
-    }
-    return true;
-  }
-};
-
-// src/app/agent/runtime/tool_execution_policy.ts
-init_sandbox_policy();
-init_runtime_config();
-init_permission_rules();
-import path38 from "path";
-var LOCAL_EDIT_TOOL_NAMES = /* @__PURE__ */ new Set(["edit_tool", "file_write", "notebook_edit"]);
-function getToolPermissionLayer(metadata) {
-  if (metadata.riskLevel === "safe") return "read";
-  if (metadata.riskLevel === "write") return "write";
-  if (metadata.riskLevel === "network") return "network";
-  return "execute";
-}
-function isLocalEditTool(toolName) {
-  return LOCAL_EDIT_TOOL_NAMES.has(toolName);
-}
-function checkFilePermissionRules(toolName, filePath, policy) {
-  if (!filePath) {
-    return { allowed: false, reason: "No file path provided for permission check." };
-  }
-  const resolvedPath = path38.resolve(filePath);
-  if (!isPathInsideWorkspace(resolvedPath, policy)) {
-    return { allowed: false, reason: `File path "${filePath}" is outside workspace root.` };
-  }
-  const relativePath = path38.relative(policy.workspaceRoot, resolvedPath);
-  const toolPattern = `${toolName}(${relativePath})`;
-  const ruleDecision = permissionRulesEngine.checkPermission(toolPattern, { filepath: filePath });
-  if (ruleDecision === "deny") {
-    return { allowed: false, reason: `File "${filePath}" denied by permission rules.` };
-  }
-  if (ruleDecision === "allow") {
-    return { allowed: true, reason: `File "${filePath}" allowed by permission rules.` };
+  if (ruleDecision === "allow") {
+    return { allowed: true, reason: `File "${filePath}" allowed by permission rules.` };
   }
   const dirPath = path38.dirname(relativePath);
   const dirPattern = `${toolName}(${dirPath}/**)`;
@@ -25699,28 +25749,6 @@ function consolidateCodingMemoryFile() {
   };
 }
 
-// src/app/agent/runtime/tool_orchestration.ts
-var PARALLEL_SAFE_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "ls_tool",
-  "read_file_lines",
-  "count_file_lines",
-  "find_by_name",
-  "grep_search",
-  "view_file_outline",
-  "read_artifact",
-  "list_agents",
-  "list_mcp_resources",
-  "read_mcp_resource",
-  "todo"
-]);
-function toolEligibleForParallelRead(toolName, sessionId) {
-  const name = String(toolName || "").trim();
-  if (!name || !PARALLEL_SAFE_TOOL_NAMES.has(name)) return false;
-  if (!decideToolExecution(name, void 0, sessionId).autoApprove) return false;
-  const meta = getNativeToolMetadata(name);
-  return meta?.riskLevel === "safe";
-}
-
 // src/app/agent/bluma/turn_start_payload.ts
 function buildUserPromptPreview(inputText) {
   const t = String(inputText ?? "").trim();
@@ -25785,276 +25813,153 @@ function subscribeToolResultStatuses(listener) {
   return changed.subscribe(listener);
 }
 
-// src/app/agent/bluma/core/bluma.ts
-var BluMaAgent = class _BluMaAgent {
-  static MAX_INVALID_TOOL_CALL_RETRIES = 3;
-  llm;
-  sessionId;
-  sessionFile = "";
-  history = [];
-  eventBus;
-  mcpClient;
-  feedbackSystem;
-  skillLoader;
-  compressor;
-  isInterrupted = false;
-  /** Mesmo turnId durante processTurn + todo o loop de tool_calls (FactorRouter). */
-  activeTurnContext = null;
-  /** Evita POST /turns/.../end duplicado no mesmo turno (ex.: Esc após message_result). */
-  factorRouterTurnClosed = false;
-  /** Passos seguidos sem tool_calls nem texto visível (só raciocínio) — evita loop lento no mesmo turno. */
-  emptyAssistantReplySteps = 0;
-  /** Reintentos consecutivos por tool call inválido. */
-  invalidToolCallRetrySteps = 0;
-  constructor(sessionId, eventBus, llm, mcpClient, feedbackSystem) {
-    this.sessionId = sessionId;
-    this.eventBus = eventBus;
-    this.llm = llm;
-    this.mcpClient = mcpClient;
-    this.feedbackSystem = feedbackSystem;
-    this.skillLoader = new SkillLoader(process.cwd());
-    this.compressor = new HistoryCompressor();
-    this.eventBus.on("user_interrupt", async () => {
-      this.isInterrupted = true;
-      await this.notifyFactorTurnEndIfNeeded("user_interrupt");
-      this.eventBus.emit("backend_message", { type: "done", status: "interrupted" });
-    });
-    this.eventBus.on("user_overlay", async (data) => {
-      const clean = String(data.payload ?? "").trim();
-      this.history.push({ role: "user", content: clean });
-      this.eventBus.emit("backend_message", { type: "user_overlay", payload: clean, ts: data.ts || Date.now() });
-      try {
-        if (this.sessionFile) {
-          this.persistSession();
-        } else {
-          const [sessionFile, , mem] = await loadOrcreateSession(this.sessionId);
-          this.sessionFile = sessionFile;
-          this.compressor.restoreSnapshot(mem);
-          this.persistSession();
-        }
-      } catch (e) {
-        this.eventBus.emit("backend_message", { type: "error", message: `Falha ao salvar hist\xF3rico ap\xF3s user_overlay: ${e.message}` });
-      }
-    });
-  }
-  getMemorySnapshot() {
-    return this.compressor.getSnapshot();
-  }
-  /**
-   * Salvar histórico de forma SÍNCRONA - usado em situações críticas (erros, shutdown)
-   * para garantir que nada se perde. NÃO usa debounce.
-   */
-  persistSessionSync() {
-    if (!this.sessionFile) return;
+// src/utils/toolActionStatus.ts
+function parseArgsRecord(args) {
+  if (args == null) return {};
+  if (typeof args === "string") {
     try {
-      const sessionData = {
-        session_id: path40.basename(this.sessionFile, ".json"),
-        created_at: (/* @__PURE__ */ new Date()).toISOString(),
-        conversation_history: this.history,
-        last_updated: (/* @__PURE__ */ new Date()).toISOString(),
-        ...this.compressor.getSnapshot()
-      };
-      fs39.writeFileSync(this.sessionFile, JSON.stringify(sessionData, null, 2), "utf-8");
-    } catch (error) {
-      console.error("[Bluma] Failed to persist session synchronously:", error);
+      return JSON.parse(args);
+    } catch {
+      return {};
     }
   }
-  /** Debounced: grava histórico + estado de compressão no mesmo ficheiro de sessão. */
-  persistSession() {
-    if (!this.sessionFile) return;
-    void saveSessionHistory(this.sessionFile, this.history, this.getMemorySnapshot());
-  }
-  recordUiSlashCommand(command, mode = "visible_only") {
-    const text = String(command ?? "").trim();
-    if (!text) return;
-    this.history.push({
-      role: "user",
-      name: mode === "with_internal_prompt" ? "ui_slash_command" : "ui_slash_command_local",
-      content: text
-    });
-    this.persistSession();
+  if (typeof args === "object") {
+    return args;
   }
-  async handleInvalidToolCallRetry(message2) {
-    this.invalidToolCallRetrySteps += 1;
-    if (this.history[this.history.length - 1] === message2) {
-      this.history.pop();
-    }
-    if (this.invalidToolCallRetrySteps >= _BluMaAgent.MAX_INVALID_TOOL_CALL_RETRIES) {
-      this.eventBus.emit("backend_message", {
-        type: "error",
-        message: "The model kept returning invalid tool calls. Closing the turn to avoid a retry loop."
-      });
-      this.eventBus.emit("backend_message", {
-        type: "log",
-        message: "Invalid tool call retry limit reached",
-        payload: String(this.invalidToolCallRetrySteps)
-      });
-      await this.notifyFactorTurnEndIfNeeded("invalid_tool_calls_exhausted");
-      this.eventBus.emit("backend_message", { type: "done", status: "failed" });
-      this.invalidToolCallRetrySteps = 0;
-      return;
+  return {};
+}
+function truncate2(value, max = 44) {
+  const text = value.trim().replace(/\s+/g, " ");
+  if (!text) return "";
+  return text.length <= max ? text : `${text.slice(0, max - 1)}\u2026`;
+}
+function shortFileName(pathLike) {
+  const trimmed = pathLike.trim();
+  if (!trimmed) return "";
+  return trimmed.split("/").pop() || trimmed;
+}
+function formatCommand(command) {
+  const compact = truncate2(command, 42);
+  return compact ? `shell command: ${compact}` : "shell command";
+}
+function formatSearchQuery(prefix, query) {
+  const compact = truncate2(query, 36);
+  return compact ? `${prefix}: ${compact}` : prefix;
+}
+function formatResponseLabel(toolName, args) {
+  switch (toolName) {
+    case "shell_command":
+    case "run_command": {
+      const cmd = typeof args.command === "string" ? args.command : "";
+      return cmd ? `Running ${formatCommand(cmd)}` : "Running shell command";
     }
-    this.history.push({
-      role: "system",
-      content: "Previous assistant tool_calls were invalid. Retry with valid JSON arguments only, or answer without tools."
-    });
-    this.persistSession();
-    await this._continueConversation();
-  }
-  async initialize() {
-    await this.mcpClient.nativeToolInvoker.initialize();
-    await this.mcpClient.initialize();
-    const [sessionFile, history, mem] = await loadOrcreateSession(this.sessionId);
-    this.sessionFile = sessionFile;
-    this.history = history;
-    this.compressor.restoreSnapshot(mem);
-    initializeSkillContext({
-      history: this.history,
-      skillLoader: this.skillLoader
-    });
-    registerSessionCronBridge({
-      eventBus: this.eventBus,
-      getSessionId: () => this.sessionId
-    });
-    const dirs = this.skillLoader.getSkillsDirs();
-    this.eventBus.emit("backend_message", {
-      type: "info",
-      message: `Skills dirs \u2014 bundled: ${dirs.bundled} | project: ${dirs.project} | global: ${dirs.global}`
-    });
-    const availableSkills = this.skillLoader.listAvailable();
-    this.eventBus.emit("backend_message", {
-      type: "info",
-      message: `Skills loaded: ${availableSkills.length} \u2014 ${availableSkills.map((s) => `${s.name} (${s.source})`).join(", ") || "none"}`
-    });
-    if (this.skillLoader.hasConflicts()) {
-      for (const warning of this.skillLoader.formatConflictWarnings()) {
-        this.eventBus.emit("backend_message", {
-          type: "warning",
-          message: warning
-        });
-      }
-    }
-    const toolsDetailed = this.mcpClient.getAvailableToolsDetailed();
-    const availableToolNames = toolsDetailed.map((t) => t.function?.name).filter(Boolean);
-    const systemPrompt = await getUnifiedSystemPrompt(availableSkills, {
-      availableToolNames,
-      toolsDetailed,
-      mcpClient: this.mcpClient,
-      sessionId: this.sessionId
-    });
-    if (this.history.length === 0) {
-      this.history.push({ role: "system", content: systemPrompt });
-    } else {
-      const sysIdx = this.history.findIndex(
-        (m) => m.role === "system" && typeof m.content === "string" && String(m.content).includes("<identity>")
-      );
-      if (sysIdx >= 0) {
-        this.history[sysIdx] = { ...this.history[sysIdx], content: systemPrompt };
-      } else {
-        this.history.unshift({ role: "system", content: systemPrompt });
-      }
-    }
-    this.persistSession();
-    const uiHistory = this.history.filter(
-      (m) => m.role !== "system"
-    );
-    if (uiHistory.length > 0) {
-      this.eventBus.emit("backend_message", {
-        type: "session_history",
-        messages: uiHistory
-      });
-    }
-  }
-  getAvailableTools() {
-    return this.mcpClient.getAvailableTools();
-  }
-  getUiToolsDetailed() {
-    return this.mcpClient.getAvailableToolsDetailed();
-  }
-  listAvailableSkills() {
-    return this.skillLoader.listAvailable();
-  }
-  getSkillsDirs() {
-    return this.skillLoader.getSkillsDirs();
-  }
-  getSkillConflictWarnings() {
-    return this.skillLoader.formatConflictWarnings();
-  }
-  getFeedbackScore() {
-    return this.feedbackSystem.getCumulativeScore();
-  }
-  /**
-   * Contrato de ciclo de turno (UI, hooks, Factor Router):
-   *
-   * - `backend_message` `{ type: 'turn_start', turnId, sessionId, userPromptPreview }` — início;
-   *   payload estável em {@link buildTurnStartBackendMessage}.
-   * - Stream: `stream_start` / `stream_reasoning_chunk` / `stream_chunk` / `stream_end`.
-   *   Se a resposta incluir tool `message`, `stream_end` leva `{ omitAssistantFlush: true }` para não
-   *   duplicar texto no histórico (o utilizador vê o `tool_result` com gutter). Ver `applyStreamEndFlush`.
-   * - Fim: `backend_message` `{ type: 'done', status }` (`completed` | `failed` | `interrupted` | …).
-   * - Factor Router: um POST `/turns/{turnId}/end` por turno via `notifyFactorTurnEndIfNeeded` (razões abaixo).
-   *
-   * Smoke manual sugerido: mensagem normal com `message`+`result`; Ctrl+C; erro LLM; loop sem resposta útil.
-   */
-  async processTurn(userInput, userContextInput, options) {
-    this.isInterrupted = false;
-    this.factorRouterTurnClosed = false;
-    const inputText = String(userInput.content || "").trim();
-    const turnId = uuidv48();
-    this.activeTurnContext = {
-      ...userContextInput,
-      turnId,
-      sessionId: userContextInput.sessionId || this.sessionId
-    };
-    process.env.BLUMA_USER_CONTEXT_JSON = JSON.stringify({
-      conversationId: this.activeTurnContext.conversationId ?? null,
-      userId: this.activeTurnContext.userId ?? null,
-      userName: this.activeTurnContext.userName ?? null,
-      userEmail: this.activeTurnContext.userEmail ?? null,
-      companyId: this.activeTurnContext.companyId ?? null,
-      companyName: this.activeTurnContext.companyName ?? null
-    });
-    const userContent = buildUserMessageContent(inputText, process.cwd());
-    this.history.push({
-      role: "user",
-      content: userContent,
-      ...options?.historyName ? { name: options.historyName } : {}
-    });
-    this.emptyAssistantReplySteps = 0;
-    this.invalidToolCallRetrySteps = 0;
-    this.eventBus.emit(
-      "backend_message",
-      buildTurnStartBackendMessage({
-        turnId: this.activeTurnContext.turnId,
-        sessionId: this.activeTurnContext.sessionId,
-        inputText,
-        appContext: this.activeTurnContext.appContext ?? null
-      })
-    );
-    if (inputText === "/init") {
-      this.eventBus.emit("dispatch", inputText);
-    }
-    await this._continueConversation();
+    case "command_status":
+      return "Checking command status";
+    case "send_command_input":
+      return "Sending command input";
+    case "kill_command":
+      return "Stopping command";
+    case "read_file_lines":
+      return `Reading ${shortFileName(String(args.filepath ?? args.file_path ?? "")) || "file"}`;
+    case "count_file_lines":
+      return `Counting lines in ${shortFileName(String(args.filepath ?? args.file_path ?? "")) || "file"}`;
+    case "ls_tool":
+      return "Listing files";
+    case "edit_tool": {
+      const edits = Array.isArray(args.edits) ? args.edits : [];
+      const count = edits.length || 1;
+      const filePath = typeof args.file_path === "string" ? args.file_path : typeof edits[0]?.file_path === "string" ? String(edits[0].file_path) : "";
+      const file = shortFileName(filePath) || "file";
+      return count === 1 ? `Editing ${file}` : `Editing ${count} files`;
+    }
+    case "file_write":
+      return `Writing ${shortFileName(String(args.filepath ?? args.file_path ?? "")) || "file"}`;
+    case "grep_search":
+      return formatSearchQuery("Searching code", String(args.query ?? ""));
+    case "find_by_name":
+      return formatSearchQuery("Finding files", String(args.pattern ?? ""));
+    case "view_file_outline":
+      return `Inspecting ${shortFileName(String(args.file_path ?? "")) || "file outline"}`;
+    case "web_fetch":
+      return formatSearchQuery("Fetching URL", String(args.url ?? ""));
+    case "search_web":
+      return formatSearchQuery("Searching the web", String(args.query ?? ""));
+    case "spawn_agent":
+      return "Spawning a worker";
+    case "wait_agent":
+      return "Waiting for worker";
+    case "list_agents":
+      return "Reviewing workers";
+    case "todo":
+      return "Updating task list";
+    case "task_boundary":
+      return "Switching task boundary";
+    case "task_create":
+    case "task_list":
+    case "task_get":
+    case "task_update":
+    case "task_stop":
+      return "Managing task";
+    case "load_skill":
+      return "Loading skill context";
+    case "coding_memory":
+      return "Updating working memory";
+    case "read_artifact":
+      return `Reading ${String(args.filename ?? "artifact")}`;
+    case "message":
+      return "Preparing assistant reply";
+    case "ask_user_question":
+      return "Waiting for your answer";
+    case "enter_plan_mode":
+      return "Entering plan mode";
+    case "exit_plan_mode":
+      return "Leaving plan mode";
+    case "list_mcp_resources":
+      return "Browsing MCP resources";
+    case "read_mcp_resource":
+      return "Reading MCP resource";
+    case "cron_create":
+      return "Scheduling reminder";
+    case "cron_list":
+      return "Listing reminders";
+    case "cron_delete":
+      return "Cancelling reminder";
+    case "notebook_edit":
+      return `Editing ${shortFileName(String(args.filepath ?? "")) || "notebook"}`;
+    case "lsp_query":
+      return "Querying language server";
+    default:
+      return toolName.replace(/_/g, " ").replace(/\b\w/g, (char) => char.toUpperCase()) || "Working";
   }
-  /** Política mostrada na UI: combina metadata base com auto-approve efectivo (incl. permission_ml). */
-  buildToolPolicyForUi(toolName, toolArgs) {
-    const base = decideToolExecution(toolName, void 0, this.sessionId);
-    const argsStr = typeof toolArgs === "string" ? toolArgs : JSON.stringify(toolArgs ?? {});
-    const synthetic = { function: { name: toolName, arguments: argsStr } };
-    const auto = effectiveToolAutoApprove(synthetic, this.sessionId, { logClassifier: false });
-    return {
-      ...base,
-      autoApprove: auto,
-      requiresConfirmation: !auto
-    };
+}
+function getToolActionLabel(toolName, args) {
+  return formatResponseLabel(toolName, parseArgsRecord(args));
+}
+function getToolActionStatus(toolName, args) {
+  return {
+    action: getToolActionLabel(toolName, args),
+    phase: "tool"
+  };
+}
+function getReasoningActionStatus() {
+  return {
+    action: "Reasoning",
+    phase: "thinking"
+  };
+}
+function getRespondingActionStatus() {
+  return {
+    action: "Writing",
+    phase: "responding"
+  };
+}
+
+// src/app/agent/bluma/core/bluma_tool_runner.ts
+var BluMaToolRunner = class {
+  constructor(deps) {
+    this.deps = deps;
   }
-  /**
-   * Executa uma tool aprovada: emit tool_call → invoke → tool_result → histórico.
-   * `backend_message` tool_call / tool_result incluem `tool_call_id` (id do tool call no modelo)
-   * para a UI correlacionar a linha de invocação (•) com o resultado compacto.
-   * @returns shouldContinue — false se `message` com message_type result terminou o turno.
-   */
-  async executeApprovedToolInvocation(toolCall, decisionData) {
+  async executeApprovedToolInvocation(toolCall, _decisionData) {
     const toolName = toolCall.function.name;
     let toolResultContent;
     let shouldContinueConversation = true;
@@ -26068,8 +25973,8 @@ var BluMaAgent = class _BluMaAgent {
       if (toolArgs === void 0 || toolArgs === null) {
         toolArgs = {};
       }
-    } catch (parseError) {
-      this.eventBus.emit("backend_message", {
+    } catch {
+      this.deps.eventBus.emit("backend_message", {
         type: "info",
         message: "O BluMa encontrou um erro ao processar. A tentar recuperar a sess\xE3o..."
       });
@@ -26078,12 +25983,12 @@ var BluMaAgent = class _BluMaAgent {
         error: "Tool arguments could not be parsed",
         recovery: "Session recovered automatically"
       });
-      this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-      this.history.push({
+      this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+      this.deps.history.push({
         role: "system",
         content: "The previous tool call had invalid JSON arguments. Please retry with properly formatted JSON arguments."
       });
-      this.persistSession();
+      this.deps.persistSession();
       return true;
     }
     const toolMetadata = getNativeToolMetadata(toolName);
@@ -26093,18 +25998,18 @@ var BluMaAgent = class _BluMaAgent {
         error: `Tool "${toolName}" not found in agent catalog.`,
         suggestion: "This tool does not exist. Please use a valid tool name from the available tools list."
       });
-      this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-      this.history.push({
+      this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+      this.deps.history.push({
         role: "system",
         content: `[SYSTEM] Tool "${toolName}" is not found in the agent's available tools. Please use only tools that are listed in your tool catalog.`
       });
-      this.persistSession();
+      this.deps.persistSession();
       return true;
     }
     if (toolName === "edit_tool") {
       const batch = toolArgs.edits;
       if (Array.isArray(batch) && batch.length > 0) {
-        for (let i = 0; i < batch.length; i++) {
+        for (let i = 0; i < batch.length; i += 1) {
           const entry = batch[i];
           if (!entry?.file_path || typeof entry.file_path !== "string") {
             toolResultContent = JSON.stringify({
@@ -26113,8 +26018,8 @@ var BluMaAgent = class _BluMaAgent {
               details: `edits[${i}].file_path is required`,
               received: toolArgs
             });
-            this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-            this.persistSession();
+            this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+            this.deps.persistSession();
             return true;
           }
           if (entry.old_string === void 0 || entry.new_string === void 0) {
@@ -26124,8 +26029,8 @@ var BluMaAgent = class _BluMaAgent {
               details: `edits[${i}]: old_string and new_string are required`,
               received: toolArgs
             });
-            this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-            this.persistSession();
+            this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+            this.deps.persistSession();
             return true;
           }
         }
@@ -26137,8 +26042,8 @@ var BluMaAgent = class _BluMaAgent {
             details: "file_path is required and must be a string (or provide non-empty edits[])",
             received: toolArgs
           });
-          this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-          this.persistSession();
+          this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+          this.deps.persistSession();
           return true;
         }
         if (toolArgs.old_string === void 0 || toolArgs.new_string === void 0) {
@@ -26148,8 +26053,8 @@ var BluMaAgent = class _BluMaAgent {
             details: "old_string and new_string are required (or provide edits[])",
             received: toolArgs
           });
-          this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-          this.persistSession();
+          this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+          this.deps.persistSession();
           return true;
         }
       }
@@ -26157,61 +26062,34 @@ var BluMaAgent = class _BluMaAgent {
     let previewContent;
     if (toolName === "edit_tool") {
       try {
-        previewContent = await this._generateEditPreview(toolArgs);
+        previewContent = await this.deps.generateEditPreview(toolArgs);
       } catch (previewError) {
         previewContent = `Failed to generate preview: ${previewError.message}`;
       }
     } else if (toolName === "file_write") {
       try {
-        previewContent = this._generateFileWritePreview(toolArgs);
+        previewContent = this.deps.generateFileWritePreview(toolArgs);
       } catch (previewError) {
         previewContent = `Failed to generate preview: ${previewError.message}`;
       }
     }
-    this.eventBus.emit("backend_message", {
+    this.deps.eventBus.emit("backend_message", {
       type: "tool_call",
       tool_call_id: String(toolCall.id),
       tool_name: toolName,
       arguments: toolArgs,
       preview: previewContent,
       suppress_edit_diff_preview: toolName === "edit_tool",
-      tool_policy: this.buildToolPolicyForUi(toolName, toolArgs)
+      tool_policy: this.deps.buildToolPolicyForUi(toolName, toolArgs)
     });
     setToolResultStatus(String(toolCall.id), "running");
     try {
-      if (this.isInterrupted) {
-        this.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled before tool execution." });
+      if (this.deps.isInterrupted()) {
+        this.deps.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled before tool execution." });
         return false;
       }
-      const actionMap = {
-        edit_tool: "Editing",
-        shell_command: "Executing",
-        command_status: "Waiting",
-        ls_tool: "Reading",
-        read_file_lines: "Reading",
-        message: "Responding",
-        load_skill: "Loading skill",
-        search_web: "Searching",
-        todo: "Planning",
-        ask_user_question: "Question",
-        enter_plan_mode: "Planning",
-        exit_plan_mode: "Planning",
-        task_create: "Planning",
-        task_list: "Planning",
-        task_get: "Planning",
-        task_update: "Planning",
-        task_stop: "Planning",
-        list_mcp_resources: "Reading",
-        read_mcp_resource: "Reading",
-        cron_create: "Scheduling",
-        cron_list: "Reading",
-        cron_delete: "Scheduling",
-        notebook_edit: "Editing",
-        lsp_query: "Reading"
-      };
-      const action = actionMap[toolName] || "Processing";
-      this.eventBus.emit("action_status", { action });
-      const result = await this.mcpClient.invoke(toolName, toolArgs);
+      this.deps.eventBus.emit("action_status", getToolActionStatus(toolName, toolArgs));
+      const result = await this.deps.mcpClient.invoke(toolName, toolArgs);
       const normalized = normalizeToolResult(result);
       setToolResultStatus(String(toolCall.id), normalized.status);
       toolResultContent = toolResultToString(normalized);
@@ -26225,12 +26103,12 @@ var BluMaAgent = class _BluMaAgent {
         null,
         2
       );
-      this.eventBus.emit("backend_message", {
+      this.deps.eventBus.emit("backend_message", {
         type: "error",
         message: `Tool "${toolName}" failed: ${error.message}`
       });
     }
-    this.eventBus.emit("backend_message", {
+    this.deps.eventBus.emit("backend_message", {
       type: "tool_result",
       tool_call_id: String(toolCall.id),
       tool_name: toolName,
@@ -26242,21 +26120,20 @@ var BluMaAgent = class _BluMaAgent {
       try {
         const resultObj = typeof toolResultContent === "string" ? JSON.parse(toolResultContent) : toolResultContent;
         if (resultObj.message_type === "result") {
-          await this.notifyFactorTurnEndIfNeeded("message_result");
+          await this.deps.notifyFactorTurnEndIfNeeded("message_result");
           shouldContinueConversation = false;
-          this.emitTurnCompleted();
+          this.deps.emitTurnCompleted();
         }
       } catch {
       }
     }
-    this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-    this.persistSession();
+    this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+    this.deps.persistSession();
     return shouldContinueConversation;
   }
-  /** Várias leituras seguras em paralelo (grep, ls, read_file, …). */
   async executeParallelReadBatch(batch, _decisionData) {
-    if (this.isInterrupted) {
-      this.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled before tool execution." });
+    if (this.deps.isInterrupted()) {
+      this.deps.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled before tool execution." });
       return false;
     }
     const parsed = [];
@@ -26279,59 +26156,46 @@ var BluMaAgent = class _BluMaAgent {
             error: `Tool "${toolName}" not found in agent catalog.`,
             suggestion: "This tool does not exist. Please use a valid tool name from the available tools list."
           });
-          this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-          this.history.push({
+          this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+          this.deps.history.push({
             role: "system",
             content: `[SYSTEM] Tool "${toolName}" is not found in the agent's available tools. Please use only tools that are listed in your tool catalog.`
           });
-          this.persistSession();
+          this.deps.persistSession();
           return true;
         }
         parsed.push({ toolCall, toolName, toolArgs });
-      } catch (parseError) {
+      } catch {
         const toolResultContent = JSON.stringify({
           error: "Tool arguments could not be parsed",
           recovery: "Session recovered automatically"
         });
-        this.eventBus.emit("backend_message", {
+        this.deps.eventBus.emit("backend_message", {
           type: "info",
           message: "O BluMa encontrou um erro ao processar. A tentar recuperar a sess\xE3o..."
         });
-        this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-        this.persistSession();
+        this.deps.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
+        this.deps.persistSession();
         return true;
       }
     }
-    const actionMap = {
-      ls_tool: "Reading",
-      read_file_lines: "Reading",
-      count_file_lines: "Reading",
-      find_by_name: "Reading",
-      grep_search: "Reading",
-      view_file_outline: "Reading",
-      read_artifact: "Reading",
-      list_agents: "Reading",
-      list_mcp_resources: "Reading",
-      read_mcp_resource: "Reading"
-    };
     const settled = await Promise.allSettled(
       parsed.map(async (p) => {
-        this.eventBus.emit("backend_message", {
+        this.deps.eventBus.emit("backend_message", {
           type: "tool_call",
           tool_call_id: String(p.toolCall.id),
           tool_name: p.toolName,
           arguments: p.toolArgs,
-          tool_policy: this.buildToolPolicyForUi(p.toolName, p.toolArgs)
+          tool_policy: this.deps.buildToolPolicyForUi(p.toolName, p.toolArgs)
         });
         setToolResultStatus(String(p.toolCall.id), "pending");
         setToolResultStatus(String(p.toolCall.id), "running");
-        const action = actionMap[p.toolName] || "Processing";
-        this.eventBus.emit("action_status", { action });
-        return this.mcpClient.invoke(p.toolName, p.toolArgs);
+        this.deps.eventBus.emit("action_status", getToolActionStatus(p.toolName, p.toolArgs));
+        return this.deps.mcpClient.invoke(p.toolName, p.toolArgs);
       })
     );
     let shouldContinue = true;
-    for (let k = 0; k < parsed.length; k++) {
+    for (let k = 0; k < parsed.length; k += 1) {
       const p = parsed[k];
       const outcome = settled[k];
       let toolResultContent;
@@ -26343,7 +26207,7 @@ var BluMaAgent = class _BluMaAgent {
           2
         );
         setToolResultStatus(String(p.toolCall.id), "error");
-        this.eventBus.emit("backend_message", {
+        this.deps.eventBus.emit("backend_message", {
           type: "error",
           message: `Tool "${p.toolName}" failed: ${errMsg}`
         });
@@ -26352,7 +26216,7 @@ var BluMaAgent = class _BluMaAgent {
         setToolResultStatus(String(p.toolCall.id), normalized.status);
         toolResultContent = toolResultToString(normalized);
       }
-      this.eventBus.emit("backend_message", {
+      this.deps.eventBus.emit("backend_message", {
         type: "tool_result",
         tool_call_id: String(p.toolCall.id),
         tool_name: p.toolName,
@@ -26363,35 +26227,263 @@ var BluMaAgent = class _BluMaAgent {
         try {
           const resultObj = typeof toolResultContent === "string" ? JSON.parse(toolResultContent) : toolResultContent;
           if (resultObj.message_type === "result") {
-            await this.notifyFactorTurnEndIfNeeded("message_result");
+            await this.deps.notifyFactorTurnEndIfNeeded("message_result");
             shouldContinue = false;
-            this.emitTurnCompleted();
+            this.deps.emitTurnCompleted();
           }
         } catch {
         }
       }
-      this.history.push({ role: "tool", tool_call_id: p.toolCall.id, content: toolResultContent });
+      this.deps.history.push({ role: "tool", tool_call_id: p.toolCall.id, content: toolResultContent });
     }
-    this.persistSession();
+    this.deps.persistSession();
     return shouldContinue;
   }
-  async handleToolResponse(decisionData) {
-    const calls = decisionData.tool_calls;
-    if (!calls?.length) return;
-    const shouldContinueConversation = decisionData.continueConversation !== false;
-    if (!this.sessionFile) {
-      const [sessionFile, history, mem] = await loadOrcreateSession(this.sessionId);
-      this.sessionFile = sessionFile;
-      if (this.history.length === 0 && history.length > 0) {
-        this.history = history;
-      }
-      this.compressor.restoreSnapshot(mem);
+};
+
+// src/app/agent/core/llm/llm_errors.ts
+function isContextWindowValidationError(error) {
+  const rawMessage = error instanceof Error ? error.message : typeof error === "string" ? error : "";
+  const lower = rawMessage.toLowerCase();
+  return lower.includes("vllmvalidationerror") || lower.includes("maximum context length") || lower.includes("input prompt contains at least") || lower.includes("requested 0 output tokens") || lower.includes("context length");
+}
+function formatLlmUiError(error) {
+  const rawMessage = error instanceof Error ? error.message : typeof error === "string" ? error : "Unknown error during LLM request.";
+  const lower = rawMessage.toLowerCase();
+  let message2 = "Ocorreu um erro inesperado ao contactar o modelo.";
+  if (lower.includes("timeout") || lower.includes("etimedout") || lower.includes("upstream_timeout")) {
+    message2 = "O BluMa demorou demasiado a responder.";
+  } else if (lower.includes("connection") || lower.includes("econnrefused") || lower.includes("ehostunreach") || lower.includes("enotfound")) {
+    message2 = "N\xE3o foi poss\xEDvel conectar ao servi\xE7o do modelo.";
+  } else if (lower.includes("401") || lower.includes("403") || lower.includes("unauthorized") || lower.includes("forbidden")) {
+    message2 = "Falha de autentica\xE7\xE3o/autoriza\xE7\xE3o ao contactar o modelo.";
+  } else if (lower.includes("api")) {
+    message2 = "Erro de comunica\xE7\xE3o com a API do modelo.";
+  }
+  return {
+    message: message2,
+    rawMessage
+  };
+}
+
+// src/app/agent/core/llm/tool_call_normalizer.ts
+import { randomUUID } from "crypto";
+var ToolCallNormalizer = class {
+  /**
+   * Com tool_calls e sem texto visível: content deve ser null (API OpenAI-compatible), nunca "" nem undefined.
+   */
+  static assistantContentWithToolCalls(content) {
+    if (content === void 0 || content === null) return null;
+    if (typeof content === "string") return content.trim() === "" ? null : content;
+    return null;
+  }
+  /**
+   * Normaliza a mensagem do assistant, convertendo diferentes formatos de tool calls
+   */
+  static normalizeAssistantMessage(message2) {
+    if (message2.tool_calls && this.isOpenAIFormat(message2.tool_calls)) {
+      return {
+        ...message2,
+        content: this.assistantContentWithToolCalls(message2.content)
+      };
     }
-    if (decisionData.type === "user_decision_decline") {
-      const declineMsg = "The system rejected this action. Verify that the command you are executing contributes to the tasks intent and try again.";
-      for (const toolCall of calls) {
-        const toolName = toolCall.function?.name || "tool";
-        let args = {};
+    const toolCalls = this.extractToolCalls(message2);
+    if (toolCalls.length > 0) {
+      return {
+        role: message2.role || "assistant",
+        content: this.assistantContentWithToolCalls(message2.content),
+        tool_calls: toolCalls
+      };
+    }
+    return message2;
+  }
+  /**
+   * Verifica se já está no formato OpenAI
+   */
+  static isOpenAIFormat(toolCalls) {
+    if (!Array.isArray(toolCalls) || toolCalls.length === 0) return false;
+    const firstCall = toolCalls[0];
+    return typeof firstCall.id === "string" && firstCall.type === "function" && typeof firstCall.function?.name === "string" && typeof firstCall.function?.arguments === "string";
+  }
+  /**
+   * Extrai tool calls de diversos formatos possíveis
+   */
+  static extractToolCalls(message2) {
+    const results = [];
+    if (message2.tool_calls && Array.isArray(message2.tool_calls)) {
+      for (const call of message2.tool_calls) {
+        const normalized = this.normalizeToolCall(call);
+        if (normalized) results.push(normalized);
+      }
+    }
+    if (typeof message2.content === "string" && message2.content.trim()) {
+      const extracted = this.extractFromContent(message2.content);
+      results.push(...extracted);
+    }
+    if (message2.function_call) {
+      const normalized = this.normalizeToolCall(message2.function_call);
+      if (normalized) results.push(normalized);
+    }
+    return results;
+  }
+  /**
+   * Normaliza um único tool call para o formato OpenAI
+   */
+  static normalizeToolCall(call) {
+    try {
+      if (call.id && call.function?.name) {
+        return {
+          id: call.id,
+          type: "function",
+          function: {
+            name: call.function.name,
+            arguments: typeof call.function.arguments === "string" ? call.function.arguments : JSON.stringify(call.function.arguments)
+          }
+        };
+      }
+      if (call.name) {
+        return {
+          id: call.id || randomUUID(),
+          type: "function",
+          function: {
+            name: call.name,
+            arguments: typeof call.arguments === "string" ? call.arguments : JSON.stringify(call.arguments || {})
+          }
+        };
+      }
+      if (call.function && typeof call.function === "object") {
+        return {
+          id: call.id || randomUUID(),
+          type: "function",
+          function: {
+            name: call.function.name,
+            arguments: typeof call.function.arguments === "string" ? call.function.arguments : JSON.stringify(call.function.arguments || {})
+          }
+        };
+      }
+      return null;
+    } catch (error) {
+      console.error("Error normalizing tool call:", error, call);
+      return null;
+    }
+  }
+  /**
+   * Extrai tool calls do content (pode estar em markdown, JSON, etc)
+   */
+  static extractFromContent(content) {
+    const results = [];
+    const cleanContent2 = content.replace(/```(?:json)?\s*([\s\S]*?)```/g, "$1");
+    const jsonMatches = this.extractJsonObjects(cleanContent2);
+    for (const jsonStr of jsonMatches) {
+      try {
+        const parsed = JSON.parse(jsonStr);
+        if (Array.isArray(parsed)) {
+          for (const call of parsed) {
+            const normalized = this.normalizeToolCall(call);
+            if (normalized) results.push(normalized);
+          }
+        } else if (parsed.name || parsed.function) {
+          const normalized = this.normalizeToolCall(parsed);
+          if (normalized) results.push(normalized);
+        } else if (parsed.tool_calls && Array.isArray(parsed.tool_calls)) {
+          for (const call of parsed.tool_calls) {
+            const normalized = this.normalizeToolCall(call);
+            if (normalized) results.push(normalized);
+          }
+        }
+      } catch (e) {
+      }
+    }
+    return results;
+  }
+  /**
+   * Extrai objetos JSON de uma string (suporta múltiplos objetos)
+   */
+  static extractJsonObjects(text) {
+    const results = [];
+    let depth = 0;
+    let start = -1;
+    for (let i = 0; i < text.length; i++) {
+      if (text[i] === "{") {
+        if (depth === 0) start = i;
+        depth++;
+      } else if (text[i] === "}") {
+        depth--;
+        if (depth === 0 && start !== -1) {
+          results.push(text.substring(start, i + 1));
+          start = -1;
+        }
+      }
+    }
+    return results;
+  }
+  /**
+   * Valida se um tool call normalizado é válido
+   * Validação dupla:
+   * 1. JSON dos argumentos é válido
+   * 2. A ferramenta existe no catálogo de ferramentas nativas
+   */
+  static isValidToolCall(call) {
+    if (!(call.id && call.type === "function" && call.function?.name && typeof call.function.arguments === "string")) {
+      return false;
+    }
+    try {
+      JSON.parse(call.function.arguments);
+    } catch {
+      return false;
+    }
+    const toolMetadata = getNativeToolMetadata(call.function.name);
+    if (!toolMetadata) {
+      return false;
+    }
+    return true;
+  }
+};
+
+// src/app/agent/runtime/tool_orchestration.ts
+var PARALLEL_SAFE_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "ls_tool",
+  "read_file_lines",
+  "count_file_lines",
+  "find_by_name",
+  "grep_search",
+  "view_file_outline",
+  "read_artifact",
+  "list_agents",
+  "list_mcp_resources",
+  "read_mcp_resource",
+  "todo"
+]);
+function toolEligibleForParallelRead(toolName, sessionId) {
+  const name = String(toolName || "").trim();
+  if (!name || !PARALLEL_SAFE_TOOL_NAMES.has(name)) return false;
+  if (!decideToolExecution(name, void 0, sessionId).autoApprove) return false;
+  const meta = getNativeToolMetadata(name);
+  return meta?.riskLevel === "safe";
+}
+
+// src/app/agent/bluma/core/bluma_turn_coordinator.ts
+init_logger();
+var BluMaTurnCoordinator = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  emptyAssistantReplySteps = 0;
+  invalidToolCallRetrySteps = 0;
+  turnLog = logger.child("turn_coordinator");
+  resetTurnState() {
+    this.emptyAssistantReplySteps = 0;
+    this.invalidToolCallRetrySteps = 0;
+  }
+  async handleToolResponse(decisionData) {
+    const calls = decisionData.tool_calls;
+    if (!calls?.length) return;
+    const shouldContinueConversation = decisionData.continueConversation !== false;
+    if (decisionData.type === "user_decision_decline") {
+      const declineMsg = "The system rejected this action. Verify that the command you are executing contributes to the tasks intent and try again.";
+      for (const toolCall of calls) {
+        const toolName = toolCall.function?.name || "tool";
+        let args = {};
         try {
           if (typeof toolCall.function?.arguments === "string") {
             args = JSON.parse(toolCall.function.arguments);
@@ -26401,276 +26493,254 @@ var BluMaAgent = class _BluMaAgent {
         } catch {
           args = {};
         }
-        if (toolCall.id) {
-          setToolResultStatus(String(toolCall.id), "error");
-        }
-        this.eventBus.emit("backend_message", {
+        this.deps.eventBus.emit("backend_message", {
           type: "tool_result",
           tool_call_id: String(toolCall.id),
           tool_name: toolName,
           arguments: args,
           result: JSON.stringify({ status: "error", error: declineMsg }, null, 2)
         });
-        this.history.push({
+        this.deps.history.push({
           role: "tool",
           tool_call_id: toolCall.id,
           content: JSON.stringify({ status: "error", error: declineMsg }, null, 2)
         });
       }
-      this.persistSession();
-      if (shouldContinueConversation && !this.isInterrupted) {
-        await this._continueConversation();
+      this.deps.persistSession();
+      if (shouldContinueConversation && !this.deps.isInterrupted()) {
+        await this.continueConversation();
       }
       return;
     }
     if (decisionData.type !== "user_decision_execute") {
       return;
     }
-    setTaskToolSessionContext(this.sessionId);
     let shouldContinue = true;
     let i = 0;
-    while (i < calls.length && shouldContinue && !this.isInterrupted) {
+    while (i < calls.length && shouldContinue && !this.deps.isInterrupted()) {
       const name = calls[i].function.name;
-      if (!toolEligibleForParallelRead(name, this.sessionId)) {
-        shouldContinue = await this.executeApprovedToolInvocation(calls[i], decisionData);
+      if (!toolEligibleForParallelRead(name, this.deps.sessionId)) {
+        shouldContinue = await this.deps.toolRunner.executeApprovedToolInvocation(calls[i], decisionData);
         i += 1;
         continue;
       }
       let j = i;
-      while (j < calls.length && toolEligibleForParallelRead(calls[j].function.name, this.sessionId)) {
+      while (j < calls.length && toolEligibleForParallelRead(calls[j].function.name, this.deps.sessionId)) {
         j += 1;
       }
       const slice = calls.slice(i, j);
       if (slice.length === 1) {
-        shouldContinue = await this.executeApprovedToolInvocation(slice[0], decisionData);
+        shouldContinue = await this.deps.toolRunner.executeApprovedToolInvocation(slice[0], decisionData);
       } else {
-        shouldContinue = await this.executeParallelReadBatch(slice, decisionData);
+        shouldContinue = await this.deps.toolRunner.executeParallelReadBatch(slice, decisionData);
       }
       i = j;
     }
-    if (shouldContinueConversation && shouldContinue && !this.isInterrupted) {
-      await this._continueConversation();
+    if (shouldContinueConversation && shouldContinue && !this.deps.isInterrupted()) {
+      await this.continueConversation();
     }
   }
-  async _generateEditPreview(toolArgs) {
+  async continueConversation() {
     try {
-      if (Array.isArray(toolArgs.edits) && toolArgs.edits.length > 0) {
-        return previewEditBatch(toolArgs.edits);
+      if (this.deps.isInterrupted()) {
+        this.deps.eventBus.emit("backend_message", { type: "info", message: "Task Canceled." });
+        return;
       }
-      if (!toolArgs.file_path) {
-        return "Error: file_path is required";
+      const mailboxUpdate = await this.pollWorkerMailbox();
+      if (mailboxUpdate && mailboxUpdate.followUp) {
+        this.deps.history.push({
+          role: "user",
+          content: mailboxUpdate.followUp.message
+        });
+        this.deps.persistSession();
+        this.deps.eventBus.emit("backend_message", {
+          type: "info",
+          message: `Received follow-up from coordinator (priority: ${mailboxUpdate.followUp.priority})`
+        });
       }
-      const editData = await calculateEdit(
-        toolArgs.file_path,
-        toolArgs.old_string || "",
-        toolArgs.new_string || "",
-        toolArgs.expected_replacements || 1
-      );
-      if (editData.error) {
-        return `Failed to generate diff:
-
-${editData.error.display}`;
+      const sanitized = sanitizeConversationForProvider(this.deps.history);
+      if (sanitized.issues.length > 0) {
+        this.deps.eventBus.emit("backend_message", {
+          type: "info",
+          message: `Sanitizing ${sanitized.issues.length} messages from history`
+        });
+        this.deps.history.splice(0, this.deps.history.length, ...sanitized.messages);
+        this.deps.persistSession();
+      }
+      this.turnLog.debug("Conversation sanitized", {
+        history_length: this.deps.history.length,
+        sanitized_length: sanitized.messages.length,
+        issue_count: sanitized.issues.length,
+        issues: sanitized.issues.slice(0, 5),
+        history_preview: summarizeHistoryForLog(this.deps.history, 6)
+      });
+      const modelName = this.deps.llm.getModelName ? this.deps.llm.getModelName() : "auto";
+      const baseTokenBudget = getContextInputBudgetForModel(modelName);
+      const retryTokenBudget = Math.max(48e3, Math.floor(baseTokenBudget * 0.75));
+      const tokenBudgets = [baseTokenBudget, retryTokenBudget];
+      const llmService = this.deps.llm;
+      for (let attempt = 0; attempt < tokenBudgets.length; attempt += 1) {
+        const tokenBudget = tokenBudgets[attempt];
+        try {
+          const { messages: contextWindow, prunedHistory } = await this.deps.compressor.buildContextWindow(
+            this.deps.history,
+            this.deps.llm,
+            this.deps.getLlmUserContext(),
+            {
+              tokenBudget,
+              toolDefinitions: this.deps.mcpClient.getAvailableTools()
+            }
+          );
+          this.turnLog.debug("Context window prepared", {
+            history_length: this.deps.history.length,
+            context_window_length: contextWindow.length,
+            pruned_history_length: prunedHistory?.length ?? null,
+            token_budget: tokenBudget,
+            context_preview: summarizeHistoryForLog(contextWindow, 8)
+          });
+          if (prunedHistory) {
+            this.deps.history.splice(0, this.deps.history.length, ...prunedHistory);
+          }
+          this.deps.persistSession();
+          if (typeof llmService.chatCompletionStream === "function") {
+            await this.handleStreamingResponse(contextWindow);
+          } else {
+            await this.handleNonStreamingResponse(contextWindow);
+          }
+          return;
+        } catch (error) {
+          const retryable = isContextWindowValidationError(error);
+          const hasRetryLeft = attempt < tokenBudgets.length - 1;
+          if (retryable && hasRetryLeft) {
+            this.deps.eventBus.emit("backend_message", {
+              type: "info",
+              message: "The model rejected the prompt size. Retrying with a smaller context window."
+            });
+            this.deps.eventBus.emit("backend_message", {
+              type: "log",
+              message: "Context validation retry",
+              payload: `attempt=${attempt + 1} budget=${tokenBudget} nextBudget=${tokenBudgets[attempt + 1]}`
+            });
+            continue;
+          }
+          throw error;
+        }
       }
-      const filename = path40.basename(toolArgs.file_path);
-      return createDiff(filename, editData.currentContent || "", editData.newContent);
-    } catch (e) {
-      return `An unexpected error occurred while generating the edit preview: ${e.message}`;
+    } catch (error) {
+      this.deps.persistSessionSync();
+      const uiError = formatLlmUiError(error);
+      this.deps.eventBus.emit("backend_message", {
+        type: "error",
+        message: "Communication error with the BluMa"
+      });
+      this.deps.eventBus.emit("backend_message", {
+        type: "log",
+        message: "LLM request failed",
+        payload: uiError.rawMessage
+      });
+      await this.deps.notifyFactorTurnEndIfNeeded("llm_error");
+      this.deps.eventBus.emit("backend_message", {
+        type: "done",
+        status: "error",
+        canRecover: true,
+        message: "Communication error with the BluMa"
+      });
+    } finally {
+      this.deps.persistSession();
     }
   }
-  _generateFileWritePreview(toolArgs) {
-    try {
-      const content = typeof toolArgs?.content === "string" ? toolArgs.content : String(toolArgs?.content ?? "");
-      if (!content) {
-        return "(No content)";
-      }
-      const normalized = content.replace(/\r\n/g, "\n");
-      const lines = normalized.split("\n");
-      const maxPreviewLines = 20;
-      const visibleLines = lines.slice(0, maxPreviewLines);
-      const hiddenLines = lines.length - visibleLines.length;
-      return hiddenLines > 0 ? `${visibleLines.join("\n")}
-\u2026 +${hiddenLines} more lines` : normalized;
-    } catch (e) {
-      return `An unexpected error occurred while generating the file write preview: ${e.message}`;
-    }
-  }
-  getLlmUserContext() {
-    if (!this.activeTurnContext) {
-      throw new Error("BluMaAgent: activeTurnContext ausente (processTurn n\xE3o iniciou o turno).");
-    }
-    return this.activeTurnContext;
-  }
-  /**
-   * Um único POST ao Factor Router por turno (`notifyFactorRouterTurnEnd`).
-   * `reason` típicos: `message_result`, `user_interrupt`, `empty_reply_exhausted`, `llm_error`.
-   */
-  async notifyFactorTurnEndIfNeeded(reason) {
-    if (this.factorRouterTurnClosed || !this.activeTurnContext) return;
-    this.factorRouterTurnClosed = true;
-    const ctx = this.activeTurnContext;
-    await notifyFactorRouterTurnEnd({
-      turnId: ctx.turnId,
-      userContext: ctx,
-      reason
-    });
-  }
-  /** Fecho explícito de turno (útil para workers antes de process.exit). */
-  async closeActiveTurn(reason = "worker_exit") {
-    await this.notifyFactorTurnEndIfNeeded(reason);
-  }
-  async _continueConversation() {
-    try {
-      if (this.isInterrupted) {
-        this.eventBus.emit("backend_message", { type: "info", message: "Task Canceled." });
-        return;
-      }
-      const mailboxUpdate = await this._pollWorkerMailbox();
-      if (mailboxUpdate && mailboxUpdate.followUp) {
-        this.history.push({
-          role: "user",
-          content: mailboxUpdate.followUp.message
-        });
-        this.persistSession();
-        this.eventBus.emit("backend_message", {
-          type: "info",
-          message: `Received follow-up from coordinator (priority: ${mailboxUpdate.followUp.priority})`
-        });
-      }
-      const sanitized = sanitizeConversationForProvider(this.history);
-      if (sanitized.issues.length > 0) {
-        this.eventBus.emit("backend_message", {
-          type: "info",
-          message: `Sanitizing ${sanitized.issues.length} messages from history`
-        });
-        this.history = sanitized.messages;
-        this.persistSession();
-      }
-      const modelName = this.llm.getModelName ? this.llm.getModelName() : "auto";
-      const tokenBudget = getContextInputBudgetForModel(modelName);
-      const { messages: contextWindow, prunedHistory } = await this.compressor.buildContextWindow(
-        this.history,
-        this.llm,
-        this.getLlmUserContext(),
-        {
-          tokenBudget,
-          toolDefinitions: this.mcpClient.getAvailableTools()
-        }
-      );
-      if (prunedHistory) {
-        this.history = prunedHistory;
-      }
-      this.persistSession();
-      const llmService = this.llm;
-      if (typeof llmService.chatCompletionStream === "function") {
-        await this._handleStreamingResponse(contextWindow);
-      } else {
-        await this._handleNonStreamingResponse(contextWindow);
-      }
-    } catch (error) {
-      this.persistSessionSync();
-      this.history.push({
-        role: "assistant",
-        content: "[<=================== The conversation will continue from here ==================>]"
-      });
-      this.persistSessionSync();
-      const uiError = formatLlmUiError(error);
-      this.eventBus.emit("backend_message", {
-        type: "error",
-        message: "Communication error with the BluMa"
-        //details: 'The connection was temporarily interrupted. Your history has been safely saved.',
-        //hint: 'You can continue from where you left off. No information was lost.',
-      });
-      this.eventBus.emit("backend_message", {
-        type: "log",
-        message: "LLM request failed",
-        payload: uiError.rawMessage
-      });
-      await this.notifyFactorTurnEndIfNeeded("llm_error");
-      this.eventBus.emit("backend_message", {
-        type: "done",
-        status: "error",
-        canRecover: true,
-        message: "Communication error with the BluMa"
-      });
-    } finally {
-      this.persistSession();
-    }
-  }
-  /**
-   * O modelo devolveu mensagem sem texto útil nem tool_calls (só raciocínio interno).
-   * Nudge único + teto de tentativas para não ficar preso em "Thinking..." como no olá.
-   */
   async continueAfterEmptyAssistantResponse() {
     this.emptyAssistantReplySteps += 1;
     if (this.emptyAssistantReplySteps === 1) {
-      this.history.push({
+      this.deps.history.push({
         role: "system",
         content: `You did not call any tool and produced no user-visible reply. Respond using the message tool with message_type "result". Keep it concise and in the user's language.`
       });
     } else if (this.emptyAssistantReplySteps === 2) {
-      this.history.push({
+      this.deps.history.push({
         role: "system",
         content: 'Retry: call message tool with message_type "result" or use a tool.'
       });
     } else if (this.emptyAssistantReplySteps >= 6) {
-      this.eventBus.emit("backend_message", {
+      this.deps.eventBus.emit("backend_message", {
         type: "info",
         message: "The BluMa is having difficulty processing yor task."
       });
-      await this.notifyFactorTurnEndIfNeeded("empty_reply_exhausted");
-      this.eventBus.emit("backend_message", { type: "done", status: "failed" });
+      await this.deps.notifyFactorTurnEndIfNeeded("empty_reply_exhausted");
+      this.deps.eventBus.emit("backend_message", { type: "done", status: "failed" });
       this.emptyAssistantReplySteps = 0;
       return;
     }
-    await this._continueConversation();
+    await this.continueConversation();
   }
-  /** Paridade com streaming: texto + tools visíveis na área `StreamingText` antes dos `tool_call` definitivos. */
-  emitSyntheticStreamForNonStreamingMessage(message2) {
-    const content = typeof message2.content === "string" ? message2.content : "";
-    const hasTools = Array.isArray(message2.tool_calls) && message2.tool_calls.length > 0;
-    const hasContent = content.trim().length > 0;
-    if (!hasContent && !hasTools) {
-      return;
+  async handleInvalidToolCallRetry(message2) {
+    this.invalidToolCallRetrySteps += 1;
+    if (this.deps.history[this.deps.history.length - 1] === message2) {
+      this.deps.history.pop();
     }
-    this.eventBus.emit("stream_start", {});
-    if (hasContent) {
-      this.eventBus.emit("stream_chunk", { delta: content });
+    if (this.invalidToolCallRetrySteps >= 3) {
+      this.deps.eventBus.emit("backend_message", {
+        type: "error",
+        message: "The model kept returning invalid tool calls. Closing the turn to avoid a retry loop."
+      });
+      this.deps.eventBus.emit("backend_message", {
+        type: "log",
+        message: "Invalid tool call retry limit reached",
+        payload: String(this.invalidToolCallRetrySteps)
+      });
+      await this.deps.notifyFactorTurnEndIfNeeded("invalid_tool_calls_exhausted");
+      this.deps.eventBus.emit("backend_message", { type: "done", status: "failed" });
+      this.invalidToolCallRetrySteps = 0;
+      return;
     }
-    const omitAssistantFlush = hasTools && message2.tool_calls.some((tc) => String(tc?.function?.name ?? "").includes("message"));
-    this.eventBus.emit("stream_end", { omitAssistantFlush });
+    this.deps.history.push({
+      role: "system",
+      content: "Previous assistant tool_calls were invalid. Retry with valid JSON arguments only, or answer without tools."
+    });
+    this.deps.persistSession();
+    await this.continueConversation();
   }
-  async _handleStreamingResponse(contextWindow) {
-    const llmService = this.llm;
+  async handleStreamingResponse(contextWindow) {
+    const llmService = this.deps.llm;
     let accumulatedContent = "";
     let toolCalls;
     let hasEmittedStart = false;
+    let currentStreamPhase = "idle";
     const stream = llmService.chatCompletionStream({
       messages: contextWindow,
       temperature: 0,
-      tools: this.mcpClient.getAvailableTools(),
+      tools: this.deps.mcpClient.getAvailableTools(),
       parallel_tool_calls: true,
-      userContext: this.getLlmUserContext()
+      userContext: this.deps.getLlmUserContext()
     });
     for await (const chunk of stream) {
-      if (this.isInterrupted) {
-        this.eventBus.emit("stream_end", {});
-        this.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled by user." });
+      if (this.deps.isInterrupted()) {
+        this.deps.eventBus.emit("stream_end", {});
+        this.deps.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled by user." });
         return;
       }
       if (chunk.reasoning) {
         if (!hasEmittedStart) {
-          this.eventBus.emit("stream_start", {});
+          this.deps.eventBus.emit("stream_start", {});
           hasEmittedStart = true;
         }
-        this.eventBus.emit("stream_reasoning_chunk", { delta: chunk.reasoning });
+        if (currentStreamPhase !== "reasoning") {
+          this.deps.eventBus.emit("action_status", getReasoningActionStatus());
+          currentStreamPhase = "reasoning";
+        }
+        this.deps.eventBus.emit("stream_reasoning_chunk", { delta: chunk.reasoning });
       }
       if (chunk.delta) {
         if (!hasEmittedStart) {
-          this.eventBus.emit("stream_start", {});
+          this.deps.eventBus.emit("stream_start", {});
           hasEmittedStart = true;
         }
+        if (currentStreamPhase !== "responding") {
+          this.deps.eventBus.emit("action_status", getRespondingActionStatus());
+          currentStreamPhase = "responding";
+        }
         accumulatedContent += chunk.delta;
-        this.eventBus.emit("stream_chunk", { delta: chunk.delta });
+        this.deps.eventBus.emit("stream_chunk", { delta: chunk.delta });
       }
       if (chunk.tool_calls && chunk.tool_calls.length > 0) {
         toolCalls = chunk.tool_calls;
@@ -26678,14 +26748,14 @@ ${editData.error.display}`;
           const toolName = tc?.function?.name ?? "";
           const argsRaw = tc?.function?.arguments ?? "{}";
           if (toolName) {
-            this.eventBus.emit("tool_stream_start", { toolName, argsRaw });
+            this.deps.eventBus.emit("tool_stream_start", { toolName, argsRaw });
           }
         }
       }
     }
     const omitAssistantFlush = Array.isArray(toolCalls) && toolCalls.some((tc) => String(tc?.function?.name ?? "").includes("message"));
     if (hasEmittedStart) {
-      this.eventBus.emit("stream_end", { omitAssistantFlush });
+      this.deps.eventBus.emit("stream_end", { omitAssistantFlush });
     }
     const trimmedText = accumulatedContent.trim();
     const hasToolCalls = Boolean(toolCalls && toolCalls.length > 0);
@@ -26698,7 +26768,7 @@ ${editData.error.display}`;
       message2.tool_calls = toolCalls;
     }
     const normalizedMessage = ToolCallNormalizer.normalizeAssistantMessage(message2);
-    this.history.push(normalizedMessage);
+    this.deps.history.push(normalizedMessage);
     if (normalizedMessage.tool_calls && normalizedMessage.tool_calls.length > 0) {
       this.emptyAssistantReplySteps = 0;
       this.invalidToolCallRetrySteps = 0;
@@ -26710,10 +26780,10 @@ ${editData.error.display}`;
         return;
       }
       const autoApprovedToolCalls = validToolCalls.filter(
-        (tc) => effectiveToolAutoApprove(tc, this.sessionId)
+        (tc) => effectiveToolAutoApprove(tc, this.deps.sessionId)
       );
       const confirmationToolCalls = validToolCalls.filter(
-        (tc) => !effectiveToolAutoApprove(tc, this.sessionId)
+        (tc) => !effectiveToolAutoApprove(tc, this.deps.sessionId)
       );
       if (autoApprovedToolCalls.length > 0) {
         await this.handleToolResponse({
@@ -26724,17 +26794,17 @@ ${editData.error.display}`;
       }
       if (confirmationToolCalls.length > 0) {
         const toolToCall = confirmationToolCalls[0];
-        const decision = decideToolExecution(toolToCall.function.name, void 0, this.sessionId);
+        const decision = decideToolExecution(toolToCall.function.name, void 0, this.deps.sessionId);
         const toolName = toolToCall.function.name;
         let previewContent;
         if (toolName === "edit_tool") {
           const args = JSON.parse(toolToCall.function.arguments);
-          previewContent = await this._generateEditPreview(args);
+          previewContent = await this.deps.generateEditPreview(args);
         } else if (toolName === "file_write") {
           const args = JSON.parse(toolToCall.function.arguments);
-          previewContent = this._generateFileWritePreview(args);
+          previewContent = this.deps.generateFileWritePreview(args);
         }
-        this.eventBus.emit("backend_message", {
+        this.deps.eventBus.emit("backend_message", {
           type: "confirmation_request",
           tool_calls: confirmationToolCalls,
           preview: previewContent,
@@ -26743,90 +26813,477 @@ ${editData.error.display}`;
       }
     } else if (trimmedText) {
       this.emptyAssistantReplySteps = 0;
-      this.eventBus.emit("backend_message", { type: "assistant_message", content: accumulatedContent });
-      await this.notifyFactorTurnEndIfNeeded("assistant_text_without_tool_call");
-      this.emitTurnCompleted();
+      this.invalidToolCallRetrySteps = 0;
+      this.deps.eventBus.emit("backend_message", { type: "assistant_message", content: accumulatedContent });
+      await this.deps.notifyFactorTurnEndIfNeeded("assistant_text_without_tool_call");
+      this.deps.emitTurnCompleted();
       return;
     } else {
       await this.continueAfterEmptyAssistantResponse();
     }
   }
-  async _handleNonStreamingResponse(contextWindow) {
-    const response = await this.llm.chatCompletion({
-      messages: contextWindow,
-      temperature: 0,
-      tools: this.mcpClient.getAvailableTools(),
-      parallel_tool_calls: true,
-      userContext: this.getLlmUserContext()
-    });
-    if (this.isInterrupted) {
-      this.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled by user." });
-      return;
-    }
-    let message2 = response.choices[0].message;
-    message2 = ToolCallNormalizer.normalizeAssistantMessage(message2);
-    if (message2.reasoning_content || message2.reasoning) {
-      const reasoningText = message2.reasoning_content || message2.reasoning;
-      this.eventBus.emit("backend_message", {
-        type: "reasoning",
-        content: typeof reasoningText === "string" ? reasoningText : JSON.stringify(reasoningText)
-      });
-    }
-    this.emitSyntheticStreamForNonStreamingMessage(message2);
-    this.history.push(message2);
-    if (message2.tool_calls && message2.tool_calls.length > 0) {
-      this.emptyAssistantReplySteps = 0;
-      this.invalidToolCallRetrySteps = 0;
-      const validToolCalls = message2.tool_calls.filter(
-        (call) => ToolCallNormalizer.isValidToolCall(call)
-      );
-      if (validToolCalls.length === 0) {
-        await this.handleInvalidToolCallRetry(message2);
-        return;
+  async handleNonStreamingResponse(contextWindow) {
+    const response = await this.deps.llm.chatCompletion({
+      messages: contextWindow,
+      temperature: 0,
+      tools: this.deps.mcpClient.getAvailableTools(),
+      parallel_tool_calls: true,
+      userContext: this.deps.getLlmUserContext()
+    });
+    if (this.deps.isInterrupted()) {
+      this.deps.eventBus.emit("backend_message", { type: "info", message: "Agent task cancelled by user." });
+      return;
+    }
+    let message2 = response.choices[0].message;
+    message2 = ToolCallNormalizer.normalizeAssistantMessage(message2);
+    if (message2.reasoning_content || message2.reasoning) {
+      const reasoningText = message2.reasoning_content || message2.reasoning;
+      this.deps.eventBus.emit("backend_message", {
+        type: "reasoning",
+        content: typeof reasoningText === "string" ? reasoningText : JSON.stringify(reasoningText)
+      });
+    }
+    this.deps.history.push(message2);
+    if (message2.tool_calls && message2.tool_calls.length > 0) {
+      this.emptyAssistantReplySteps = 0;
+      this.invalidToolCallRetrySteps = 0;
+      const validToolCalls = message2.tool_calls.filter(
+        (call) => ToolCallNormalizer.isValidToolCall(call)
+      );
+      if (validToolCalls.length === 0) {
+        await this.handleInvalidToolCallRetry(message2);
+        return;
+      }
+      const autoApprovedToolCalls = validToolCalls.filter(
+        (tc) => effectiveToolAutoApprove(tc, this.deps.sessionId)
+      );
+      const confirmationToolCalls = validToolCalls.filter(
+        (tc) => !effectiveToolAutoApprove(tc, this.deps.sessionId)
+      );
+      if (autoApprovedToolCalls.length > 0) {
+        await this.handleToolResponse({
+          type: "user_decision_execute",
+          tool_calls: autoApprovedToolCalls,
+          continueConversation: confirmationToolCalls.length === 0
+        });
+      }
+      if (confirmationToolCalls.length > 0) {
+        const toolToCall = confirmationToolCalls[0];
+        const decision = decideToolExecution(toolToCall.function.name, void 0, this.deps.sessionId);
+        const toolName = toolToCall.function.name;
+        let previewContent;
+        if (toolName === "edit_tool") {
+          const args = JSON.parse(toolToCall.function.arguments);
+          previewContent = await this.deps.generateEditPreview(args);
+        } else if (toolName === "file_write") {
+          const args = JSON.parse(toolToCall.function.arguments);
+          previewContent = this.deps.generateFileWritePreview(args);
+        }
+        this.deps.eventBus.emit("backend_message", {
+          type: "confirmation_request",
+          tool_calls: confirmationToolCalls,
+          preview: previewContent,
+          tool_policy: decision
+        });
+      }
+    } else if (typeof message2.content === "string" && message2.content.trim()) {
+      this.emptyAssistantReplySteps = 0;
+      this.invalidToolCallRetrySteps = 0;
+      this.deps.eventBus.emit("backend_message", { type: "assistant_message", content: message2.content });
+      await this.deps.notifyFactorTurnEndIfNeeded("assistant_text_without_tool_call");
+      this.deps.emitTurnCompleted();
+      return;
+    } else {
+      await this.continueAfterEmptyAssistantResponse();
+    }
+  }
+  async pollWorkerMailbox() {
+    if (!process.env.BLUMA_PARENT_SESSION_ID) {
+      return null;
+    }
+    try {
+      const { pollMailbox: pollMailbox2 } = await import("../../tools/natives/poll_mailbox.js");
+      const result = await pollMailbox2({
+        timeout: 0,
+        pollInterval: 500,
+        types: ["follow_up", "cancel_request", "permission_response"],
+        includeSignals: false
+      });
+      if (!result.success || !result.hasNewMessages) {
+        return null;
+      }
+      return {
+        followUp: result.followUp ? {
+          message: result.followUp.message,
+          priority: result.followUp.priority
+        } : void 0,
+        cancelRequested: result.cancelRequested
+      };
+    } catch {
+      return null;
+    }
+  }
+};
+function summarizeHistoryForLog(messages, limit = 8) {
+  return messages.slice(0, limit).map((message2) => {
+    const content = message2?.content;
+    const contentType = Array.isArray(content) ? "array" : typeof content;
+    const preview = typeof content === "string" ? content.slice(0, 120) : Array.isArray(content) ? content.filter((part) => part && typeof part === "object" && part.type === "text" && typeof part.text === "string").map((part) => part.text).join(" ").slice(0, 120) : void 0;
+    return {
+      role: message2?.role,
+      name: message2?.name ?? null,
+      content_type: contentType,
+      preview: preview || null,
+      has_tool_calls: Array.isArray(message2?.tool_calls) && message2.tool_calls.length > 0,
+      tool_call_id: message2?.tool_call_id ?? null
+    };
+  });
+}
+
+// src/app/agent/bluma/core/bluma.ts
+var BluMaAgent = class {
+  llm;
+  sessionId;
+  sessionFile = "";
+  history = [];
+  eventBus;
+  mcpClient;
+  feedbackSystem;
+  skillLoader;
+  compressor;
+  toolRunner;
+  turnCoordinator;
+  isInterrupted = false;
+  /** Mesmo turnId durante processTurn + todo o loop de tool_calls (FactorRouter). */
+  activeTurnContext = null;
+  /** Evita POST /turns/.../end duplicado no mesmo turno (ex.: Esc após message_result). */
+  factorRouterTurnClosed = false;
+  constructor(sessionId, eventBus, llm, mcpClient, feedbackSystem) {
+    this.sessionId = sessionId;
+    this.eventBus = eventBus;
+    this.llm = llm;
+    this.mcpClient = mcpClient;
+    this.feedbackSystem = feedbackSystem;
+    this.skillLoader = new SkillLoader(process.cwd());
+    this.compressor = new HistoryCompressor();
+    this.toolRunner = new BluMaToolRunner({
+      eventBus: this.eventBus,
+      history: this.history,
+      sessionId: this.sessionId,
+      mcpClient: this.mcpClient,
+      isInterrupted: () => this.isInterrupted,
+      persistSession: () => this.persistSession(),
+      notifyFactorTurnEndIfNeeded: (reason) => this.notifyFactorTurnEndIfNeeded(reason),
+      emitTurnCompleted: () => this.emitTurnCompleted(),
+      buildToolPolicyForUi: (toolName, toolArgs) => this.buildToolPolicyForUi(toolName, toolArgs),
+      generateEditPreview: (toolArgs) => this._generateEditPreview(toolArgs),
+      generateFileWritePreview: (toolArgs) => this._generateFileWritePreview(toolArgs)
+    });
+    this.turnCoordinator = new BluMaTurnCoordinator({
+      eventBus: this.eventBus,
+      history: this.history,
+      sessionId: this.sessionId,
+      llm: this.llm,
+      mcpClient: this.mcpClient,
+      compressor: this.compressor,
+      toolRunner: this.toolRunner,
+      isInterrupted: () => this.isInterrupted,
+      getLlmUserContext: () => this.getLlmUserContext(),
+      persistSession: () => this.persistSession(),
+      persistSessionSync: () => this.persistSessionSync(),
+      notifyFactorTurnEndIfNeeded: (reason) => this.notifyFactorTurnEndIfNeeded(reason),
+      emitTurnCompleted: () => this.emitTurnCompleted(),
+      generateEditPreview: (toolArgs) => this._generateEditPreview(toolArgs),
+      generateFileWritePreview: (toolArgs) => this._generateFileWritePreview(toolArgs)
+    });
+    this.eventBus.on("user_interrupt", async () => {
+      this.isInterrupted = true;
+      await this.notifyFactorTurnEndIfNeeded("user_interrupt");
+      this.eventBus.emit("backend_message", { type: "done", status: "interrupted" });
+    });
+    this.eventBus.on("user_overlay", async (data) => {
+      const clean = String(data.payload ?? "").trim();
+      this.history.push({ role: "user", content: clean });
+      this.eventBus.emit("backend_message", { type: "user_overlay", payload: clean, ts: data.ts || Date.now() });
+      try {
+        if (this.sessionFile) {
+          this.persistSession();
+        } else {
+          const [sessionFile, , mem] = await loadOrcreateSession(this.sessionId);
+          this.sessionFile = sessionFile;
+          this.compressor.restoreSnapshot(mem);
+          this.persistSession();
+        }
+      } catch (e) {
+        this.eventBus.emit("backend_message", { type: "error", message: `Falha ao salvar hist\xF3rico ap\xF3s user_overlay: ${e.message}` });
+      }
+    });
+  }
+  getMemorySnapshot() {
+    return this.compressor.getSnapshot();
+  }
+  /**
+   * Salvar histórico de forma SÍNCRONA - usado em situações críticas (erros, shutdown)
+   * para garantir que nada se perde. NÃO usa debounce.
+   */
+  persistSessionSync() {
+    if (!this.sessionFile) return;
+    try {
+      const sessionData = {
+        session_id: path40.basename(this.sessionFile, ".json"),
+        created_at: (/* @__PURE__ */ new Date()).toISOString(),
+        conversation_history: this.history,
+        last_updated: (/* @__PURE__ */ new Date()).toISOString(),
+        ...this.compressor.getSnapshot()
+      };
+      fs39.writeFileSync(this.sessionFile, JSON.stringify(sessionData, null, 2), "utf-8");
+    } catch (error) {
+      console.error("[Bluma] Failed to persist session synchronously:", error);
+    }
+  }
+  /** Debounced: grava histórico + estado de compressão no mesmo ficheiro de sessão. */
+  persistSession() {
+    if (!this.sessionFile) return;
+    void saveSessionHistory(this.sessionFile, this.history, this.getMemorySnapshot());
+  }
+  recordUiSlashCommand(command, mode = "visible_only") {
+    const text = String(command ?? "").trim();
+    if (!text) return;
+    this.history.push({
+      role: "user",
+      name: mode === "with_internal_prompt" ? "ui_slash_command" : "ui_slash_command_local",
+      content: text
+    });
+    this.persistSession();
+  }
+  async initialize() {
+    await this.mcpClient.nativeToolInvoker.initialize();
+    await this.mcpClient.initialize();
+    const [sessionFile, history, mem] = await loadOrcreateSession(this.sessionId);
+    this.sessionFile = sessionFile;
+    this.history.splice(0, this.history.length, ...history);
+    this.compressor.restoreSnapshot(mem);
+    initializeSkillContext({
+      history: this.history,
+      skillLoader: this.skillLoader
+    });
+    registerSessionCronBridge({
+      eventBus: this.eventBus,
+      getSessionId: () => this.sessionId
+    });
+    const dirs = this.skillLoader.getSkillsDirs();
+    this.eventBus.emit("backend_message", {
+      type: "info",
+      message: `Skills dirs \u2014 bundled: ${dirs.bundled} | project: ${dirs.project} | global: ${dirs.global}`
+    });
+    const availableSkills = this.skillLoader.listAvailable();
+    this.eventBus.emit("backend_message", {
+      type: "info",
+      message: `Skills loaded: ${availableSkills.length} \u2014 ${availableSkills.map((s) => `${s.name} (${s.source})`).join(", ") || "none"}`
+    });
+    if (this.skillLoader.hasConflicts()) {
+      for (const warning of this.skillLoader.formatConflictWarnings()) {
+        this.eventBus.emit("backend_message", {
+          type: "warning",
+          message: warning
+        });
+      }
+    }
+    const toolsDetailed = this.mcpClient.getAvailableToolsDetailed();
+    const availableToolNames = toolsDetailed.map((t) => t.function?.name).filter(Boolean);
+    const systemPrompt = await getUnifiedSystemPrompt(availableSkills, {
+      availableToolNames,
+      toolsDetailed,
+      mcpClient: this.mcpClient,
+      sessionId: this.sessionId
+    });
+    if (this.history.length === 0) {
+      this.history.push({ role: "system", content: systemPrompt });
+    } else {
+      const sysIdx = this.history.findIndex(
+        (m) => m.role === "system" && typeof m.content === "string" && String(m.content).includes("<identity>")
+      );
+      if (sysIdx >= 0) {
+        this.history[sysIdx] = { ...this.history[sysIdx], content: systemPrompt };
+      } else {
+        this.history.unshift({ role: "system", content: systemPrompt });
+      }
+    }
+    this.persistSession();
+    const uiHistory = this.history.filter(
+      (m) => m.role !== "system"
+    );
+    if (uiHistory.length > 0) {
+      this.eventBus.emit("backend_message", {
+        type: "session_history",
+        messages: uiHistory
+      });
+    }
+  }
+  getAvailableTools() {
+    return this.mcpClient.getAvailableTools();
+  }
+  getUiToolsDetailed() {
+    return this.mcpClient.getAvailableToolsDetailed();
+  }
+  listAvailableSkills() {
+    return this.skillLoader.listAvailable();
+  }
+  getSkillsDirs() {
+    return this.skillLoader.getSkillsDirs();
+  }
+  getSkillConflictWarnings() {
+    return this.skillLoader.formatConflictWarnings();
+  }
+  getFeedbackScore() {
+    return this.feedbackSystem.getCumulativeScore();
+  }
+  /**
+   * Contrato de ciclo de turno (UI, hooks, Factor Router):
+   *
+   * - `backend_message` `{ type: 'turn_start', turnId, sessionId, userPromptPreview }` — início;
+   *   payload estável em {@link buildTurnStartBackendMessage}.
+   * - Stream: `stream_start` / `stream_reasoning_chunk` / `stream_chunk` / `stream_end`.
+   *   Se a resposta incluir tool `message`, `stream_end` leva `{ omitAssistantFlush: true }` para não
+   *   duplicar texto no histórico (o utilizador vê o `tool_result` com gutter). Ver `applyStreamEndFlush`.
+   * - Fim: `backend_message` `{ type: 'done', status }` (`completed` | `failed` | `interrupted` | …).
+   * - Factor Router: um POST `/turns/{turnId}/end` por turno via `notifyFactorTurnEndIfNeeded` (razões abaixo).
+   *
+   * Smoke manual sugerido: mensagem normal com `message`+`result`; Ctrl+C; erro LLM; loop sem resposta útil.
+   */
+  async processTurn(userInput, userContextInput, options) {
+    this.isInterrupted = false;
+    this.factorRouterTurnClosed = false;
+    this.turnCoordinator.resetTurnState();
+    const inputText = String(userInput.content || "").trim();
+    const turnId = uuidv48();
+    this.activeTurnContext = {
+      ...userContextInput,
+      turnId,
+      sessionId: userContextInput.sessionId || this.sessionId
+    };
+    process.env.BLUMA_USER_CONTEXT_JSON = JSON.stringify({
+      conversationId: this.activeTurnContext.conversationId ?? null,
+      userId: this.activeTurnContext.userId ?? null,
+      userName: this.activeTurnContext.userName ?? null,
+      userEmail: this.activeTurnContext.userEmail ?? null,
+      companyId: this.activeTurnContext.companyId ?? null,
+      companyName: this.activeTurnContext.companyName ?? null
+    });
+    const userContent = buildUserMessageContent(inputText, process.cwd());
+    this.history.push({
+      role: "user",
+      content: userContent,
+      ...options?.historyName ? { name: options.historyName } : {}
+    });
+    this.eventBus.emit(
+      "backend_message",
+      buildTurnStartBackendMessage({
+        turnId: this.activeTurnContext.turnId,
+        sessionId: this.activeTurnContext.sessionId,
+        inputText,
+        appContext: this.activeTurnContext.appContext ?? null
+      })
+    );
+    if (inputText === "/init") {
+      this.eventBus.emit("dispatch", inputText);
+    }
+    await this.turnCoordinator.continueConversation();
+  }
+  /** Política mostrada na UI: combina metadata base com auto-approve efectivo (incl. permission_ml). */
+  buildToolPolicyForUi(toolName, toolArgs) {
+    const base = decideToolExecution(toolName, void 0, this.sessionId);
+    const argsStr = typeof toolArgs === "string" ? toolArgs : JSON.stringify(toolArgs ?? {});
+    const synthetic = { function: { name: toolName, arguments: argsStr } };
+    const auto = effectiveToolAutoApprove(synthetic, this.sessionId, { logClassifier: false });
+    return {
+      ...base,
+      autoApprove: auto,
+      requiresConfirmation: !auto
+    };
+  }
+  /**
+   * Executa uma tool aprovada: emit tool_call → invoke → tool_result → histórico.
+   * `backend_message` tool_call / tool_result incluem `tool_call_id` (id do tool call no modelo)
+   * para a UI correlacionar a linha de invocação (•) com o resultado compacto.
+   * @returns shouldContinue — false se `message` com message_type result terminou o turno.
+   */
+  async executeApprovedToolInvocation(toolCall, decisionData) {
+    return this.toolRunner.executeApprovedToolInvocation(toolCall, decisionData);
+  }
+  /** Várias leituras seguras em paralelo (grep, ls, read_file, …). */
+  async executeParallelReadBatch(batch, _decisionData) {
+    return this.toolRunner.executeParallelReadBatch(batch, _decisionData);
+  }
+  async handleToolResponse(decisionData) {
+    return this.turnCoordinator.handleToolResponse(decisionData);
+  }
+  async _generateEditPreview(toolArgs) {
+    try {
+      if (Array.isArray(toolArgs.edits) && toolArgs.edits.length > 0) {
+        return previewEditBatch(toolArgs.edits);
       }
-      const autoApprovedToolCalls = validToolCalls.filter(
-        (tc) => effectiveToolAutoApprove(tc, this.sessionId)
-      );
-      const confirmationToolCalls = validToolCalls.filter(
-        (tc) => !effectiveToolAutoApprove(tc, this.sessionId)
+      if (!toolArgs.file_path) {
+        return "Error: file_path is required";
+      }
+      const editData = await calculateEdit(
+        toolArgs.file_path,
+        toolArgs.old_string || "",
+        toolArgs.new_string || "",
+        toolArgs.expected_replacements || 1
       );
-      if (autoApprovedToolCalls.length > 0) {
-        await this.handleToolResponse({
-          type: "user_decision_execute",
-          tool_calls: autoApprovedToolCalls,
-          continueConversation: confirmationToolCalls.length === 0
-        });
+      if (editData.error) {
+        return `Failed to generate diff:
+
+${editData.error.display}`;
       }
-      if (confirmationToolCalls.length > 0) {
-        const toolToCall = confirmationToolCalls[0];
-        const decision = decideToolExecution(toolToCall.function.name, void 0, this.sessionId);
-        const toolName = toolToCall.function.name;
-        let previewContent;
-        if (toolName === "edit_tool") {
-          const args = JSON.parse(toolToCall.function.arguments);
-          previewContent = await this._generateEditPreview(args);
-        } else if (toolName === "file_write") {
-          const args = JSON.parse(toolToCall.function.arguments);
-          previewContent = this._generateFileWritePreview(args);
-        }
-        this.eventBus.emit("backend_message", {
-          type: "confirmation_request",
-          tool_calls: confirmationToolCalls,
-          preview: previewContent,
-          tool_policy: decision
-        });
+      const filename = path40.basename(toolArgs.file_path);
+      return createDiff(filename, editData.currentContent || "", editData.newContent);
+    } catch (e) {
+      return `An unexpected error occurred while generating the edit preview: ${e.message}`;
+    }
+  }
+  _generateFileWritePreview(toolArgs) {
+    try {
+      const content = typeof toolArgs?.content === "string" ? toolArgs.content : String(toolArgs?.content ?? "");
+      if (!content) {
+        return "(No content)";
       }
-    } else if (typeof message2.content === "string" && message2.content.trim()) {
-      this.emptyAssistantReplySteps = 0;
-      this.invalidToolCallRetrySteps = 0;
-      this.eventBus.emit("backend_message", { type: "assistant_message", content: message2.content });
-      await this.notifyFactorTurnEndIfNeeded("assistant_text_without_tool_call");
-      this.emitTurnCompleted();
-      return;
-    } else {
-      await this.continueAfterEmptyAssistantResponse();
+      const normalized = content.replace(/\r\n/g, "\n");
+      const lines = normalized.split("\n");
+      const maxPreviewLines = 20;
+      const visibleLines = lines.slice(0, maxPreviewLines);
+      const hiddenLines = lines.length - visibleLines.length;
+      return hiddenLines > 0 ? `${visibleLines.join("\n")}
+\u2026 +${hiddenLines} more lines` : normalized;
+    } catch (e) {
+      return `An unexpected error occurred while generating the file write preview: ${e.message}`;
     }
   }
+  getLlmUserContext() {
+    if (!this.activeTurnContext) {
+      throw new Error("BluMaAgent: activeTurnContext ausente (processTurn n\xE3o iniciou o turno).");
+    }
+    return this.activeTurnContext;
+  }
+  /**
+   * Um único POST ao Factor Router por turno (`notifyFactorRouterTurnEnd`).
+   * `reason` típicos: `message_result`, `user_interrupt`, `empty_reply_exhausted`, `llm_error`.
+   */
+  async notifyFactorTurnEndIfNeeded(reason) {
+    if (this.factorRouterTurnClosed || !this.activeTurnContext) return;
+    this.factorRouterTurnClosed = true;
+    const ctx = this.activeTurnContext;
+    await notifyFactorRouterTurnEnd({
+      turnId: ctx.turnId,
+      userContext: ctx,
+      reason
+    });
+  }
+  /** Fecho explícito de turno (útil para workers antes de process.exit). */
+  async closeActiveTurn(reason = "worker_exit") {
+    await this.notifyFactorTurnEndIfNeeded(reason);
+  }
   emitTurnCompleted() {
     this.eventBus.emit("backend_message", { type: "done", status: "completed" });
     void this.runAutoDreamIfEnabled();
@@ -26838,37 +27295,6 @@ ${editData.error.display}`;
     } catch {
     }
   }
-  /**
-   * WORKER: Poll mailbox para checkar follow-ups do coordinator
-   * Retorna null se não há novas mensagens ou se não é um worker
-   */
-  async _pollWorkerMailbox() {
-    if (!process.env.BLUMA_PARENT_SESSION_ID) {
-      return null;
-    }
-    try {
-      const { pollMailbox: pollMailbox2 } = await import("../../tools/natives/poll_mailbox.js");
-      const result = await pollMailbox2({
-        timeout: 0,
-        // Non-blocking
-        pollInterval: 500,
-        types: ["follow_up", "cancel_request", "permission_response"],
-        includeSignals: false
-      });
-      if (!result.success || !result.hasNewMessages) {
-        return null;
-      }
-      return {
-        followUp: result.followUp ? {
-          message: result.followUp.message,
-          priority: result.followUp.priority
-        } : void 0,
-        cancelRequested: result.cancelRequested
-      };
-    } catch (error) {
-      return null;
-    }
-  }
 };
 
 // src/app/agent/subagents/registry.ts
@@ -28482,7 +28908,7 @@ function ChatUserImageBlock({
   if (imageCount < 1) return null;
   const cap = caption?.trim() ?? "";
   const capLines = cap.length > 0 ? cap.split("\n") : [];
-  return /* @__PURE__ */ jsxs4(Box_default, { flexDirection: "column", marginBottom: 0, children: [
+  return /* @__PURE__ */ jsxs4(Box_default, { flexDirection: "column", children: [
     Array.from({ length: imageCount }, (_, i) => /* @__PURE__ */ jsx11(Text, { color: BLUMA_TERMINAL.blue, children: `[IMAGE #${i + 1}]` }, `img-${i}`)),
     capLines.map((line, i) => /* @__PURE__ */ jsxs4(Box_default, { flexDirection: "row", flexWrap: "wrap", children: [
       /* @__PURE__ */ jsx11(Text, { color: BLUMA_TERMINAL.subtle, children: i === 0 ? " L " : "   " }),
@@ -28656,15 +29082,11 @@ var HighlightedCodeComponent = ({ code, filePath, maxLines }) => {
   const visible = maxLines ? lines.slice(0, maxLines) : lines;
   const hidden = lines.length - visible.length;
   const gutterWidth = String(lines.length).length;
-  return /* @__PURE__ */ jsxs5(Box_default, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs5(Box_default, { flexDirection: "column", width: "100%", alignItems: "stretch", children: [
     visible.map((line, idx) => {
       const tokens = tokenizeLine(line, language);
       const lineNum = String(idx + 1).padStart(gutterWidth, " ");
-      return /* @__PURE__ */ jsx12(Box_default, { children: /* @__PURE__ */ jsxs5(Text, { children: [
-        /* @__PURE__ */ jsx12(Text, { color: THEME.lineNumber, children: lineNum }),
-        /* @__PURE__ */ jsx12(Text, { color: THEME.gutter, children: " \u2502 " }),
-        tokens.map((t, ti) => /* @__PURE__ */ jsx12(Text, { color: t.color, children: t.text }, ti))
-      ] }) }, idx);
+      return /* @__PURE__ */ jsx12(Box_default, { width: "100%", flexDirection: "row", children: /* @__PURE__ */ jsx12(Text, { children: tokens.map((t, ti) => /* @__PURE__ */ jsx12(Text, { color: t.color, children: t.text }, ti)) }) }, idx);
     }),
     hidden > 0 && /* @__PURE__ */ jsxs5(Text, { color: THEME.lineNumber, dimColor: true, children: [
       "\u2026 +",
@@ -28735,6 +29157,11 @@ function headingAccent(depth) {
   if (depth === 3) return BLUMA_TERMINAL.magenta;
   return BLUMA_TERMINAL.inactive;
 }
+function normalizeMarkdownText(content) {
+  const trimmed = content.trim();
+  if (!trimmed) return "";
+  return trimmed.replace(/\r\n/g, "\n").replace(/\n{3,}/g, "\n\n");
+}
 function listMarker(ordered, index, start, task, checked) {
   if (task) return checked ? "[x]" : "[ ]";
   if (ordered) {
@@ -28928,6 +29355,46 @@ function renderParagraph(p, key, compact) {
   const nodes = walkInline(p.tokens, key);
   return /* @__PURE__ */ jsx13(Box_default, { marginBottom: compact ? 0 : 1, flexDirection: "row", flexWrap: "wrap", children: nodes.length > 0 ? nodes : /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.muted, wrap: "wrap", children: p.text }) }, key);
 }
+function renderCodeBlock(code, key) {
+  const raw = code.text.replace(/\n$/, "");
+  return /* @__PURE__ */ jsxs6(
+    Box_default,
+    {
+      flexDirection: "column",
+      marginBottom: 1,
+      paddingX: 1,
+      paddingY: 0,
+      backgroundColor: BLUMA_TERMINAL.surfaceContainer,
+      borderStyle: "round",
+      borderColor: BLUMA_TERMINAL.outlineVariant,
+      children: [
+        code.lang ? /* @__PURE__ */ jsx13(Box_default, { marginBottom: 0, children: /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.blue, bold: true, children: code.lang }) }) : null,
+        /* @__PURE__ */ jsx13(HighlightedCode, { code: raw, filePath: code.lang || "snippet" })
+      ]
+    },
+    key
+  );
+}
+function renderBlockquote(q, key) {
+  const inner = q.tokens && q.tokens.length > 0 ? renderBlockTokens(q.tokens, `${key}-inner`) : /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.blue, italic: true, wrap: "wrap", children: q.text });
+  return /* @__PURE__ */ jsxs6(
+    Box_default,
+    {
+      flexDirection: "row",
+      marginBottom: 1,
+      alignItems: "flex-start",
+      paddingX: 1,
+      borderStyle: "round",
+      borderColor: BLUMA_TERMINAL.outlineVariant,
+      backgroundColor: BLUMA_TERMINAL.surfaceContainer,
+      children: [
+        /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.blue, children: "\u2502 " }),
+        /* @__PURE__ */ jsx13(Box_default, { flexDirection: "column", flexGrow: 1, children: inner })
+      ]
+    },
+    key
+  );
+}
 function renderListItemBlocks(item, depth, keyBase) {
   if (!item.tokens?.length) {
     const nodes = walkInline(
@@ -28963,13 +29430,6 @@ function renderListBlock(list, depth, keyBase) {
     ] }, `${keyBase}-row-${idx}`);
   }) }, keyBase);
 }
-function renderBlockquote(q, key) {
-  const inner = q.tokens && q.tokens.length > 0 ? renderBlockTokens(q.tokens, `${key}-inner`) : /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.blue, italic: true, wrap: "wrap", children: q.text });
-  return /* @__PURE__ */ jsxs6(Box_default, { flexDirection: "row", marginBottom: 1, alignItems: "flex-start", children: [
-    /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.blue, children: "\u2502 " }),
-    /* @__PURE__ */ jsx13(Box_default, { flexDirection: "column", flexGrow: 1, children: inner })
-  ] }, key);
-}
 function renderBlockTokens(tokens, keyRoot) {
   const elements = [];
   for (let i = 0; i < tokens.length; i++) {
@@ -28992,17 +29452,9 @@ function renderBlockTokens(tokens, keyRoot) {
       case "list":
         elements.push(renderListBlock(token, 0, key));
         break;
-      case "code": {
-        const code = token;
-        const raw = code.text.replace(/\n$/, "");
-        elements.push(
-          /* @__PURE__ */ jsxs6(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-            code.lang ? /* @__PURE__ */ jsx13(Text, { color: BLUMA_TERMINAL.blue, wrap: "wrap", children: code.lang }) : null,
-            /* @__PURE__ */ jsx13(HighlightedCode, { code: raw, filePath: code.lang || "snippet" })
-          ] }, key)
-        );
+      case "code":
+        elements.push(renderCodeBlock(token, key));
         break;
-      }
       case "blockquote":
         elements.push(renderBlockquote(token, key));
         break;
@@ -29059,7 +29511,8 @@ var MarkdownRendererComponent = ({ markdown }) => {
   if (!markdown || markdown.trim() === "") {
     return null;
   }
-  const tokens = cachedLexer(markdown);
+  const normalized = normalizeMarkdownText(markdown);
+  const tokens = cachedLexer(normalized);
   return /* @__PURE__ */ jsx13(Box_default, { flexDirection: "column", paddingRight: 1, children: renderBlockTokens(tokens, "md") });
 };
 var MarkdownRenderer = memo4(MarkdownRendererComponent, (prevProps, nextProps) => {
@@ -30618,9 +31071,12 @@ import { jsx as jsx33, jsxs as jsxs20 } from "react/jsx-runtime";
 function renderToolHeader6({ args }) {
   const cmd = args?.command ?? "";
   const displayCmd = cmd.length > 50 ? cmd.substring(0, 50) + "\u2026" : cmd;
-  return /* @__PURE__ */ jsxs20(Box_default, { flexDirection: "row", gap: 1, alignItems: "flex-end", children: [
+  return /* @__PURE__ */ jsxs20(Box_default, { flexDirection: "row", alignItems: "flex-end", children: [
     /* @__PURE__ */ jsx33(Text, { bold: true, color: BLUMA_TERMINAL.m3OnSurface, children: "Ran" }),
-    /* @__PURE__ */ jsx33(Text, { color: BLUMA_TERMINAL.dim, children: displayCmd })
+    /* @__PURE__ */ jsxs20(Text, { color: BLUMA_TERMINAL.dim, children: [
+      " ",
+      displayCmd
+    ] })
   ] });
 }
 function renderToolUseMessage6({ args }) {
@@ -31965,6 +32421,46 @@ function getPatchForEdit({
   }));
   return { patch, updatedFile: unescapeFromDiff(updatedFile) };
 }
+function getPatchFromContents({
+  filePath,
+  oldContent,
+  newContent
+}) {
+  const result = structuredPatch(
+    filePath,
+    filePath,
+    escapeForDiff(oldContent),
+    escapeForDiff(newContent),
+    void 0,
+    void 0,
+    {
+      context: CONTEXT_LINES,
+      timeout: DIFF_TIMEOUT_MS
+    }
+  );
+  if (!result) {
+    return [];
+  }
+  return result.hunks.map((h) => ({
+    ...h,
+    lines: h.lines.map(unescapeFromDiff)
+  }));
+}
+function patchToUnifiedDiffText(filePath, patch) {
+  if (patch.length === 0) return "";
+  let text = `--- a/${filePath}
++++ b/${filePath}
+`;
+  for (const hunk of patch) {
+    text += `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@
+`;
+    for (const line of hunk.lines) {
+      text += `${line}
+`;
+    }
+  }
+  return text;
+}
 
 // src/app/ui/utils/readEditContext.ts
 import { promises as fs41 } from "fs";
@@ -32064,14 +32560,64 @@ function diffSummary(additions, removals, hidden) {
   if (hidden > 0) bits.push(`\u22EF ${hidden} hidden`);
   return bits.join(" \xB7 ");
 }
+var THEME2 = {
+  keyword: "#569CD6",
+  string: "#CE9178",
+  number: "#B5CEA8",
+  comment: "#6A9955",
+  //#22c55e
+  function: "#DCDCAA",
+  variable: "#9CDCFE",
+  operator: "#D4D4D4",
+  punctuation: "#D4D4D4",
+  default: "#D4D4D4",
+  lineNumber: "#858585",
+  gutter: "#404040"
+};
+var KEYWORDS2 = /* @__PURE__ */ new Set([
+  "const",
+  "let",
+  "var",
+  "function",
+  "return",
+  "if",
+  "else",
+  "for",
+  "while",
+  "switch",
+  "case",
+  "break",
+  "continue",
+  "class",
+  "extends",
+  "import",
+  "from",
+  "export",
+  "default",
+  "async",
+  "await",
+  "try",
+  "catch",
+  "finally",
+  "new",
+  "typeof",
+  "instanceof",
+  "null",
+  "undefined",
+  "true",
+  "false",
+  "type",
+  "interface",
+  "enum",
+  "implements",
+  "abstract",
+  "readonly",
+  "override"
+]);
 function hunkToRows(hunk) {
   const rows = [];
   let oldLine = hunk.oldStart;
   let newLine = hunk.newStart;
-  rows.push({
-    kind: "meta",
-    text: `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`
-  });
   for (const raw of hunk.lines) {
     if (!raw.length) continue;
     const prefix = raw[0];
@@ -32112,22 +32658,22 @@ function pairWordDiffs(rows) {
   }
   return out;
 }
-function maxLineNums(rows) {
-  let maxO = 0;
+function calcGutterW(rows) {
   let maxN = 0;
   for (const r of rows) {
-    if (r.kind === "ctx") {
-      maxO = Math.max(maxO, r.old);
-      maxN = Math.max(maxN, r.new);
-    } else if (r.kind === "rem") {
-      maxO = Math.max(maxO, r.old);
-    } else if (r.kind === "add") {
-      maxN = Math.max(maxN, r.new);
-    }
+    if (r.kind === "ctx") maxN = Math.max(maxN, r.old, r.new);
+    else if (r.kind === "rem") maxN = Math.max(maxN, r.old);
+    else if (r.kind === "add") maxN = Math.max(maxN, r.new);
   }
-  const wOld = Math.max(2, String(maxO || 0).length);
-  const wNew = Math.max(2, String(maxN || 0).length);
-  return { wOld, wNew };
+  return Math.max(2, String(maxN || 0).length);
+}
+function calcLegacyGutterW(segs) {
+  let maxN = 0;
+  for (const s of segs) {
+    if (s.kind === "rem") maxN = Math.max(maxN, s.oldLine);
+    if (s.kind === "add") maxN = Math.max(maxN, s.newLine);
+  }
+  return Math.max(2, String(maxN || 0).length);
 }
 function rowLineCounts(rows) {
   let additions = 0;
@@ -32138,21 +32684,11 @@ function rowLineCounts(rows) {
   }
   return { additions, removals };
 }
-function gutterCtx(wOld, wNew, oldN, newN) {
-  return `${String(oldN).padStart(wOld)} ${String(newN).padStart(wNew)} \u2502 `;
-}
-function gutterRem(wOld, wNew, oldN) {
-  return `${String(oldN).padStart(wOld)} ${" ".repeat(wNew)} \u2502\u2212`;
+function gutterLine(w, n) {
+  return ` ${String(n).padEnd(w)} `;
 }
-function gutterAdd(wOld, wNew, newN) {
-  return `${" ".repeat(wOld)} ${String(newN).padStart(wNew)} \u2502+`;
-}
-function gutterOmit(wOld, wNew) {
-  const cols = wOld + 1 + wNew;
-  const dot = "\u22EE";
-  const padL = Math.max(0, Math.floor((cols - dot.length) / 2));
-  const padR = Math.max(0, cols - dot.length - padL);
-  return `${" ".repeat(padL)}${dot}${" ".repeat(padR)} \u2502 `;
+function gutterOmit(w) {
+  return ` ${"\u22EE".padEnd(w)} `;
 }
 function WordDiffChunks({
   parts,
@@ -32170,11 +32706,84 @@ function WordDiffChunks({
       /* @__PURE__ */ jsx41(Text, { backgroundColor: bg, color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: p.value }, k++)
     );
   }
-  return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", children: chunks });
+  return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", flexGrow: 1, children: chunks });
+}
+function collapseContextRows(rows) {
+  const out = [];
+  let ctx = [];
+  const flush = () => {
+    if (ctx.length <= 3) {
+      out.push(...ctx);
+    } else {
+      out.push({ kind: "omit", count: ctx.length });
+    }
+    ctx = [];
+  };
+  for (const r of rows) {
+    if (r.kind === "ctx") {
+      ctx.push(r);
+      continue;
+    }
+    flush();
+    out.push(r);
+  }
+  flush();
+  return out;
+}
+function tokenizeLine2(line, _language) {
+  if (!line.trim()) return [{ text: line || " ", color: THEME2.default }];
+  const tokens = [];
+  let i = 0;
+  while (i < line.length) {
+    if (/\s/.test(line[i])) {
+      let spaces = "";
+      while (i < line.length && /\s/.test(line[i])) spaces += line[i++];
+      tokens.push({ text: spaces, color: THEME2.default });
+      continue;
+    }
+    if (line[i] === "/" && line[i + 1] === "/") {
+      tokens.push({ text: line.slice(i), color: THEME2.comment });
+      break;
+    }
+    if (line[i] === "#") {
+      tokens.push({ text: line.slice(i), color: THEME2.comment });
+      break;
+    }
+    if (line[i] === '"' || line[i] === "'" || line[i] === "`") {
+      const quote = line[i];
+      let j = i + 1;
+      while (j < line.length && line[j] !== quote) {
+        if (line[j] === "\\") j++;
+        j++;
+      }
+      tokens.push({ text: line.slice(i, j + 1), color: THEME2.string });
+      i = j + 1;
+      continue;
+    }
+    if (/\d/.test(line[i])) {
+      let num = "";
+      while (i < line.length && /[\d.]/.test(line[i])) num += line[i++];
+      tokens.push({ text: num, color: THEME2.number });
+      continue;
+    }
+    if (/[a-zA-Z_$]/.test(line[i])) {
+      let word = "";
+      while (i < line.length && /[\w$]/.test(line[i])) word += line[i++];
+      const isCall = line[i] === "(";
+      let color = THEME2.variable;
+      if (KEYWORDS2.has(word)) color = THEME2.keyword;
+      else if (isCall) color = THEME2.function;
+      tokens.push({ text: word, color });
+      continue;
+    }
+    tokens.push({ text: line[i], color: THEME2.punctuation });
+    i++;
+  }
+  return tokens;
 }
 function renderStructuredRows(rows, maxHeight) {
   const paired = collapseContextRows(pairWordDiffs(rows));
-  const { wOld, wNew } = maxLineNums(paired);
+  const w = calcGutterW(paired);
   const { additions, removals } = rowLineCounts(paired);
   const nodes = [];
   let lineBudget = maxHeight > 0 ? maxHeight : Number.POSITIVE_INFINITY;
@@ -32191,11 +32800,13 @@ function renderStructuredRows(rows, maxHeight) {
   for (const r of paired) {
     if (r.kind === "omit") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterOmit(wOld, wNew) }),
-          r.count > 1 ? /* @__PURE__ */ jsxs26(Text, { dimColor: true, wrap: "wrap", children: [
+        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, paddingLeft: 5, children: [
+          /* @__PURE__ */ jsxs26(Text, { dimColor: true, children: [
             " ",
-            "\xB7 ",
+            gutterOmit(w)
+          ] }),
+          r.count > 1 ? /* @__PURE__ */ jsxs26(Text, { dimColor: true, wrap: "wrap", children: [
+            " \xB7 ",
             r.count
           ] }) : null
         ] }, `o-${idx++}`)
@@ -32204,33 +32815,32 @@ function renderStructuredRows(rows, maxHeight) {
     }
     if (r.kind === "meta") {
       push(
-        /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", width: "100%", children: /* @__PURE__ */ jsx41(Text, { dimColor: true, wrap: "wrap", children: r.text }) }, `m-${idx++}`)
+        /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) }, `m-${idx++}`)
       );
       continue;
     }
     if (r.kind === "ctx") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterCtx(wOld, wNew, r.old, r.new) }),
-          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.muted, wrap: "wrap", children: r.text || " " })
-        ] }, `c-${idx++}`)
+        /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", width: "100%", flexGrow: 1, children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) }, `c-${idx++}`)
       );
       continue;
     }
     if (r.kind === "rem") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexWrap: "wrap", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterRem(wOld, wNew, r.old) }),
-          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "rem" }) }) : /* @__PURE__ */ jsx41(Text, { backgroundColor: BLUMA_TERMINAL.diffRemoved, color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: r.text || " " })
+        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffRemoved, paddingLeft: 3, children: [
+          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, r.old) }),
+          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: "-" }),
+          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, marginLeft: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "rem" }) }) : /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) })
         ] }, `r-${idx++}`)
       );
       continue;
     }
     if (r.kind === "add") {
       push(
-        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexWrap: "wrap", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterAdd(wOld, wNew, r.new) }),
-          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "add" }) }) : /* @__PURE__ */ jsx41(Text, { backgroundColor: BLUMA_TERMINAL.diffAdded, color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: r.text || " " })
+        /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexGrow: 1, flexWrap: "wrap", backgroundColor: BLUMA_TERMINAL.diffAdded, paddingLeft: 3, children: [
+          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, r.new) }),
+          /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: "+" }),
+          r.wordParts && r.wordParts.length > 0 ? /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", flexGrow: 1, children: /* @__PURE__ */ jsx41(WordDiffChunks, { parts: r.wordParts, mode: "add" }) }) : /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexWrap: "wrap", children: tokenizeLine2(r.text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, children: t.text }, i)) })
         ] }, `a-${idx++}`)
       );
     }
@@ -32255,15 +32865,18 @@ function legacyDiffToSegs(lines) {
     const isNewHeader = line.startsWith("+++");
     if (isOldHeader || isNewHeader) {
       flushCtx();
-      out.push({ kind: "header", line });
       if (isNewHeader) {
         oldLine = 1;
         newLine = 1;
       }
       continue;
     }
-    const isRem = line.startsWith("-") && !isOldHeader;
-    const isAdd = line.startsWith("+") && !isNewHeader;
+    if (line.startsWith("\\")) {
+      flushCtx();
+      continue;
+    }
+    const isRem = line.startsWith("-");
+    const isAdd = line.startsWith("+");
     if (isRem) {
       flushCtx();
       out.push({ kind: "rem", body: line.slice(1), oldLine });
@@ -32281,11 +32894,6 @@ function legacyDiffToSegs(lines) {
       ctx += 1;
       continue;
     }
-    if (line.startsWith("\\")) {
-      flushCtx();
-      out.push({ kind: "raw", line });
-      continue;
-    }
     if (line.startsWith("[")) {
       flushCtx();
       out.push({ kind: "raw", line });
@@ -32301,18 +32909,6 @@ function legacyDiffToSegs(lines) {
   flushCtx();
   return out;
 }
-function legacySegWidths(segs) {
-  let maxO = 0;
-  let maxN = 0;
-  for (const s of segs) {
-    if (s.kind === "rem") maxO = Math.max(maxO, s.oldLine);
-    if (s.kind === "add") maxN = Math.max(maxN, s.newLine);
-  }
-  return {
-    wOld: Math.max(2, String(maxO || 0).length),
-    wNew: Math.max(2, String(maxN || 0).length)
-  };
-}
 function legacySegLineCounts(lines) {
   let additions = 0;
   let removals = 0;
@@ -32322,75 +32918,104 @@ function legacySegLineCounts(lines) {
   }
   return { additions, removals };
 }
-function collapseContextRows(rows) {
-  const out = [];
-  let ctxCount = 0;
-  const flush = () => {
-    if (ctxCount > 0) {
-      out.push({ kind: "omit", count: ctxCount });
-      ctxCount = 0;
-    }
-  };
-  for (const r of rows) {
-    if (r.kind === "ctx") {
-      ctxCount += 1;
-      continue;
-    }
-    if (r.kind === "meta" && r.text.startsWith("@@")) {
-      ctxCount += 1;
-      continue;
-    }
-    flush();
-    out.push(r);
-  }
-  flush();
-  return out;
-}
 function LegacyDiffBody({
   lines,
   maxHeight
 }) {
   const segs = legacyDiffToSegs(lines);
-  const { wOld, wNew } = legacySegWidths(segs);
+  const w = calcLegacyGutterW(segs);
   const truncated = maxHeight > 0 && segs.length > maxHeight;
   const toRender = truncated ? segs.slice(0, maxHeight) : segs;
   const hiddenBelow = truncated ? segs.length - toRender.length : 0;
   const { additions, removals } = legacySegLineCounts(lines);
-  const summary = diffSummary(additions, removals, hiddenBelow);
-  return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", children: [
-    toRender.map((seg, index) => {
-      if (seg.kind === "header") {
-        return /* @__PURE__ */ jsx41(Text, { dimColor: true, wrap: "wrap", children: seg.line }, index);
-      }
-      if (seg.kind === "omit") {
-        return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterOmit(wOld, wNew) }),
-          seg.count > 1 ? /* @__PURE__ */ jsxs26(Text, { dimColor: true, wrap: "wrap", children: [
-            " ",
-            "\xB7 ",
-            seg.count
-          ] }) : null
-        ] }, index);
-      }
-      if (seg.kind === "raw") {
-        return /* @__PURE__ */ jsx41(Text, { dimColor: true, wrap: "wrap", children: seg.line }, index);
-      }
-      if (seg.kind === "rem") {
-        return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexWrap: "wrap", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterRem(wOld, wNew, seg.oldLine) }),
-          /* @__PURE__ */ jsx41(Text, { backgroundColor: BLUMA_TERMINAL.diffRemoved, color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: seg.body || " " })
-        ] }, index);
-      }
-      if (seg.kind === "add") {
-        return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "row", width: "100%", flexWrap: "wrap", children: [
-          /* @__PURE__ */ jsx41(Text, { dimColor: true, children: gutterAdd(wOld, wNew, seg.newLine) }),
-          /* @__PURE__ */ jsx41(Text, { backgroundColor: BLUMA_TERMINAL.diffAdded, color: BLUMA_TERMINAL.m3OnSurface, wrap: "wrap", children: seg.body || " " })
-        ] }, index);
-      }
-      return null;
-    }),
-    summary ? /* @__PURE__ */ jsx41(Text, { dimColor: true, children: summary }) : null
-  ] });
+  const summary = diffSummary(
+    additions,
+    removals,
+    hiddenBelow
+  );
+  const renderTokenizedLine = (text, backgroundColor) => tokenizeLine2(text || " ", "ts").map((t, i) => /* @__PURE__ */ jsx41(Text, { color: t.color, backgroundColor, children: t.text }, i));
+  return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", width: "100%", children: toRender.map((seg, index) => {
+    if (seg.kind === "omit") {
+      return /* @__PURE__ */ jsx41(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexGrow: 1,
+          paddingLeft: 6,
+          children: /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterOmit(w) })
+        },
+        index
+      );
+    }
+    if (seg.kind === "raw") {
+      return /* @__PURE__ */ jsx41(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexWrap: "wrap",
+          children: renderTokenizedLine(seg.line)
+        },
+        index
+      );
+    }
+    if (seg.kind === "rem") {
+      return /* @__PURE__ */ jsxs26(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexGrow: 1,
+          flexWrap: "wrap",
+          backgroundColor: BLUMA_TERMINAL.diffRemoved,
+          paddingLeft: 3,
+          children: [
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, seg.oldLine) }),
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: "-" }),
+            /* @__PURE__ */ jsx41(
+              Box_default,
+              {
+                flexDirection: "row",
+                flexWrap: "wrap",
+                backgroundColor: BLUMA_TERMINAL.diffRemoved,
+                children: renderTokenizedLine(seg.body, BLUMA_TERMINAL.diffRemoved)
+              }
+            )
+          ]
+        },
+        index
+      );
+    }
+    if (seg.kind === "add") {
+      return /* @__PURE__ */ jsxs26(
+        Box_default,
+        {
+          flexDirection: "row",
+          width: "100%",
+          flexGrow: 1,
+          flexWrap: "wrap",
+          backgroundColor: BLUMA_TERMINAL.diffAdded,
+          paddingLeft: 3,
+          children: [
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.dim, children: gutterLine(w, seg.newLine) }),
+            /* @__PURE__ */ jsx41(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: "+" }),
+            /* @__PURE__ */ jsx41(
+              Box_default,
+              {
+                flexDirection: "row",
+                flexWrap: "wrap",
+                backgroundColor: BLUMA_TERMINAL.diffAdded,
+                children: renderTokenizedLine(seg.body, BLUMA_TERMINAL.diffAdded)
+              }
+            )
+          ]
+        },
+        index
+      );
+    }
+    return null;
+  }) });
 }
 var SimpleDiff = ({ text, maxHeight, frame = false }) => {
   const raw = stripOptionalMarkdownFence(String(text ?? ""));
@@ -32406,28 +33031,16 @@ var SimpleDiff = ({ text, maxHeight, frame = false }) => {
     const allLines = raw.split("\n");
     const body2 = /* @__PURE__ */ jsx41(LegacyDiffBody, { lines: allLines, maxHeight });
     if (!frame) return body2;
-    return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule }),
-      /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", paddingX: 1, children: body2 }),
-      /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule })
-    ] });
+    return /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", children: /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", paddingX: 1, children: body2 }) });
   }
   const rows = [];
   for (const h of hunks) {
     rows.push(...hunkToRows(h));
   }
-  const { nodes, hidden, additions, removals } = renderStructuredRows(
-    rows,
-    maxHeight
-  );
-  const body = /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", children: [
-    (hidden > 0 || additions > 0 || removals > 0) && /* @__PURE__ */ jsx41(Text, { dimColor: true, children: diffSummary(additions, removals, hidden) }),
-    nodes
-  ] });
-  if (!frame) {
-    return body;
-  }
-  return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", children: [
+  const { nodes, hidden, additions, removals } = renderStructuredRows(rows, maxHeight);
+  const body = /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", width: "100%", children: nodes });
+  if (!frame) return body;
+  return /* @__PURE__ */ jsxs26(Box_default, { flexDirection: "column", width: "100%", children: [
     /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule }),
     /* @__PURE__ */ jsx41(Box_default, { flexDirection: "column", paddingX: 1, children: body }),
     /* @__PURE__ */ jsx41(Text, { dimColor: true, children: rule })
@@ -32549,7 +33162,20 @@ function EditToolDiffPanel({
 }
 
 // src/app/agent/tools/EditTool/UI.tsx
+import { diffLines as diffLines2 } from "diff";
 import { Fragment as Fragment5, jsx as jsx44, jsxs as jsxs27 } from "react/jsx-runtime";
+function countLineDiff(oldText, newText) {
+  const parts = diffLines2(oldText.replace(/\r\n/g, "\n"), newText.replace(/\r\n/g, "\n"));
+  let added = 0;
+  let removed = 0;
+  for (const part of parts) {
+    const lines = part.value.replace(/\n$/, "").split("\n");
+    const lineCount = part.value === "" ? 0 : lines.length;
+    if (part.added) added += lineCount;
+    if (part.removed) removed += lineCount;
+  }
+  return { added, removed };
+}
 function userFacingName11(args) {
   if (!args) return "Updated";
   if (args.edits && Array.isArray(args.edits) && args.edits.length > 0) {
@@ -32564,11 +33190,32 @@ function renderToolUseMessage12({ args }) {
   return /* @__PURE__ */ jsx44(Text, { color: BLUMA_TERMINAL.blue, children: p });
 }
 function renderToolHeader12({ args }) {
-  const label = userFacingName11(args);
   const path50 = args?.file_path ?? ".";
+  const oldText = typeof args?.old_string === "string" ? args.old_string : "";
+  const newText = typeof args?.new_string === "string" ? args.new_string : "";
+  const counts = countLineDiff(oldText, newText);
+  const action = oldText === "" ? "Created" : "Update";
   return /* @__PURE__ */ jsxs27(Box_default, { flexDirection: "row", gap: 1, alignItems: "flex-end", children: [
-    /* @__PURE__ */ jsx44(Text, { bold: true, color: BLUMA_TERMINAL.m3OnSurface, children: label }),
-    /* @__PURE__ */ jsx44(FilePathLink, { filePath: path50, color: BLUMA_TERMINAL.dim })
+    /* @__PURE__ */ jsxs27(Text, { bold: true, color: BLUMA_TERMINAL.m3OnSurface, children: [
+      action,
+      /* @__PURE__ */ jsxs27(Text, { dimColor: true, children: [
+        " ",
+        /* @__PURE__ */ jsx44(FilePathLink, { filePath: path50, color: BLUMA_TERMINAL.dim })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs27(Text, { dimColor: true, children: [
+      "(",
+      /* @__PURE__ */ jsxs27(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: [
+        "+",
+        counts.added
+      ] }),
+      " ",
+      /* @__PURE__ */ jsxs27(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: [
+        "-",
+        counts.removed
+      ] }),
+      ")"
+    ] })
   ] });
 }
 function renderSingleEditDiff(edit, index, total, state2) {
@@ -32584,7 +33231,20 @@ function renderSingleEditDiff(edit, index, total, state2) {
         total
       ] }),
       /* @__PURE__ */ jsx44(Text, { bold: true, color: isNewFile ? BLUMA_TERMINAL.success : BLUMA_TERMINAL.blue, children: isNewFile ? "Create" : "Update" }),
-      /* @__PURE__ */ jsx44(FilePathLink, { filePath, color: BLUMA_TERMINAL.dim })
+      /* @__PURE__ */ jsx44(FilePathLink, { filePath, color: BLUMA_TERMINAL.dim }),
+      /* @__PURE__ */ jsxs27(Text, { dimColor: true, children: [
+        "(",
+        /* @__PURE__ */ jsxs27(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: [
+          "+",
+          countLineDiff(oldString, newString).added
+        ] }),
+        " ",
+        /* @__PURE__ */ jsxs27(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: [
+          "-",
+          countLineDiff(oldString, newString).removed
+        ] }),
+        ")"
+      ] })
     ] }),
     /* @__PURE__ */ jsx44(Box_default, { marginLeft: 2, marginTop: 0, children: /* @__PURE__ */ jsx44(
       EditToolDiffPanel,
@@ -32653,7 +33313,7 @@ function renderToolResultMessage12(result) {
       {
         filePath: edit.file_path,
         isNewFile: edit.is_new_file ?? false,
-        diffText: edit.diff
+        diffText: typeof edit.diff === "string" ? edit.diff : null
       }
     ) }, `result-edit-${idx}`)) });
   }
@@ -32691,7 +33351,7 @@ function prettifyToolToken(value) {
   if (!s) return "";
   return s.replace(/[_-]+/g, " ").replace(/\s+/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
-function parseArgsRecord(args) {
+function parseArgsRecord2(args) {
   if (args == null) return {};
   if (typeof args === "string") {
     try {
@@ -32748,7 +33408,7 @@ var TOOL_INVOCATION_TITLES = {
 function getToolInvocationTitle(internalName, args) {
   const key = internalName.trim();
   if (key === "edit_tool") {
-    const p = parseArgsRecord(args);
+    const p = parseArgsRecord2(args);
     const edits = p.edits;
     if (Array.isArray(edits) && edits.length > 0) {
       const allCreate = edits.every(
@@ -33458,6 +34118,8 @@ var loadSkillTool = createTool({
 });
 
 // src/app/agent/tools/FileWriteTool/UI.tsx
+import fs42 from "fs";
+import { diffLines as diffLines3 } from "diff";
 import { jsx as jsx54, jsxs as jsxs37 } from "react/jsx-runtime";
 function getFilePath(args) {
   if (typeof args?.filepath === "string" && args.filepath.trim()) {
@@ -33468,6 +34130,49 @@ function getFilePath(args) {
   }
   return void 0;
 }
+function readExistingFileText(filePath) {
+  if (!filePath) return "";
+  try {
+    return fs42.readFileSync(filePath, "utf-8");
+  } catch {
+    return "";
+  }
+}
+function countLineDiff2(oldText, newText) {
+  const parts = diffLines3(oldText.replace(/\r\n/g, "\n"), newText.replace(/\r\n/g, "\n"));
+  let added = 0;
+  let removed = 0;
+  for (const part of parts) {
+    const lines = part.value.replace(/\n$/, "").split("\n");
+    const lineCount = part.value === "" ? 0 : lines.length;
+    if (part.added) added += lineCount;
+    if (part.removed) removed += lineCount;
+  }
+  return { added, removed };
+}
+function renderChangeCount(added, removed) {
+  return /* @__PURE__ */ jsxs37(Text, { dimColor: true, children: [
+    "(",
+    /* @__PURE__ */ jsxs37(Text, { color: BLUMA_TERMINAL.diffAddedWord, children: [
+      "+",
+      added
+    ] }),
+    " ",
+    /* @__PURE__ */ jsxs37(Text, { color: BLUMA_TERMINAL.diffRemovedWord, children: [
+      "-",
+      removed
+    ] }),
+    ")"
+  ] });
+}
+function buildUnifiedDiffText(filePath, oldContent, newContent) {
+  const patch = getPatchFromContents({
+    filePath,
+    oldContent,
+    newContent
+  });
+  return patchToUnifiedDiffText(filePath, patch);
+}
 function userFacingName20(args) {
   if (!args) return "Wrote";
   const p = getFilePath(args)?.split("/").pop() ?? "...";
@@ -33480,9 +34185,12 @@ function renderToolUseMessage21({ args }) {
 function renderToolHeader21({ args }) {
   const filePath = getFilePath(args) ?? "";
   const isNewFile = !args?.hasExistingContent;
+  const content = typeof args?.content === "string" ? args.content : "";
+  const counts = content ? countLineDiff2(isNewFile ? "" : readExistingFileText(filePath), content) : { added: 0, removed: 0 };
   return /* @__PURE__ */ jsxs37(Box_default, { flexDirection: "row", flexWrap: "wrap", alignItems: "flex-end", gap: 1, children: [
-    /* @__PURE__ */ jsx54(Text, { bold: true, color: isNewFile ? BLUMA_TERMINAL.success : BLUMA_TERMINAL.m3OnSurface, children: isNewFile ? "Created" : "Wrote" }),
-    /* @__PURE__ */ jsx54(FilePathLink, { filePath, color: BLUMA_TERMINAL.dim })
+    /* @__PURE__ */ jsx54(Text, { bold: true, color: isNewFile ? BLUMA_TERMINAL.m3OnSurface : BLUMA_TERMINAL.err, children: isNewFile ? "Created" : "Updated" }),
+    /* @__PURE__ */ jsx54(FilePathLink, { filePath, color: isNewFile ? BLUMA_TERMINAL.dim : BLUMA_TERMINAL.err }),
+    content ? renderChangeCount(counts.added, counts.removed) : null
   ] });
 }
 function renderToolMessage20({
@@ -33494,12 +34202,15 @@ function renderToolMessage20({
   const filePath = getFilePath(p);
   const payload = resolveToolPayload(result);
   const content = typeof p?.content === "string" ? p.content : "";
+  const isNewFile = !p?.hasExistingContent;
+  const previousContent = isNewFile ? "" : readExistingFileText(filePath);
+  const diffText = content && filePath ? buildUnifiedDiffText(filePath, previousContent, content) : "";
   return /* @__PURE__ */ jsx54(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx54(MessageResponse, { children: /* @__PURE__ */ jsxs37(Box_default, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ jsxs37(Box_default, { flexDirection: "row", flexWrap: "wrap", alignItems: "flex-end", children: [
       /* @__PURE__ */ jsx54(ToolUseLoader, { state: state2 ?? "pending" }),
       renderToolHeader21({ args: p })
     ] }),
-    /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", paddingLeft: 1, marginTop: 1, children: payload != null ? renderToolResultMessage21(payload, { filePath, content }) : /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: /* @__PURE__ */ jsx54(Box_default, { marginTop: 0, children: content ? /* @__PURE__ */ jsx54(HighlightedCode, { code: content, filePath: filePath ?? "file.txt", maxLines: 40 }) : /* @__PURE__ */ jsxs37(Text, { dimColor: true, children: [
+    /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", paddingLeft: 1, children: payload != null ? renderToolResultMessage21(payload, { filePath, content }) : /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: /* @__PURE__ */ jsx54(Box_default, { marginTop: 0, width: "100%", children: content ? /* @__PURE__ */ jsx54(Box_default, { width: "100%", flexGrow: 1, flexDirection: "column", children: /* @__PURE__ */ jsx54(SimpleDiff, { text: diffText, maxHeight: 2e3 }) }) : /* @__PURE__ */ jsxs37(Text, { dimColor: true, children: [
       "Writing to ",
       filePath ?? "...",
       " (",
@@ -33520,15 +34231,31 @@ function renderToolResultMessage21(result, context) {
   }
   const filePath = payload.filepath ?? payload.file_path ?? "";
   const bytes = payload.bytes_written ?? 0;
-  const statusText = payload.created ? "created" : payload.overwritten ? "overwritten" : "written";
-  return /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: typeof context?.content === "string" && context.content.trim() ? /* @__PURE__ */ jsx54(Box_default, { marginTop: 0, children: /* @__PURE__ */ jsx54(
-    HighlightedCode,
+  const resultFilePath = filePath || context?.filePath || "file.txt";
+  const previousContent = typeof payload.previous_content === "string" ? payload.previous_content : void 0;
+  const currentContent = typeof payload.content === "string" ? payload.content : typeof context?.args?.content === "string" ? (context?.args).content : typeof context?.content === "string" ? context.content : void 0;
+  const canRenderDiff = typeof currentContent === "string" && currentContent.trim() && typeof previousContent === "string";
+  return /* @__PURE__ */ jsx54(Box_default, { flexDirection: "column", children: canRenderDiff ? /* @__PURE__ */ jsx54(Box_default, { width: "100%", flexGrow: 1, children: /* @__PURE__ */ jsx54(
+    SimpleDiff,
+    {
+      text: buildUnifiedDiffText(resultFilePath, previousContent ?? "", currentContent ?? ""),
+      maxHeight: 2e3
+    }
+  ) }) : typeof currentContent === "string" && currentContent.trim() ? /* @__PURE__ */ jsx54(
+    Box_default,
     {
-      code: context.content,
-      filePath: filePath || context.filePath || "file.txt",
-      maxLines: 200
+      width: "100%",
+      backgroundColor: BLUMA_TERMINAL.diffAdded,
+      children: /* @__PURE__ */ jsx54(
+        HighlightedCode,
+        {
+          code: currentContent,
+          filePath: resultFilePath,
+          maxLines: 2e3
+        }
+      )
     }
-  ) }) : null });
+  ) : null });
 }
 
 // src/app/agent/tools/FileWriteTool/index.ts
@@ -35961,162 +36688,6 @@ var ConfirmationPrompt = memo13(ConfirmationPromptComponent);
 // src/app/ui/WorkingTimer.tsx
 import { useState as useState15, useEffect as useEffect13, memo as memo14, useRef as useRef6 } from "react";
 import { EventEmitter as EventEmitter6 } from "events";
-
-// src/app/ui/utils/toolActionLabels.ts
-function parseArgsRecord2(args) {
-  if (args == null) return {};
-  if (typeof args === "string") {
-    try {
-      return JSON.parse(args);
-    } catch {
-      return {};
-    }
-  }
-  if (typeof args === "object") {
-    return args;
-  }
-  return {};
-}
-function getToolActionLabel(toolName, args) {
-  const p = parseArgsRecord2(args);
-  switch (toolName) {
-    case "shell_command":
-    case "run_command": {
-      const cmd = typeof p.command === "string" ? p.command : "";
-      const truncated = cmd.length > 40 ? `${cmd.slice(0, 40)}\u2026` : cmd;
-      return truncated ? `Bash ${truncated}` : "Bash";
-    }
-    case "command_status":
-      return "Status";
-    case "send_command_input":
-      return "Input";
-    case "kill_command":
-      return "Kill";
-    case "read_file_lines": {
-      const filepath = typeof p.filepath === "string" ? p.filepath : "";
-      const file = filepath.split("/").pop() || filepath;
-      return file ? `Read ${file}` : "Read";
-    }
-    case "ls_tool":
-      return "List";
-    case "count_file_lines": {
-      const filepath = typeof p.filepath === "string" ? p.filepath : "";
-      const file = filepath.split("/").pop() || filepath;
-      return file ? `Count ${file}` : "Count";
-    }
-    case "edit_tool": {
-      const edits = p.edits;
-      const count = Array.isArray(edits) ? edits.length : 1;
-      const filepath = typeof p.file_path === "string" ? p.file_path : Array.isArray(edits) && edits[0]?.file_path ? edits[0].file_path : "";
-      const file = filepath ? filepath.split("/").pop() : "file";
-      return count === 1 ? `Edit ${file}` : `Edit ${count} files`;
-    }
-    case "file_write": {
-      const filepath = typeof p.filepath === "string" ? p.filepath : "";
-      const file = filepath.split("/").pop() || filepath;
-      return file ? `Write ${file}` : "Write";
-    }
-    case "grep_search": {
-      const query = typeof p.query === "string" ? p.query : "";
-      const truncated = query.length > 30 ? `${query.slice(0, 30)}\u2026` : query;
-      return truncated ? `Grep ${truncated}` : "Grep";
-    }
-    case "find_by_name": {
-      const pattern = typeof p.pattern === "string" ? p.pattern : "";
-      return pattern ? `Find ${pattern}` : "Find files";
-    }
-    case "view_file_outline": {
-      const filepath = typeof p.file_path === "string" ? p.file_path : "";
-      const file = filepath.split("/").pop() || filepath;
-      return file ? `Outline ${file}` : "Outline";
-    }
-    case "web_fetch": {
-      const url = typeof p.url === "string" ? p.url : "";
-      const truncated = url.length > 40 ? `${url.slice(0, 40)}\u2026` : url;
-      return truncated ? `Fetch ${truncated}` : "Fetch URL";
-    }
-    case "search_web": {
-      const query = typeof p.query === "string" ? p.query : "";
-      const truncated = query.length > 30 ? `${query.slice(0, 30)}\u2026` : query;
-      return truncated ? `Web ${truncated}` : "Web search";
-    }
-    case "spawn_agent": {
-      const title = typeof p.title === "string" ? p.title : "";
-      const task = typeof p.task === "string" ? p.task : "";
-      const label = title ? prettifyToolToken(title) : task ? task.slice(0, 40) : "task";
-      return `Spawn ${label}`;
-    }
-    case "wait_agent":
-      return "Wait";
-    case "list_agents":
-      return "Agents";
-    case "todo": {
-      const action = typeof p.action === "string" ? p.action : "update";
-      return `Todo ${action}`;
-    }
-    case "task_boundary": {
-      const mode = typeof p.mode === "string" ? p.mode : "";
-      const taskName = typeof p.task_name === "string" ? p.task_name : "";
-      return taskName ? `${mode} ${taskName}` : `Task ${mode}`;
-    }
-    case "task_create":
-    case "task_list":
-    case "task_get":
-    case "task_update":
-    case "task_stop": {
-      const title = typeof p.title === "string" ? p.title : "";
-      return title ? `Task ${prettifyToolToken(title)}` : "Task";
-    }
-    case "load_skill": {
-      const skill = typeof p.skill_name === "string" ? p.skill_name : "";
-      return skill ? `Skill ${skill.replace(/[_-]+/g, " ").replace(/\b\w/g, (c) => c.toUpperCase())}` : "Skill";
-    }
-    case "coding_memory": {
-      const action = typeof p.action === "string" ? p.action : "update";
-      return `Memory ${action}`;
-    }
-    case "read_artifact": {
-      const filename = typeof p.filename === "string" ? p.filename : "";
-      return filename ? `Read ${filename}` : "Read artifact";
-    }
-    case "message":
-      return "Message";
-    case "ask_user_question":
-      return "Question";
-    case "enter_plan_mode":
-      return "Plan mode";
-    case "exit_plan_mode":
-      return "Exit plan";
-    case "list_mcp_resources":
-      return "MCP resources";
-    case "read_mcp_resource": {
-      const server = typeof p.server === "string" ? p.server : "";
-      const uri = typeof p.uri === "string" ? p.uri : "";
-      return `MCP ${server || uri || "resource"}`;
-    }
-    case "cron_create":
-      return "Schedule";
-    case "cron_list":
-      return "Reminders";
-    case "cron_delete":
-      return "Cancel reminder";
-    case "notebook_edit": {
-      const filepath = typeof p.filepath === "string" ? p.filepath : "";
-      const file = filepath.split("/").pop() || filepath;
-      return file ? `Notebook ${file}` : "Notebook";
-    }
-    case "lsp_query": {
-      const operation = typeof p.operation === "string" ? p.operation : "";
-      return `LSP ${operation || "query"}`;
-    }
-    default: {
-      const pretty = toolName.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
-      return pretty || "Working";
-    }
-  }
-}
-
-// src/app/ui/WorkingTimer.tsx
 import { Fragment as Fragment8, jsx as jsx77, jsxs as jsxs60 } from "react/jsx-runtime";
 var SHIMMER_CYCLE_MS = 2e3;
 var SHIMMER_TICK_MS = 80;
@@ -36163,9 +36734,6 @@ var WorkingTimerComponent = ({
   finalElapsedMs: externalFinalElapsedMs
   // External final elapsed time (from parent)
 }) => {
-  if (startedAtMs == null && externalFinalElapsedMs == null) {
-    return null;
-  }
   const [currentAction, setCurrentAction] = useState15("working");
   const [nowTick, setNowTick] = useState15(() => Date.now());
   const [internalFinalElapsedMs, setInternalFinalElapsedMs] = useState15(null);
@@ -36206,11 +36774,10 @@ var WorkingTimerComponent = ({
   }, [startedAtMs]);
   useEffect13(() => {
     const localBus = localEventBusRef.current;
-    if (startedAtMs == null) return;
     let isMounted = true;
     completionHandledRef.current = false;
     const handleTurnComplete = (data) => {
-      if (!isMounted || completionHandledRef.current) return;
+      if (!isMounted || completionHandledRef.current || startedAtMs == null) return;
       const elapsedMs2 = typeof data?.elapsedMs === "number" ? data.elapsedMs : null;
       if (elapsedMs2 == null) return;
       completionHandledRef.current = true;
@@ -36235,7 +36802,10 @@ var WorkingTimerComponent = ({
       localBus.removeAllListeners();
     };
   }, [eventBus, startedAtMs]);
-  const displayAction = dynamicActionLabel || (taskStatus || (isReasoning ? "thinking" : currentAction)).trim() || "working";
+  if (startedAtMs == null && externalFinalElapsedMs == null) {
+    return null;
+  }
+  const displayAction = dynamicActionLabel || (taskStatus || (currentAction !== "working" ? currentAction : isReasoning ? getReasoningActionStatus().action : currentAction)).trim() || "working";
   const actionLine = `${displayAction}`;
   const elapsedMs = finalElapsedMs != null ? finalElapsedMs : startedAtMs != null ? Math.max(0, nowTick - startedAtMs) : 0;
   const elapsedLabel = formatTurnDurationMs(elapsedMs);
@@ -36379,13 +36949,13 @@ var StatusBar = memo16(() => {
   } = snapshot;
   void renderKey;
   const colors = {
-    primary: BLUMA_TERMINAL.primary,
-    secondary: BLUMA_TERMINAL.accent,
-    accent: BLUMA_TERMINAL.accent,
-    success: BLUMA_TERMINAL.success,
-    warning: BLUMA_TERMINAL.warning,
-    error: BLUMA_TERMINAL.err,
-    muted: BLUMA_TERMINAL.muted
+    primary: BLUMA_TERMINAL.subtle,
+    secondary: BLUMA_TERMINAL.subtle,
+    accent: BLUMA_TERMINAL.subtle,
+    success: BLUMA_TERMINAL.subtle,
+    warning: BLUMA_TERMINAL.subtle,
+    error: BLUMA_TERMINAL.subtle,
+    muted: BLUMA_TERMINAL.subtle
   };
   const remainingPercent = tokenBudget > 0 ? Math.max(0, Math.round((tokenBudget - tokenCount) / tokenBudget * 100)) : 100;
   let remainingColor = colors.muted;
@@ -36399,27 +36969,27 @@ var StatusBar = memo16(() => {
   const shortWorkdir = workdir ? workdir.split("/").filter(Boolean).pop() || workdir : "";
   const compressionText = isCompressing ? ` \xB7 compressing ${compressionProgress}%` : "";
   const planModeText = isPlanMode ? /* @__PURE__ */ jsxs62(Fragment9, { children: [
-    /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "\xB7" }),
-    /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "Plan Mode" })
+    /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "\xB7" }),
+    /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "Plan Mode" })
   ] }) : null;
   const agentModeIndicator = (() => {
     if (!agentMode || agentMode === "default") return null;
     const mode = agentMode.toLowerCase();
     if (mode === "coordinator") {
       return /* @__PURE__ */ jsxs62(Fragment9, { children: [
-        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "\xB7" }),
-        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "Coordinator" })
+        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "\xB7" }),
+        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "Coordinator" })
       ] });
     }
     if (mode === "plan") {
       return /* @__PURE__ */ jsxs62(Fragment9, { children: [
-        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "\xB7" }),
-        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "Plan" })
+        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "\xB7" }),
+        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "Plan" })
       ] });
     }
     return /* @__PURE__ */ jsxs62(Fragment9, { children: [
-      /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "\xB7" }),
-      /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: agentMode })
+      /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "\xB7" }),
+      /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: agentMode })
     ] });
   })();
   const modelText = modelName ? ` \xB7 model: ${modelName}` : "";
@@ -36435,25 +37005,25 @@ var StatusBar = memo16(() => {
       flexShrink: 0,
       children: [
         shortWorkdir && /* @__PURE__ */ jsxs62(Fragment9, { children: [
-          /* @__PURE__ */ jsxs62(Text, { color: BLUMA_TERMINAL.dim, children: [
+          /* @__PURE__ */ jsxs62(Text, { color: BLUMA_TERMINAL.subtle, children: [
             "~/",
             shortWorkdir
           ] }),
-          /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "\xB7" })
+          /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "\xB7" })
         ] }),
-        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: "Context" }),
+        /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: "Context" }),
         /* @__PURE__ */ jsxs62(Text, { color: remainingColor, children: [
           remainingPercent,
           "% left"
         ] }),
         modelText && /* @__PURE__ */ jsxs62(Fragment9, { children: [
-          /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: modelText }),
-          /* @__PURE__ */ jsx79(Text, { dimColor: true, children: "\xB7" })
+          /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: modelText }),
+          /* @__PURE__ */ jsx79(Text, { subtleColor: true, children: "\xB7" })
         ] }),
-        compressionText && /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: compressionText }),
+        compressionText && /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: compressionText }),
         agentModeIndicator,
         planModeText,
-        projectsText && /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.dim, children: projectsText })
+        projectsText && /* @__PURE__ */ jsx79(Text, { color: BLUMA_TERMINAL.subtle, children: projectsText })
       ]
     }
   );
@@ -36841,7 +37411,7 @@ function ToolMessageComponent({
     if (!normalizedResult) return null;
     if (entry?.renderToolResultMessage) {
       const payload = normalizedResult.status === "success" ? normalizedResult.data : normalizedResult;
-      return entry.renderToolResultMessage(payload, { verbose: false });
+      return entry.renderToolResultMessage(payload, { verbose: false, args });
     }
     return renderRawJson(normalizedResult);
   })();
@@ -38279,7 +38849,7 @@ var renderCode = () => {
 // src/app/agent/core/thread/thread_store.ts
 import path46 from "path";
 import os34 from "os";
-import { promises as fs42 } from "fs";
+import { promises as fs43 } from "fs";
 import { randomUUID as randomUUID2 } from "crypto";
 var INDEX_VERSION = 1;
 var fileLocks2 = /* @__PURE__ */ new Map();
@@ -38314,10 +38884,10 @@ var ThreadStore = class {
    * Inicializa o diretório de threads
    */
   async initialize() {
-    await fs42.mkdir(this.threadsDir, { recursive: true });
-    await fs42.mkdir(this.archiveDir, { recursive: true });
+    await fs43.mkdir(this.threadsDir, { recursive: true });
+    await fs43.mkdir(this.archiveDir, { recursive: true });
     try {
-      await fs42.access(this.indexPath);
+      await fs43.access(this.indexPath);
     } catch {
       await this.saveIndex({ version: INDEX_VERSION, threads: [], lastUpdated: (/* @__PURE__ */ new Date()).toISOString() });
     }
@@ -38346,7 +38916,7 @@ var ThreadStore = class {
   async loadIndex() {
     return withFileLock2(this.indexPath, async () => {
       try {
-        const content = await fs42.readFile(this.indexPath, "utf-8");
+        const content = await fs43.readFile(this.indexPath, "utf-8");
         return JSON.parse(content);
       } catch {
         return { version: INDEX_VERSION, threads: [], lastUpdated: (/* @__PURE__ */ new Date()).toISOString() };
@@ -38357,8 +38927,8 @@ var ThreadStore = class {
     return withFileLock2(this.indexPath, async () => {
       index.lastUpdated = (/* @__PURE__ */ new Date()).toISOString();
       const tempPath = `${this.indexPath}.${Date.now()}.tmp`;
-      await fs42.writeFile(tempPath, JSON.stringify(index, null, 2), "utf-8");
-      await fs42.rename(tempPath, this.indexPath);
+      await fs43.writeFile(tempPath, JSON.stringify(index, null, 2), "utf-8");
+      await fs43.rename(tempPath, this.indexPath);
     });
   }
   // ==================== Git Info ====================
@@ -38554,7 +39124,7 @@ var ThreadStore = class {
     const oldPath = this.getHistoryPath(threadId);
     const newPath = path46.join(this.archiveDir, `${threadId}.jsonl`);
     try {
-      await fs42.rename(oldPath, newPath);
+      await fs43.rename(oldPath, newPath);
     } catch (e) {
       if (e.code !== "ENOENT") throw e;
     }
@@ -38578,7 +39148,7 @@ var ThreadStore = class {
     const oldPath = path46.join(this.archiveDir, `${threadId}.jsonl`);
     const newPath = this.getHistoryPath(threadId);
     try {
-      await fs42.rename(oldPath, newPath);
+      await fs43.rename(oldPath, newPath);
     } catch (e) {
       if (e.code !== "ENOENT") throw e;
     }
@@ -38599,7 +39169,7 @@ var ThreadStore = class {
     if (entryIndex === -1) return false;
     const entry = index.threads[entryIndex];
     try {
-      await fs42.unlink(entry.historyPath);
+      await fs43.unlink(entry.historyPath);
     } catch {
     }
     index.threads.splice(entryIndex, 1);
@@ -38626,7 +39196,7 @@ var ThreadStore = class {
     for (const msg of history.messages) {
       lines.push(JSON.stringify({ type: "message", ...msg }));
     }
-    await fs42.writeFile(historyPath, lines.join("\n") + "\n", "utf-8");
+    await fs43.writeFile(historyPath, lines.join("\n") + "\n", "utf-8");
   }
   /**
    * Carrega o histórico de uma thread
@@ -38636,7 +39206,7 @@ var ThreadStore = class {
     const entry = index.threads.find((t) => t.threadId === threadId);
     if (!entry) return null;
     try {
-      const content = await fs42.readFile(entry.historyPath, "utf-8");
+      const content = await fs43.readFile(entry.historyPath, "utf-8");
       const lines = content.split("\n").filter(Boolean);
       const history = {
         threadId,
@@ -38669,7 +39239,7 @@ var ThreadStore = class {
     const entry = index.threads.find((t) => t.threadId === threadId);
     if (!entry) throw new Error(`Thread not found: ${threadId}`);
     const lines = messages.map((msg) => JSON.stringify({ type: "message", ...msg }));
-    await fs42.appendFile(entry.historyPath, lines.join("\n") + "\n", "utf-8");
+    await fs43.appendFile(entry.historyPath, lines.join("\n") + "\n", "utf-8");
     entry.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     await this.saveIndex(index);
   }
@@ -38957,7 +39527,7 @@ function formatRelativeTime(iso) {
   if (diffDays < 7) return `h\xE1 ${diffDays}d`;
   return formatDate(iso);
 }
-function truncate3(str, max) {
+function truncate4(str, max) {
   if (str.length <= max) return str;
   return str.slice(0, max - 3) + "...";
 }
@@ -38983,7 +39553,7 @@ async function renderCurrentThread() {
       ] }),
       /* @__PURE__ */ jsxs79(Text, { children: [
         /* @__PURE__ */ jsx96(Text, { dimColor: true, children: "Preview: " }),
-        /* @__PURE__ */ jsx96(Text, { dimColor: true, children: truncate3(metadata.preview, 60) })
+        /* @__PURE__ */ jsx96(Text, { dimColor: true, children: truncate4(metadata.preview, 60) })
       ] }),
       /* @__PURE__ */ jsxs79(Text, { children: [
         /* @__PURE__ */ jsx96(Text, { dimColor: true, children: "Modelo: " }),
@@ -38998,7 +39568,7 @@ async function renderCurrentThread() {
         /* @__PURE__ */ jsxs79(Text, { dimColor: true, children: [
           metadata.gitInfo.branch || "?",
           " @ ",
-          truncate3(metadata.gitInfo.sha || "?", 8)
+          truncate4(metadata.gitInfo.sha || "?", 8)
         ] })
       ] }),
       /* @__PURE__ */ jsxs79(Text, { children: [
@@ -39066,7 +39636,7 @@ async function renderThreadList(args) {
 }
 var ThreadListItem = ({ thread, isActive, index }) => {
   const statusColor = thread.status === "archived" ? BLUMA_TERMINAL.warning : BLUMA_TERMINAL.success;
-  const name = thread.name || truncate3(thread.preview, 40);
+  const name = thread.name || truncate4(thread.preview, 40);
   return /* @__PURE__ */ jsxs79(Box_default, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs79(Box_default, { gap: 1, children: [
       /* @__PURE__ */ jsxs79(Text, { dimColor: true, children: [
@@ -41535,15 +42105,15 @@ import semverGt from "semver/functions/gt.js";
 import semverValid from "semver/functions/valid.js";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import path47 from "path";
-import fs43 from "fs";
+import fs44 from "fs";
 var BLUMA_PACKAGE_NAME = "@nomad-e/bluma-cli";
 function findBlumaPackageJson(startDir) {
   let dir = startDir;
   for (let i = 0; i < 12; i++) {
     const candidate = path47.join(dir, "package.json");
-    if (fs43.existsSync(candidate)) {
+    if (fs44.existsSync(candidate)) {
       try {
-        const raw = fs43.readFileSync(candidate, "utf8");
+        const raw = fs44.readFileSync(candidate, "utf8");
         const parsed = JSON.parse(raw);
         if (parsed?.name === BLUMA_PACKAGE_NAME && parsed?.version) {
           return { name: parsed.name, version: String(parsed.version) };
@@ -41574,8 +42144,8 @@ function resolveInstalledBlumaPackage() {
   if (argv1 && !argv1.startsWith("-")) {
     try {
       let resolved = argv1;
-      if (path47.isAbsolute(argv1) && fs43.existsSync(argv1)) {
-        resolved = fs43.realpathSync(argv1);
+      if (path47.isAbsolute(argv1) && fs44.existsSync(argv1)) {
+        resolved = fs44.realpathSync(argv1);
       } else {
         resolved = path47.resolve(process.cwd(), argv1);
       }
@@ -42398,16 +42968,16 @@ function usePlanMode() {
 
 // src/app/hooks/useAgentMode.ts
 import { useState as useState22, useEffect as useEffect20, useCallback as useCallback9 } from "react";
-import * as fs44 from "fs";
+import * as fs45 from "fs";
 import * as path48 from "path";
 import { homedir as homedir3 } from "os";
 var SETTINGS_PATH = path48.join(homedir3(), ".bluma", "settings.json");
 function readAgentModeFromFile() {
   try {
-    if (!fs44.existsSync(SETTINGS_PATH)) {
+    if (!fs45.existsSync(SETTINGS_PATH)) {
       return "default";
     }
-    const content = fs44.readFileSync(SETTINGS_PATH, "utf-8");
+    const content = fs45.readFileSync(SETTINGS_PATH, "utf-8");
     const settings = JSON.parse(content);
     return settings.agentMode || "default";
   } catch (error) {
@@ -42426,16 +42996,16 @@ function useAgentMode() {
   }, []);
   const updateAgentMode = useCallback9((mode) => {
     try {
-      if (!fs44.existsSync(SETTINGS_PATH)) {
-        fs44.mkdirSync(path48.dirname(SETTINGS_PATH), { recursive: true });
+      if (!fs45.existsSync(SETTINGS_PATH)) {
+        fs45.mkdirSync(path48.dirname(SETTINGS_PATH), { recursive: true });
       }
       let settings = {};
-      if (fs44.existsSync(SETTINGS_PATH)) {
-        const content = fs44.readFileSync(SETTINGS_PATH, "utf-8");
+      if (fs45.existsSync(SETTINGS_PATH)) {
+        const content = fs45.readFileSync(SETTINGS_PATH, "utf-8");
         settings = JSON.parse(content);
       }
       settings.agentMode = mode;
-      fs44.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf-8");
+      fs45.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2), "utf-8");
       setAgentMode(mode);
     } catch (error) {
       console.error("Failed to update agent mode:", error);
@@ -43691,9 +44261,9 @@ async function runAgentMode() {
   try {
     if (inputFileIndex !== -1 && args[inputFileIndex + 1]) {
       const filePath = args[inputFileIndex + 1];
-      rawPayload = fs45.readFileSync(filePath, "utf-8");
+      rawPayload = fs46.readFileSync(filePath, "utf-8");
     } else {
-      rawPayload = fs45.readFileSync(0, "utf-8");
+      rawPayload = fs46.readFileSync(0, "utf-8");
     }
   } catch (err) {
     writeAgentEvent(registrySessionId, {
@@ -43893,7 +44463,7 @@ function readCliPackageVersion() {
   try {
     const base = path49.dirname(fileURLToPath7(import.meta.url));
     const pkgPath = path49.join(base, "..", "package.json");
-    const j = JSON.parse(fs45.readFileSync(pkgPath, "utf8"));
+    const j = JSON.parse(fs46.readFileSync(pkgPath, "utf8"));
     return String(j.version || "0.0.0");
   } catch {
     return "0.0.0";
@@ -44019,7 +44589,7 @@ function startBackgroundAgent() {
     process.exit(1);
   }
   const filePath = args[inputFileIndex + 1];
-  const rawPayload = fs45.readFileSync(filePath, "utf-8");
+  const rawPayload = fs46.readFileSync(filePath, "utf-8");
   const envelope = JSON.parse(rawPayload);
   const sessionId = envelope.session_id || envelope.message_id || uuidv412();
   registerSession({