u-foo 3.0.8 → 3.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "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/notifier.js

@@ -315,7 +315,6 @@ class AgentNotifier {
     if (this.stopped) return;
 
     const currentCount = this.getMessageCount();
-    const nowMs = Date.now();
 
     // 有新消息
     if (currentCount > this.lastCount) {
@@ -330,14 +329,22 @@ class AgentNotifier {
     }
 
     this.lastCount = this.getMessageCount();
-    if (this._launcherReady && (!this.lastWorkingAt || nowMs - this.lastWorkingAt >= this.workingHoldMs)) {
+    // Delivery moved to the daemon scheduler. ActivityDetector owns
+    // working → idle / waiting_input. Never force-idle over working here:
+    // lastWorkingAt is only set by the legacy deliverPending path, so the
+    // old hold-window check stayed permanently true and stomped real
+    // working states every poll (~2s) — Codex injections then slipped mid-turn.
+    if (this._launcherReady) {
       const currentActivityState = this.getCurrentActivityState();
-      if (currentActivityState !== "waiting_input" && currentActivityState !== "blocked") {
-        if (currentActivityState === "working") {
-          this.updateActivityState("idle", { force: true });
-        } else {
-          this.updateActivityState("idle");
-        }
+      if (
+        currentActivityState
+        && currentActivityState !== "working"
+        && currentActivityState !== "waiting_input"
+        && currentActivityState !== "blocked"
+      ) {
+        // Soft fallback only (no force): ready/starting → idle for delivery,
+        // without overriding detector-owned busy states.
+        this.updateActivityState("idle");
       }
     }
     this.refreshTitle();

package/src/code/context/userNudge.js

@@ -58,6 +58,14 @@ function hasPendingUserPrompts(executionState = null) {
   return state.pendingUserPrompts.length > 0;
 }
 
+/** Peek pending nudge texts without draining (for TUI queue banner). */
+function listPendingUserPrompts(executionState = null) {
+  const state = ensurePendingUserPrompts(executionState);
+  return state.pendingUserPrompts
+    .map((entry) => String(entry && entry.text || "").trim())
+    .filter(Boolean);
+}
+
 function shouldFrameAsUserReminder(executionState = null) {
   if (!executionState || typeof executionState !== "object") return false;
   if (executionState.planMode === true) return true;
@@ -160,6 +168,7 @@ module.exports = {
   drainUserPrompts,
   clearUserPrompts,
   hasPendingUserPrompts,
+  listPendingUserPrompts,
   shouldFrameAsUserReminder,
   formatUserReminderMessage,
   buildContinuationUserPrompt,

package/src/runtime/daemon/deliveryScheduler.js

@@ -5,6 +5,7 @@ const Injector = require("../../coordination/bus/inject");
 const { buildPromptInjectionText } = require("../../coordination/bus/promptEnvelope");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 const { normalizeQueueEnvelope } = require("../../coordination/bus/deliveryQueue");
+const { writeActivityState } = require("../../agents/activity/activityStateWriter");
 
 function asState(value = "") {
   return String(value || "").trim().toLowerCase();
@@ -58,6 +59,14 @@ class DeliveryScheduler {
     this.emitDelivery = typeof options.emitDelivery === "function"
       ? options.emitDelivery
       : async () => {};
+    this.markWorking = typeof options.markWorking === "function"
+      ? options.markWorking
+      : (subscriber) => {
+        writeActivityState(this.paths.agentsFile, subscriber, "working", {
+          force: true,
+          detail: "inject",
+        });
+      };
     this.log = typeof options.log === "function" ? options.log : () => {};
     this.now = typeof options.now === "function" ? options.now : () => Date.now();
     this.deferWarnAfterMs = positiveMs(options.deferWarnAfterMs, DEFAULT_DEFER_WARN_AFTER_MS);
@@ -224,6 +233,15 @@ class DeliveryScheduler {
       try {
         await this.injector.inject(subscriber, injectionText);
         queue.completeClaim(claim);
+        // Close the idle gate immediately. PTY ActivityDetector will refresh
+        // working from output, then quiet-window back to idle; without this
+        // stamp a second pending message can slip through on the next tick
+        // before any Codex stdout arrives.
+        try {
+          this.markWorking(subscriber);
+        } catch {
+          // activity stamp must never undo a successful inject
+        }
         await this.emitDelivery({
           subscriber,
           event: envelope,

package/src/ui/ink/ChatApp.js

@@ -732,6 +732,86 @@ function wrapInternalPlainLine(text = "", width = 80) {
   return rows;
 }
 
+// Ink's wrap:"wrap" + <Static> under-counts CJK row height on live appends,
+// so later log writes overpaint the previous line. Pre-wrap by display cells
+// and paint with wrap:"truncate" so each Static item occupies a known height.
+function expandChatLogPhysicalLines(text = "", width = 80) {
+  const limit = Math.max(1, Math.floor(Number(width) || 80));
+  const source = String(text || "").replace(/\r/g, "");
+  if (!source) return [""];
+  const out = [];
+  for (const line of source.split("\n")) {
+    out.push(...wrapInternalPlainLine(line, limit));
+  }
+  return out.length > 0 ? out : [""];
+}
+
+function padDisplayCells(cells = 0) {
+  return " ".repeat(Math.max(0, Math.floor(Number(cells) || 0)));
+}
+
+function splitUserLogAtMention(bodyText = "") {
+  const body = String(bodyText || "");
+  const atMatch = body.match(/^@([^\s]+)\s+(.*)$/);
+  if (atMatch) {
+    return { at: atMatch[1], rest: atMatch[2] || "" };
+  }
+  return { at: "", rest: body };
+}
+
+/**
+ * Flatten one chat log row into terminal-width physical lines. Each returned
+ * line is a single string (marker/speaker/body already merged) so Ink never
+ * has to wrap it — critical for <Static> append-only CJK safety.
+ */
+function buildChatLogDisplayLines(row = {}, options = {}) {
+  const cols = Math.max(8, Math.floor(Number(options.cols) || 80));
+  const continuation = Boolean(options.continuation);
+  const groupKind = options.groupKind || row.kind || "plain";
+  const kind = row.kind || "plain";
+
+  if (kind === "spacer") return [" "];
+  if (kind === "divider") {
+    return [fitPlainLine(`  ${compactDividerLabel(row.body || row.bodyText || "")}`, cols)];
+  }
+  if (kind === "banner") {
+    return expandChatLogPhysicalLines(stripInternalLogMarkup(row.bodyText || row.body || ""), cols)
+      .map((line) => fitPlainLine(line, cols));
+  }
+
+  const markerText = continuation
+    ? (groupKind === "assistant" || groupKind === "agent" || groupKind === "report" ? "   " : "  ")
+    : String(row.markerText != null ? row.markerText : "");
+
+  if (kind === "user") {
+    const userBody = splitUserLogAtMention(row.bodyText || row.body || "");
+    const atPrefix = userBody.at ? `@${userBody.at} ` : "";
+    const firstPrefix = `${markerText || "› "}${atPrefix}`;
+    const prefixCells = fmt.displayCellWidth(firstPrefix);
+    const budget = Math.max(1, cols - prefixCells);
+    const chunks = expandChatLogPhysicalLines(userBody.rest, budget);
+    const contPad = padDisplayCells(prefixCells);
+    return chunks.map((chunk, idx) => {
+      const line = idx === 0 ? `${firstPrefix}${chunk}` : `${contPad}${chunk}`;
+      return fitPlainLine(line, cols);
+    });
+  }
+
+  const speakerPrefix = (!continuation && row.speaker)
+    ? `${row.speaker} · `
+    : "";
+  const head = `${markerText}${speakerPrefix}`;
+  const headCells = fmt.displayCellWidth(head);
+  const budget = Math.max(1, cols - headCells);
+  const bodyPlain = stripInternalLogMarkup(row.bodyText != null ? row.bodyText : (row.body || ""));
+  const chunks = expandChatLogPhysicalLines(bodyPlain, budget);
+  const contPad = padDisplayCells(headCells);
+  return chunks.map((chunk, idx) => {
+    const line = idx === 0 ? `${head}${chunk}` : `${contPad}${chunk}`;
+    return fitPlainLine(line, cols);
+  });
+}
+
 function classifyInternalLogLine(line = "") {
   const raw = stripInternalLogMarkup(line).replace(/\r/g, "");
   if (!raw) return { kind: "spacer", text: "", markdown: false, bold: false };
@@ -3580,16 +3660,44 @@ function createChatApp({ React, ink, props, interactive = true }) {
       return null;
     }
 
-    const renderUserLogBody = (bodyText = "") => {
-      const body = String(bodyText || "");
-      const atMatch = body.match(/^@([^\s]+)\s+(.*)$/);
-      if (atMatch) {
-        return {
-          at: atMatch[1],
-          rest: atMatch[2] || "",
-        };
+    const renderChatLogLines = (row, { key, continuation = false, groupKind = "", marginTop = 0, marginBottom = 0 } = {}) => {
+      const colors = CHAT_LOG_ROW_PALETTE[row.kind] || CHAT_LOG_ROW_PALETTE.plain;
+      const cols = Math.max(20, size.cols || 80);
+      const lines = buildChatLogDisplayLines(row, {
+        continuation,
+        groupKind: groupKind || row.kind,
+        cols,
+      });
+      const textProps = {
+        color: row.kind === "user" ? "green" : colors.body,
+        bold: Boolean(
+          row.kind === "user"
+          || colors.bold
+          || row.kind === "error"
+          || row.kind === "assistant"
+          || row.kind === "banner"
+        ),
+        wrap: "truncate",
+      };
+      if (colors.dim) textProps.dimColor = true;
+      if (row.kind === "agent" || row.kind === "report") {
+        textProps.color = colors.speaker;
       }
-      return { at: "", rest: body };
+      if (lines.length <= 1) {
+        return h(Box, { key, width: "100%", marginTop, marginBottom },
+          h(Text, textProps, (lines[0] != null ? lines[0] : " ") || " "));
+      }
+      return h(Box, {
+        key,
+        flexDirection: "column",
+        width: "100%",
+        marginTop,
+        marginBottom,
+      },
+      ...lines.map((line, idx) => h(Text, {
+        key: `${key}-r${idx}`,
+        ...textProps,
+      }, line || " ")));
     };
 
     const renderChatLogEntry = (entry, group) => {
@@ -3598,53 +3706,12 @@ function createChatApp({ React, ink, props, interactive = true }) {
       if (row.kind === "spacer") {
         return h(Text, { key, color: "gray" }, " ");
       }
-      const colors = CHAT_LOG_ROW_PALETTE[row.kind] || CHAT_LOG_ROW_PALETTE.plain;
-      if (row.kind === "divider") {
-        return h(Box, { key, marginBottom: 1 },
-          h(Text, { color: colors.body, wrap: "truncate" }, `  ${compactDividerLabel(row.body)}`),
-        );
-      }
-      if (row.kind === "banner") {
-        return h(Box, { key },
-          h(Text, { color: colors.body, bold: true, wrap: "truncate" }, row.body),
-        );
-      }
-      if (row.kind === "user") {
-        const userBody = renderUserLogBody(row.bodyText);
-        return h(Box, { key, width: "100%", marginBottom: 1, alignItems: "flex-start" },
-          h(Text, { color: "green", bold: true }, row.markerText || "› "),
-          userBody.at
-            ? h(Text, { color: "magenta", bold: true }, `@${userBody.at} `)
-            : null,
-          h(Text, { color: "green", bold: true, wrap: "wrap" }, userBody.rest),
-        );
-      }
-      const markerText = entry && entry.continuation
-        ? (group && (group.kind === "assistant" || group.kind === "agent" || group.kind === "report") ? "   " : "  ")
-        : row.markerText;
-      const bodyProps = {
-        color: colors.body,
-        wrap: "wrap",
-      };
-      if (colors.dim) bodyProps.dimColor = true;
-      // Pin the gutter glyph to the first text line; default Yoga stretch/center
-      // floats markers above wrapped speaker · body rows.
-      return h(Box, { key, width: "100%", alignItems: "flex-start" },
-        h(Text, {
-          color: colors.marker,
-          bold: row.kind === "error" || row.kind === "assistant",
-          dimColor: Boolean(colors.dim),
-        }, markerText),
-        h(Text, bodyProps,
-          row.speaker && !(entry && entry.continuation)
-            ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
-            : null,
-          row.speaker && !(entry && entry.continuation)
-            ? h(Text, { color: "gray" }, " · ")
-            : null,
-          row.bodyText,
-        ),
-      );
+      return renderChatLogLines(row, {
+        key,
+        continuation: Boolean(entry && entry.continuation),
+        groupKind: group && group.kind ? group.kind : row.kind,
+        marginBottom: row.kind === "user" || row.kind === "divider" ? 1 : 0,
+      });
     };
 
     const renderChatLogGroup = (group) => {
@@ -3664,64 +3731,23 @@ function createChatApp({ React, ink, props, interactive = true }) {
       ...entries.map((entry) => renderChatLogEntry(entry, group)));
     };
 
-    // Renderer for one finalized (append-only) <Static> log item. Mirrors
-    // renderChatLogEntry visually; spacing differs because per-item
-    // rendering can't wrap a group in one margin-bottom Box — instead the
-    // decoration pass flags `marginBefore` on whatever entry follows a
-    // transcript group.
+    // Renderer for one finalized (append-only) <Static> log item. Spacing
+    // uses decorateStaticLogEntry's marginBefore; body text is pre-wrapped to
+    // the terminal width so Ink never wrap:"wrap"s CJK inside Static.
     const renderStaticChatLogItem = (item) => {
       const { row, groupKind, continuation, marginBefore } = item;
       const key = item.entry && item.entry.id ? item.entry.id : `log-${row.body}`;
-      const marginTop = marginBefore ? 1 : 0;
       if (row.kind === "spacer") {
-        return h(Box, { key, marginTop },
+        return h(Box, { key, marginTop: marginBefore ? 1 : 0 },
           h(Text, { color: "gray" }, " "));
       }
-      const colors = CHAT_LOG_ROW_PALETTE[row.kind] || CHAT_LOG_ROW_PALETTE.plain;
-      if (row.kind === "divider") {
-        return h(Box, { key, marginTop, marginBottom: 1 },
-          h(Text, { color: colors.body, wrap: "truncate" }, `  ${compactDividerLabel(row.body)}`),
-        );
-      }
-      if (row.kind === "banner") {
-        return h(Box, { key, marginTop },
-          h(Text, { color: colors.body, bold: true, wrap: "truncate" }, row.body),
-        );
-      }
-      if (row.kind === "user") {
-        const userBody = renderUserLogBody(row.bodyText);
-        return h(Box, { key, width: "100%", marginTop, marginBottom: 1, alignItems: "flex-start" },
-          h(Text, { color: "green", bold: true }, row.markerText || "› "),
-          userBody.at
-            ? h(Text, { color: "magenta", bold: true }, `@${userBody.at} `)
-            : null,
-          h(Text, { color: "green", bold: true, wrap: "wrap" }, userBody.rest),
-        );
-      }
-      const markerText = continuation
-        ? (groupKind === "assistant" || groupKind === "agent" || groupKind === "report" ? "   " : "  ")
-        : row.markerText;
-      const bodyProps = {
-        color: colors.body,
-        wrap: "wrap",
-      };
-      if (colors.dim) bodyProps.dimColor = true;
-      return h(Box, { key, width: "100%", marginTop, alignItems: "flex-start" },
-        h(Text, {
-          color: colors.marker,
-          bold: row.kind === "error" || row.kind === "assistant",
-          dimColor: Boolean(colors.dim),
-        }, markerText),
-        h(Text, bodyProps,
-          row.speaker && !continuation
-            ? h(Text, { color: colors.speaker, bold: colors.bold }, row.speaker)
-            : null,
-          row.speaker && !continuation
-            ? h(Text, { color: "gray" }, " · ")
-            : null,
-          row.bodyText,
-        ),
-      );
+      return renderChatLogLines(row, {
+        key,
+        continuation,
+        groupKind,
+        marginTop: marginBefore ? 1 : 0,
+        marginBottom: row.kind === "user" || row.kind === "divider" ? 1 : 0,
+      });
     };
 
     if (state.viewingAgentId) {
@@ -4099,6 +4125,8 @@ module.exports = {
   createInkStreamState,
   createThrottledSender,
   decorateStaticLogEntry,
+  buildChatLogDisplayLines,
+  expandChatLogPhysicalLines,
   bootstrapEnvironment,
   buildDirectBusSendRequest,
   buildPromptIpcRequest,

package/src/ui/ink/UcodeApp.js

@@ -96,6 +96,10 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       hash: "",
     }));
     const [interactionLines, setInteractionLines] = useState([]);
+    // Bumps when pendingUserPrompts change so the near-input queue banner
+    // re-renders without dumping a chat-log system line.
+    const [queueTick, setQueueTick] = useState(0);
+    const bumpQueue = useCallback(() => setQueueTick((n) => n + 1), []);
     const [spinnerTick, setSpinnerTick] = useState(0);
     const [size, setSize] = useState({ cols: 0, rows: 0 });
     const [contextMeter, setContextMeter] = useState(() => {
@@ -903,6 +907,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
             cancelThinkingFlush();
             thinkingTailRef.current = "";
             refreshPlanUi();
+            bumpQueue();
             setStatus({ message: "", type: "thinking", showTimer: false, startedAt: 0 });
           }
           if (streamBuf) {
@@ -942,7 +947,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
         default:
           if (result.output) appendLogText(result.output);
       }
-    }, [appendLogLine, appendLogText, exit, props, logToolHint, flushActiveMerge, flushTableBuffer, refreshPlanUi]);
+    }, [appendLogLine, appendLogText, exit, props, logToolHint, flushActiveMerge, flushTableBuffer, refreshPlanUi, bumpQueue]);
     // ^ `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.
@@ -1153,14 +1158,8 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
         if (!props.state.executionState || typeof props.state.executionState !== "object") {
           props.state.executionState = emptyExecutionState();
         }
-        const queued = enqueueUserPrompt(props.state.executionState, modelText);
-        const reminderPreview = logText.slice(0, 120) + (logText.length > 120 ? "…" : "");
-        appendLogText(
-          queued.enqueued
-            ? `Queued user reminder for next model turn: ${reminderPreview}`
-            : "Could not queue user reminder (empty).",
-          "system",
-        );
+        enqueueUserPrompt(props.state.executionState, modelText);
+        bumpQueue();
         return;
       }
 
@@ -1180,6 +1179,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
       appendLogLine,
       flushActiveMerge,
       flushTableBuffer,
+      bumpQueue,
       props.state,
       props.submitUserInteractionAnswer,
       refreshPlanUi,
@@ -1410,6 +1410,25 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
           ),
         )
         : null,
+      (() => {
+        void queueTick;
+        let pending = [];
+        try {
+          const { listPendingUserPrompts } = require("../../code/context/userNudge");
+          pending = listPendingUserPrompts(props.state && props.state.executionState);
+        } catch {
+          pending = [];
+        }
+        if (pending.length === 0) return null;
+        const latest = String(pending[pending.length - 1] || "");
+        const more = pending.length > 1 ? ` · +${pending.length - 1}` : "";
+        const preview = latest.length > 72 ? `${latest.slice(0, 72)}…` : latest;
+        return h(Box, { width: "100%" },
+          h(Text, { color: "yellow", wrap: "truncate" },
+            `排队中 · 未发出 · ${preview}${more}`,
+          ),
+        );
+      })(),
       h(Box, { width: "100%" },
         h(MultilineInput, {
           value: draft,
@@ -1469,6 +1488,7 @@ function createUcodeApp({ React, ink, props, interactive = true }) {
                 if (props.state && props.state.executionState) {
                   clearUserPrompts(props.state.executionState);
                 }
+                bumpQueue();
               } catch { /* ignore */ }
               appendLogLine("⚙ Cancellation requested. Stopping the current task...", "system");
               setStatus({