u-foo 1.0.6 → 1.2.0

package/src/bus/index.js

@@ -2,10 +2,9 @@ const fs = require("fs");
 const path = require("path");
 const { spawn } = require("child_process");
 const {
-  getTimestamp,
-  ensureDir,
   logInfo,
   logOk,
+  ensureDir,
   logWarn,
   logError,
   colors,
@@ -14,6 +13,7 @@ const {
   isPidAlive,
   truncateFile,
   getCurrentTty,
+  sleep,
 } = require("./utils");
 const { shakeTerminalByTty } = require("./shake");
 const QueueManager = require("./queue");
@@ -22,8 +22,7 @@ const MessageManager = require("./message");
 const NicknameManager = require("./nickname");
 const BusDaemon = require("./daemon");
 const Injector = require("./inject");
-const { getUfooPaths } = require("../ufoo/paths");
-const { loadAgentsData, saveAgentsData } = require("../ufoo/agentsStore");
+const { BusStore } = require("./store");
 
 /**
  * Event Bus - 项目级 Agent 事件总线
@@ -31,11 +30,12 @@ const { loadAgentsData, saveAgentsData } = require("../ufoo/agentsStore");
 class EventBus {
   constructor(projectRoot) {
     this.projectRoot = projectRoot;
-    this.paths = getUfooPaths(projectRoot);
-    this.busDir = this.paths.busDir;
-    this.agentsFile = this.paths.agentsFile;
-    this.eventsDir = this.paths.busEventsDir;
-    this.logsDir = this.paths.busLogsDir;
+    this.store = new BusStore(projectRoot);
+    this.paths = this.store.paths;
+    this.busDir = this.store.busDir;
+    this.agentsFile = this.store.agentsFile;
+    this.eventsDir = this.store.eventsDir;
+    this.logsDir = this.store.logsDir;
 
     this.busData = null;
     this.queueManager = null;
@@ -47,18 +47,14 @@ class EventBus {
    * 确保 bus 已初始化
    */
   ensureBus() {
-    if (!fs.existsSync(this.busDir) || !fs.existsSync(this.paths.agentDir)) {
-      throw new Error(
-        "Event bus not initialized. Please run: ufoo bus init or /uinit"
-      );
-    }
+    this.store.ensure();
   }
 
   /**
    * 加载 bus 数据
    */
   loadBusData() {
-    this.busData = loadAgentsData(this.agentsFile);
+    this.busData = this.store.load();
 
     this.queueManager = new QueueManager(this.busDir);
     this.subscriberManager = new SubscriberManager(
@@ -79,101 +75,100 @@ class EventBus {
    * 保存 bus 数据
    */
   saveBusData() {
-    if (this.busData) {
-      saveAgentsData(this.agentsFile, this.busData);
-    }
+    this.store.save(this.busData);
   }
 
   /**
    * 获取当前订阅者 ID
    */
   getCurrentSubscriber() {
-    // 优先使用 UFOO_SUBSCRIBER_ID（daemon 启动的情况）
-    if (process.env.UFOO_SUBSCRIBER_ID) {
-      return process.env.UFOO_SUBSCRIBER_ID;
-    }
+    return this.store.getCurrentSubscriber(this.busData);
+  }
 
-    if (!fs.existsSync(this.agentsFile)) {
-      return null;
-    }
+  /**
+   * 解析订阅者 ID
+   */
+  parseSubscriber(subscriber) {
+    if (!subscriber || typeof subscriber !== "string") return null;
+    if (subscriber === "ufoo-agent") {
+      return { agentType: "codex", sessionId: "ufoo-agent" };
+    }
+    const parts = subscriber.split(":");
+    if (parts.length !== 2 || !parts[0] || !parts[1]) return null;
+    return {
+      agentType: parts[0],
+      sessionId: parts[1],
+    };
+  }
 
-    // 尝试从 session.txt 读取
-    const sessionFile = path.join(this.paths.agentDir, "session.txt");
-    if (fs.existsSync(sessionFile)) {
-      const sessionId = fs.readFileSync(sessionFile, "utf8").trim();
-      if (sessionId) {
-        return sessionId;
-      }
-    }
+  /**
+   * 推断 join 所需的 agentType
+   */
+  resolveJoinAgentType(explicitAgentType, currentSubscriber = "") {
+    if (explicitAgentType) return explicitAgentType;
 
-    // 尝试通过 tty 查找订阅者
-    let currentTty = null;
-    try {
-      const ttyPath = fs.realpathSync("/dev/tty");
-      if (ttyPath && ttyPath.startsWith("/dev/")) {
-        currentTty = ttyPath;
-      }
-    } catch {
-      // tty 不可用
-    }
+    const parsedCurrent = this.parseSubscriber(currentSubscriber);
+    if (parsedCurrent && parsedCurrent.agentType) return parsedCurrent.agentType;
 
-    if (currentTty && this.busData && this.busData.agents) {
-      for (const [id, meta] of Object.entries(this.busData.agents)) {
-        if (meta.tty === currentTty) {
-          return id;
-        }
-      }
-    }
+    const envAgentType = (process.env.UFOO_AGENT_TYPE || "").trim();
+    if (envAgentType) return envAgentType;
 
-    return null;
+    const parsedEnv = this.parseSubscriber(process.env.UFOO_SUBSCRIBER_ID || "");
+    if (parsedEnv && parsedEnv.agentType) return parsedEnv.agentType;
+
+    // 最后回退（手动场景）
+    return "claude-code";
   }
 
   /**
    * 初始化事件总线
    */
   async init() {
-    // 创建目录结构
-    ensureDir(this.busDir);
-    ensureDir(this.paths.agentDir);
-    ensureDir(this.eventsDir);
-    ensureDir(path.join(this.busDir, "queues"));
-    ensureDir(this.logsDir);
-    ensureDir(path.join(this.busDir, "offsets"));
-    ensureDir(this.paths.busDaemonDir);
-    ensureDir(this.paths.busDaemonCountsDir);
-
-    // 创建初始 agents 文件（如不存在）
-    if (!fs.existsSync(this.agentsFile)) {
-      const busData = {
-        created_at: getTimestamp(),
-        agents: {},
-      };
-      saveAgentsData(this.agentsFile, busData);
-    }
+    this.store.init();
     logOk("Event bus initialized");
   }
 
   /**
    * 加入总线
    */
-  async join(sessionId, agentType, nickname = null) {
+  async join(sessionId, agentType, nickname = null, options = {}) {
     this.ensureBus();
     this.loadBusData();
 
+    const currentSubscriber = this.getCurrentSubscriber();
+    const currentMeta = currentSubscriber && this.busData.agents
+      ? this.busData.agents[currentSubscriber]
+      : null;
+    const currentActive = currentMeta
+      && currentMeta.status === "active"
+      && (!currentMeta.pid || isPidAlive(currentMeta.pid));
+
+    // 已在总线中且无显式参数时，直接复用当前身份（避免二次 join 产生新 ID）
+    if (!sessionId && !agentType && currentSubscriber && currentActive) {
+      this.subscriberManager.updateLastSeen(currentSubscriber);
+      this.saveBusData();
+      const currentNickname = currentMeta.nickname ? ` (${currentMeta.nickname})` : "";
+      logInfo(`Already joined event bus: ${currentSubscriber}${currentNickname}`);
+      return currentSubscriber;
+    }
+
     // 自动检测 session ID 和 agent type
+    const parsedCurrent = this.parseSubscriber(currentSubscriber);
+    if (!sessionId && parsedCurrent && parsedCurrent.sessionId) {
+      sessionId = parsedCurrent.sessionId;
+    }
+
     if (!sessionId) {
       sessionId = generateInstanceId();
     }
 
-    if (!agentType) {
-      // 默认为 claude-code（手动启动情况）
-      agentType = "claude-code";
-    }
+    agentType = this.resolveJoinAgentType(agentType, currentSubscriber);
 
     const result = await this.subscriberManager.join(
       sessionId,
       agentType,
-      nickname
+      nickname,
+      options
     );
 
     this.saveBusData();
@@ -266,7 +261,7 @@ class EventBus {
   /**
    * 发送消息
    */
-  async send(target, message, publisher = null) {
+  async send(target, message, publisher = null, options = {}) {
     this.ensureBus();
     this.loadBusData();
 
@@ -308,7 +303,11 @@ class EventBus {
     }
 
     try {
-      const result = await this.messageManager.send(target, message, publisher);
+      const eventName = options.event || "message";
+      const data = options.data || { message };
+      const result = eventName === "message"
+        ? await this.messageManager.send(target, message, publisher)
+        : await this.messageManager.emit(target, eventName, data, publisher);
       logOk(
         `Message sent: seq=${result.seq} -> ${result.targets.join(", ")}`
       );
@@ -322,8 +321,8 @@ class EventBus {
   /**
    * 广播消息
    */
-  async broadcast(message, publisher = null) {
-    return this.send("*", message, publisher);
+  async broadcast(message, publisher = null, options = {}) {
+    return this.send("*", message, publisher, options);
   }
 
   /**
@@ -506,13 +505,25 @@ class EventBus {
 
     // 检查是否已经 join
     const currentSubscriber = this.getCurrentSubscriber();
-    if (currentSubscriber && this.busData.agents && this.busData.agents[currentSubscriber]) {
+    const currentMeta = currentSubscriber && this.busData.agents
+      ? this.busData.agents[currentSubscriber]
+      : null;
+    const currentActive = currentMeta
+      && currentMeta.status === "active"
+      && (!currentMeta.pid || isPidAlive(currentMeta.pid));
+    if (currentSubscriber && currentActive) {
       // 已经 join，只需更新心跳
       this.subscriberManager.updateLastSeen(currentSubscriber);
       this.saveBusData();
       return currentSubscriber;
     }
 
+    // 当前身份可解析但元数据缺失/失效时，复用同一身份重新注册
+    const parsedCurrent = this.parseSubscriber(currentSubscriber || "");
+    if (parsedCurrent) {
+      return this.join(parsedCurrent.sessionId, parsedCurrent.agentType, null);
+    }
+
     // 还没有 join，自动 join
     const sessionId = null; // 自动生成
     const agentType = null; // 自动检测
@@ -670,6 +681,52 @@ class EventBus {
     }
   }
 
+  /**
+   * 远程唤醒本地 agent（触发 /ubus 注入）
+   */
+  async wake(subscriber, options = {}) {
+    this.ensureBus();
+    this.loadBusData();
+
+    const publisher =
+      options.publisher ||
+      process.env.AI_BUS_PUBLISHER ||
+      this.getDefaultPublisher() ||
+      this.getCurrentSubscriber() ||
+      "unknown";
+
+    const targets = this.messageManager.resolveTarget(subscriber || "");
+    if (targets.length === 0) {
+      throw new Error(`Target "${subscriber}" not found`);
+    }
+
+    for (const target of targets) {
+      const safeName = subscriberToSafeName(target);
+      const queueDir = path.join(this.busDir, "queues", safeName);
+      const pendingFile = path.join(queueDir, "pending.jsonl");
+      ensureDir(queueDir);
+
+      const before = fs.existsSync(pendingFile) ? fs.readFileSync(pendingFile, "utf8") : "";
+      const countBefore = before.trim() ? before.trim().split(/\r?\n/).length : 0;
+      await this.messageManager.emit(target, "wake", { reason: options.reason || "remote" }, publisher, "status/wake");
+      const after = fs.existsSync(pendingFile) ? fs.readFileSync(pendingFile, "utf8") : "";
+      const countAfter = after.trim() ? after.trim().split(/\r?\n/).length : 0;
+
+      if (countAfter > countBefore) {
+        await sleep(50);
+        const daemon = new BusDaemon(this.busDir, this.agentsFile, this.paths.busDaemonDir, 2000);
+        await daemon.injector.inject(target, options.command || "");
+        if (options.shake !== false) {
+          const tty = daemon.injector.readTty(target);
+          if (tty) shakeTerminalByTty(tty, { skipFrontmost: true });
+        }
+      }
+    }
+
+    logOk(`Wake sent -> ${targets.join(", ")}`);
+    return { ok: true, targets };
+  }
+
   /**
    * 前台消息监听
    */

package/src/bus/inject.js

@@ -3,6 +3,7 @@ const fs = require("fs");
 const net = require("net");
 const path = require("path");
 const { subscriberToSafeName, isValidTty } = require("./utils");
+const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 
 const SHOULD_LOG_INJECT = process.env.UFOO_INJECT_DEBUG === "1";
 const logInject = (message) => {
@@ -35,6 +36,18 @@ class Injector {
   /**
    * 获取订阅者的 tmux pane ID（从 all-agents.json）
    */
+  getAgentMeta(subscriber) {
+    const agentsFile = this.agentsFile;
+    if (!agentsFile || !fs.existsSync(agentsFile)) return null;
+
+    try {
+      const busData = JSON.parse(fs.readFileSync(agentsFile, "utf8"));
+      return busData.agents?.[subscriber] || null;
+    } catch {
+      return null;
+    }
+  }
+
   getTmuxPane(subscriber) {
     const agentsFile = this.agentsFile;
     if (!agentsFile || !fs.existsSync(agentsFile)) return null;
@@ -235,16 +248,31 @@ class Injector {
    * 2. tmux send-keys（无需权限）
    */
   async inject(subscriber, commandOverride = "") {
+    if (String(subscriber || "").startsWith("ufoo-code:")) {
+      throw new Error(`Inject disabled for ${subscriber}. ufoo-code consumes bus internally.`);
+    }
+
     // 确定注入命令（codex 用 "ubus"，claude-code 用 "/ubus"）
     const command = commandOverride
       ? String(commandOverride)
       : (subscriber.startsWith("codex:") ? "ubus" : "/ubus");
 
+    const meta = this.getAgentMeta(subscriber) || {};
+    const launchMode = meta.launch_mode || "";
+    const adapterRouter = createTerminalAdapterRouter();
+    const adapter = adapterRouter.getAdapter({ launchMode, agentId: subscriber });
+    const supportsSocket = adapter.capabilities.supportsSocketProtocol;
+    const supportsNotifier = adapter.capabilities.supportsNotifierInjector;
+
     // 1. 优先尝试 PTY socket（无需任何macOS权限）
     const injectSockPath = this.getInjectSockPath(subscriber);
     if (fs.existsSync(injectSockPath)) {
       try {
-        logInject(`[inject] Using PTY socket: ${injectSockPath}`);
+        if (!supportsSocket) {
+          logInject(`[inject] PTY socket present but unsupported for launch_mode=${launchMode}`);
+        } else {
+          logInject(`[inject] Using PTY socket: ${injectSockPath}`);
+        }
         await this.injectPty(subscriber, command);
         logInject("[inject] PTY inject success");
         return;
@@ -256,24 +284,26 @@ class Injector {
     // 读取 tty（tmux 需要）
     const tty = this.readTty(subscriber);
 
-    // 2. 尝试 tmux（无需权限）
-    const tmuxPane = this.getTmuxPane(subscriber);
-    if (tmuxPane) {
-      const paneExists = await this.checkTmuxPane(tmuxPane);
-      if (paneExists) {
-        logInject(`[inject] Using tmux send-keys for pane: ${tmuxPane}`);
-        await this.injectTmux(tmuxPane, command);
-        return;
+    if (supportsNotifier) {
+      // 2. 尝试 tmux（无需权限）
+      const tmuxPane = meta.tmux_pane || this.getTmuxPane(subscriber);
+      if (tmuxPane) {
+        const paneExists = await this.checkTmuxPane(tmuxPane);
+        if (paneExists) {
+          logInject(`[inject] Using tmux send-keys for pane: ${tmuxPane}`);
+          await this.injectTmux(tmuxPane, command);
+          return;
+        }
       }
-    }
 
-    // 尝试通过 tty 查找 tmux pane
-    if (tty && isValidTty(tty)) {
-      const fallbackPane = await this.findTmuxPaneByTty(tty);
-      if (fallbackPane) {
-        logInject(`[inject] Using tmux send-keys for pane: ${fallbackPane}`);
-        await this.injectTmux(fallbackPane, command);
-        return;
+      // 尝试通过 tty 查找 tmux pane
+      if (tty && isValidTty(tty)) {
+        const fallbackPane = await this.findTmuxPaneByTty(tty);
+        if (fallbackPane) {
+          logInject(`[inject] Using tmux send-keys for pane: ${fallbackPane}`);
+          await this.injectTmux(fallbackPane, command);
+          return;
+        }
       }
     }
 

package/src/bus/message.js

@@ -6,11 +6,23 @@ const {
   readJSONL,
   appendJSONL,
   readLastLine,
-  readJSON,
-  isMetaActive,
+  isPidAlive,
 } = require("./utils");
 const NicknameManager = require("./nickname");
 
+const SEQ_LOCK_TIMEOUT_MS = 5000;
+const SEQ_LOCK_POLL_MS = 25;
+const SEQ_LOCK_STALE_MS = 30000;
+
+function normalizeAgentTypeAlias(value = "") {
+  const text = String(value || "").trim().toLowerCase();
+  if (!text) return "";
+  if (text === "codex") return "codex";
+  if (text === "claude" || text === "claude-code") return "claude-code";
+  if (text === "ufoo" || text === "ucode" || text === "ufoo-code") return "ufoo-code";
+  return text;
+}
+
 /**
  * 消息管理器
  */
@@ -20,17 +32,17 @@ class MessageManager {
     this.busData = busData;
     this.queueManager = queueManager;
     this.eventsDir = path.join(busDir, "events");
+    this.seqFile = path.join(busDir, "seq.counter");
+    this.seqLockFile = path.join(busDir, "seq.counter.lock");
   }
 
   /**
-   * 获取下一个全局序号
+   * 从 events 日志中恢复最大序号（仅用于 counter 缺失时）
    */
-  async getNextSeq() {
-    // 读取所有 events/*.jsonl 文件，找到最大的 seq
+  readMaxSeqFromEvents() {
     let maxSeq = 0;
-
     if (!fs.existsSync(this.eventsDir)) {
-      return 1;
+      return maxSeq;
     }
 
     const files = fs.readdirSync(this.eventsDir)
@@ -55,7 +67,116 @@ class MessageManager {
       }
     }
 
-    return maxSeq + 1;
+    return maxSeq;
+  }
+
+  readSeqCounter() {
+    try {
+      const raw = fs.readFileSync(this.seqFile, "utf8").trim();
+      const parsed = parseInt(raw, 10);
+      if (Number.isFinite(parsed) && parsed > 0) {
+        return parsed;
+      }
+    } catch {
+      // ignore
+    }
+    return 0;
+  }
+
+  writeSeqCounter(seq) {
+    fs.mkdirSync(path.dirname(this.seqFile), { recursive: true });
+    fs.writeFileSync(this.seqFile, `${seq}\n`, "utf8");
+  }
+
+  cleanupStaleSeqLock() {
+    if (!fs.existsSync(this.seqLockFile)) return;
+    let shouldRemove = false;
+
+    try {
+      const raw = fs.readFileSync(this.seqLockFile, "utf8").trim();
+      const pid = parseInt(raw, 10);
+      if (!Number.isFinite(pid) || pid <= 0) {
+        shouldRemove = true;
+      } else if (!isPidAlive(pid)) {
+        shouldRemove = true;
+      }
+    } catch {
+      shouldRemove = true;
+    }
+
+    if (!shouldRemove) {
+      try {
+        const stat = fs.statSync(this.seqLockFile);
+        if (Date.now() - stat.mtimeMs > SEQ_LOCK_STALE_MS) {
+          shouldRemove = true;
+        }
+      } catch {
+        shouldRemove = true;
+      }
+    }
+
+    if (shouldRemove) {
+      try {
+        fs.unlinkSync(this.seqLockFile);
+      } catch {
+        // ignore stale lock cleanup errors
+      }
+    }
+  }
+
+  async acquireSeqLock() {
+    const deadline = Date.now() + SEQ_LOCK_TIMEOUT_MS;
+    while (Date.now() < deadline) {
+      try {
+        const fd = fs.openSync(this.seqLockFile, "wx");
+        fs.writeSync(fd, `${process.pid}\n`);
+        return fd;
+      } catch (err) {
+        if (err && err.code === "EEXIST") {
+          this.cleanupStaleSeqLock();
+          // eslint-disable-next-line no-await-in-loop
+          await new Promise((resolve) => setTimeout(resolve, SEQ_LOCK_POLL_MS));
+          continue;
+        }
+        throw err;
+      }
+    }
+    throw new Error("Failed to acquire sequence lock");
+  }
+
+  releaseSeqLock(lockFd) {
+    try {
+      if (typeof lockFd === "number") {
+        fs.closeSync(lockFd);
+      }
+    } catch {
+      // ignore
+    }
+    try {
+      if (fs.existsSync(this.seqLockFile)) {
+        fs.unlinkSync(this.seqLockFile);
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  /**
+   * 获取下一个全局序号（文件锁保证跨进程原子递增）
+   */
+  async getNextSeq() {
+    const lockFd = await this.acquireSeqLock();
+    try {
+      let current = this.readSeqCounter();
+      if (current === 0) {
+        current = this.readMaxSeqFromEvents();
+      }
+      const next = current + 1;
+      this.writeSeqCounter(next);
+      return next;
+    } finally {
+      this.releaseSeqLock(lockFd);
+    }
   }
 
   /**
@@ -63,6 +184,13 @@ class MessageManager {
    */
   resolveTarget(target) {
     const nicknameManager = new NicknameManager(this.busData);
+    const normalizedTarget = normalizeAgentTypeAlias(target);
+
+    // 0. Exact subscriber ID match (allows ids without ":" e.g. "ufoo-agent")
+    const subscribers = this.busData.agents || {};
+    if (target && typeof target === "string" && subscribers[target]) {
+      return [target];
+    }
 
     // 1. 尝试作为订阅者 ID
     if (target.includes(":")) {
@@ -75,10 +203,11 @@ class MessageManager {
       return [byNickname];
     }
 
-    // 3. 尝试作为代理类型（匹配所有该类型的活跃订阅者）
-    const subscribers = this.busData.agents || {};
+    // 3. 尝试作为代理类型（匹配所有该类型的订阅者）
+    const isActive = (meta) => !meta || meta.status === "active";
+
     const byType = Object.entries(subscribers)
-      .filter(([, meta]) => meta.agent_type === target && isMetaActive(meta))
+      .filter(([, meta]) => normalizeAgentTypeAlias(meta.agent_type) === normalizedTarget && isActive(meta))
       .map(([id]) => id);
 
     if (byType.length > 0) {
@@ -88,7 +217,7 @@ class MessageManager {
     // 4. 通配符（所有活跃订阅者）
     if (target === "*") {
       return Object.entries(subscribers)
-        .filter(([, meta]) => isMetaActive(meta))
+        .filter(([, meta]) => isActive(meta))
         .map(([id]) => id);
     }
 
@@ -100,12 +229,13 @@ class MessageManager {
    * 检查目标是否匹配订阅者
    */
   targetMatches(target, subscriber) {
+    const normalizedTarget = normalizeAgentTypeAlias(target);
     // 精确匹配
     if (target === subscriber) return true;
 
     // 代理类型匹配
     const meta = this.busData.agents?.[subscriber];
-    if (meta && target === meta.agent_type) return true;
+    if (meta && normalizedTarget === normalizeAgentTypeAlias(meta.agent_type)) return true;
 
     // 昵称匹配
     if (meta && target === meta.nickname) return true;
@@ -269,16 +399,14 @@ class MessageManager {
    * 智能路由解析（找出所有匹配的候选者）
    */
   async resolve(myId, targetType) {
+    const normalizedTargetType = normalizeAgentTypeAlias(targetType);
     const subscribers = this.busData.agents || {};
     const candidates = Object.entries(subscribers)
       .filter(([id, meta]) => {
         if (id === myId) return false; // 排除自己
         if (meta.status !== "active") return false;
 
-        // 匹配代理类型
-        if (targetType === "codex" && meta.agent_type === "codex") return true;
-        if (targetType === "claude" && meta.agent_type === "claude-code") return true;
-        if (targetType === meta.agent_type) return true;
+        if (normalizeAgentTypeAlias(meta.agent_type) === normalizedTargetType) return true;
 
         return false;
       })

package/src/bus/nickname.js

@@ -44,7 +44,9 @@ class NicknameManager {
    */
   generateAutoNickname(agentType) {
     const subscribers = this.busData.agents || {};
-    const prefix = agentType === "claude-code" ? "claude" : agentType;
+    const prefix = agentType === "claude-code" ? "claude"
+                 : agentType === "ufoo-code" ? "ucode"
+                 : agentType;
 
     // 找出所有相同前缀的昵称
     const existing = Object.values(subscribers)