u-foo 1.7.2 → 1.7.3

package/package.json

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

package/src/bus/daemon.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { readJSON, writeJSON, isPidAlive, isAgentPidAlive, ensureDir, safeNameToSubscriber, subscriberToSafeName } = require("./utils");
+const { readJSON, writeJSON, isPidAlive, isAgentPidAlive, isMetaActive, ensureDir, safeNameToSubscriber, subscriberToSafeName } = require("./utils");
 const Injector = require("./inject");
 const QueueManager = require("./queue");
 const MessageManager = require("./message");
@@ -405,12 +405,13 @@ class BusDaemon {
         continue;
       }
 
-      // 检查 PID 是否仍然存活
-      if (meta.pid && !isAgentPidAlive(meta.pid)) {
+      // 检查 agent 是否仍然存活（PID + TTY 交叉检查）
+      if (!isMetaActive(meta)) {
         const now = new Date().toISOString().split("T")[1].slice(0, 8);
-        console.log(`[daemon] ${now} Agent ${subscriber} (pid=${meta.pid}) is dead, marking inactive`);
+        console.log(`[daemon] ${now} Agent ${subscriber} (pid=${meta.pid || 0}) is dead, marking inactive`);
 
         meta.status = "inactive";
+        meta.activity_state = "";
         changed = true;
 
         // 清理队列目录和 offset

package/src/bus/utils.js

@@ -310,23 +310,44 @@ function isMetaActive(meta) {
   // 2. PID 存活（最可靠）
   if (meta.pid && isAgentPidAlive(meta.pid)) return true;
 
-  // 3. TTY 上有 agent 进程
+  // 3. PID 已记录但进程已死 → 确定离线
+  if (meta.pid) return false;
+
+  // 4. 无 PID（如 codex）— TTY 交叉校验
+  //    仅当 tty_shell_pid 也还活着时才信任 TTY 检查，
+  //    防止 TTY 上残留的僵尸进程导致误判存活
   if (meta.tty) {
     const ttyInfo = getTtyProcessInfo(meta.tty);
-    if (ttyInfo && ttyInfo.hasAgent) return true;
+    if (ttyInfo && ttyInfo.hasAgent) {
+      // 如果记录了 tty_shell_pid，验证它还在
+      if (meta.tty_shell_pid) {
+        if (isPidAlive(meta.tty_shell_pid)) return true;
+        // shell pid 已死，TTY 上的进程是残留
+        return false;
+      }
+      // 无 tty_shell_pid，用 last_seen 超时兜底
+      if (meta.last_seen) {
+        const age = Date.now() - new Date(meta.last_seen).getTime();
+        return age <= HEARTBEAT_TIMEOUT_MS;
+      }
+      return true;
+    }
   }
 
-  // 4. PID 存在但 dead（且 TTY 也没有 agent）→ 离线
-  if (meta.pid) return false;
-
-  // 5. 无 PID，用 last_seen 心跳超时兜底
+  // 5. 无 PID 无 TTY agent，用 last_seen 心跳超时兜底
   if (meta.status === "active" && meta.last_seen) {
     const age = Date.now() - new Date(meta.last_seen).getTime();
     return age <= HEARTBEAT_TIMEOUT_MS;
   }
 
-  // 6. status=active 但无任何信息
-  if (meta.status === "active") return true;
+  // 6. status=active 但无任何可靠信息 → 超时后判定离线
+  if (meta.status === "active") {
+    if (meta.joined_at) {
+      const age = Date.now() - new Date(meta.joined_at).getTime();
+      return age <= HEARTBEAT_TIMEOUT_MS;
+    }
+    return true;
+  }
 
   return false;
 }

package/src/chat/commandExecutor.js

@@ -839,6 +839,7 @@ function createCommandExecutor(options = {}) {
         alias,
         instance,
         dry_run: dryRun,
+        ...collectHostLaunchRequestContext(),
       });
       schedule(requestStatus, 1000);
       return;

package/src/cli.js

@@ -791,6 +791,7 @@ async function runCli(argv) {
             alias,
             instance: opts.instance || "",
             dry_run: opts.dryRun === true,
+            ...collectHostLaunchRequestContext(),
           });
           if (opts.json) {
             console.log(JSON.stringify(resp?.data || {}, null, 2));
@@ -1684,6 +1685,7 @@ async function runCli(argv) {
             alias,
             instance,
             dry_run: dryRun,
+            ...collectHostLaunchRequestContext(),
           });
           if (outputJson) {
             console.log(JSON.stringify(resp?.data || {}, null, 2));

package/src/daemon/groupOrchestrator.js

@@ -190,6 +190,24 @@ function nowIso() {
   return new Date().toISOString();
 }
 
+function buildLaunchHostContext(params = {}) {
+  const hostInjectSock = asTrimmedString(params.host_inject_sock || params.hostInjectSock);
+  const hostDaemonSock = asTrimmedString(params.host_daemon_sock || params.hostDaemonSock);
+  const hostName = asTrimmedString(params.host_name || params.hostName);
+  const hostSessionId = asTrimmedString(params.host_session_id || params.hostSessionId);
+  const context = {};
+  if (hostInjectSock) context.host_inject_sock = hostInjectSock;
+  if (hostDaemonSock) context.host_daemon_sock = hostDaemonSock;
+  if (hostName) context.host_name = hostName;
+  if (hostSessionId) context.host_session_id = hostSessionId;
+  if (params.host_capabilities && typeof params.host_capabilities === "object") {
+    context.host_capabilities = { ...params.host_capabilities };
+  } else if (params.hostCapabilities && typeof params.hostCapabilities === "object") {
+    context.host_capabilities = { ...params.hostCapabilities };
+  }
+  return context;
+}
+
 function buildDefaultRuntime({
   groupId,
   instance,
@@ -309,6 +327,7 @@ function createGroupOrchestrator(options = {}) {
     const alias = asTrimmedString(params.alias);
     const instance = asTrimmedString(params.instance);
     const dryRun = params.dry_run === true || params.dryRun === true;
+    const launchHostContext = buildLaunchHostContext(params);
 
     if (!alias) {
       return { ok: false, error: "group run requires alias", status: "failed" };
@@ -377,6 +396,7 @@ function createGroupOrchestrator(options = {}) {
         agent: item.type,
         count: 1,
         nickname: item.nickname,
+        ...launchHostContext,
       };
 
       // eslint-disable-next-line no-await-in-loop

package/src/daemon/index.js

@@ -1080,11 +1080,26 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
       const alias = req.alias || req.template || "";
       const instance = req.instance || req.group_id || "";
       const dryRun = req.dry_run === true || req.dryRun === true;
+      const hostInjectSock = req.host_inject_sock || req.hostInjectSock || "";
+      const hostDaemonSock = req.host_daemon_sock || req.hostDaemonSock || "";
+      const hostName = req.host_name || req.hostName || "";
+      const hostSessionId = req.host_session_id || req.hostSessionId || "";
+      const hostCapabilities =
+        req.host_capabilities && typeof req.host_capabilities === "object"
+          ? req.host_capabilities
+          : ((req.hostCapabilities && typeof req.hostCapabilities === "object")
+            ? req.hostCapabilities
+            : null);
       try {
         const result = await daemonGroupOrchestrator.runGroup({
           alias,
           instance,
           dry_run: dryRun,
+          host_inject_sock: hostInjectSock,
+          host_daemon_sock: hostDaemonSock,
+          host_name: hostName,
+          host_session_id: hostSessionId,
+          host_capabilities: hostCapabilities,
         });
         const ok = result && result.ok !== false;
         let reply = "";