u-foo 2.4.8 → 2.4.9

package/package.json

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

package/src/code/tui.js

@@ -5,6 +5,7 @@ const {
   StreamBuffer,
   UCODE_BANNER_LINES,
   UCODE_VERSION,
+  appendToolMergeEntry,
   buildMergedToolExpandedLines,
   buildMergedToolSummaryText,
   buildUcodeBannerLines,
@@ -31,6 +32,7 @@ const {
   shouldClearAgentSelectionOnUp,
   shouldEnterAgentSelection,
   shouldUseUcodeTui,
+  splitStreamingLogChunk,
   stripLeakedEscapeTags,
 } = fmt;
 
@@ -64,8 +66,10 @@ module.exports = {
   resolveHistoryDownTransition,
   filterSelectableAgents,
   stripLeakedEscapeTags,
+  splitStreamingLogChunk,
   createEscapeTagStripper,
   formatPendingElapsed,
+  appendToolMergeEntry,
   normalizeBashToolCommand,
   normalizeToolMergeEntry,
   buildMergedToolSummaryText,

package/src/ui/format/index.js

@@ -518,6 +518,24 @@ function normalizeToolMergeEntry(entry = {}) {
   };
 }
 
+function appendToolMergeEntry(currentMerge = null, entry = {}, scope = 0, nextId = 1) {
+  const toolEntry = normalizeToolMergeEntry(entry);
+  const current = currentMerge && typeof currentMerge === "object" ? currentMerge : null;
+  const normalizedScope = Number.isFinite(Number(scope)) ? Number(scope) : 0;
+  if (current && current.scope === normalizedScope && Array.isArray(current.entries)) {
+    return {
+      ...current,
+      entries: current.entries.concat([toolEntry]),
+    };
+  }
+  return {
+    id: Number.isFinite(Number(nextId)) ? Number(nextId) : 1,
+    scope: normalizedScope,
+    entries: [toolEntry],
+    expanded: false,
+  };
+}
+
 function buildMergedToolSummaryText(entries = []) {
   const list = Array.isArray(entries)
     ? entries.map((item) => normalizeToolMergeEntry(item))
@@ -551,6 +569,27 @@ function buildMergedToolExpandedLines(entries = []) {
   });
 }
 
+function splitStreamingLogChunk(buffer = "", chunk = "", options = {}) {
+  const previous = String(buffer || "");
+  const text = String(chunk || "");
+  const combined = `${previous}${text}`;
+  const parts = combined.split(/\r?\n/);
+  const lines = parts.slice(0, -1);
+  const dropLeadingBlank = Boolean(options.dropLeadingBlank) && previous === "";
+
+  if (dropLeadingBlank) {
+    while (lines.length > 0 && lines[0] === "") {
+      lines.shift();
+    }
+  }
+
+  return {
+    lines,
+    buffer: parts[parts.length - 1] || "",
+    sawVisible: /[^\s]/.test(text),
+  };
+}
+
 // Composed live-row text for an in-flight tool group: shows the merged
 // summary, plus a "(Ctrl+O expand)" hint once at least two entries are
 // present.
@@ -937,6 +976,7 @@ module.exports = {
   TOOL_LABELS,
   UCODE_BANNER_LINES,
   UCODE_VERSION,
+  appendToolMergeEntry,
   buildMergedToolExpandedLines,
   buildMergedToolSummaryText,
   buildToolMergeRowText,
@@ -970,5 +1010,6 @@ module.exports = {
   shouldClearAgentSelectionOnUp,
   shouldEnterAgentSelection,
   shouldUseUcodeTui,
+  splitStreamingLogChunk,
   stripLeakedEscapeTags,
 };

package/src/ui/ink/UcodeApp.js

@@ -78,6 +78,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
     const { stdout } = useStdout();
     const lineSeqRef = useRef(banner.length + 1);
     const mergeIdRef = useRef(0);
+    const toolMergeScopeRef = useRef(0);
 
     const targetAgent = agentSelectionMode && selectedAgentIndex >= 0
       ? agents[selectedAgentIndex]
@@ -261,13 +262,12 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       const toolEntry = fmt.normalizeToolMergeEntry({ tool, detail, isError, errorText });
 
       setActiveMerge((current) => {
-        let next;
-        if (current) {
-          next = { ...current, entries: current.entries.concat([toolEntry]) };
-        } else {
+        const scope = toolMergeScopeRef.current;
+        const isNewScope = !(current && current.scope === scope);
+        if (isNewScope) {
           mergeIdRef.current += 1;
-          next = { id: mergeIdRef.current, entries: [toolEntry], expanded: false };
         }
+        const next = fmt.appendToolMergeEntry(current, toolEntry, scope, mergeIdRef.current);
         if (next.entries.length >= 2) lastMergeRef.current = next;
         return next;
       });
@@ -313,6 +313,8 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
     const executeLine = useCallback(async (rawValue) => {
       const normalized = String(rawValue || "").replace(/\r?\n/g, " ").trim();
       if (!normalized) return;
+      toolMergeScopeRef.current += 1;
+      flushActiveMerge();
       appendLogLine(`› ${normalized}`);
 
       const runtimeWorkspace = String(
@@ -459,6 +461,8 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
           setNlStatus("Waiting for model...");
           let streamBuf = "";
           let sawStreamText = false;
+          let streamStarted = false;
+          let dropLeadingStreamBlank = false;
           let nlResult = null;
           try {
             nlResult = await props.runNaturalLanguageTask(result.task, props.state, {
@@ -477,13 +481,21 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
               onDelta: (delta) => {
                 const text = String(delta || "");
                 if (!text) return;
-                if (/[^\s]/.test(text)) sawStreamText = true;
-                streamBuf += text;
-                const parts = streamBuf.split(/\r?\n/);
-                while (parts.length > 1) {
-                  appendLogLine(parts.shift());
+                if (!streamStarted) {
+                  flushActiveMerge();
+                  streamStarted = true;
+                }
+                const split = fmt.splitStreamingLogChunk(streamBuf, text, {
+                  dropLeadingBlank: dropLeadingStreamBlank,
+                });
+                if (split.sawVisible) {
+                  sawStreamText = true;
+                  dropLeadingStreamBlank = false;
+                }
+                for (const line of split.lines) {
+                  appendLogLine(line);
                 }
-                streamBuf = parts[0];
+                streamBuf = split.buffer;
               },
               onToolLog: (entry) => {
                 if (!entry || typeof entry !== "object") return;
@@ -491,6 +503,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
                   const label = fmt.TOOL_LABELS[String(entry.tool || "").toLowerCase()] ||
                     `Calling ${entry.tool}`;
                   setNlStatus(`${label}...`);
+                  dropLeadingStreamBlank = true;
                 }
                 logToolHint(entry, entry.result);
               },
@@ -516,6 +529,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
             const summary = props.formatNlResult(nlResult, false);
             if (summary) appendLogText(summary);
           }
+          flushActiveMerge();
           try {
             const persisted = props.persistSessionState(props.state);
             if (persisted && persisted.ok === false) {
@@ -531,7 +545,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
         default:
           if (result.output) appendLogText(result.output);
       }
-    }, [appendLogLine, appendLogText, exit, props, logToolHint]);
+    }, [appendLogLine, appendLogText, exit, props, logToolHint, flushActiveMerge]);
     // ^ `props` is captured by the createUcodeApp closure on a single mount,
     // so its reference is stable across renders even though it looks like a
     // changing dep to React's exhaustive-deps lint.