u-foo 2.5.1 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "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/launcher.js

@@ -662,6 +662,9 @@ class AgentLauncher {
               // Enable Claude Code SDK session state events for precise idle/busy detection
               ...(this.agentType === "claude-code" ? { CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1" } : {}),
             },
+            titlePrefix: process.env.UFOO_LAUNCH_MODE === "host"
+              ? (this._originalNickname || process.env.UFOO_NICKNAME || "")
+              : "",
             // 未来扩展：ioAdapter: new TerminalIOAdapter()
           });
 

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
@@ -90,7 +91,9 @@ class AgentNotifier {
   setTitle(nickname) {
     if (!nickname) return;
     if (!process.stdout || !process.stdout.isTTY) return;
-    process.stdout.write(`\x1b]0;${nickname}\x07`);
+    if (process.env.UFOO_LAUNCH_MODE !== "host") {
+      process.stdout.write(`\x1b]0;${nickname}\x07`);
+    }
     if (isITerm2()) {
       iterm2.setBadge(nickname);
       iterm2.setCwd(this.projectRoot);
@@ -187,45 +190,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 +236,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 +315,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) {
@@ -79,6 +58,14 @@ function stripAnsi(text) {
     .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
 }
 
+function rewriteTitleOscPrefix(text, prefix) {
+  if (!prefix || !text) return text;
+  return String(text).replace(/\x1b\]([012]);([^\x07\x1b]*)(\x07|\x1b\\)/g, (match, code, title, terminator) => {
+    if (!title || title.startsWith(`${prefix}:`)) return match;
+    return `\x1b]${code};${prefix}:${title}${terminator}`;
+  });
+}
+
 function parseInputMessage(message) {
   if (!message) return { raw: false, text: "" };
   if (parseStreamEnvelope(message)) return null;
@@ -440,8 +427,29 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
     }
   }
 
-  function broadcastOutput(data) {
+  const titlePrefix = process.env.UFOO_LAUNCH_MODE === "host"
+    ? String(process.env.UFOO_NICKNAME || "").trim()
+    : "";
+  let titleOscBuffer = "";
+
+  function prependTitlePrefix(data) {
+    if (!titlePrefix) return Buffer.from(data || "").toString("utf8");
     const text = Buffer.from(data || "").toString("utf8");
+    const combined = titleOscBuffer + text;
+    titleOscBuffer = "";
+    const trailingOscStart = combined.lastIndexOf("\x1b]");
+    if (trailingOscStart >= 0) {
+      const trailing = combined.slice(trailingOscStart);
+      if (!/(?:\x07|\x1b\\)/.test(trailing)) {
+        titleOscBuffer = trailing;
+        return rewriteTitleOscPrefix(combined.slice(0, trailingOscStart), titlePrefix);
+      }
+    }
+    return rewriteTitleOscPrefix(combined, titlePrefix);
+  }
+
+  function broadcastOutput(data) {
+    const text = prependTitlePrefix(data);
     if (!text) return;
     if (process.stdout && process.stdout.isTTY && typeof process.stdout.write === "function") {
       try {
@@ -1044,28 +1052,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();
@@ -1078,6 +1087,7 @@ module.exports = {
   appendStartupBootstrapArg,
   buildPtyInputFromEvent,
   parseInputMessage,
+  rewriteTitleOscPrefix,
   resolvePtyBootstrapArgs,
   resolveCommand,
   runPtyRunner,

package/src/agents/launch/ptyWrapper.js

@@ -41,6 +41,8 @@ class PtyWrapper {
 
     // 可插拔的IO适配器（未来扩展）
     this.ioAdapter = options.ioAdapter || null;
+    this.titlePrefix = String(options.titlePrefix || "").trim();
+    this._titleOscBuffer = "";
 
     // 事件处理器引用（用于cleanup）
     this._stdinHandler = null;
@@ -111,8 +113,10 @@ class PtyWrapper {
   _attachDirectStreams(stdin, stdout) {
     // PTY输出 -> stdout
     this._ptyDataHandler = (data) => {
+      const output = this._prependTitlePrefix(data);
+
       // 1. 输出到terminal
-      stdout.write(data);
+      stdout.write(output);
 
       // 2. 可选：日志记录（JSONL格式）
       if (this.logger) {
@@ -185,6 +189,33 @@ class PtyWrapper {
     this.pty.onExit(this._ptyExitHandler);
   }
 
+  _prependTitlePrefix(data) {
+    if (!this.titlePrefix) return data;
+    const text = typeof data === "string" ? data : Buffer.from(data).toString("utf8");
+    const combined = this._titleOscBuffer + text;
+    this._titleOscBuffer = "";
+
+    const trailingOscStart = combined.lastIndexOf("\x1b]");
+    if (trailingOscStart >= 0) {
+      const trailing = combined.slice(trailingOscStart);
+      if (!/(?:\x07|\x1b\\)/.test(trailing)) {
+        this._titleOscBuffer = trailing;
+        return this._rewriteTitleOsc(combined.slice(0, trailingOscStart));
+      }
+    }
+
+    return this._rewriteTitleOsc(combined);
+  }
+
+  _rewriteTitleOsc(text) {
+    if (!this.titlePrefix || !text) return text;
+    const prefix = this.titlePrefix;
+    return text.replace(/\x1b\]([012]);([^\x07\x1b]*)(\x07|\x1b\\)/g, (match, code, title, terminator) => {
+      if (!title || title.startsWith(`${prefix}:`)) return match;
+      return `\x1b]${code};${prefix}:${title}${terminator}`;
+    });
+  }
+
   /**
    * 写入数据到PTY（用于外部inject）
    *

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 };