u-foo 1.8.1 → 1.8.3

package/package.json

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

package/src/agent/launcher.js

@@ -132,6 +132,12 @@ function findPreviousSession(cwd, agentType, tty, tmuxPane) {
         continue;
       }
 
+      // 检查旧 shell 进程是否还存活（防止 tty 回收导致误匹配）
+      if (meta.tty_shell_pid && !isAgentPidAlive(meta.tty_shell_pid)) {
+        // shell 已退出，说明是不同的终端窗口复用了同一个 tty
+        continue;
+      }
+
       // 找到了可以复用的旧 session
       const parts = id.split(":");
       if (parts.length !== 2) continue;
@@ -504,6 +510,8 @@ class AgentLauncher {
    * 启动 agent
    */
   async launch(args) {
+    // 保存用户/group 显式传入的 nickname（在 session 复用覆盖前）
+    this._originalNickname = process.env.UFOO_NICKNAME || "";
     try {
       // 1. 确保初始化
       await this.ensureInit();
@@ -537,8 +545,9 @@ class AgentLauncher {
 
       // 6. 启动消息通知监听器（ufoo-code 改为内部 bus 轮询消费）
       const shouldStartNotifier = String(this.agentType || "").trim().toLowerCase() !== "ufoo-code";
+      let notifier = null;
       if (shouldStartNotifier) {
-        const notifier = new AgentNotifier(this.cwd, subscriberId);
+        notifier = new AgentNotifier(this.cwd, subscriberId);
         notifier.start();
       }
 
@@ -605,6 +614,10 @@ class AgentLauncher {
           });
           readyDetector.onReady(async () => {
             launcherActivityDetector.markReady();
+            // 通知 notifier launcher 已检测到 ready，可以开始设 idle 状态
+            if (notifier) {
+              notifier.markLauncherReady();
+            }
             // Claude Code's Ink TUI renders ❯ prompt before the input handler
             // is fully mounted. Wait a short period for the TUI to be ready to
             // accept injected text, otherwise only the trailing CR is processed
@@ -612,6 +625,26 @@ class AgentLauncher {
             if (this.agentType === "claude-code") {
               await new Promise((r) => setTimeout(r, 800));
             }
+
+            // Claude Code: inject /rename 设置 session 标签（在 AGENT_READY/bootstrap 之前）
+            // /rename 是 slash 命令，瞬间完成，不调 LLM
+            // 仅在有显式 nickname 时注入（UFOO_NICKNAME 由 group launch 或用户指定）
+            // 使用启动前保存的原始值，避免复用 nickname 污染
+            const explicitNickname = this._originalNickname || "";
+            if (this.agentType === "claude-code" && explicitNickname && wrapper.pty) {
+              try {
+                const safeNick = AgentLauncher._sanitizeNickname(explicitNickname);
+                if (safeNick) {
+                  wrapper.write(`/rename ${safeNick}\r`);
+                  await new Promise((r) => setTimeout(r, 400));
+                }
+              } catch (err) {
+                if (process.env.UFOO_DEBUG) {
+                  console.error("[rename] inject failed:", err.message);
+                }
+              }
+            }
+
             const startTime = Date.now();
             try {
               const daemonSock = await connectWithRetry(daemonSockPath, 3, 100);
@@ -619,6 +652,7 @@ class AgentLauncher {
                 daemonSock.write(`${JSON.stringify({
                   type: IPC_REQUEST_TYPES.AGENT_READY,
                   subscriberId,
+                  agentPid: wrapper.pty ? wrapper.pty.pid : 0,
                 })}\n`);
                 daemonSock.end();
 
@@ -637,6 +671,7 @@ class AgentLauncher {
                 console.error(`[ready] daemon notification error: ${err.message}, will use fallback delay`);
               }
             }
+
           });
 
           // Fallback：如果10秒后还没检测到ready，强制标记为ready
@@ -670,6 +705,7 @@ class AgentLauncher {
           wrapper.spawn();
           wrapper.attachStreams(process.stdin, process.stdout, process.stderr);
 
+
           // 启动inject监听socket（用于外部注入命令到PTY）
           const injectSockPath = path.join(
             getUfooPaths(this.cwd).busQueuesDir,
@@ -873,4 +909,8 @@ class AgentLauncher {
   }
 }
 
+// Exported for testing
+AgentLauncher._sanitizeNickname = (nick) => nick.replace(/[^a-zA-Z0-9_-]/g, "");
+AgentLauncher._findPreviousSession = findPreviousSession;
+
 module.exports = AgentLauncher;

package/src/agent/notifier.js

@@ -29,6 +29,7 @@ class AgentNotifier {
     this.lastNickname = "";
     this.lastUbusWakeCount = -1;
 
+
     // 计算队列文件路径
     const safeSub = subscriber.replace(/:/g, "_");
     const paths = getUfooPaths(projectRoot);
@@ -69,9 +70,18 @@ class AgentNotifier {
     }
   }
 
+  /**
+   * 通知 notifier launcher 已检测到 agent ready
+   * 在此之前 notifier 不会将 activity_state 设为 idle（避免 bootstrap 提前注入）
+   */
+  markLauncherReady() {
+    this._launcherReady = true;
+  }
+
   /**
    * 设置终端标题为昵称
-   * iTerm2: 同时设置 badge 和 cwd
+   * codex 等: OSC escape sequence + iTerm2 badge
+   * claude-code: OSC 会被 Claude 覆盖，仅设 iTerm2 badge
    */
   setTitle(nickname) {
     if (!nickname) return;
@@ -364,7 +374,7 @@ class AgentNotifier {
     }
 
     this.lastCount = this.getMessageCount();
-    if (!this.lastWorkingAt || nowMs - this.lastWorkingAt >= this.workingHoldMs) {
+    if (this._launcherReady && (!this.lastWorkingAt || nowMs - this.lastWorkingAt >= this.workingHoldMs)) {
       this.updateActivityState("idle");
     }
     this.refreshTitle();
@@ -381,7 +391,10 @@ class AgentNotifier {
     if (this.lastNickname) {
       this.setTitle(this.lastNickname);
     }
-    this.updateActivityState("ready");
+    this.updateActivityState("starting");
+    // launcher 的 readyDetector 负责在 TUI 真正 ready 后标记 "ready"
+    // 在那之前 notifier 不应覆盖 activity_state
+    this._launcherReady = false;
 
     // 启动轮询
     this.timer = setInterval(() => {

package/src/daemon/index.js

@@ -13,7 +13,7 @@ const { createDaemonIpcServer } = require("./ipcServer");
 const { IPC_REQUEST_TYPES, IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../shared/eventContract");
 const { getUfooPaths } = require("../ufoo/paths");
 const { upsertProjectRuntime, markProjectStopped } = require("../projects/registry");
-const { scheduleProviderSessionProbe, loadProviderSessionCache } = require("./providerSessions");
+const { scheduleProviderSessionProbe, resolveSessionFromFile, persistProviderSession, loadProviderSessionCache } = require("./providerSessions");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 const { createDaemonCronController } = require("./cronOps");
 const { createGroupOrchestrator } = require("./groupOrchestrator");
@@ -499,6 +499,7 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
               subscriberId,
               agentType: probeAgentType,
               nickname: resolvedNickname,
+              agentCwd: projectRoot,
               onResolved: (id, resolved) => {
                 if (providerSessions) {
                   providerSessions.set(id, {
@@ -1973,6 +1974,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
             subscriberId,
             agentType,
             nickname: resolvedNickname,
+            agentCwd: projectRoot,
             onResolved: (id, resolved) => {
               if (providerSessions) {
                 providerSessions.set(id, {
@@ -2009,11 +2011,41 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
       return;
     }
     if (req.type === IPC_REQUEST_TYPES.AGENT_READY) {
-      const { subscriberId } = req;
+      const { subscriberId, agentPid } = req;
       if (!subscriberId) {
         return;
       }
-      log(`agent_ready id=${subscriberId} - triggering probe immediately`);
+      log(`agent_ready id=${subscriberId} pid=${agentPid || 0} - resolving session`);
+
+      // Try direct file read first if we have agentPid (fast path)
+      const parsedAgentPid = Number.parseInt(agentPid, 10);
+      if (Number.isFinite(parsedAgentPid) && parsedAgentPid > 0) {
+        const agentType = subscriberId.split(":")[0] || "";
+        const resolved = resolveSessionFromFile(agentType, {
+          pid: parsedAgentPid,
+          cwd: projectRoot,
+        });
+        if (resolved && resolved.sessionId) {
+          log(`agent_ready session resolved from file for ${subscriberId}: ${resolved.sessionId}`);
+          persistProviderSession(projectRoot, subscriberId, resolved);
+          if (providerSessions) {
+            providerSessions.set(subscriberId, {
+              sessionId: resolved.sessionId,
+              source: resolved.source || "",
+              updated_at: new Date().toISOString(),
+            });
+          }
+          // Cancel the scheduled probe to prevent /ufoo injection
+          const handle = probeHandles.get(subscriberId);
+          if (handle && typeof handle.cancel === "function") {
+            handle.cancel();
+          }
+          probeHandles.delete(subscriberId);
+          return;
+        }
+      }
+
+      // Fallback: trigger scheduled probe
       const probeHandle = probeHandles.get(subscriberId);
       if (probeHandle && typeof probeHandle.triggerNow === "function") {
         probeHandle.triggerNow().catch((err) => {

package/src/daemon/providerSessions.js

@@ -233,74 +233,256 @@ async function executeProbe({
 }
 
 /**
- * Schedule a provider session probe
+ * Resolve Claude Code session ID directly from session file.
+ * Claude writes ~/.claude/sessions/<pid>.json with { sessionId, pid, cwd, ... }
+ */
+function resolveClaudeSessionFromFile(pid) {
+  if (!pid) return null;
+  const filePath = path.join(os.homedir(), ".claude", "sessions", `${pid}.json`);
+  try {
+    if (!fs.existsSync(filePath)) return null;
+    const data = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    const sessionId = data.sessionId || data.session_id || "";
+    if (!sessionId) return null;
+    return { sessionId, source: filePath };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Resolve Codex session ID from session rollout files.
+ * Codex writes ~/.codex/sessions/YYYY/MM/DD/rollout-<ts>-<id>.jsonl
+ * First line contains { type: "session_meta", payload: { id, cwd, ... } }
+ */
+function resolveCodexSessionFromFile(cwd) {
+  if (!cwd) return null;
+  try {
+    const now = new Date();
+    // Check today and yesterday (session may have started before midnight)
+    const dates = [now];
+    const yesterday = new Date(now);
+    yesterday.setDate(yesterday.getDate() - 1);
+    dates.push(yesterday);
+
+    let bestMatch = null;
+    let bestMtime = 0;
+
+    for (const d of dates) {
+      const yyyy = String(d.getFullYear());
+      const mm = String(d.getMonth() + 1).padStart(2, "0");
+      const dd = String(d.getDate()).padStart(2, "0");
+      const dir = path.join(os.homedir(), ".codex", "sessions", yyyy, mm, dd);
+      if (!fs.existsSync(dir)) continue;
+
+      const files = fs.readdirSync(dir)
+        .filter((f) => f.startsWith("rollout-") && f.endsWith(".jsonl"));
+
+      for (const file of files) {
+        const filePath = path.join(dir, file);
+        try {
+          const stat = fs.statSync(filePath);
+          if (stat.mtimeMs <= bestMtime) continue;
+
+          // Read first line for session_meta
+          const fd = fs.openSync(filePath, "r");
+          const buf = Buffer.alloc(4096);
+          const bytesRead = fs.readSync(fd, buf, 0, 4096, 0);
+          fs.closeSync(fd);
+          const firstLine = buf.toString("utf8", 0, bytesRead).split("\n")[0];
+          if (!firstLine) continue;
+
+          const record = JSON.parse(firstLine);
+          const payload = record.payload || record;
+          const sessionCwd = payload.cwd || "";
+          const sessionId = payload.id || "";
+
+          if (sessionId && sessionCwd === cwd && stat.mtimeMs > bestMtime) {
+            bestMatch = { sessionId, source: filePath };
+            bestMtime = stat.mtimeMs;
+          }
+        } catch {
+          continue;
+        }
+      }
+    }
+    return bestMatch;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Resolve provider session ID directly from session files (no probe needed).
+ * @param {string} agentType - "claude-code" or "codex"
+ * @param {object} opts - { pid, cwd }
+ */
+function resolveSessionFromFile(agentType, opts = {}) {
+  if (agentType === "claude-code") {
+    return resolveClaudeSessionFromFile(opts.pid);
+  }
+  if (agentType === "codex") {
+    return resolveCodexSessionFromFile(opts.cwd);
+  }
+  return null;
+}
+
+/**
+ * Retry reading session file (agent may not have written it yet)
+ */
+async function resolveSessionFromFileWithRetries(agentType, opts = {}, attempts = 10, intervalMs = 1000) {
+  for (let i = 0; i < attempts; i += 1) {
+    const resolved = resolveSessionFromFile(agentType, opts);
+    if (resolved && resolved.sessionId) return resolved;
+    // eslint-disable-next-line no-await-in-loop
+    await new Promise((r) => setTimeout(r, intervalMs));
+  }
+  return null;
+}
+
+/**
+ * Schedule provider session resolution.
+ * Tries direct file read first (fast, non-invasive), falls back to probe if needed.
  *
  * @param {Object} options
  * @param {string} options.projectRoot - Project root directory
  * @param {string} options.subscriberId - Subscriber ID (e.g., "claude-code:abc123")
  * @param {string} options.agentType - Agent type ("claude-code" or "codex")
  * @param {string} options.nickname - Agent nickname (e.g., "claude-47")
- * @param {number} options.delayMs - Delay before injection
- * @param {number} options.attempts - Number of search attempts
- * @param {number} options.intervalMs - Interval between attempts
+ * @param {number} options.agentPid - Agent child process PID (for claude-code)
+ * @param {string} options.agentCwd - Agent working directory (for codex)
+ * @param {number} options.delayMs - Delay before starting resolution
+ * @param {number} options.fileAttempts - File read retry attempts
+ * @param {number} options.fileIntervalMs - File read retry interval
+ * @param {number} options.probeAttempts - Probe retry attempts (fallback)
+ * @param {number} options.probeIntervalMs - Probe retry interval (fallback)
  * @param {Function} options.onResolved - Callback when session ID is found
  */
-function scheduleProviderSessionProbe({
+function scheduleProviderSessionResolve({
   projectRoot,
   subscriberId,
   agentType,
   nickname,
-  delayMs = 8000,
-  attempts = 15,
-  intervalMs = 2000,
+  agentPid = 0,
+  agentCwd = "",
+  delayMs = 3000,
+  fileAttempts = 10,
+  fileIntervalMs = 1000,
+  probeAttempts = 15,
+  probeIntervalMs = 2000,
   onResolved = null,
 }) {
   if (!subscriberId || !agentType) return null;
   if (agentType !== "codex" && agentType !== "claude-code") return null;
-  if (!nickname) return null;
 
-  const marker = buildProbeMarker(nickname);
-  persistProbeMarker(projectRoot, subscriberId, marker);
+  const marker = nickname ? buildProbeMarker(nickname) : "";
+  if (marker) {
+    persistProbeMarker(projectRoot, subscriberId, marker);
+  }
 
   let executed = false;
+  let cancelled = false;
   let timer = null;
 
   const execute = async () => {
-    if (executed) return;
+    if (executed || cancelled) return;
     executed = true;
     if (timer) {
       clearTimeout(timer);
       timer = null;
     }
-    await executeProbe({
-      projectRoot,
-      subscriberId,
-      agentType,
-      nickname,
-      attempts,
-      intervalMs,
-      onResolved,
-    });
+
+    // 1. Try direct file read (fast, non-invasive)
+    const fileOpts = { pid: agentPid, cwd: agentCwd || projectRoot };
+    const fileResolved = await resolveSessionFromFileWithRetries(
+      agentType, fileOpts, fileAttempts, fileIntervalMs,
+    );
+    if (cancelled) return;
+    if (fileResolved && fileResolved.sessionId) {
+      persistProviderSession(projectRoot, subscriberId, fileResolved);
+      if (typeof onResolved === "function") {
+        onResolved(subscriberId, fileResolved);
+      }
+      return;
+    }
+
+    // 2. Fallback to probe (inject command + search history)
+    // Re-check cancelled: AGENT_READY may have resolved session while we were retrying
+    if (cancelled) return;
+    if (nickname) {
+      await executeProbe({
+        projectRoot,
+        subscriberId,
+        agentType,
+        nickname,
+        attempts: probeAttempts,
+        intervalMs: probeIntervalMs,
+        onResolved,
+      });
+    }
   };
 
-  // Schedule delayed execution (fallback)
+  // Schedule delayed execution
   timer = setTimeout(execute, delayMs);
 
-  // Return handle for early trigger
+  // Return handle for early trigger or cancellation
   return {
     subscriberId,
     marker,
     triggerNow: execute,
+    cancel: () => {
+      cancelled = true;
+      executed = true;
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    },
   };
 }
 
+/**
+ * Schedule a provider session probe (legacy wrapper)
+ */
+function scheduleProviderSessionProbe({
+  projectRoot,
+  subscriberId,
+  agentType,
+  nickname,
+  delayMs = 8000,
+  attempts = 15,
+  intervalMs = 2000,
+  onResolved = null,
+  agentPid = 0,
+  agentCwd = "",
+}) {
+  // Delegate to new resolve function which tries file read first
+  return scheduleProviderSessionResolve({
+    projectRoot,
+    subscriberId,
+    agentType,
+    nickname,
+    agentPid,
+    agentCwd,
+    delayMs: agentPid || agentCwd ? 3000 : delayMs,
+    probeAttempts: attempts,
+    probeIntervalMs: intervalMs,
+    onResolved,
+  });
+}
+
 module.exports = {
   scheduleProviderSessionProbe,
+  scheduleProviderSessionResolve,
+  resolveSessionFromFile,
+  persistProviderSession,
   loadProviderSessionCache,
   __private: {
     buildProbeCommand,
     recordContainsMarker,
     containsProbeCommand,
     escapeRegExp,
+    resolveClaudeSessionFromFile,
+    resolveCodexSessionFromFile,
   },
 };

package/src/group/promptProfiles.js

@@ -44,6 +44,7 @@ const BUILTIN_PROFILES = [
       "Handoff:",
       "- Send the architect a scoped brief.",
       "- Send the scope challenger any assumptions that feel inflated or weak.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -71,6 +72,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send approved scope decisions to the architect and builder.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -99,6 +101,7 @@ const BUILTIN_PROFILES = [
       "Handoff:",
       "- Send execution-ready slices to the implementation lead.",
       "- Send risk hotspots to the reviewer and QA roles.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -126,6 +129,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send changed areas and known risk points to review-critic and qa-driver.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -154,6 +158,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send changed surfaces and known UI tradeoffs to design-critic and qa-driver.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -183,6 +188,7 @@ const BUILTIN_PROFILES = [
       "Handoff:",
       "- Send ranked UI issues and concrete polish guidance to frontend-refiner.",
       "- Send user-visible risk items and regression watch points to qa-driver.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -209,6 +215,7 @@ const BUILTIN_PROFILES = [
       "Handoff:",
       "- Send must-fix items back to implementation lead.",
       "- Send user-visible risk items to qa-driver.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -235,6 +242,7 @@ const BUILTIN_PROFILES = [
       "Handoff:",
       "- Send fixable bugs to implementation lead.",
       "- Send suspicious root-cause patterns to debug-investigator.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -262,6 +270,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send confirmed cause and fix guidance to implementation lead.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -288,6 +297,7 @@ const BUILTIN_PROFILES = [
       "Handoff:",
       "- Send blockers back to the responsible agent.",
       "- Send the final readiness note to the human operator.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -313,6 +323,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send the architect and builder a short ordered plan with explicit blockers.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -338,6 +349,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send a concise findings brief and source list to the next agent.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
   {
@@ -363,6 +375,7 @@ const BUILTIN_PROFILES = [
       "",
       "Handoff:",
       "- Send the prototype status, evidence, and remaining gaps to the next agent.",
+      "- Use `ufoo bus send <target-nickname> \"<message>\"` to deliver handoffs to other agents.",
     ].join("\n"),
   },
 ];