u-foo 2.5.1 → 2.5.2

package/package.json

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

package/src/agents/internal/internalRunner.js

@@ -16,6 +16,7 @@ const { redactToolCallPayload, redactSecrets } = require("../../runtime/privacy/
 const { buildCachedMemoryPrefix } = require("../../coordination/memory");
 const { normalizePublisher, shouldForwardStreamToPublisher } = require("../launch/publisherRouting");
 const { appendAgentRegistryDiagnostic } = require("../../coordination/state/agentRegistryDiagnostics");
+const { DeliveryQueue } = require("../../coordination/bus/deliveryQueue");
 const {
   buildDefaultStartupBootstrapPrompt,
   isValueForCodexOption,
@@ -216,37 +217,15 @@ function shouldStreamReplyToPublisher(projectRoot, publisher, evt = {}) {
   return shouldForwardStreamToPublisher(projectRoot, publisher);
 }
 
-function drainQueue(queueFile) {
-  if (!fs.existsSync(queueFile)) return [];
-  const processingFile = `${queueFile}.processing.${process.pid}.${Date.now()}`;
-  let content = "";
-  let readOk = false;
-  try {
-    fs.renameSync(queueFile, processingFile);
-    content = fs.readFileSync(processingFile, "utf8");
-    readOk = true;
-  } catch {
-    try {
-      if (fs.existsSync(processingFile)) {
-        fs.renameSync(processingFile, queueFile);
-      }
-    } catch {
-      // ignore rollback errors
-    }
-    return [];
-  } finally {
-    if (readOk) {
-      try {
-        if (fs.existsSync(processingFile)) {
-          fs.rmSync(processingFile, { force: true });
-        }
-      } catch {
-        // ignore cleanup errors
-      }
-    }
+function claimQueuedEvents(queueFile) {
+  const queue = new DeliveryQueue(queueFile);
+  const claims = [];
+  while (true) {
+    const claim = queue.claimNext();
+    if (!claim) break;
+    claims.push({ ...claim, queue });
   }
-  if (!content.trim()) return [];
-  return content.split(/\r?\n/).filter(Boolean);
+  return claims;
 }
 
 function parseAgentViewRawInput(message) {
@@ -835,67 +814,67 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
     if (!processing) {
       processing = true;
       try {
-        const lines = drainQueue(queueFile);
-        if (lines.length > 0) {
-          const events = [];
-          for (const line of lines) {
-            try {
-              events.push(JSON.parse(line));
-            } catch {
-              // ignore malformed line
-            }
-          }
+        const claims = claimQueuedEvents(queueFile);
+        if (claims.length > 0) {
+          let handledAny = false;
 
-          const runnableEvents = [];
-          for (const evt of events) {
+          for (const claim of claims) {
+            const evt = claim.event;
+            const runnableEvents = [];
             const rawInput = parseAgentViewRawInput(evt && evt.data ? evt.data.message : "");
             if (rawInput === null) {
               runnableEvents.push(evt);
-              continue;
+            } else {
+              const session = getInteractiveSession(evt.publisher || "unknown");
+              const submissions = session.handleRaw(rawInput);
+              for (const message of submissions) {
+                runnableEvents.push({
+                  ...evt,
+                  __agentViewRaw: true,
+                  data: {
+                    ...(evt.data || {}),
+                    message,
+                  },
+                });
+              }
             }
 
-            const session = getInteractiveSession(evt.publisher || "unknown");
-            const submissions = session.handleRaw(rawInput);
-            for (const message of submissions) {
-              runnableEvents.push({
-                ...evt,
-                __agentViewRaw: true,
-                data: {
-                  ...(evt.data || {}),
-                  message,
-                },
-              });
+            if (runnableEvents.length > 0) {
+              activityTracker.notifyTurnStart("thinking");
             }
-          }
-
-          if (runnableEvents.length > 0) {
-            activityTracker.notifyTurnStart("thinking");
-          }
 
-          for (const evt of runnableEvents) {
-            // eslint-disable-next-line no-await-in-loop
-            await handleEvent(
-              projectRoot,
-              parsedAgentType,
-              provider,
-              model,
-              subscriber,
-              nickname,
-              evt,
-              busSender,
-              bootstrap.extraArgs,
-              threadRuntime,
-              bootstrap.promptText,
-              activityTracker
-            );
-            if (evt.__agentViewRaw) {
-              getInteractiveSession(evt.publisher || "unknown").writeResponsePrompt();
+            try {
+              for (const runnableEvent of runnableEvents) {
+                // eslint-disable-next-line no-await-in-loop
+                await handleEvent(
+                  projectRoot,
+                  parsedAgentType,
+                  provider,
+                  model,
+                  subscriber,
+                  nickname,
+                  runnableEvent,
+                  busSender,
+                  bootstrap.extraArgs,
+                  threadRuntime,
+                  bootstrap.promptText,
+                  activityTracker
+                );
+                if (runnableEvent.__agentViewRaw) {
+                  getInteractiveSession(runnableEvent.publisher || "unknown").writeResponsePrompt();
+                }
+              }
+              claim.queue.completeClaim(claim);
+              if (runnableEvents.length > 0) handledAny = true;
+            } catch (err) {
+              claim.queue.restoreClaim(claim);
+              throw err;
             }
           }
           // 处理消息后更新心跳
           updateHeartbeat();
           lastHeartbeat = now;
-          if (runnableEvents.length > 0) {
+          if (handledAny) {
             activityTracker.markIdle();
           }
           await busSender.flush();

package/src/agents/launch/notifier.js

@@ -9,8 +9,8 @@ const { shakeTerminalByTty } = require("../../coordination/bus/shake");
 const { isITerm2 } = require("../../runtime/terminal/detect");
 const iterm2 = require("../../runtime/terminal/iterm2");
 const { createActivityStatePublisher } = require("../activity/activityStatePublisher");
-const { INJECTION_MODES, getInjectionModeFromEvent } = require("../../coordination/bus/messageMeta");
 const { buildPromptInjectionText } = require("../../coordination/bus/promptEnvelope");
+const { DeliveryQueue } = require("../../coordination/bus/deliveryQueue");
 
 /**
  * Agent 消息通知监听器
@@ -41,6 +41,7 @@ class AgentNotifier {
       safeSub,
       "pending.jsonl"
     );
+    this.deliveryQueue = new DeliveryQueue(this.queueFile);
     this.agentsFile = paths.agentsFile;
 
     // 初始化 injector
@@ -187,45 +188,6 @@ class AgentNotifier {
     }
   }
 
-  drainPending() {
-    if (!fs.existsSync(this.queueFile)) return [];
-    const processingFile = `${this.queueFile}.processing.${process.pid}.${Date.now()}`;
-    let content = "";
-    let readOk = false;
-    try {
-      fs.renameSync(this.queueFile, processingFile);
-      content = fs.readFileSync(processingFile, "utf8");
-      readOk = true;
-    } catch {
-      try {
-        if (fs.existsSync(processingFile)) {
-          fs.renameSync(processingFile, this.queueFile);
-        }
-      } catch {
-        // ignore rollback errors
-      }
-      return [];
-    } finally {
-      if (readOk) {
-        try {
-          if (fs.existsSync(processingFile)) {
-            fs.rmSync(processingFile, { force: true });
-          }
-        } catch {
-          // ignore cleanup errors
-        }
-      }
-    }
-    if (!content.trim()) return [];
-    return content.split(/\r?\n/).filter(Boolean).map((line) => {
-      try {
-        return JSON.parse(line);
-      } catch {
-        return null;
-      }
-    }).filter(Boolean);
-  }
-
   normalizePublisher(publisher) {
     if (!publisher) return "";
     if (typeof publisher === "string") return publisher;
@@ -272,57 +234,41 @@ class AgentNotifier {
       return 0;
     }
 
-    const events = this.drainPending();
-    if (events.length === 0) return 0;
-    const requeue = [];
-    let delivered = 0;
-    let consumedOne = false;
-    for (const evt of events) {
-      if (!evt || evt.event !== "message" || !evt.data || typeof evt.data.message !== "string") {
-        continue;
-      }
-      const injectionMode = getInjectionModeFromEvent(evt, INJECTION_MODES.IMMEDIATE);
-      const activityState = this.getCurrentActivityState();
-      if (injectionMode === INJECTION_MODES.QUEUED && this.isBusyState(activityState)) {
-        requeue.push(evt);
-        continue;
-      }
-      if (consumedOne) {
-        requeue.push(evt);
-        continue;
-      }
-      const message = buildPromptInjectionText(evt, this.subscriber, this.getAgentsMap());
-      try {
-        // Inject the prompt-facing text into the terminal/tmux agent
-        // (Bus is the source of truth; inject is the delivery adapter.)
-        // eslint-disable-next-line no-await-in-loop
-        await this.injector.inject(this.subscriber, message);
-        delivered += 1;
-        consumedOne = true;
-        this.injectFailCount = 0;
-        this.updateActivityState("working");
-        // eslint-disable-next-line no-await-in-loop
-        await this.emitDelivery(evt, "ok");
-      } catch (err) {
-        consumedOne = true;
-        this.injectFailCount += 1;
-        requeue.push(evt);
-        // eslint-disable-next-line no-await-in-loop
-        await this.emitDelivery(evt, "error", err.message || "inject failed");
-      }
+    if (this.isBusyState(this.getCurrentActivityState())) {
+      return 0;
     }
-    if (requeue.length > 0) {
-      try {
-        const content = requeue.map((e) => JSON.stringify(e)).join("\n") + "\n";
-        fs.appendFileSync(this.queueFile, content, "utf8");
-      } catch {
-        // ignore requeue failures
-      }
+
+    const claim = this.deliveryQueue.claimNext();
+    if (!claim) return 0;
+
+    const evt = claim.event;
+    if (!evt || evt.event !== "message" || !evt.data || typeof evt.data.message !== "string") {
+      this.deliveryQueue.completeClaim(claim);
+      return 0;
+    }
+
+    const activityState = this.getCurrentActivityState();
+    if (this.isBusyState(activityState)) {
+      this.deliveryQueue.restoreClaim(claim);
+      return 0;
     }
-    if (delivered > 0) {
+
+    const message = buildPromptInjectionText(evt, this.subscriber, this.getAgentsMap());
+    try {
+      // Inject the prompt-facing text into the terminal/tmux agent.
+      await this.injector.inject(this.subscriber, message);
+      this.deliveryQueue.completeClaim(claim);
+      this.injectFailCount = 0;
+      this.updateActivityState("working");
+      await this.emitDelivery(evt, "ok");
       this.lastWorkingAt = Date.now();
+      return 1;
+    } catch (err) {
+      this.injectFailCount += 1;
+      this.deliveryQueue.restoreClaim(claim);
+      await this.emitDelivery(evt, "error", err.message || "inject failed");
+      return 0;
     }
-    return delivered;
   }
 
   /**
@@ -367,32 +313,10 @@ class AgentNotifier {
     if (currentCount > this.lastCount) {
       const newCount = currentCount - this.lastCount;
       this.notify(newCount);
-
-      // 自动触发终端输入（非阻塞）
-      this.autoTriggerInput().catch(() => {
-        // 忽略触发失败
-      });
     }
 
-    // Ensure pending delivery happens even if count doesn't change
-    if (this.autoTrigger && currentCount > 0) {
-      if (this.isUfooCodeSubscriber()) {
-        if (this.lastUbusWakeCount !== currentCount) {
-          try {
-            await this.autoTriggerInput();
-            this.lastUbusWakeCount = currentCount;
-          } catch {
-            // ignore delivery errors
-          }
-        }
-      } else {
-        try {
-          await this.deliverPending();
-        } catch {
-          // ignore delivery errors
-        }
-      }
-    }
+    // Delivery is owned by the project daemon scheduler. The notifier keeps
+    // terminal notifications, title badges, heartbeat, and activity fallback.
     if (currentCount <= 0) {
       this.lastUbusWakeCount = -1;
     }

package/src/agents/launch/ptyRunner.js

@@ -17,6 +17,7 @@ const {
   resolveDefaultManualBootstrap,
 } = require("../prompts/defaultBootstrap");
 const { buildPromptInjectionText } = require("../../coordination/bus/promptEnvelope");
+const { DeliveryQueue } = require("../../coordination/bus/deliveryQueue");
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -40,37 +41,15 @@ function safeSubscriber(subscriber) {
   return subscriber.replace(/:/g, "_");
 }
 
-function drainQueue(queueFile) {
-  if (!fs.existsSync(queueFile)) return [];
-  const processingFile = `${queueFile}.processing.${process.pid}.${Date.now()}`;
-  let content = "";
-  let readOk = false;
-  try {
-    fs.renameSync(queueFile, processingFile);
-    content = fs.readFileSync(processingFile, "utf8");
-    readOk = true;
-  } catch {
-    try {
-      if (fs.existsSync(processingFile)) {
-        fs.renameSync(processingFile, queueFile);
-      }
-    } catch {
-      // ignore rollback errors
-    }
-    return [];
-  } finally {
-    if (readOk) {
-      try {
-        if (fs.existsSync(processingFile)) {
-          fs.rmSync(processingFile, { force: true });
-        }
-      } catch {
-        // ignore cleanup errors
-      }
-    }
+function claimQueuedEvents(queueFile) {
+  const queue = new DeliveryQueue(queueFile);
+  const claims = [];
+  while (true) {
+    const claim = queue.claimNext();
+    if (!claim) break;
+    claims.push({ ...claim, queue });
   }
-  if (!content.trim()) return [];
-  return content.split(/\r?\n/).filter(Boolean);
+  return claims;
 }
 
 function stripAnsi(text) {
@@ -1044,28 +1023,29 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
       lastHeartbeat = now;
     }
 
-    const lines = drainQueue(queueFile);
-    if (lines.length > 0) {
+    const claims = claimQueuedEvents(queueFile);
+    if (claims.length > 0) {
       const agents = readAgentsMap(agentsFilePath);
-      const events = [];
-      for (const line of lines) {
+      for (const claim of claims) {
+        const evt = claim.event;
         try {
-          events.push(JSON.parse(line));
+          const input = buildPtyInputFromEvent(evt, subscriber, agents);
+          if (!input) {
+            claim.queue.completeClaim(claim);
+            continue;
+          }
+          const { raw, text } = input;
+          if (messageQueue.length >= maxQueue) {
+            messageQueue.shift();
+          }
+          const publisher = typeof evt.publisher === "object" && evt.publisher
+            ? (evt.publisher.subscriber || evt.publisher.nickname || "unknown")
+            : (evt.publisher || "unknown");
+          messageQueue.push({ publisher, raw, text });
+          claim.queue.completeClaim(claim);
         } catch {
-          // ignore malformed line
-        }
-      }
-      for (const evt of events) {
-        const input = buildPtyInputFromEvent(evt, subscriber, agents);
-        if (!input) continue;
-        const { raw, text } = input;
-        if (messageQueue.length >= maxQueue) {
-          messageQueue.shift();
+          claim.queue.restoreClaim(claim);
         }
-        const publisher = typeof evt.publisher === "object" && evt.publisher
-          ? (evt.publisher.subscriber || evt.publisher.nickname || "unknown")
-          : (evt.publisher || "unknown");
-        messageQueue.push({ publisher, raw, text });
       }
     }
     processQueue();

package/src/app/cli/busCoreCommands.js

@@ -39,6 +39,18 @@ function parseSendArgs(cmdArgs = []) {
   };
 }
 
+function resolvePollSubscriber(cmdArgs = [], env = process.env) {
+  const positionals = cmdArgs.filter((arg) => typeof arg === "string" && !arg.startsWith("--"));
+  const subscriber = String(positionals[0] || env.UFOO_SUBSCRIBER_ID || "").trim();
+  if (!subscriber) {
+    throw new Error("poll requires [subscriber] or UFOO_SUBSCRIBER_ID");
+  }
+  return {
+    subscriber,
+    autoAck: cmdArgs.includes("--ack") || cmdArgs.includes("--auto-ack"),
+  };
+}
+
 async function runBusCoreCommand(eventBus, cmd, cmdArgs = []) {
   switch (cmd) {
     case "init":
@@ -76,6 +88,12 @@ async function runBusCoreCommand(eventBus, cmd, cmdArgs = []) {
     case "check":
       await eventBus.check(cmdArgs[0]);
       return {};
+    case "poll":
+      {
+        const parsed = resolvePollSubscriber(cmdArgs);
+        await eventBus.check(parsed.subscriber, parsed.autoAck);
+      }
+      return {};
     case "ack":
       await eventBus.ack(cmdArgs[0]);
       return {};
@@ -99,4 +117,4 @@ async function runBusCoreCommand(eventBus, cmd, cmdArgs = []) {
   }
 }
 
-module.exports = { runBusCoreCommand };
+module.exports = { runBusCoreCommand, resolvePollSubscriber };

package/src/app/cli/run.js

@@ -1524,32 +1524,6 @@ async function runCli(argv) {
             process.exitCode = 1;
           });
       });
-    bus
-      .command("daemon")
-      .description("Start/stop daemon that auto-injects /bus into terminals")
-      .option("--interval <n>", "Poll interval in seconds", "2")
-      .option("--daemon", "Run in background")
-      .option("--stop", "Stop running daemon")
-      .option("--status", "Check daemon status")
-      .action((opts) => {
-        const EventBus = require("../../coordination/bus");
-        const eventBus = new EventBus(process.cwd());
-        (async () => {
-          try {
-            const interval = parseInt(opts.interval, 10) * 1000 || 2000;
-            if (opts.stop) {
-              await eventBus.daemon("stop");
-            } else if (opts.status) {
-              await eventBus.daemon("status");
-            } else {
-              await eventBus.daemon("start", { background: opts.daemon, interval });
-            }
-          } catch (err) {
-            console.error(err.message);
-            process.exitCode = 1;
-          }
-        })();
-      });
     bus
       .command("inject")
       .description("Inject /bus into a Terminal.app tab by subscriber ID")
@@ -1739,6 +1713,7 @@ async function runCli(argv) {
     console.log("  ufoo online send --nickname <name> --text <msg> [--channel <ch>] [--room <id>]");
     console.log("  ufoo online inbox <nickname> [--clear] [--unread]");
     console.log("  ufoo bus wake <target> [--reason <reason>] [--no-shake]");
+    console.log("  ufoo bus poll [subscriber] [--ack]");
     console.log("  ufoo bus <args...>    (JS bus implementation)");
     console.log("  ufoo ctx <subcmd> ... (doctor|lint|decisions|sync)");
     console.log("  ufoo history <build|show|prompt> [limit]");
@@ -2377,33 +2352,6 @@ async function runCli(argv) {
         });
       return;
     }
-    if (sub === "daemon") {
-      // 使用 JavaScript daemon
-      const EventBus = require("../../coordination/bus");
-      const eventBus = new EventBus(process.cwd());
-
-      (async () => {
-        try {
-          const hasStop = rest.includes("--stop");
-          const hasStatus = rest.includes("--status");
-          const hasDaemon = rest.includes("--daemon");
-          const intervalIdx = rest.indexOf("--interval");
-          const interval = intervalIdx !== -1 ? parseInt(rest[intervalIdx + 1], 10) * 1000 : 2000;
-
-          if (hasStop) {
-            await eventBus.daemon("stop");
-          } else if (hasStatus) {
-            await eventBus.daemon("status");
-          } else {
-            await eventBus.daemon("start", { background: hasDaemon, interval });
-          }
-        } catch (err) {
-          console.error(err.message);
-          process.exitCode = 1;
-        }
-      })();
-      return;
-    }
     if (sub === "inject") {
       // 使用 JavaScript inject
       const EventBus = require("../../coordination/bus");