u-foo 1.8.5 → 1.8.8

package/package.json

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

package/src/agent/activityDetector.js

@@ -10,6 +10,8 @@
  *                      BLOCKED ----+
  */
 
+const { isTranscriptActive } = require("./claudeSessionFiles");
+
 const ACTIVITY_STATES = {
   starting: "starting",
   ready: "ready",
@@ -24,6 +26,7 @@ const DEFAULT_TAIL_LINES = 10;
 const DEFAULT_BLOCKED_TIMEOUT_MS = 300000;
 const DEFAULT_INTERNAL_QUIET_MS = 3500;
 const DEFAULT_EXTERNAL_QUIET_MS = 5000;
+const DEFAULT_TRANSCRIPT_THRESHOLD_MS = 5000;
 const ANSI_PATTERN = /\x1b\[[0-?]*[ -/]*[@-~]/g;
 const OSC_PATTERN = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g;
 
@@ -34,6 +37,10 @@ const INPUT_PATTERNS = {
     /\bAllow\b.*\bDeny\b/,            // Claude Code permission dialog: "Allow | Deny"
     /\ballow mcp\b/i,                 // MCP tool approval prompt
     /Enter to select.*\u2191\/\u2193 to navigate/, // Ink TUI interactive prompt navigation bar (permissions, AskUserQuestion, Plan approval)
+    /\u276f\s+.*\n.*\u276f\s+/,       // AskUserQuestion multi-option selector (❯ markers)
+    /Do you want to proceed/i,         // Plan mode approval prompt
+    /\bApprove\b.*\bReject\b/,        // Plan approval dialog
+    /\bYes\b.*\bNo\b.*\bAlways allow\b/, // Permission with "Always allow" option
   ],
   codex: [
     /\[Y\/n\]/,                        // Bracket-style prompt
@@ -79,6 +86,8 @@ class ActivityDetector {
    * @param {boolean} [options.startOnOutput=false] - allow STARTING -> WORKING on first output
    * @param {number} [options.quietWindowMs] - output quiet window before WAITING_INPUT/IDLE classification
    * @param {number} [options.blockedTimeoutMs=300000] - 5 min WAITING_INPUT → BLOCKED
+   * @param {number} [options.pid] - agent PID for transcript mtime checking (claude-code only)
+   * @param {number} [options.transcriptThresholdMs=5000] - transcript mtime threshold for busy detection
    */
   constructor(agentType, options = {}) {
     this.agentType = agentType;
@@ -87,6 +96,8 @@ class ActivityDetector {
     this.tailLines = toPositiveInt(options.tailLines, DEFAULT_TAIL_LINES);
     this.startOnOutput = options.startOnOutput === true;
     this.blockedTimeoutMs = toPositiveInt(options.blockedTimeoutMs, DEFAULT_BLOCKED_TIMEOUT_MS);
+    this.pid = toPositiveInt(options.pid, 0);
+    this.transcriptThresholdMs = toPositiveInt(options.transcriptThresholdMs, DEFAULT_TRANSCRIPT_THRESHOLD_MS);
     const optionQuietMs = toPositiveInt(options.quietWindowMs, 0);
     const envQuietMs = toPositiveInt(process.env.UFOO_ACTIVITY_QUIET_MS, 0);
     this.quietWindowMs = optionQuietMs || envQuietMs || getDefaultQuietWindowMs(this.mode);
@@ -126,6 +137,13 @@ class ActivityDetector {
     }
   }
 
+  /**
+   * Set the agent PID (for transcript mtime checking after spawn).
+   */
+  setPid(pid) {
+    this.pid = toPositiveInt(pid, 0);
+  }
+
   /**
    * STARTING → READY
    */
@@ -224,6 +242,21 @@ class ActivityDetector {
 
   _classifyAfterQuietWindow() {
     if (this.state !== ACTIVITY_STATES.working) return;
+
+    // Transcript mtime check: if Claude Code's transcript was recently written,
+    // the agent is still working (e.g. waiting for API response). Reschedule
+    // classification instead of prematurely going idle.
+    if (this.pid && this.agentType === "claude-code") {
+      try {
+        if (isTranscriptActive(this.pid, this.transcriptThresholdMs)) {
+          this._scheduleQuietClassification();
+          return;
+        }
+      } catch {
+        // ignore — fall through to normal classification
+      }
+    }
+
     const tailBuffer = this._tailWindow();
 
     // Check agent-specific patterns only after output has stabilized.

package/src/agent/claudeSessionFiles.js

@@ -0,0 +1,127 @@
+"use strict";
+
+/**
+ * Claude Code session file utilities.
+ *
+ * Reads Claude Code's PID files (~/.claude/sessions/{pid}.json) and
+ * transcript files (~/.claude/projects/{encoded-cwd}/{sessionId}.jsonl)
+ * to provide external status signals.
+ */
+
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+const CLAUDE_CONFIG_DIR = path.join(os.homedir(), ".claude");
+const SESSIONS_DIR = path.join(CLAUDE_CONFIG_DIR, "sessions");
+const PROJECTS_DIR = path.join(CLAUDE_CONFIG_DIR, "projects");
+
+/**
+ * Encode a CWD path to Claude Code's project directory name.
+ * e.g. "/Users/icy/Code/ufoo" → "-Users-icy-Code-ufoo"
+ */
+function encodeProjectPath(cwd) {
+  return String(cwd || "").replace(/\//g, "-");
+}
+
+/**
+ * Read a Claude Code PID file.
+ * Returns { pid, sessionId, cwd, startedAt, kind, entrypoint } or null.
+ */
+function readClaudePidFile(pid) {
+  try {
+    const filePath = path.join(SESSIONS_DIR, `${pid}.json`);
+    const raw = fs.readFileSync(filePath, "utf8");
+    const data = JSON.parse(raw);
+    if (!data || typeof data !== "object") return null;
+    return data;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Find the transcript JSONL file for a Claude Code session.
+ * Returns the file path or "" if not found.
+ */
+function findTranscriptFile(cwd, sessionId) {
+  if (!cwd || !sessionId) return "";
+  const projectDir = path.join(PROJECTS_DIR, encodeProjectPath(cwd));
+  const transcriptPath = path.join(projectDir, `${sessionId}.jsonl`);
+  try {
+    if (fs.existsSync(transcriptPath)) return transcriptPath;
+  } catch {
+    // ignore
+  }
+  return "";
+}
+
+/**
+ * Get the mtime (in ms) of a Claude Code transcript file.
+ * Returns 0 if the file doesn't exist or can't be read.
+ */
+function getTranscriptMtimeMs(transcriptPath) {
+  if (!transcriptPath) return 0;
+  try {
+    const stat = fs.statSync(transcriptPath);
+    return stat.mtimeMs || 0;
+  } catch {
+    return 0;
+  }
+}
+
+/**
+ * Check if a Claude Code instance (by PID) is actively writing to its transcript.
+ * Returns true if the transcript was modified within `thresholdMs` (default 5000ms).
+ *
+ * This is useful as a supplementary busy signal — when PTY output goes quiet
+ * (e.g. during API wait), the transcript file is still being written to.
+ */
+function isTranscriptActive(pid, thresholdMs = 5000) {
+  const pidData = readClaudePidFile(pid);
+  if (!pidData || !pidData.sessionId || !pidData.cwd) return false;
+  const transcriptPath = findTranscriptFile(pidData.cwd, pidData.sessionId);
+  if (!transcriptPath) return false;
+  const mtime = getTranscriptMtimeMs(transcriptPath);
+  if (!mtime) return false;
+  return (Date.now() - mtime) < thresholdMs;
+}
+
+/**
+ * Find all live Claude Code sessions.
+ * Returns array of { pid, sessionId, cwd, startedAt, kind, transcriptPath }.
+ */
+function listClaudeSessions() {
+  const results = [];
+  try {
+    const files = fs.readdirSync(SESSIONS_DIR);
+    for (const file of files) {
+      if (!/^\d+\.json$/.test(file)) continue;
+      const pid = parseInt(file.slice(0, -5), 10);
+      // Check if process is alive
+      try {
+        process.kill(pid, 0);
+      } catch {
+        continue; // dead process
+      }
+      const data = readClaudePidFile(pid);
+      if (!data) continue;
+      const transcriptPath = findTranscriptFile(data.cwd, data.sessionId);
+      results.push({ ...data, pid, transcriptPath });
+    }
+  } catch {
+    // ignore
+  }
+  return results;
+}
+
+module.exports = {
+  encodeProjectPath,
+  readClaudePidFile,
+  findTranscriptFile,
+  getTranscriptMtimeMs,
+  isTranscriptActive,
+  listClaudeSessions,
+  SESSIONS_DIR,
+  PROJECTS_DIR,
+};

package/src/agent/launcher.js

@@ -491,7 +491,10 @@ class AgentLauncher {
     const child = spawn(this.command, args, {
       cwd: this.cwd,
       stdio: "inherit",
-      env: process.env,
+      env: {
+        ...process.env,
+        ...(this.agentType === "claude-code" ? { CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1" } : {}),
+      },
     });
 
     child.on("error", (err) => {
@@ -588,7 +591,11 @@ class AgentLauncher {
         try {
           const wrapper = new PtyWrapper(this.command, args, {
             cwd: this.cwd,
-            env: process.env,
+            env: {
+              ...process.env,
+              // Enable Claude Code SDK session state events for precise idle/busy detection
+              ...(this.agentType === "claude-code" ? { CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1" } : {}),
+            },
             // 未来扩展：ioAdapter: new TerminalIOAdapter()
           });
 
@@ -716,6 +723,10 @@ class AgentLauncher {
 
           // 启动PTY
           wrapper.spawn();
+          // Pass PID to ActivityDetector for transcript mtime checking
+          if (wrapper.pty && wrapper.pty.pid) {
+            launcherActivityDetector.setPid(wrapper.pty.pid);
+          }
           wrapper.attachStreams(process.stdin, process.stdout, process.stderr);
 
 

package/src/bus/subscriber.js

@@ -99,9 +99,10 @@ class SubscriberManager {
   }
 
   async cleanupDuplicateTty(currentSubscriber, ttyPath) {
-    if (!ttyPath) return;
-    if (!this.busData.agents) return;
+    if (!ttyPath) return null;
+    if (!this.busData.agents) return null;
 
+    let inheritedNickname = null;
     const entries = Object.entries(this.busData.agents);
     for (const [id, meta] of entries) {
       if (id === currentSubscriber) continue;
@@ -111,6 +112,10 @@ 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) {
+          inheritedNickname = meta.nickname;
+        }
         // Remove stale subscriber using same tty
         delete this.busData.agents[id];
         try {
@@ -125,6 +130,7 @@ class SubscriberManager {
         }
       }
     }
+    return inheritedNickname;
   }
 
   /**
@@ -186,7 +192,12 @@ class SubscriberManager {
     const ttyInfo = finalTty ? getTtyProcessInfo(finalTty) : null;
 
     // 清理同一 tty 的旧订阅者（避免重复启动污染）
-    await this.cleanupDuplicateTty(subscriber, finalTty);
+    // 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);
+    if (inheritedNickname && !nickname && !existingMeta) {
+      finalNickname = inheritedNickname;
+    }
 
     // 更新订阅者信息（保留已有字段，如 provider_session_*）
     const preserved = existingMeta && typeof existingMeta === "object"
@@ -288,6 +299,7 @@ class SubscriberManager {
     }
 
     this.busData.agents[subscriber].status = "inactive";
+    this.busData.agents[subscriber].activity_state = "";
     this.busData.agents[subscriber].last_seen = getTimestamp();
 
     return true;
@@ -350,6 +362,7 @@ class SubscriberManager {
     for (const [id, meta] of Object.entries(this.busData.agents)) {
       if (meta.status === "active" && !isMetaActive(meta)) {
         meta.status = "inactive";
+        meta.activity_state = "";
         meta.last_seen = getTimestamp();
       }
     }

package/src/chat/commandExecutor.js

@@ -189,7 +189,6 @@ function createCommandExecutor(options = {}) {
     }
 
     if (subcommand === "restart") {
-      logMessage("system", "{white-fg}⚙{/white-fg} Restarting daemon...");
       await restartDaemon();
       return;
     }

package/src/chat/commands.js

@@ -38,10 +38,10 @@ const COMMAND_TREE = {
   "/group": {
     desc: "Agent group orchestration",
     children: {
-      diagram: { desc: "Render group diagram (ascii|mermaid)" },
       run: { desc: "Launch a group template" },
-      status: { desc: "Show group runtime status" },
       stop: { desc: "Stop a running group" },
+      status: { desc: "Show group runtime status" },
+      diagram: { desc: "Render group diagram (ascii|mermaid)" },
       template: { desc: "Template ops (list/show/validate/new)" },
       templates: { desc: "List available templates" },
     },
@@ -136,6 +136,13 @@ function parseCommand(text) {
   return { command, args };
 }
 
+function shouldEchoCommandInChat(text) {
+  const parsed = parseCommand(String(text || "").trim());
+  if (!parsed) return true;
+  if (parsed.command === "group" && parsed.args[0] === "run") return false;
+  return true;
+}
+
 function parseAtTarget(text) {
   if (!text.startsWith("@")) return null;
   const trimmed = text.slice(1).trim();
@@ -155,5 +162,6 @@ module.exports = {
   sortCommands,
   buildCommandRegistry,
   parseCommand,
+  shouldEchoCommandInChat,
   parseAtTarget,
 };

package/src/chat/daemonCoordinator.js

@@ -39,6 +39,7 @@ function createDaemonCoordinator(options = {}) {
     startDaemon,
     daemonConnection: connection,
     logMessage,
+    resolveStatusLine,
   });
   let switchProjectChain = Promise.resolve();
 

package/src/chat/daemonMessageRouter.js

@@ -1,5 +1,6 @@
 const { IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../shared/eventContract");
 const { renderMarkdownLines } = require("../shared/markdownRenderer");
+const { decodeEscapedNewlines } = require("./text");
 
 function createDaemonMessageRouter(options = {}) {
   const {
@@ -51,7 +52,7 @@ function createDaemonMessageRouter(options = {}) {
     }
 
     if (typeof displayMessage === "string") {
-      displayMessage = displayMessage.replace(/\\n/g, "\n");
+      displayMessage = decodeEscapedNewlines(displayMessage);
     }
 
     return { displayMessage, streamPayload };
@@ -198,8 +199,23 @@ function createDaemonMessageRouter(options = {}) {
   function handleResponseMessage(msg) {
     const payload = msg.data || {};
     if (payload.reply) {
-      resolveStatusLine(`{gray-fg}←{/gray-fg} ${escapeBlessed(payload.reply)}`);
-      logMessage("reply", `{white-fg}←{/white-fg} ${escapeBlessed(payload.reply)}`);
+      const replyText = decodeEscapedNewlines(payload.reply);
+      resolveStatusLine(`{gray-fg}←{/gray-fg} ${escapeBlessed(replyText)}`);
+      const ops = Array.isArray(payload.ops) ? payload.ops : [];
+      const isLifecycleStatusOnly = ops.length > 0
+        && ops.every((op) => op && (op.action === "close" || op.action === "launch"));
+      const group = payload.group && typeof payload.group === "object" ? payload.group : null;
+      const isGroupStartedConfirmation = Boolean(
+        group &&
+        group.group_id &&
+        Array.isArray(group.members) &&
+        !group.dry_run &&
+        /^Group started\b/i.test(replyText)
+      );
+      // Suppress lifecycle confirmations from chat history — status line plus structured payload is enough.
+      if (!isLifecycleStatusOnly && !isGroupStartedConfirmation) {
+        logMessage("reply", `{white-fg}←{/white-fg} ${escapeBlessed(replyText)}`);
+      }
     }
 
     if (payload.recoverable && typeof payload.recoverable === "object") {
@@ -277,7 +293,7 @@ function createDaemonMessageRouter(options = {}) {
 
     if (payload.dispatch && payload.dispatch.length > 0) {
       const targets = payload.dispatch.map((d) => d.target || d).join(", ");
-      logMessage("dispatch", `{white-fg}→{/white-fg} Dispatched to: ${escapeBlessed(targets)}`);
+      resolveStatusLine(`{gray-fg}→{/gray-fg} Dispatched to: ${escapeBlessed(targets)}`);
     }
 
     if (
@@ -350,6 +366,10 @@ function createDaemonMessageRouter(options = {}) {
 
     const { displayMessage, streamPayload } = normalizeDisplayMessage(data.message || "");
 
+    // Skip silent events (e.g. delivery confirmations from notifier) and empty messages
+    if (data.silent && !streamPayload) return true;
+    if (!displayMessage && !streamPayload) return true;
+
     const isAgentViewTarget =
       getCurrentView() === "agent" &&
       isAgentViewUsesBus() &&
@@ -361,7 +381,7 @@ function createDaemonMessageRouter(options = {}) {
     if (isAgentViewTarget) {
       if (streamPayload) {
         const delta = typeof streamPayload.delta === "string"
-          ? streamPayload.delta.replace(/\\n/g, "\n")
+          ? decodeEscapedNewlines(streamPayload.delta)
           : "";
         if (delta) writeToAgentTerm(delta);
       } else if (displayMessage) {
@@ -371,15 +391,7 @@ function createDaemonMessageRouter(options = {}) {
     }
 
     if (data.event === "delivery" && consumePendingDelivery(publisher, displayName)) {
-      const ok = (data.status || "").toLowerCase() !== "error";
-      const detail = typeof data.message === "string" && data.message
-        ? data.message
-        : (ok ? `Delivered to @${displayName}` : `Delivery failed to @${displayName}`);
-      if (ok) {
-        logMessage("status", `{white-fg}✓{/white-fg} ${escapeBlessed(detail)}`);
-      } else {
-        logMessage("error", `{white-fg}✗{/white-fg} ${escapeBlessed(detail)}`);
-      }
+      // Delivery confirmations are already shown in the status bar — suppress from chat.
       requestStatus();
       renderScreen();
       return true;
@@ -391,7 +403,7 @@ function createDaemonMessageRouter(options = {}) {
 
     if (streamPayload) {
       const delta = typeof streamPayload.delta === "string"
-        ? streamPayload.delta.replace(/\\n/g, "\n")
+        ? decodeEscapedNewlines(streamPayload.delta)
         : "";
       const state = beginStream(publisher, prefixLabel, continuationPrefix, data);
       if (delta) appendStreamDelta(state, delta);
@@ -426,7 +438,6 @@ function createDaemonMessageRouter(options = {}) {
 
   function handleErrorMessage(msg) {
     resolveStatusLine(`{gray-fg}✗{/gray-fg} Error: ${msg.error}`);
-    logMessage("error", `{white-fg}✗{/white-fg} Error: ${msg.error}`);
     renderScreen();
     return false;
   }

package/src/chat/daemonReconnect.js

@@ -9,14 +9,17 @@ function restartDaemonFlow(options = {}) {
     startDaemon,
     daemonConnection,
     logMessage,
+    resolveStatusLine = null,
   } = options;
 
+  const statusMsg = resolveStatusLine || ((text) => logMessage("status", text));
+
   let restartInProgress = false;
 
   return async function restartDaemon() {
     if (restartInProgress) return;
     restartInProgress = true;
-    logMessage("status", "{white-fg}⚙{/white-fg} Restarting daemon...");
+    statusMsg("{gray-fg}⚙{/gray-fg} Restarting daemon...");
     try {
       const connection = resolveDaemonConnection(daemonConnection);
       if (connection) {
@@ -26,9 +29,9 @@ function restartDaemonFlow(options = {}) {
       startDaemon(projectRoot);
       const connected = connection ? await connection.connect() : false;
       if (connected) {
-        logMessage("status", "{white-fg}✓{/white-fg} Daemon reconnected");
+        statusMsg("{gray-fg}✓{/gray-fg} Daemon reconnected");
       } else {
-        logMessage("error", "{white-fg}✗{/white-fg} Failed to reconnect to daemon");
+        statusMsg("{gray-fg}✗{/gray-fg} Failed to reconnect to daemon");
       }
     } finally {
       restartInProgress = false;

package/src/chat/index.js

@@ -1136,6 +1136,7 @@ async function runChat(projectRoot, options = {}) {
     fsModule: fs,
     getUfooPaths,
     logMessage,
+    resolveStatusLine,
     renderDashboard,
     renderScreen: () => screen.render(),
     restartDaemon,