u-foo 2.5.4 → 2.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",

package/src/agents/launch/ptyRunner.js

@@ -61,8 +61,8 @@ function stripAnsi(text) {
 function rewriteTitleOscPrefix(text, prefix) {
   if (!prefix || !text) return text;
   return String(text).replace(/\x1b\]([012]);([^\x07\x1b]*)(\x07|\x1b\\)/g, (match, code, title, terminator) => {
-    if (!title || title.startsWith(`${prefix}:`)) return match;
-    return `\x1b]${code};${prefix}:${title}${terminator}`;
+    if (!title || title.startsWith(`${prefix}: `)) return match;
+    return `\x1b]${code};${prefix}: ${title}${terminator}`;
   });
 }
 

package/src/agents/launch/ptyWrapper.js

@@ -211,8 +211,8 @@ class PtyWrapper {
     if (!this.titlePrefix || !text) return text;
     const prefix = this.titlePrefix;
     return text.replace(/\x1b\]([012]);([^\x07\x1b]*)(\x07|\x1b\\)/g, (match, code, title, terminator) => {
-      if (!title || title.startsWith(`${prefix}:`)) return match;
-      return `\x1b]${code};${prefix}:${title}${terminator}`;
+      if (!title || title.startsWith(`${prefix}: `)) return match;
+      return `\x1b]${code};${prefix}: ${title}${terminator}`;
     });
   }
 

package/src/agents/prompts/native/index.js

