u-foo 2.4.2 → 2.4.4

package/package.json

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

package/src/ui/ink/ChatApp.js

@@ -407,11 +407,11 @@ function classifyChatLogLine(text = "") {
     const speaker = dotMatch[1].trim();
     const lower = speaker.toLowerCase();
     const kind = lower === "ufoo" ? "assistant" : "agent";
-    return { kind, marker: kind === "assistant" ? "◆" : "●", speaker, body: dotMatch[2] || " " };
+    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: "agent", marker: "•", speaker: colonMatch[1], body: colonMatch[2] || " " };
   }
   if (/^(CHAT|UCODE)\s+·/i.test(trimmed)) {
     return { kind: "meta", marker: "·", speaker: "", body: clean };
@@ -419,6 +419,16 @@ function classifyChatLogLine(text = "") {
   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,
@@ -1010,8 +1020,14 @@ function inferStatusType(text = "", requestedType = "") {
   const type = String(requestedType || "").trim().toLowerCase();
   if (type === "done" || type === "success" || type === "error" || type === "idle") return type;
   const clean = stripBlessedTags(String(text || "")).trim();
-  if (/^[✓✔]/.test(clean) || /\bdone\b/i.test(clean) || /\bprocessed\b/i.test(clean)) return "done";
-  if (/^[✗!]/.test(clean) || /\berror\b/i.test(clean) || /\bfailed\b/i.test(clean)) return "error";
+  if (/^[✗!]/.test(clean) || /\b(error|failed|failure|offline)\b/i.test(clean) || /失败|错误/.test(clean)) return "error";
+  if (
+    /^[✓✔]/.test(clean) ||
+    /^(done|closed|complete|completed|finished|success|succeeded|ready)\b/i.test(clean) ||
+    /\b(processed|reconnected|switched|saved)\b/i.test(clean) ||
+    /\bdone\s*$/i.test(clean) ||
+    /完成|成功|已处理|已保存|已切换|已连接/.test(clean)
+  ) return "done";
   return type || "typing";
 }
 
@@ -1123,12 +1139,13 @@ function createChatApp({ React, ink, props, interactive = true }) {
         dispatch({ type: "status/idle" });
         return;
       }
+      const type = inferStatusType(clean, options.type || "typing");
       dispatch({
         type: "status/set",
         payload: {
           message: clean,
-          type: inferStatusType(clean, options.type || "typing"),
-          showTimer: options.showTimer === true,
+          type,
+          showTimer: options.showTimer === true && isAnimatedStatusType(type),
           startedAt: options.startedAt || Date.now(),
         },
       });
@@ -1312,8 +1329,10 @@ function createChatApp({ React, ink, props, interactive = true }) {
 
     useEffect(() => {
       if (!stdout) return undefined;
-      const update = () =>
-        setSize({ cols: stdout.columns || 0, rows: stdout.rows || 0 });
+      const update = () => {
+        const next = { cols: stdout.columns || 0, rows: stdout.rows || 0 };
+        setSize((prev) => (prev.cols === next.cols && prev.rows === next.rows ? prev : next));
+      };
       update();
       stdout.on("resize", update);
       return () => stdout.off("resize", update);
@@ -1881,7 +1900,8 @@ function createChatApp({ React, ink, props, interactive = true }) {
     useEffect(() => {
       const internalStatus = state.viewingAgentId ? internalStatusLabel(internalAgentView.status) : "ready";
       const internalActive = internalStatus !== "ready";
-      const statusAnimated = state.status.message && isAnimatedStatusType(state.status.type);
+      const statusType = inferStatusType(state.status.message, state.status.type);
+      const statusAnimated = state.status.message && isAnimatedStatusType(statusType);
       if ((!statusAnimated) && !internalActive) return undefined;
       const timer = setInterval(() => setSpinnerTick((t) => t + 1), 100);
       return () => clearInterval(timer);
@@ -1922,13 +1942,10 @@ function createChatApp({ React, ink, props, interactive = true }) {
         dispatch({ type: "log/append", text: `Error: ${err && err.message ? err.message : err}` });
       }
       if (statusText) {
-        dispatch({
-          type: "status/set",
-          payload: { message: statusText, type: "typing", showTimer: false, startedAt: Date.now() },
-        });
+        setStatusText(statusText, { type: "typing", showTimer: false });
       }
       if (restart) restartDaemonBestEffort();
-    }, [restartDaemonBestEffort]);
+    }, [restartDaemonBestEffort, setStatusText]);
 
     const clearUfooAgentIdentity = useCallback(() => {
       try {
@@ -3241,7 +3258,7 @@ function createChatApp({ React, ink, props, interactive = true }) {
     }
 
     const renderChatLogLine = (item) => {
-      const row = classifyChatLogLine((item && item.text) || "");
+      const row = buildChatLogLineModel((item && item.text) || "");
       const key = item && item.id ? item.id : `log-${row.body}`;
       if (row.kind === "spacer") {
         return h(Text, { key, color: "gray" }, " ");
@@ -3268,16 +3285,16 @@ function createChatApp({ React, ink, props, interactive = true }) {
         );
       }
       return h(Box, { key, width: "100%", marginBottom: 1 },
-        h(Box, { width: 2 },
-          h(Text, { color: colors.marker, bold: row.kind === "error" }, row.marker || " "),
+        h(Text, { color: colors.marker, bold: row.kind === "error" }, row.markerText),
+        h(Text, { color: colors.body, wrap: "wrap" },
+          row.speaker
+            ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
+            : null,
+          row.speaker
+            ? h(Text, { color: "gray" }, " · ")
+            : null,
+          row.bodyText,
         ),
-        row.speaker
-          ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
-          : null,
-        row.speaker
-          ? h(Text, { color: "gray" }, " · ")
-          : null,
-        h(Text, { color: colors.body, wrap: "wrap" }, row.body || " "),
       );
     };
 
@@ -3501,7 +3518,7 @@ function buildDashHints(state, targetAgentLabel) {
 function computeStatusText(status, spinnerTick) {
   const message = String((status && status.message) || "");
   if (!message) return "CHAT · Ready";
-  const type = String((status && status.type) || "thinking");
+  const type = inferStatusType(message, status && status.type);
   if (type === "done" || type === "success") {
     const clean = stripBlessedTags(message).trim();
     return /^[✓✔]/.test(clean) ? clean : `✓ ${clean}`;
@@ -3656,6 +3673,7 @@ module.exports = {
   buildPromptIpcRequest,
   chatHistoryOptionsForScope,
   classifyChatLogLine,
+  buildChatLogLineModel,
   createInkMultiWindowToggle,
   resolveActiveAgentId,
   resolveInjectSockPathForAgent,

package/src/ui/ink/MultilineInput.js

@@ -482,11 +482,19 @@ function createMultilineInput({ React, ink }) {
         return undefined;
       }
       patchStdoutForIME(out);
+      const targetRowsUp = __imeCursor.lastFrameHadNewline
+        ? rowsBelowCursor
+        : Math.max(0, rowsBelowCursor - 1);
+      const alreadyParked = __imeCursor.active === true
+        && __imeCursor.parkRowsUp === rowsBelowCursor
+        && __imeCursor.parkCol === cursorTermCol
+        && __imeCursor.movedUpRows === targetRowsUp;
       // Publish the desired park target so the stdout monkey-patch can
       // re-park after every throttled ink frame write.
       __imeCursor.active = true;
       __imeCursor.parkRowsUp = rowsBelowCursor;
       __imeCursor.parkCol = cursorTermCol;
+      if (alreadyParked) return undefined;
       // Park immediately — covers cases where ink has nothing to render
       // (output unchanged) and won't fire a frame write at all, and keeps
       // the caret visible between frames. Combine hide + restore + park +
@@ -496,7 +504,7 @@ function createMultilineInput({ React, ink }) {
       // CRITICAL: the move-up amount must match the anchor that movedUpRows
       // was measured against. If the last frame ended without '\n' (the
       // full-screen path), the anchor is one row higher than the log-update
-      // case, so we use rowsUpFromAnchor() rather than parkRowsUp directly.
+      // case, so we use targetRowsUp rather than parkRowsUp directly.
       // Otherwise restoring down by movedUpRows then moving up parkRowsUp
       // overshoots by one and leaves the hardware cursor one row above the
       // inverse caret — the residual "ghost cursor" symptom.
@@ -505,7 +513,7 @@ function createMultilineInput({ React, ink }) {
         combined += `\x1b[${__imeCursor.movedUpRows}B`;
         __imeCursor.movedUpRows = 0;
       }
-      combined += applyParkSequence(rowsUpFromAnchor());
+      combined += applyParkSequence(targetRowsUp);
       out.write(combined);
       return undefined;
     });

package/src/ui/ink/UcodeApp.js

@@ -643,8 +643,10 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
     useEffect(() => {
       if (!stdout) return undefined;
-      const update = () =>
-        setSize({ cols: stdout.columns || 0, rows: stdout.rows || 0 });
+      const update = () => {
+        const next = { cols: stdout.columns || 0, rows: stdout.rows || 0 };
+        setSize((prev) => (prev.cols === next.cols && prev.rows === next.rows ? prev : next));
+      };
       update();
       stdout.on("resize", update);
       return () => stdout.off("resize", update);
@@ -652,7 +654,11 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
 
     // Drive the spinner + elapsed-timer redraws while a task is in flight.
     useEffect(() => {
-      if (!status.message || status.type === "none") return undefined;
+      const statusType = inferStatusType(status.message, status.type);
+      if (!status.message || statusType === "none" || statusType === "idle" ||
+        statusType === "done" || statusType === "success" || statusType === "error") {
+        return undefined;
+      }
       const timer = setInterval(() => {
         setSpinnerTick((t) => t + 1);
         if (status.showTimer) setNowTick((t) => t + 1);
@@ -792,6 +798,22 @@ function runUcodeInkTui(props = {}) {
 
 module.exports = { runUcodeInkTui, createUcodeApp, computeStatusText };
 
+function inferStatusType(text = "", requestedType = "") {
+  const type = String(requestedType || "").trim().toLowerCase();
+  if (type === "done" || type === "success" || type === "error" || type === "idle" || type === "none") {
+    return type;
+  }
+  const clean = String(text || "").trim();
+  if (/^[✗!]/.test(clean) || /\b(error|failed|failure)\b/i.test(clean) || /失败|错误/.test(clean)) return "error";
+  if (
+    /^[✓✔]/.test(clean) ||
+    /^(done|complete|completed|finished|success|succeeded|ready)\b/i.test(clean) ||
+    /\bdone\s*$/i.test(clean) ||
+    /完成|成功/.test(clean)
+  ) return "done";
+  return type || "thinking";
+}
+
 /**
  * Pure status-line text builder used by the React component (and unit
  * tests). Returns "UCODE · Ready" while idle and a spinner+message+timer
@@ -802,7 +824,16 @@ function computeStatusText(status, spinnerTick, backgroundSuffix = "") {
   const message = String((status && status.message) || "");
   const suffix = String(backgroundSuffix || "");
   if (!message) return `UCODE · Ready${suffix}`;
-  const type = String((status && status.type) || "thinking");
+  const type = inferStatusType(message, status && status.type);
+  if (type === "done" || type === "success") {
+    const clean = message.trim();
+    return `${/^[✓✔]/.test(clean) ? clean : `✓ ${clean}`}${suffix}`;
+  }
+  if (type === "error") {
+    const clean = message.trim();
+    return `${/^[✗!]/.test(clean) ? clean : `✗ ${clean}`}${suffix}`;
+  }
+  if (type === "idle" || type === "none") return `${message.trim() || "UCODE · Ready"}${suffix}`;
   const indicators = fmt.STATUS_INDICATORS[type] || fmt.STATUS_INDICATORS.thinking;
   const indicator = indicators[Math.max(0, Math.floor(Number(spinnerTick) || 0)) % indicators.length];
   const startedAt = Number.isFinite(status && status.startedAt) ? status.startedAt : 0;

package/src/ui/ink/chatReducer.js

@@ -48,6 +48,53 @@ function projectRootOf(row = {}) {
   return String((row && (row.root || row.project_root || row.projectRoot)) || "");
 }
 
+function stableJson(value) {
+  if (value === null || typeof value !== "object") return JSON.stringify(value);
+  if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
+  const keys = Object.keys(value).sort();
+  return `{${keys.map((key) => `${JSON.stringify(key)}:${stableJson(value[key])}`).join(",")}}`;
+}
+
+function shallowArrayEqual(left = [], right = []) {
+  if (left === right) return true;
+  if (!Array.isArray(left) || !Array.isArray(right)) return false;
+  if (left.length !== right.length) return false;
+  for (let i = 0; i < left.length; i += 1) {
+    if (left[i] !== right[i]) return false;
+  }
+  return true;
+}
+
+function listPayloadEqual(left = [], right = []) {
+  if (left === right) return true;
+  if (!Array.isArray(left) || !Array.isArray(right)) return false;
+  if (left.length !== right.length) return false;
+  for (let i = 0; i < left.length; i += 1) {
+    if (stableJson(left[i]) !== stableJson(right[i])) return false;
+  }
+  return true;
+}
+
+function mapPayloadEqual(left, right) {
+  if (left === right) return true;
+  if (!(left instanceof Map) || !(right instanceof Map)) return false;
+  if (left.size !== right.size) return false;
+  for (const [key, value] of left.entries()) {
+    if (!right.has(key)) return false;
+    if (stableJson(value) !== stableJson(right.get(key))) return false;
+  }
+  return true;
+}
+
+function statusPayloadEqual(left, right) {
+  const normalize = (value = {}) => {
+    const normalized = { ...value };
+    if (normalized.showTimer !== true) normalized.startedAt = 0;
+    return normalized;
+  };
+  return stableJson(normalize(left)) === stableJson(normalize(right));
+}
+
 function createInitialState({ banner = [], globalMode = false, globalScope = "controller", settings = {} } = {}) {
   const initialLaunchMode = settings.launchMode || "auto";
   const initialAgentProvider = settings.agentProvider || "codex-cli";
@@ -174,6 +221,14 @@ function reducer(state, action) {
       } else if (nextIdx >= ids.length) {
         nextIdx = ids.length - 1;
       }
+      if (
+        shallowArrayEqual(state.agents, ids) &&
+        mapPayloadEqual(state.activeAgentMeta, meta) &&
+        state.selectedAgentIndex === nextIdx &&
+        state.agentSelectionMode === nextMode
+      ) {
+        return state;
+      }
       return {
         ...state,
         agents: ids,
@@ -216,12 +271,22 @@ function reducer(state, action) {
       const selectedIndex = selectedRoot
         ? list.findIndex((row) => projectRootOf(row) === selectedRoot)
         : -1;
+      const nextActiveRoot = action.activeProjectRoot || state.activeProjectRoot;
+      if (
+        listPayloadEqual(state.projects, list) &&
+        state.selectedProjectRoot === (selectedIndex >= 0 ? selectedRoot : "") &&
+        state.selectedProjectIndex === selectedIndex &&
+        state.activeProjectRoot === nextActiveRoot &&
+        state.emptyProjectsDownArmed === (list.length === 0 ? state.emptyProjectsDownArmed : false)
+      ) {
+        return state;
+      }
       return {
         ...state,
         projects: list,
         selectedProjectRoot: selectedIndex >= 0 ? selectedRoot : "",
         selectedProjectIndex: selectedIndex,
-        activeProjectRoot: action.activeProjectRoot || state.activeProjectRoot,
+        activeProjectRoot: nextActiveRoot,
         emptyProjectsDownArmed: list.length === 0 ? state.emptyProjectsDownArmed : false,
       };
     }
@@ -240,8 +305,11 @@ function reducer(state, action) {
       return { ...state, projectListWindowStart: Math.max(0, action.windowStart | 0) };
     case "scope/set":
       return { ...state, globalScope: action.scope === "project" ? "project" : "controller" };
-    case "status/set":
-      return { ...state, status: { ...state.status, ...action.payload } };
+    case "status/set": {
+      const nextStatus = { ...state.status, ...action.payload };
+      if (statusPayloadEqual(state.status, nextStatus)) return state;
+      return { ...state, status: nextStatus };
+    }
     case "status/idle":
       return { ...state, status: { message: "", type: "thinking", showTimer: false, startedAt: 0 } };
     case "history/push": {
@@ -311,10 +379,16 @@ function reducer(state, action) {
       return { ...state, selectedProviderIndex: Math.max(0, action.index | 0) };
     case "cronIndex/set":
       return { ...state, selectedCronIndex: Math.max(-1, action.index | 0) };
-    case "cron/set":
-      return { ...state, cronTasks: Array.isArray(action.list) ? action.list : [] };
-    case "loop/set":
-      return { ...state, loopSummary: action.summary && typeof action.summary === "object" ? action.summary : null };
+    case "cron/set": {
+      const list = Array.isArray(action.list) ? action.list : [];
+      if (listPayloadEqual(state.cronTasks, list)) return state;
+      return { ...state, cronTasks: list };
+    }
+    case "loop/set": {
+      const summary = action.summary && typeof action.summary === "object" ? action.summary : null;
+      if (stableJson(state.loopSummary) === stableJson(summary)) return state;
+      return { ...state, loopSummary: summary };
+    }
     case "stream/begin":
       return {
         ...state,