u-foo 1.8.4 → 1.8.5

package/package.json

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

package/src/bus/index.js

@@ -285,13 +285,19 @@ class EventBus {
 
     // 如果 publisher 不在 agents 列表中，自动注册它（懒加载模式）
     if (publisher !== "unknown" && this.busData.agents && !this.busData.agents[publisher]) {
-      // 解析 agent 信息
-      const parts = publisher.split(":");
-      const agentType = parts[0] || "unknown-agent";
-      const sessionId = parts[1] || require("./utils").generateInstanceId();
+      let subscriber;
+      if (publisher === "ufoo-agent") {
+        // Keep the reserved controller on its fixed identity even after metadata loss.
+        subscriber = (await this.subscriberManager.join("ufoo-agent", "ufoo-agent", "ufoo-agent")).subscriber;
+      } else {
+        // 解析 agent 信息
+        const parts = publisher.split(":");
+        const agentType = parts[0] || "unknown-agent";
+        const sessionId = parts[1] || require("./utils").generateInstanceId();
 
-      // 自动加入总线（静默模式，不输出日志）
-      const subscriber = await this.subscriberManager.join(sessionId, agentType, null);
+        // 自动加入总线（静默模式，不输出日志）
+        subscriber = (await this.subscriberManager.join(sessionId, agentType, null)).subscriber;
+      }
       this.saveBusData();
       publisher = subscriber; // 使用规范化的 subscriber ID
     }

package/src/bus/message.js

@@ -178,6 +178,7 @@ class MessageManager {
   resolveTarget(target) {
     const nicknameManager = new NicknameManager(this.busData);
     const normalizedTarget = normalizeAgentTypeAlias(target);
+    const controllerTarget = target === "ufoo-agent";
 
     // 0. Exact subscriber ID match (allows ids without ":" e.g. "ufoo-agent")
     const subscribers = this.busData.agents || {};
@@ -185,6 +186,21 @@ class MessageManager {
       return [target];
     }
 
+    // Reserved controller ID should never fan out to legacy typed aliases.
+    if (controllerTarget) {
+      try {
+        const queueDir = this.queueManager && this.queueManager.getQueueDir
+          ? this.queueManager.getQueueDir(target)
+          : path.join(this.busDir, "queues", target);
+        if (queueDir && fs.existsSync(queueDir)) {
+          return [target];
+        }
+      } catch {
+        // ignore queue lookup errors
+      }
+      return [];
+    }
+
     // 1. 尝试作为订阅者 ID
     if (target.includes(":")) {
       return [target];

package/src/bus/store.js

@@ -47,6 +47,75 @@ function allocateRecoveredNickname(agentType, used) {
   return nick;
 }
 
+function recoverQueueEntry(data, subscriber, queueDir, usedNicknames, now) {
+  if (!subscriber || data.agents[subscriber]) return false;
+
+  if (subscriber === "ufoo-agent") {
+    const tty = readQueueTty(queueDir);
+    const ttyInfo = tty ? getTtyProcessInfo(tty) : null;
+    data.agents[subscriber] = {
+      agent_type: "ufoo-agent",
+      nickname: "ufoo-agent",
+      status: "active",
+      joined_at: now,
+      last_seen: now,
+      pid: 0,
+      tty,
+      tty_shell_pid: ttyInfo && ttyInfo.shellPid ? ttyInfo.shellPid : 0,
+      tmux_pane: "",
+      launch_mode: "",
+    };
+    return true;
+  }
+
+  const parts = subscriber.split(":");
+  if (parts.length !== 2) return false;
+  const [agentType, sessionId] = parts;
+  if (!agentType || !sessionId) return false;
+  if (!isRecoverableSessionId(sessionId)) return false;
+
+  const tty = readQueueTty(queueDir);
+  const ttyInfo = tty ? getTtyProcessInfo(tty) : null;
+  const activeByTty = Boolean(ttyInfo && ttyInfo.alive && ttyInfo.hasAgent);
+  const nickname = activeByTty ? allocateRecoveredNickname(agentType, usedNicknames) : "";
+
+  data.agents[subscriber] = {
+    agent_type: agentType,
+    nickname,
+    status: activeByTty ? "active" : "inactive",
+    joined_at: now,
+    last_seen: now,
+    pid: 0,
+    tty,
+    tty_shell_pid: ttyInfo && ttyInfo.shellPid ? ttyInfo.shellPid : 0,
+    tmux_pane: "",
+    launch_mode: "",
+  };
+  return true;
+}
+
+function reconcileReservedControllerAliases(data, now) {
+  if (!data.agents || !data.agents["ufoo-agent"]) return false;
+
+  let changed = false;
+  for (const [id, meta] of Object.entries(data.agents)) {
+    if (!id.startsWith("ufoo-agent:")) continue;
+    if (!meta || meta.status !== "active") continue;
+    if (String(meta.agent_type || "").trim() !== "ufoo-agent") continue;
+    const hasRuntimeBinding = Boolean(
+      meta.tty
+      || meta.tmux_pane
+      || meta.host_inject_sock
+      || meta.host_daemon_sock
+    );
+    if (hasRuntimeBinding) continue;
+    meta.status = "inactive";
+    meta.last_seen = now;
+    changed = true;
+  }
+  return changed;
+}
+
 class BusStore {
   constructor(projectRoot) {
     this.projectRoot = projectRoot;
@@ -89,33 +158,11 @@ class BusStore {
       if (!stat.isDirectory()) continue;
 
       const subscriber = safeNameToSubscriber(entry);
-      const parts = subscriber.split(":");
-      if (parts.length !== 2) continue;
-      const [agentType, sessionId] = parts;
-      if (!agentType || !sessionId) continue;
-      if (!isRecoverableSessionId(sessionId)) continue;
-      if (data.agents[subscriber]) continue;
-
-      const tty = readQueueTty(queueDir);
-      const ttyInfo = tty ? getTtyProcessInfo(tty) : null;
-      const activeByTty = Boolean(ttyInfo && ttyInfo.alive && ttyInfo.hasAgent);
-      const nickname = activeByTty ? allocateRecoveredNickname(agentType, usedNicknames) : "";
-
-      data.agents[subscriber] = {
-        agent_type: agentType,
-        nickname,
-        status: activeByTty ? "active" : "inactive",
-        joined_at: now,
-        last_seen: now,
-        pid: 0,
-        tty,
-        tty_shell_pid: ttyInfo && ttyInfo.shellPid ? ttyInfo.shellPid : 0,
-        tmux_pane: "",
-        launch_mode: "",
-      };
-      recovered = true;
+      recovered = recoverQueueEntry(data, subscriber, queueDir, usedNicknames, now) || recovered;
     }
 
+    recovered = reconcileReservedControllerAliases(data, now) || recovered;
+
     if (recovered) {
       saveAgentsData(this.agentsFile, data);
     }