u-foo 2.3.0 → 2.3.2

package/package.json

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

package/src/agent/activityStatePublisher.js

@@ -12,6 +12,7 @@ const { writeActivityState } = require("./activityStateWriter");
  * @param {string} options.subscriber  - Subscriber ID (e.g. "claude-code:abc123")
  * @param {string} options.projectRoot - Project root (unused, kept for API compat)
  * @param {boolean} [options.force=true] - Force overwrite priority-protected states
+ * publish(state, extra, { force }) can override this default for one transition.
  */
 function createActivityStatePublisher(options = {}) {
   const {
@@ -22,10 +23,13 @@ function createActivityStatePublisher(options = {}) {
 
   let lastState = "";
 
-  function publish(state, extra = {}) {
+  function publish(state, extra = {}, publishOptions = {}) {
     if (state === lastState) return false;
     const since = extra.since || undefined;
-    const changed = writeActivityState(agentsFile, subscriber, state, { since, force });
+    const effectiveForce = typeof publishOptions.force === "boolean"
+      ? publishOptions.force
+      : force;
+    const changed = writeActivityState(agentsFile, subscriber, state, { since, force: effectiveForce });
     if (!changed) return false;
     lastState = state;
     // Write to bus events directory for daemon bridge to pick up.

package/src/agent/notifier.js

@@ -123,8 +123,10 @@ class AgentNotifier {
    * 更新 activity_state（terminal/tmux agent 基础支持）
    * 基于消息投递推断 WORKING，无 pending 时推断 IDLE
    */
-  updateActivityState(state) {
-    return this.activityPublisher.publish(state);
+  updateActivityState(state, options = {}) {
+    return this.activityPublisher.publish(state, {}, {
+      force: typeof options.force === "boolean" ? options.force : undefined,
+    });
   }
 
   getCurrentActivityState() {
@@ -375,7 +377,14 @@ class AgentNotifier {
 
     this.lastCount = this.getMessageCount();
     if (this._launcherReady && (!this.lastWorkingAt || nowMs - this.lastWorkingAt >= this.workingHoldMs)) {
-      this.updateActivityState("idle");
+      const currentActivityState = this.getCurrentActivityState();
+      if (currentActivityState !== "waiting_input" && currentActivityState !== "blocked") {
+        if (currentActivityState === "working") {
+          this.updateActivityState("idle", { force: true });
+        } else {
+          this.updateActivityState("idle");
+        }
+      }
     }
     this.refreshTitle();
     this.updateHeartbeat();

package/src/bus/subscriber.js

@@ -122,10 +122,11 @@ class SubscriberManager {
     }
   }
 
-  async cleanupDuplicateTty(currentSubscriber, ttyPath) {
+  async cleanupDuplicateTty(currentSubscriber, ttyPath, options = {}) {
     if (!ttyPath) return null;
     if (!this.busData.agents) return null;
 
+    const currentAgentType = String(options.agentType || "").trim();
     let inheritedNickname = null;
     const entries = Object.entries(this.busData.agents);
     for (const [id, meta] of entries) {
@@ -136,8 +137,9 @@ class SubscriberManager {
         : (await this.queueManager.readTty(id));
       if (!metaTty) continue;
       if (metaTty === ttyPath) {
-        // Inherit user-set nickname from the displaced entry
-        if (meta.nickname && !inheritedNickname) {
+        const sameAgentType = !currentAgentType || meta?.agent_type === currentAgentType;
+        // Inherit user-set nickname only when replacing the same agent type.
+        if (sameAgentType && meta.nickname && !inheritedNickname) {
           inheritedNickname = meta.nickname;
         }
         // Remove stale subscriber using same tty
@@ -227,7 +229,7 @@ class SubscriberManager {
     // 清理同一 tty 的旧订阅者（避免重复启动污染）
     // Inherit nickname from displaced entry when this is a new subscriber
     // with no explicit nickname (e.g. session restart on same TTY)
-    const inheritedNickname = await this.cleanupDuplicateTty(subscriber, finalTty);
+    const inheritedNickname = await this.cleanupDuplicateTty(subscriber, finalTty, { agentType });
     if (inheritedNickname && !nickname && !existingMeta) {
       finalNickname = inheritedNickname;
       if (!finalScopedNickname) finalScopedNickname = inheritedNickname;

package/src/chat/commandExecutor.js

@@ -117,6 +117,7 @@ function createCommandExecutor(options = {}) {
     parseCommand = () => null,
     escapeBlessed = (value) => String(value || ""),
     logMessage = () => {},
+    resolveStatusLine = null,
     renderScreen = () => {},
     getActiveAgents = () => [],
     getActiveAgentMetaMap = () => new Map(),
@@ -157,6 +158,10 @@ function createCommandExecutor(options = {}) {
     throw new Error("createCommandExecutor requires projectRoot");
   }
 
+  const statusMsg = typeof resolveStatusLine === "function"
+    ? resolveStatusLine
+    : (text) => logMessage("status", text);
+
   async function handleDoctorCommand() {
     logMessage("system", "{white-fg}⚙{/white-fg} Running health check...");
 
@@ -221,51 +226,51 @@ function createCommandExecutor(options = {}) {
 
     if (subcommand === "start") {
       if (isDaemonRunning(targetRoot)) {
-        logMessage("system", "{white-fg}⚠{/white-fg} Daemon already running");
+        statusMsg("{gray-fg}⚠{/gray-fg} Daemon already running");
       } else {
-        logMessage("system", "{white-fg}⚙{/white-fg} Starting daemon...");
+        statusMsg("{gray-fg}⚙{/gray-fg} Starting daemon...");
         startDaemon(targetRoot);
         await sleep(1000);
         if (isDaemonRunning(targetRoot)) {
-          logMessage("system", "{white-fg}✓{/white-fg} Daemon started");
+          statusMsg("{gray-fg}✓{/gray-fg} Daemon started");
         } else {
-          logMessage("error", "{white-fg}✗{/white-fg} Failed to start daemon");
+          statusMsg("{gray-fg}✗{/gray-fg} Failed to start daemon");
         }
       }
       return;
     }
 
     if (subcommand === "stop") {
-      logMessage("system", "{white-fg}⚙{/white-fg} Stopping daemon...");
+      statusMsg("{gray-fg}⚙{/gray-fg} Stopping daemon...");
       stopDaemon(targetRoot);
       await sleep(1000);
       if (!isDaemonRunning(targetRoot)) {
-        logMessage("system", "{white-fg}✓{/white-fg} Daemon stopped");
+        statusMsg("{gray-fg}✓{/gray-fg} Daemon stopped");
       } else {
-        logMessage("error", "{white-fg}✗{/white-fg} Failed to stop daemon");
+        statusMsg("{gray-fg}✗{/gray-fg} Failed to stop daemon");
       }
       return;
     }
 
     if (subcommand === "restart") {
-      logMessage("system", "{white-fg}⚙{/white-fg} Restarting daemon...");
+      statusMsg("{gray-fg}⚙{/gray-fg} Restarting daemon...");
       stopDaemon(targetRoot);
       await sleep(500);
       startDaemon(targetRoot);
       await sleep(1000);
       if (isDaemonRunning(targetRoot)) {
-        logMessage("system", "{white-fg}✓{/white-fg} Daemon restarted");
+        statusMsg("{gray-fg}✓{/gray-fg} Daemon restarted");
       } else {
-        logMessage("error", "{white-fg}✗{/white-fg} Failed to restart daemon");
+        statusMsg("{gray-fg}✗{/gray-fg} Failed to restart daemon");
       }
       return;
     }
 
     if (subcommand === "status") {
       if (isDaemonRunning(targetRoot)) {
-        logMessage("system", "{white-fg}✓{/white-fg} Daemon is running");
+        statusMsg("{gray-fg}✓{/gray-fg} Daemon is running");
       } else {
-        logMessage("system", "{white-fg}✗{/white-fg} Daemon is not running");
+        statusMsg("{gray-fg}✗{/gray-fg} Daemon is not running");
       }
       return;
     }

package/src/chat/daemonMessageRouter.js

@@ -37,6 +37,14 @@ function createDaemonMessageRouter(options = {}) {
     return text.includes(":") && !text.includes(" ");
   }
 
+  function speakerPrefix(label, color = "cyan") {
+    const escapedLabel = escapeBlessed(label);
+    if (color === "white") {
+      return `{white-fg}${escapedLabel}{/white-fg} {gray-fg}·{/gray-fg} `;
+    }
+    return `{cyan-fg}${escapedLabel}{/cyan-fg} {gray-fg}·{/gray-fg} `;
+  }
+
   function normalizeDisplayMessage(raw) {
     let displayMessage = raw || "";
     let streamPayload = null;
@@ -77,9 +85,9 @@ function createDaemonMessageRouter(options = {}) {
         resolveBusStatus(item);
         if (text) {
           const prefix = data.phase === BUS_STATUS_PHASES.ERROR
-            ? "{white-fg}✗{/white-fg}"
-            : "{white-fg}✓{/white-fg}";
-          logMessage("status", `${prefix} ${escapeBlessed(text)}`, data);
+            ? "{gray-fg}✗{/gray-fg}"
+            : "{gray-fg}✓{/gray-fg}";
+          resolveStatusLine(`${prefix} ${escapeBlessed(text)}`, data);
         }
       } else {
         enqueueBusStatus(item);
@@ -214,7 +222,7 @@ function createDaemonMessageRouter(options = {}) {
       );
       // Suppress lifecycle confirmations from chat history — status line plus structured payload is enough.
       if (!isLifecycleStatusOnly && !isGroupStartedConfirmation) {
-        logMessage("reply", `{white-fg}←{/white-fg} ${escapeBlessed(replyText)}`);
+        logMessage("reply", `${speakerPrefix("ufoo", "white")}${escapeBlessed(replyText)}`);
       }
     }
 
@@ -352,15 +360,11 @@ function createDaemonMessageRouter(options = {}) {
       const publisher = report.agent_id || data.publisher || "ufoo-agent";
       const displayName = resolveAgentDisplayName(publisher);
       const detail = report.summary || report.message || data.message || report.task_id || "report";
-      logMessage(
-        "system",
-        `{gray-fg}↥{/gray-fg} {cyan-fg}${escapeBlessed(displayName)}{/cyan-fg} {gray-fg}→ ufoo-agent{/gray-fg} ${escapeBlessed(detail)}`
-      );
+      logMessage("bus", `${speakerPrefix(displayName)}${escapeBlessed(detail)}`);
       requestStatus();
       renderScreen();
       return true;
     }
-    const prefix = data.event === "broadcast" ? "{gray-fg}⇢{/gray-fg}" : "{gray-fg}↔{/gray-fg}";
     const publisher = data.publisher && data.publisher !== "unknown"
       ? data.publisher
       : (data.event === "broadcast" ? "broadcast" : "bus");
@@ -399,7 +403,7 @@ function createDaemonMessageRouter(options = {}) {
     }
 
     const pendingBeforeMessage = getPendingState(publisher, displayName);
-    const prefixLabel = `${prefix} {gray-fg}${escapeBlessed(displayName)}{/gray-fg}: `;
+    const prefixLabel = speakerPrefix(displayName);
     const continuationPrefix = " ".repeat(stripBlessedTags(prefixLabel).length);
 
     if (streamPayload) {

package/src/chat/index.js

@@ -1905,6 +1905,7 @@ async function runChat(projectRoot, options = {}) {
     renderDashboard,
     renderScreen: () => screen.render(),
     logMessage,
+    resolveStatusLine,
     escapeBlessed,
   });
 
@@ -1919,6 +1920,7 @@ async function runChat(projectRoot, options = {}) {
     parseCommand,
     escapeBlessed,
     logMessage,
+    resolveStatusLine,
     renderScreen: () => screen.render(),
     getActiveAgents: () => activeAgents,
     getActiveAgentMetaMap: () => activeAgentMetaMap,

package/src/chat/inputSubmitHandler.js

@@ -30,6 +30,10 @@ function createInputSubmitHandler(options = {}) {
     throw new Error("createInputSubmitHandler requires a mutable state object");
   }
 
+  function userPrefix() {
+    return "{white-fg}you{/white-fg} {gray-fg}·{/gray-fg}";
+  }
+
   async function tryActivateTargetAgent(agentId) {
     const adapter = getAgentAdapter(agentId);
     const capabilities = adapter && adapter.capabilities ? adapter.capabilities : null;
@@ -88,7 +92,7 @@ function createInputSubmitHandler(options = {}) {
       const label = getAgentLabel(state.targetAgent);
       logMessage(
         "user",
-        `{cyan-fg}→{/cyan-fg} {magenta-fg}@${escapeBlessed(label)}{/magenta-fg} ${escapeBlessed(text)}`
+        `${userPrefix()} {magenta-fg}@${escapeBlessed(label)}{/magenta-fg} ${escapeBlessed(text)}`
       );
       renderScreen();  // Immediately render the user message
       markPendingDelivery(state.targetAgent);
@@ -114,10 +118,7 @@ function createInputSubmitHandler(options = {}) {
           return;
         }
         setTargetAgent(resolvedTarget);
-        logMessage(
-          "status",
-          `{white-fg}⚙{/white-fg} Target selected: @${escapeBlessed(atTarget.target)}`
-        );
+        queueStatusLine(`Target selected: @${escapeBlessed(atTarget.target)}`);
         focusInput();
         return;
       }
@@ -125,7 +126,7 @@ function createInputSubmitHandler(options = {}) {
       const message = atTarget.message.trim();
       logMessage(
         "user",
-        `{cyan-fg}→{/cyan-fg} {magenta-fg}@${escapeBlessed(atTarget.target)}{/magenta-fg} ${escapeBlessed(message)}`
+        `${userPrefix()} {magenta-fg}@${escapeBlessed(atTarget.target)}{/magenta-fg} ${escapeBlessed(message)}`
       );
       renderScreen();  // Immediately render the user message
       markPendingDelivery(resolvedTarget);
@@ -142,7 +143,7 @@ function createInputSubmitHandler(options = {}) {
 
     if (text.startsWith("/")) {
       if (shouldEchoCommandInChat(text)) {
-        logMessage("user", `{white-fg}→{/white-fg} ${escapeBlessed(text)}`);
+        logMessage("user", `${userPrefix()} ${escapeBlessed(text)}`);
         renderScreen();  // Render slash command immediately
       }
       try {
@@ -188,7 +189,7 @@ function createInputSubmitHandler(options = {}) {
           allow_relevance_queue: true,
         },
       });
-      logMessage("user", `{white-fg}→{/white-fg} ${escapeBlessed(text)}`);
+      logMessage("user", `${userPrefix()} ${escapeBlessed(text)}`);
       renderScreen();  // Render plain text message immediately
     }
 

package/src/chat/projectCloseController.js

@@ -23,10 +23,14 @@ function createProjectCloseController(options = {}) {
     renderDashboard = () => {},
     renderScreen = () => {},
     logMessage = () => {},
+    resolveStatusLine = null,
     escapeBlessed = (value) => String(value || ""),
   } = options;
 
   let closingProject = false;
+  const statusMsg = typeof resolveStatusLine === "function"
+    ? resolveStatusLine
+    : (text) => logMessage("status", text);
 
   function pickFallbackProjectRoot(targetProjectRoot) {
     const rows = Array.isArray(getProjects()) ? getProjects() : [];
@@ -61,7 +65,7 @@ function createProjectCloseController(options = {}) {
 
     closingProject = true;
     try {
-      logMessage("status", `{white-fg}⚙{/white-fg} Closing project ${escapedName} daemon and agents...`);
+      statusMsg(`{gray-fg}⚙{/gray-fg} Closing project ${escapedName} daemon and agents...`);
 
       let switchedTo = "";
       if (activeProjectRoot === projectRoot) {
@@ -89,9 +93,9 @@ function createProjectCloseController(options = {}) {
       renderScreen();
 
       if (wasRunning) {
-        logMessage("status", `{white-fg}✓{/white-fg} Closed project ${escapedName} daemon and agents`);
+        statusMsg(`{gray-fg}✓{/gray-fg} Closed project ${escapedName} daemon and agents`);
       } else {
-        logMessage("status", `{white-fg}✓{/white-fg} Project ${escapedName} daemon already stopped`);
+        statusMsg(`{gray-fg}✓{/gray-fg} Project ${escapedName} daemon already stopped`);
       }
 
       return {

package/src/chat/settingsController.js

@@ -75,7 +75,8 @@ function createSettingsController(options = {}) {
     setSelectedProviderIndex(Math.max(0, providerOptions.findIndex((opt) => opt.value === next)));
     saveConfig(projectRoot, { agentProvider: next });
     clearUfooAgentIdentity();
-    logMessage("status", `{white-fg}⚙{/white-fg} ufoo-agent: ${providerLabel(next)}`);
+    const statusMsg = resolveStatusLine || ((text) => logMessage("status", text));
+    statusMsg(`{gray-fg}⚙{/gray-fg} ufoo-agent: ${providerLabel(next)}`);
     renderDashboard();
     renderScreen();
     void restartDaemon();
@@ -89,7 +90,8 @@ function createSettingsController(options = {}) {
     setSelectedResumeIndex(next ? 0 : 1);
     saveConfig(projectRoot, { autoResume: next });
     const label = next ? "Resume previous session" : "Start new session";
-    logMessage("status", `{white-fg}⚙{/white-fg} Resume mode: ${label}`);
+    const statusMsg = resolveStatusLine || ((text) => logMessage("status", text));
+    statusMsg(`{gray-fg}⚙{/gray-fg} Resume mode: ${label}`);
     renderDashboard();
     renderScreen();
     return true;