@@ -70,7 +70,7 @@ function getSystemPrompt({
   // --- Dynamic sections (may change per session/turn) ---
   const dynamicSectionDefs = [
     systemPromptSection("ufoo", () => getUfooIntegrationSection()),
-    systemPromptSection("environment", () =>
+    uncachedSection("environment", () =>
       getEnvironmentSection({ workspaceRoot, model, provider }),
     ),
     uncachedSection("skills", () => {

package/src/agents/prompts/native/toolDescriptions/bash.js

@@ -6,7 +6,7 @@ function getBashToolDescription() {
   return `Run a single shell command in the workspace directory.
 
 Usage notes:
-- Default timeout is 60 seconds. Use timeoutMs to adjust for longer operations.
+- Default timeout is 60 seconds. Use timeoutMs to adjust for longer operations (maximum 600 seconds; larger values are clamped).
 - Do NOT use bash for file operations when a dedicated tool exists:
   - Use read instead of cat/head/tail.
   - Use write instead of echo/cat heredoc.

package/src/agents/prompts/native/toolDescriptions/read.js

@@ -7,11 +7,12 @@ function getReadToolDescription() {
 
 Usage notes:
 - The path parameter is relative to the workspace root.
-- By default reads the entire file. For large files, use startLine and endLine to read specific ranges.
+- By default reads the entire file. Files larger than ~4MB are only partially read from the start; in that case truncated is true.
+- Use startLine and endLine to read specific line ranges.
 - Use maxBytes to limit the amount of data returned (default ~200KB).
 - Cannot read directories — use bash with \`ls\` for that.
 - Always read a file before editing it to understand its current content and structure.
-- Results are returned with line numbers for easy reference.`;
+- The content field contains the raw file text without line numbers. The result also includes totalLines (lines in the portion that was read) and truncated (true when the content was cut short by maxBytes or the large-file limit).`;
 }
 
 module.exports = { READ_TOOL_NAME, getReadToolDescription };

package/src/app/chat/multiWindow/renderer.js

@@ -1,4 +1,9 @@
 const BOX = { h: "─", v: "│", tl: "┌", tr: "┐", bl: "└", br: "┘", t: "┬", b: "┴", l: "├", r: "┤", x: "┼" };
+const {
+  classifyChatLogLine,
+  compactContinuationIndent,
+  compactDividerLabel,
+} = require("../../../ui/ink/chatLogModel");
 
 function createRenderer(options = {}) {
   const {
@@ -239,49 +244,31 @@ function createRenderer(options = {}) {
     return str.slice(0, i);
   }
 
-  function classifyLogLine(raw = "") {
-    const clean = stripControl(raw)
-      .replace(/\{\/?[^{}\n]+\}/g, "")
-      .replace(/\*\*([^*]+)\*\*/g, "$1")
-      .replace(/`([^`]+)`/g, "$1");
-    const trimmed = clean.trim();
-    if (!trimmed) return { kind: "spacer", text: " " };
-    if (/^[█▀▄ ]+$/.test(trimmed) || /^ufoo chat/i.test(trimmed)) return { kind: "banner", text: clean };
-    if (/^───.*───$/.test(trimmed)) return { kind: "divider", text: clean };
-    if (/^(error:|✗|failed\b)/i.test(trimmed)) return { kind: "error", marker: "!", speaker: "error", body: clean.replace(/^(error:\s*)/i, "") };
-    if (/^(✓|✔|done\b|closed\b)/i.test(trimmed)) return { kind: "success", marker: "✓", body: clean.replace(/^[✓✔]\s*/, "") };
-    const dot = clean.match(/^([^·:\n]{1,34})\s+·\s+(.*)$/);
-    if (dot) {
-      const speaker = dot[1].trim();
-      return {
-        kind: speaker.toLowerCase() === "ufoo" ? "assistant" : "agent",
-        marker: speaker.toLowerCase() === "ufoo" ? "◆" : "●",
-        speaker,
-        body: dot[2] || " ",
-      };
-    }
-    const colon = clean.match(/^([A-Za-z0-9_.:@/-]{1,34}):\s+(.*)$/);
-    if (colon) return { kind: "agent", marker: "●", speaker: colon[1], body: colon[2] || " " };
-    return { kind: "plain", marker: "│", body: clean };
-  }
-
   function formatChatLogLine(raw = "", width = 80) {
-    const row = classifyLogLine(raw);
+    const row = classifyChatLogLine(stripControl(raw));
     const reset = "\x1b[0m";
     if (row.kind === "spacer") return " ".repeat(width);
-    if (row.kind === "banner") return `\x1b[36;1m${truncateVisible(row.text, width)}${reset}`;
-    if (row.kind === "divider") return `\x1b[90m${truncateVisible(row.text, width)}${reset}`;
+    if (row.kind === "banner") return `\x1b[36;1m${truncateVisible(row.body, width)}${reset}`;
+    if (row.kind === "divider") return `\x1b[90m${truncateVisible(`  ${compactDividerLabel(row.body)}`, width)}${reset}`;
 
     const palette = {
       assistant: { marker: "\x1b[36m", speaker: "\x1b[37;1m", body: "" },
       agent: { marker: "\x1b[36m", speaker: "\x1b[36m", body: "" },
       error: { marker: "\x1b[31;1m", speaker: "\x1b[31m", body: "\x1b[31m" },
       success: { marker: "\x1b[32m", speaker: "\x1b[32m", body: "\x1b[32m" },
+      meta: { marker: "\x1b[90m", speaker: "\x1b[90m", body: "\x1b[90m" },
       plain: { marker: "\x1b[90m", speaker: "\x1b[90m", body: "" },
     };
     const colors = palette[row.kind] || palette.plain;
     const speaker = row.speaker ? `${colors.speaker}${row.speaker}${reset}\x1b[90m · ${reset}` : "";
-    const line = `${colors.marker}${row.marker || "│"}${reset} ${speaker}${colors.body || ""}${row.body || row.text || " "}${reset}`;
+    const markerGlyph = row.kind === "agent" ? "●" : row.marker;
+    const marker = markerGlyph
+      ? `${colors.marker}${markerGlyph}${reset} `
+      : "  ";
+    const body = row.kind === "plain"
+      ? compactContinuationIndent(row.body || row.text || " ")
+      : (row.body || row.text || " ");
+    const line = `${marker}${speaker}${colors.body || ""}${body}${reset}`;
     return truncateVisible(line, width);
   }
 

package/src/code/agent.js

@@ -2,7 +2,7 @@ const readline = require("readline");
 const fs = require("fs");
 const path = require("path");
 const { execSync } = require("child_process");
-const { runToolCall } = require("./dispatch");
+const { runToolCall, TOOL_NAMES } = require("./dispatch");
 const { runNativeAgentTask } = require("./nativeRunner");
 const {
   runDecomposedTask,
@@ -440,6 +440,7 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
   const timeoutMs = Number.isFinite(state.timeoutMs) ? state.timeoutMs : 600000;
   let streamed = false;
   let streamLastChar = "";
+  let toolEventsThisAttempt = 0;
   const onDelta = typeof options.onDelta === "function"
     ? options.onDelta
     : null;
@@ -495,23 +496,27 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
     : runNativeAgentTask;
   const onPhase = typeof options.onPhase === "function" ? options.onPhase : null;
   const onThinkingDelta = typeof options.onThinkingDelta === "function" ? options.onThinkingDelta : null;
-  const invokeNative = (sessionIdValue = "", timeoutOverrideMs = timeoutMs) => runNativeAgentImpl({
-    workspaceRoot,
-    provider,
-    model,
-    prompt: effectiveTaskPrompt,
-    systemPrompt: systemContext,
-    messages: Array.isArray(state.nlMessages) ? state.nlMessages : [],
-    sessionId: String(sessionIdValue || ""),
-    timeoutMs: timeoutOverrideMs,
-    onStreamDelta: onStream,
-    onThinkingDelta,
-    onPhase,
-    onToolEvent: (event) => {
-      pushToolLog(event);
-    },
-    signal: options.signal,
-  });
+  const invokeNative = (sessionIdValue = "", timeoutOverrideMs = timeoutMs) => {
+    toolEventsThisAttempt = 0;
+    return runNativeAgentImpl({
+      workspaceRoot,
+      provider,
+      model,
+      prompt: effectiveTaskPrompt,
+      systemPrompt: systemContext,
+      messages: Array.isArray(state.nlMessages) ? state.nlMessages : [],
+      sessionId: String(sessionIdValue || ""),
+      timeoutMs: timeoutOverrideMs,
+      onStreamDelta: onStream,
+      onThinkingDelta,
+      onPhase,
+      onToolEvent: (event) => {
+        toolEventsThisAttempt += 1;
+        pushToolLog(event);
+      },
+      signal: options.signal,
+    });
+  };
 
   try {
     let cliRes;
@@ -551,7 +556,9 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
 
       if (!cliRes || cliRes.ok === false) {
         const errMsg = String((cliRes && cliRes.error) || "");
-        if (isCliTimeoutError(errMsg)) {
+        // Only replay the whole task when this attempt ran no tool calls;
+        // retrying after executed write/edit/bash steps would replay side effects.
+        if (isCliTimeoutError(errMsg) && toolEventsThisAttempt === 0) {
           const extendedTimeoutMs = computeExtendedTimeout(timeoutMs);
           cliRes = await invokeNative(String(state.sessionId || ""), extendedTimeoutMs);
         }
@@ -1317,6 +1324,13 @@ function runSingleCommand(line = "", workspaceRoot = process.cwd()) {
     };
   }
   const tool = String(match[2] || "").trim().toLowerCase();
+  if (String(match[1]).toLowerCase() === "run" && !TOOL_NAMES.includes(tool)) {
+    // Natural language like "run the tests" is not a tool invocation.
+    return {
+      kind: "nl",
+      task: text,
+    };
+  }
   const payload = String(match[3] || "").trim();
   let args = {};
   try {
@@ -1546,7 +1560,7 @@ async function runUcodeCoreAgent({
         }
       }
       if (result.kind === "resume") {
-        const resumed = resumeSessionState(state, result.sessionId, workspaceRoot);
+        const resumed = resumeSessionState(state, result.sessionId, state.workspaceRoot || resolvedWorkspaceRoot);
         if (!resumed.ok) {
           stdout.write(`Error: ${resumed.error}\n`);
         } else {

package/src/code/launcher/ucode.js

@@ -224,8 +224,10 @@ function readLastArgValue(args = [], flag = "") {
     if (!item) continue;
     if (item === flag) {
       const next = String(args[i + 1] || "").trim();
-      if (next) value = next;
-      i += 1;
+      if (next && !next.startsWith("--")) {
+        value = next;
+        i += 1;
+      }
       continue;
     }
     if (item.startsWith(`${flag}=`)) {
@@ -342,7 +344,7 @@ function resolveUcodeLaunch({
   const promptFile = String(
     env.UFOO_UCODE_PROMPT_FILE
       || config.ucodePromptFile
-      || defaultBundledPromptFile()
+      || ""
   ).trim();
   const bootstrapFile = String(
     env.UFOO_UCODE_BOOTSTRAP_FILE

package/src/code/launcher/ucodeDoctor.js

@@ -3,7 +3,6 @@ const path = require("path");
 const { loadConfig } = require("../../config");
 const {
   resolveNativeFallbackCommand,
-  defaultBundledPromptFile,
 } = require("./ucode");
 const { inspectUcodeBuildSetup } = require("./ucodeBuild");
 const { inspectUcodeRuntimeConfig } = require("./ucodeRuntimeConfig");
@@ -30,7 +29,7 @@ function inspectUcodeSetup({
   const promptFile = String(
     env.UFOO_UCODE_PROMPT_FILE
       || config.ucodePromptFile
-      || defaultBundledPromptFile()
+      || ""
   ).trim();
   const bootstrapFile = String(
     env.UFOO_UCODE_BOOTSTRAP_FILE
@@ -130,7 +129,7 @@ function formatUcodeDoctor(result = {}) {
   if (result.configuredCommand) {
     lines.push(`configured command override (ignored in native-only mode): ${result.configuredCommand}`);
   }
-  lines.push(`prompt: ${result.promptFile || "(none)"}${result.promptExists ? "" : " (missing)"}`);
+  lines.push(`prompt: ${result.promptFile || "(none)"}${result.promptFile && !result.promptExists ? " (missing)" : ""}`);
   lines.push(`bootstrap: ${result.bootstrapFile || "(none)"}`);
   if (result.build && result.build.coreRoot) {
     lines.push(`build: ${result.build.distCliExists ? "ready" : "missing dist"}`);
@@ -170,6 +169,10 @@ function prepareAndInspectUcode({
     projectRoot: inspection.projectRoot,
     promptFile: inspection.promptFile,
     targetFile: inspection.bootstrapFile,
+    // The native core already injects the ufoo protocol via the modular
+    // prompt (src/agents/prompts/native/ufoo.js); inlining it into the
+    // bootstrap file would append the same protocol text a second time.
+    includeDefaultProtocol: false,
   });
   return {
     ...inspection,

package/src/code/nativeRunner.js

@@ -14,6 +14,11 @@ const DEFAULT_ANTHROPIC_BASE_URL = "https://api.anthropic.com/v1";
 // for non-trivial tasks while still catching runaway loops. Override via env.
 const DEFAULT_MAX_NATIVE_TOOL_CALLS = 100;
 const DEFAULT_MAX_NATIVE_TOOL_ERRORS = 5;
+// Anthropic Messages rejects max_tokens above the model's real cap (64K on
+// current models), so the transports use different defaults. Override either
+// via UFOO_UCODE_MAX_TOKENS (positive integer).
+const DEFAULT_OPENAI_MAX_TOKENS = 131072;
+const DEFAULT_ANTHROPIC_MAX_TOKENS = 64000;
 
 function nowMs() {
   return Date.now();
@@ -38,6 +43,10 @@ function resolveNativeToolBudget(env = process.env) {
   };
 }
 
+function resolveMaxTokens(fallback) {
+  return normalizePositiveInt(process.env.UFOO_UCODE_MAX_TOKENS, fallback);
+}
+
 function enforceNativeToolBudget({
   toolCallsExecuted = 0,
   toolErrors = 0,
@@ -46,7 +55,7 @@ function enforceNativeToolBudget({
   lastTool = "",
   lastError = "",
 } = {}) {
-  if (toolCallsExecuted > maxToolCalls) {
+  if (toolCallsExecuted >= maxToolCalls) {
     throw new Error(`tool call budget exceeded (${maxToolCalls})`);
   }
   if (toolErrors >= maxToolErrors) {
@@ -534,7 +543,7 @@ async function runOpenAiLikeTurn({
 } = {}) {
   const payload = {
     model,
-    max_tokens: 131072,
+    max_tokens: resolveMaxTokens(DEFAULT_OPENAI_MAX_TOKENS),
     messages,
     tools: buildCoreToolSpecs(),
     tool_choice: "auto",
@@ -588,6 +597,8 @@ async function runOpenAiLikeTurn({
     let rawBuffer = "";
     let responseText = "";
     const announcedToolNames = new Set();
+    let nextSyntheticIndex = 0;
+    let lastSyntheticIndex = -1;
 
     while (true) {
       const { done, value } = await reader.read();
@@ -633,7 +644,23 @@ async function runOpenAiLikeTurn({
 
         if (Array.isArray(delta.tool_calls)) {
           for (const callPart of delta.tool_calls) {
-            const index = Number.isFinite(callPart.index) ? callPart.index : 0;
+            let index;
+            if (Number.isFinite(callPart.index)) {
+              index = callPart.index;
+            } else if (typeof callPart.id === "string" && callPart.id) {
+              // Provider omitted index: a chunk carrying an id starts a new
+              // call, so give it its own synthetic index instead of
+              // collapsing every call into slot 0.
+              while (toolCallMap.has(nextSyntheticIndex)) nextSyntheticIndex += 1;
+              index = nextSyntheticIndex;
+              nextSyntheticIndex += 1;
+              lastSyntheticIndex = index;
+            } else if (lastSyntheticIndex >= 0) {
+              // No index and no id: continuation of the latest synthetic call.
+              index = lastSyntheticIndex;
+            } else {
+              index = 0;
+            }
             const previous = toolCallMap.get(index) || {
               id: "",
               type: "function",
@@ -755,7 +782,7 @@ async function runAnthropicTurn({
 } = {}) {
   const payload = {
     model,
-    max_tokens: 131072,
+    max_tokens: resolveMaxTokens(DEFAULT_ANTHROPIC_MAX_TOKENS),
     messages,
     tools: buildAnthropicToolSpecs(),
     stream: true,

package/src/code/taskDecomposer.js

@@ -280,6 +280,15 @@ function compileSummary(results) {
   return summaryParts.join("\n\n");
 }
 
+/**
+ * Quote a value for safe inclusion in a shell command (single-quote style).
+ * Kept local to avoid a circular dependency with agent.js.
+ */
+function shellQuote(value = "") {
+  const text = String(value == null ? "" : value);
+  return `'${text.replace(/'/g, `'\"'\"'`)}'`;
+}
+
 /**
  * Create a progress reporter that sends updates via bus
  */
@@ -297,10 +306,10 @@ function createBusProgressReporter(shell, publisher) {
 
     if (progress.type === "step_start") {
       const message = `⏳ ${progress.name} (${progress.current}/${progress.total})`;
-      shell(`ufoo bus send ${publisher} ${JSON.stringify(message)}`);
+      shell(`ufoo bus send ${shellQuote(publisher)} ${shellQuote(JSON.stringify(message))}`);
     } else if (progress.type === "step_complete" && progress.success) {
       const message = `✅ ${progress.name} completed`;
-      shell(`ufoo bus send ${publisher} ${JSON.stringify(message)}`);
+      shell(`ufoo bus send ${shellQuote(publisher)} ${shellQuote(JSON.stringify(message))}`);
     }
   };
 }

package/src/code/tools/bash.js

@@ -1,6 +1,8 @@
 const { spawnSync } = require("child_process");
 const { normalizeWorkspaceRoot } = require("./common");
 
+const MAX_TIMEOUT_MS = 600000;
+
 function runBashTool(input = {}, options = {}) {
   try {
     const command = String(input.command || "").trim();
@@ -11,7 +13,9 @@ function runBashTool(input = {}, options = {}) {
       };
     }
     const workspaceRoot = normalizeWorkspaceRoot(options.workspaceRoot, options.cwd);
-    const timeoutMs = Number.isFinite(input.timeoutMs) ? Math.max(100, Math.floor(input.timeoutMs)) : 60000;
+    const timeoutMs = Number.isFinite(input.timeoutMs)
+      ? Math.min(MAX_TIMEOUT_MS, Math.max(100, Math.floor(input.timeoutMs)))
+      : 60000;
     const result = spawnSync(command, {
       cwd: workspaceRoot,
       shell: true,
@@ -25,13 +29,26 @@ function runBashTool(input = {}, options = {}) {
         ok: false,
         workspaceRoot,
         code: typeof result.status === "number" ? result.status : -1,
+        signal: result.signal || "",
         stdout: String(result.stdout || ""),
         stderr: String(result.stderr || ""),
         error: result.error.message || "bash failed",
       };
     }
 
-    const code = typeof result.status === "number" ? result.status : 0;
+    if (typeof result.status !== "number") {
+      return {
+        ok: false,
+        workspaceRoot,
+        code: -1,
+        signal: result.signal || "",
+        stdout: String(result.stdout || ""),
+        stderr: String(result.stderr || ""),
+        error: `command killed by signal ${result.signal || "unknown"}`,
+      };
+    }
+
+    const code = result.status;
     return {
       ok: code === 0,
       workspaceRoot,

package/src/code/tools/read.js

@@ -1,6 +1,23 @@
 const fs = require("fs");
 const { resolveWorkspacePath } = require("./common");
 
+const MAX_FULL_READ_BYTES = 4 * 1024 * 1024;
+
+function readFileBounded(resolved) {
+  const stat = fs.statSync(resolved);
+  if (stat.size <= MAX_FULL_READ_BYTES) {
+    return { raw: fs.readFileSync(resolved, "utf8"), partial: false };
+  }
+  const fd = fs.openSync(resolved, "r");
+  try {
+    const buffer = Buffer.alloc(MAX_FULL_READ_BYTES);
+    const bytesRead = fs.readSync(fd, buffer, 0, MAX_FULL_READ_BYTES, 0);
+    return { raw: buffer.slice(0, bytesRead).toString("utf8"), partial: true };
+  } finally {
+    fs.closeSync(fd);
+  }
+}
+
 function runReadTool(input = {}, options = {}) {
   try {
     const filePath = String(input.path || input.file || "").trim();
@@ -9,13 +26,13 @@ function runReadTool(input = {}, options = {}) {
     const endLine = Number.isFinite(input.endLine) ? Math.max(startLine, Math.floor(input.endLine)) : 0;
     const maxBytes = Number.isFinite(input.maxBytes) ? Math.max(256, Math.floor(input.maxBytes)) : 200000;
 
-    const raw = fs.readFileSync(resolved, "utf8");
+    const { raw, partial } = readFileBounded(resolved);
     const lines = raw.split(/\r?\n/);
     const from = startLine - 1;
     const to = endLine > 0 ? endLine : lines.length;
     const selected = lines.slice(from, to);
     let content = selected.join("\n");
-    let truncated = false;
+    let truncated = partial;
     if (Buffer.byteLength(content, "utf8") > maxBytes) {
       content = Buffer.from(content, "utf8").slice(0, maxBytes).toString("utf8");
       truncated = true;
@@ -41,4 +58,5 @@ function runReadTool(input = {}, options = {}) {
 
 module.exports = {
   runReadTool,
+  MAX_FULL_READ_BYTES,
 };

package/src/ui/ink/ChatApp.js

@@ -23,6 +23,14 @@ const fmt = require("../format");
 const { createMultilineInput } = require("./MultilineInput");
 const { createDashboardBar } = require("./DashboardBar");
 const { reducer, createInitialState } = require("./chatReducer");
+const {
+  stripBlessedTags,
+  compactDividerLabel,
+  classifyChatLogLine,
+  buildChatLogLineModel,
+  buildChatLogGroups,
+  chatLogEntryText,
+} = require("./chatLogModel");
 const { restartDaemonLifecycle } = require("../../runtime/daemon/restart");
 
 function bootstrapEnvironment(projectRoot, options = {}) {
@@ -157,12 +165,20 @@ function loadChatHistory(projectRoot, cap = 200, options = {}) {
     const raw = fs.readFileSync(file, "utf8");
     const lines = raw.split(/\r?\n/).filter(Boolean);
     const out = [];
+    const pushLine = (line = "") => {
+      const value = String(line || "");
+      if (!value.trim()) {
+        if (out.length > 0 && out[out.length - 1] !== "") out.push("");
+        return;
+      }
+      out.push(value);
+    };
     for (const line of lines) {
       try {
         const entry = JSON.parse(line);
         if (!entry) continue;
         if (entry.type === "spacer") {
-          out.push("");
+          pushLine("");
           continue;
         }
         const text = String(entry.text || "");
@@ -170,12 +186,18 @@ function loadChatHistory(projectRoot, cap = 200, options = {}) {
         // Strip blessed-tag markup that the legacy log writer used; ink
         // can't render those tags and we don't want them shown literally.
         const stripped = text.replace(/\{[^{}]+\}/g, "");
-        out.push(stripped);
+        for (const renderedLine of normalizeInkLogLines(stripped)) {
+          pushLine(renderedLine);
+        }
       } catch {
         // ignore malformed lines
       }
     }
-    return out.slice(-cap);
+    while (out.length > 0 && out[0] === "") out.shift();
+    while (out.length > 0 && out[out.length - 1] === "") out.pop();
+    const capped = out.slice(-cap);
+    while (capped.length > 0 && capped[0] === "") capped.shift();
+    return capped;
   } catch {
     return [];
   }
@@ -369,67 +391,11 @@ function buildPromptIpcRequest(text) {
   };
 }
 
-function stripBlessedTags(text = "") {
-  return String(text || "")
-    .replace(/\{\/?[^{}\n]+\}/g, "")
-    .replace(/\r/g, "");
-}
-
 function normalizeInkLogLines(text = "") {
   const clean = stripBlessedTags(text);
   return clean.split(/\r?\n/);
 }
 
-function stripMarkdownDecorators(text = "") {
-  return String(text || "")
-    .replace(/\*\*([^*]+)\*\*/g, "$1")
-    .replace(/`([^`]+)`/g, "$1");
-}
-
-function classifyChatLogLine(text = "") {
-  const raw = stripBlessedTags(text).replace(/\r/g, "");
-  const clean = stripMarkdownDecorators(raw);
-  const trimmed = clean.trim();
-  if (!trimmed) return { kind: "spacer", marker: " ", speaker: "", body: " " };
-  if (/^[█▀▄ ]+(?:\s{2,}(?:Version|Mode|Dictionary):.*)?$/.test(trimmed) || /^ufoo chat/i.test(trimmed)) {
-    return { kind: "banner", marker: " ", speaker: "", body: clean };
-  }
-  if (/^───.*───$/.test(trimmed)) {
-    return { kind: "divider", marker: "─", speaker: "", body: clean };
-  }
-  if (/^(error:|✗|failed\b)/i.test(trimmed)) {
-    return { kind: "error", marker: "!", speaker: "error", body: clean.replace(/^(error:\s*)/i, "") };
-  }
-  if (/^(✓|✔|done\b|closed\b)/i.test(trimmed)) {
-    return { kind: "success", marker: "✓", speaker: "", body: clean.replace(/^[✓✔]\s*/, "") };
-  }
-  const dotMatch = clean.match(/^([^·:\n]{1,42})\s+·\s+(.*)$/);
-  if (dotMatch) {
-    const speaker = dotMatch[1].trim();
-    const lower = speaker.toLowerCase();
-    const kind = lower === "ufoo" ? "assistant" : "agent";
-    return { kind, marker: kind === "assistant" ? "◆" : "•", speaker, body: dotMatch[2] || " " };
-  }
-  const colonMatch = clean.match(/^([A-Za-z0-9_.:@/-]{1,42}):\s+(.*)$/);
-  if (colonMatch) {
-    return { kind: "agent", marker: "•", speaker: colonMatch[1], body: colonMatch[2] || " " };
-  }
-  if (/^(CHAT|UCODE)\s+·/i.test(trimmed)) {
-    return { kind: "meta", marker: "·", speaker: "", body: clean };
-  }
-  return { kind: "plain", marker: "│", speaker: "", body: clean };
-}
-
-function buildChatLogLineModel(text = "") {
-  const row = classifyChatLogLine(text);
-  const hasSpeaker = Boolean(row.speaker);
-  return {
-    ...row,
-    markerText: hasSpeaker ? `${row.marker || " "}  ` : `${row.marker || " "} `,
-    bodyText: row.body || " ",
-  };
-}
-
 function createInkStreamState({
   dispatch,
   appendHistory,
@@ -1234,7 +1200,7 @@ function createChatApp({ React, ink, props, interactive = true }) {
         getChatLogLines: () => {
           const current = stateRef.current || {};
           return Array.isArray(current.logLines)
-            ? current.logLines.map((item) => String((item && item.text) || ""))
+            ? current.logLines.map((item) => chatLogEntryText(item))
             : [];
         },
         getStatusText: () => {
@@ -3262,9 +3228,9 @@ function createChatApp({ React, ink, props, interactive = true }) {
       return null;
     }
 
-    const renderChatLogLine = (item) => {
-      const row = buildChatLogLineModel((item && item.text) || "");
-      const key = item && item.id ? item.id : `log-${row.body}`;
+    const renderChatLogEntry = (entry, group) => {
+      const row = entry && entry.row ? entry.row : buildChatLogLineModel("");
+      const key = entry && entry.id ? entry.id : `log-${row.body}`;
       if (row.kind === "spacer") {
         return h(Text, { key, color: "gray" }, " ");
       }
@@ -3281,7 +3247,7 @@ function createChatApp({ React, ink, props, interactive = true }) {
       const colors = palette[row.kind] || palette.plain;
       if (row.kind === "divider") {
         return h(Box, { key, marginBottom: 1 },
-          h(Text, { color: colors.body, wrap: "truncate" }, row.body),
+          h(Text, { color: colors.body, wrap: "truncate" }, `  ${compactDividerLabel(row.body)}`),
         );
       }
       if (row.kind === "banner") {
@@ -3289,13 +3255,16 @@ function createChatApp({ React, ink, props, interactive = true }) {
           h(Text, { color: colors.body, bold: true, wrap: "truncate" }, row.body),
         );
       }
-      return h(Box, { key, width: "100%", marginBottom: 1 },
-        h(Text, { color: colors.marker, bold: row.kind === "error" }, row.markerText),
+      const markerText = entry && entry.continuation
+        ? (group && (group.kind === "assistant" || group.kind === "agent") ? "   " : "  ")
+        : row.markerText;
+      return h(Box, { key, width: "100%" },
+        h(Text, { color: colors.marker, bold: row.kind === "error" }, markerText),
         h(Text, { color: colors.body, wrap: "wrap" },
-          row.speaker
+          row.speaker && !(entry && entry.continuation)
             ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
             : null,
-          row.speaker
+          row.speaker && !(entry && entry.continuation)
             ? h(Text, { color: "gray" }, " · ")
             : null,
           row.bodyText,
@@ -3303,6 +3272,27 @@ function createChatApp({ React, ink, props, interactive = true }) {
       );
     };
 
+    const renderChatLogGroup = (group) => {
+      const entries = Array.isArray(group && group.entries) ? group.entries : [];
+      if (entries.length === 0) return null;
+      const first = entries[0] || {};
+      const row = first.row || buildChatLogLineModel("");
+      if (row.kind === "spacer" || row.kind === "banner" || row.kind === "divider") {
+        return renderChatLogEntry(first, group);
+      }
+      return h(Box, {
+        key: `group-${group.id}`,
+        flexDirection: "column",
+        width: "100%",
+        marginBottom: 1,
+      },
+      ...entries.map((entry) => renderChatLogEntry(entry, group)));
+    };
+
+    const renderChatLogGroups = (items) => buildChatLogGroups(items)
+      .map(renderChatLogGroup)
+      .filter(Boolean);
+
     if (state.viewingAgentId) {
       const maxWidth = Math.max(20, size.cols || 80);
       const logRows = Math.max(1, (size.rows || 24) - 5);
@@ -3379,7 +3369,7 @@ function createChatApp({ React, ink, props, interactive = true }) {
 
     return h(Box, { flexDirection: "column", width: "100%" },
       h(Box, { flexDirection: "column", width: "100%" },
-        ...state.logLines.map(renderChatLogLine),
+        ...renderChatLogGroups(state.logLines),
       ),
       state.activeMerge ? h(Box, null,
         h(Text, { color: state.activeMerge.entries.some((e) => e.isError) ? "red" : "cyan" },
@@ -3391,10 +3381,10 @@ function createChatApp({ React, ink, props, interactive = true }) {
           const prefix = state.activeStream.publisher
             ? `${state.activeStream.publisher}: `
             : "";
-          return lines.map((line, idx) => renderChatLogLine({
+          return renderChatLogGroups(lines.map((line, idx) => ({
             id: `s-${idx}`,
             text: idx === 0 ? `${prefix}${line}` : `  ${line}`,
-          }));
+          })));
         })(),
       ) : null,
       h(Box, { marginTop: 1, width: "100%" },
@@ -3680,6 +3670,7 @@ module.exports = {
   chatHistoryOptionsForScope,
   classifyChatLogLine,
   buildChatLogLineModel,
+  buildChatLogGroups,
   createInkMultiWindowToggle,
   resolveActiveAgentId,
   resolveInjectSockPathForAgent,

package/src/ui/ink/chatLogModel.js

@@ -0,0 +1,202 @@
+"use strict";
+
+function stripBlessedTags(text = "") {
+  return String(text || "")
+    .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "")
+    .replace(/\{\/?[^{}\n]+\}/g, "")
+    .replace(/\r/g, "");
+}
+
+function stripMarkdownDecorators(text = "") {
+  return String(text || "")
+    .replace(/\*\*([^*]+)\*\*/g, "$1")
+    .replace(/`([^`]+)`/g, "$1");
+}
+
+function compactContinuationIndent(text = "") {
+  return String(text || "").replace(/^\s{8,}(?=\S)/, "");
+}
+
+function compactDividerLabel(text = "") {
+  const label = String(text || "")
+    .trim()
+    .replace(/^─+\s*/, "")
+    .replace(/\s*─+$/, "")
+    .trim();
+  return label || String(text || "").trim() || "section";
+}
+
+function classifyChatLogLine(text = "") {
+  const raw = stripBlessedTags(text).replace(/\r/g, "");
+  const clean = stripMarkdownDecorators(raw);
+  const trimmed = clean.trim();
+  if (!trimmed) return { kind: "spacer", marker: " ", speaker: "", body: " " };
+  if (/^[█▀▄ ]+(?:\s{2,}(?:Version|Mode|Dictionary):.*)?$/.test(trimmed) || /^ufoo chat/i.test(trimmed)) {
+    return { kind: "banner", marker: " ", speaker: "", body: clean };
+  }
+  if (/^───.*───$/.test(trimmed)) {
+    return { kind: "divider", marker: "─", speaker: "", body: clean };
+  }
+  if (/^(CHAT|UCODE)\s+·/i.test(trimmed)) {
+    return { kind: "meta", marker: "·", speaker: "", body: clean };
+  }
+  if (/^(error:|✗|failed\b)/i.test(trimmed)) {
+    return { kind: "error", marker: "!", speaker: "error", body: clean.replace(/^(error:\s*)/i, "") };
+  }
+  if (/^(✓|✔|done\b|closed\b)/i.test(trimmed)) {
+    return { kind: "success", marker: "✓", speaker: "", body: clean.replace(/^[✓✔]\s*/, "") };
+  }
+  const dotMatch = clean.match(/^([^·\n]{1,64})\s+·\s+(.*)$/);
+  if (dotMatch) {
+    const speaker = dotMatch[1].trim();
+    const lower = speaker.toLowerCase();
+    const kind = lower === "ufoo" ? "assistant" : "agent";
+    return { kind, marker: kind === "assistant" ? "◆" : "•", speaker, body: dotMatch[2] || " " };
+  }
+  const colonMatch = clean.match(/^([A-Za-z0-9_.:@/-]{1,42}):\s+(.*)$/);
+  if (colonMatch) {
+    return { kind: "agent", marker: "•", speaker: colonMatch[1], body: colonMatch[2] || " " };
+  }
+  return { kind: "plain", marker: "", speaker: "", body: clean };
+}
+
+function defaultMarkerForKind(kind = "", speaker = "") {
+  if (kind === "assistant") return "◆";
+  if (kind === "agent") return "•";
+  if (kind === "error") return "!";
+  if (kind === "success") return "✓";
+  if (kind === "divider") return "─";
+  if (kind === "meta") return "·";
+  if (kind === "banner" || kind === "spacer") return " ";
+  return speaker ? "•" : "";
+}
+
+function buildChatLogLineModel(input = "") {
+  if (input && typeof input === "object" && !input.kind) {
+    return buildChatLogLineModel(chatLogEntryText(input));
+  }
+
+  if (input && typeof input === "object" && input.kind) {
+    const kind = String(input.kind || "plain");
+    const speaker = String(input.speaker || "");
+    const marker = input.marker != null ? String(input.marker) : defaultMarkerForKind(kind, speaker);
+    const rawBody = input.bodyText != null
+      ? String(input.bodyText)
+      : String(input.body != null ? input.body : chatLogEntryText(input));
+    const body = kind === "plain" ? compactContinuationIndent(rawBody || " ") : (rawBody || " ");
+    return {
+      kind,
+      marker,
+      speaker,
+      body: input.body != null ? String(input.body) : rawBody,
+      markerText: input.markerText != null
+        ? String(input.markerText)
+        : (speaker ? `${marker || " "}  ` : `${marker || " "} `),
+      bodyText: body,
+    };
+  }
+
+  const row = classifyChatLogLine(input);
+  const hasSpeaker = Boolean(row.speaker);
+  const body = row.kind === "plain"
+    ? compactContinuationIndent(row.body || " ")
+    : (row.body || " ");
+  return {
+    ...row,
+    markerText: hasSpeaker ? `${row.marker || " "}  ` : `${row.marker || " "} `,
+    bodyText: body,
+  };
+}
+
+function normalizeEntryInput(input) {
+  if (input && typeof input === "object" && !Array.isArray(input)) return input;
+  return { text: input };
+}
+
+function createChatLogEntry(input = "", id = "") {
+  const source = normalizeEntryInput(input);
+  const text = String(source.text != null ? source.text : chatLogEntryText(source));
+  const row = source.kind
+    ? buildChatLogLineModel({ ...source, text })
+    : buildChatLogLineModel(text);
+  const meta = source.meta && typeof source.meta === "object" && !Array.isArray(source.meta)
+    ? { ...source.meta }
+    : {};
+  const entry = {
+    id: String(id || source.id || ""),
+    text,
+    kind: row.kind,
+    marker: row.marker,
+    speaker: row.speaker,
+    body: row.body,
+    markerText: row.markerText,
+    bodyText: row.bodyText,
+    sourceType: String(source.sourceType || source.type || ""),
+    meta,
+  };
+  return entry;
+}
+
+function chatLogEntryText(entry = "") {
+  if (typeof entry === "string") return entry;
+  if (!entry || typeof entry !== "object") return "";
+  if (entry.text != null) return String(entry.text);
+  if (entry.speaker) return `${entry.speaker} · ${entry.bodyText || entry.body || ""}`;
+  return String(entry.bodyText || entry.body || "");
+}
+
+function canAppendToChatLogGroup(group, row) {
+  if (!group || !row) return false;
+  if (row.kind !== "plain" && row.kind !== "spacer") return false;
+  return group.kind === "assistant"
+    || group.kind === "agent"
+    || group.kind === "success"
+    || group.kind === "error"
+    || group.kind === "meta"
+    || group.kind === "plain";
+}
+
+function buildChatLogGroups(items = []) {
+  const source = Array.isArray(items) ? items : [];
+  const groups = [];
+  let current = null;
+  for (let index = 0; index < source.length; index += 1) {
+    const item = source[index] || {};
+    const itemId = item && typeof item === "object" && item.id ? item.id : `log-${index}`;
+    const row = buildChatLogLineModel(item);
+    const entry = {
+      id: itemId,
+      text: chatLogEntryText(item),
+      row,
+      sourceType: item && typeof item === "object" ? String(item.sourceType || item.type || "") : "",
+      meta: item && typeof item === "object" && item.meta ? item.meta : {},
+      continuation: false,
+    };
+
+    if (canAppendToChatLogGroup(current, row)) {
+      entry.continuation = true;
+      current.entries.push(entry);
+      continue;
+    }
+
+    current = {
+      id: entry.id,
+      kind: row.kind,
+      entries: [entry],
+    };
+    groups.push(current);
+  }
+  return groups;
+}
+
+module.exports = {
+  stripBlessedTags,
+  stripMarkdownDecorators,
+  compactContinuationIndent,
+  compactDividerLabel,
+  classifyChatLogLine,
+  buildChatLogLineModel,
+  buildChatLogGroups,
+  createChatLogEntry,
+  chatLogEntryText,
+};

package/src/ui/ink/chatReducer.js

@@ -35,6 +35,7 @@
  */
 
 const fmt = require("../format");
+const { createChatLogEntry } = require("./chatLogModel");
 
 const LOG_CAP = 1000;
 const HISTORY_CAP = 200;
@@ -100,7 +101,10 @@ function createInitialState({ banner = [], globalMode = false, globalScope = "co
   const initialAgentProvider = settings.agentProvider || "codex-cli";
   const selectedProviderIndex = Math.max(0, DEFAULT_PROVIDER_OPTIONS.findIndex((opt) => opt.value === initialAgentProvider));
   return {
-    logLines: banner.concat([""]).map((line, idx) => ({ id: `b-${idx}`, text: line })),
+    logLines: banner.concat([""]).map((line, idx) => createChatLogEntry({
+      text: line,
+      sourceType: "banner",
+    }, `b-${idx}`)),
     lineSeq: banner.length + 1,
     draft: "",
     focusMode: "input",
@@ -144,10 +148,10 @@ function createInitialState({ banner = [], globalMode = false, globalScope = "co
 function appendLog(state, lines) {
   const incoming = Array.isArray(lines) ? lines : [lines];
   let seq = state.lineSeq;
-  const out = state.logLines.concat(incoming.map((text) => {
+  const out = state.logLines.concat(incoming.map((line) => {
     const id = `l-${seq}`;
     seq += 1;
-    return { id, text: String(text == null ? "" : text) };
+    return createChatLogEntry(line, id);
   }));
   return {
     ...state,