u-foo 2.5.3 → 2.5.5

package/package.json

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

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/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,

package/templates/groups/build-ultra.json

@@ -14,7 +14,7 @@
     {
       "id": "pmo",
       "nickname": "pmo",
-      "type": "claude",
+      "type": "auto",
       "role": "coordinate builders, track progress, enforce delivery cadence",
       "prompt_profile": "pmo-coordinator",
       "accept_from": [