u-foo 1.0.3 → 1.0.6

package/src/agent/cliRunner.js

@@ -32,10 +32,18 @@ function runCommand(command, args, options = {}) {
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (d) => {
-      stdout += d.toString("utf8");
+      const chunk = d.toString("utf8");
+      stdout += chunk;
+      if (options.onStdout) {
+        options.onStdout(chunk);
+      }
     });
     child.stderr.on("data", (d) => {
-      stderr += d.toString("utf8");
+      const chunk = d.toString("utf8");
+      stderr += chunk;
+      if (options.onStderr) {
+        options.onStderr(chunk);
+      }
     });
     let timeout = null;
     if (options.timeoutMs) {
@@ -74,7 +82,7 @@ const DEFAULT_CLAUDE = {
     "--dangerously-skip-permissions",
     "--no-session-persistence",
     "--json-schema",
-    '{"type":"object","properties":{"reply":{"type":"string"},"dispatch":{"type":"array","items":{"type":"object","properties":{"target":{"type":"string"},"message":{"type":"string"}},"required":["target","message"]}},"ops":{"type":"array","items":{"type":"object","properties":{"action":{"type":"string"},"agent":{"type":"string"},"count":{"type":"integer"},"agent_id":{"type":"string"},"nickname":{"type":"string"}},"required":["action"]}},"disambiguate":{"type":"object","properties":{"prompt":{"type":"string"},"candidates":{"type":"array","items":{"type":"object","properties":{"agent_id":{"type":"string"},"reason":{"type":"string"}},"required":["agent_id"]}}}}},"required":["reply","dispatch","ops"]}',
+    '{"type":"object","properties":{"reply":{"type":"string"},"dispatch":{"type":"array","items":{"type":"object","properties":{"target":{"type":"string"},"message":{"type":"string"}},"required":["target","message"]}},"ops":{"type":"array","items":{"type":"object","properties":{"action":{"type":"string","enum":["launch","close","rename"]},"agent":{"type":"string"},"count":{"type":"integer"},"agent_id":{"type":"string"},"nickname":{"type":"string"}},"required":["action"]}},"disambiguate":{"type":"object","properties":{"prompt":{"type":"string"},"candidates":{"type":"array","items":{"type":"object","properties":{"agent_id":{"type":"string"},"reason":{"type":"string"}},"required":["agent_id"]}}}}},"required":["reply","dispatch","ops"]}',
   ],
   output: "json",
   input: "arg",
@@ -111,6 +119,20 @@ function buildArgs(backend, prompt, opts) {
   return { args, stdin: prompt };
 }
 
+function applySandboxOverride(args, sandbox) {
+  if (!sandbox) return;
+  const idx = args.indexOf("--sandbox");
+  if (idx >= 0) {
+    if (idx + 1 < args.length) {
+      args[idx + 1] = sandbox;
+    } else {
+      args.push(sandbox);
+    }
+  } else {
+    args.push("--sandbox", sandbox);
+  }
+}
+
 function isUnsupportedArgError(errText) {
   const text = (errText || "").toLowerCase();
   return text.includes("unknown option")
@@ -132,11 +154,14 @@ async function runCliAgent(params) {
     systemPrompt: params.systemPrompt,
     disableSession: params.disableSession,
   });
+  if (backend === DEFAULT_CODEX && params.sandbox) {
+    applySandboxOverride(args, params.sandbox);
+  }
 
   let res;
   const env = { ...process.env, ...(params.env || {}) };
-  delete env.CLAUDE_SESSION_ID;
-  delete env.CODEX_SESSION_ID;
+  // Clean up ufoo-specific env vars to avoid interference with CLI agents
+  delete env.UFOO_SUBSCRIBER_ID;
   try {
     res = await runCommand(backend.command, args, {
       cwd: params.cwd,
@@ -161,6 +186,9 @@ async function runCliAgent(params) {
           disableSession: params.disableSession,
         },
       );
+      if (params.sandbox) {
+        applySandboxOverride(retry.args, params.sandbox);
+      }
       try {
         res = await runCommand(backend.command, retry.args, {
           cwd: params.cwd,

package/src/agent/internalRunner.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
+const { getUfooPaths } = require("../ufoo/paths");
 const { spawnSync } = require("child_process");
-const { randomBytes } = require("crypto");
 const { runCliAgent } = require("./cliRunner");
 const { normalizeCliOutput } = require("./normalizeOutput");
 
@@ -9,76 +9,79 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-function generateSessionId() {
-  return randomBytes(4).toString("hex");
-}
-
 function buildEnv(agentType, sessionId, publisher, nickname) {
   const env = { ...process.env };
-  if (agentType === "codex") {
-    env.CODEX_SESSION_ID = sessionId;
-    env.CLAUDE_SESSION_ID = "";
-  } else {
-    env.CLAUDE_SESSION_ID = sessionId;
-    env.CODEX_SESSION_ID = "";
-  }
   env.AI_BUS_PUBLISHER = publisher || env.AI_BUS_PUBLISHER || "";
   env.UFOO_NICKNAME = nickname || env.UFOO_NICKNAME || "";
   env.UFOO_PARENT_PID = String(process.pid);
   return env;
 }
 
-function joinBus(projectRoot, agentType, sessionId, nickname) {
-  const env = buildEnv(agentType, sessionId, "", nickname);
-  const args = ["bus", "join", sessionId, agentType === "codex" ? "codex" : "claude-code"];
-  if (nickname) args.push(nickname);
-  const res = spawnSync("ufoo", args, {
-    cwd: projectRoot,
-    env,
-    stdio: ["ignore", "pipe", "pipe"],
-  });
-  if (res.status !== 0) {
-    const err = (res.stderr || res.stdout || "").toString("utf8").trim();
-    throw new Error(err || "bus join failed");
+function parseSubscriberId() {
+  // Daemon 已经注册，直接使用
+  if (process.env.UFOO_SUBSCRIBER_ID) {
+    const parts = process.env.UFOO_SUBSCRIBER_ID.split(":");
+    if (parts.length === 2) {
+      return {
+        subscriber: process.env.UFOO_SUBSCRIBER_ID,
+        agentType: parts[0],
+        sessionId: parts[1],
+      };
+    }
   }
-  const out = (res.stdout || "").toString("utf8").trim().split(/\r?\n/);
-  const subscriber = out[out.length - 1];
-  return { subscriber, env };
+
+  throw new Error("Internal runner requires UFOO_SUBSCRIBER_ID set by daemon");
 }
 
 function safeSubscriber(subscriber) {
   return subscriber.replace(/:/g, "_");
 }
 
-function readQueue(queueFile) {
+function drainQueue(queueFile) {
   if (!fs.existsSync(queueFile)) return [];
+  const processingFile = `${queueFile}.processing.${process.pid}.${Date.now()}`;
+  let content = "";
+  let readOk = false;
   try {
-    const content = fs.readFileSync(queueFile, "utf8");
-    if (!content.trim()) return [];
-    return content.split(/\r?\n/).filter(Boolean);
+    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
+      }
+    }
   }
+  if (!content.trim()) return [];
+  return content.split(/\r?\n/).filter(Boolean);
 }
 
-function truncateQueue(queueFile) {
-  try {
-    fs.truncateSync(queueFile, 0);
-  } catch {
-    // ignore
-  }
-}
-
-async function handleEvent(projectRoot, agentType, provider, model, subscriber, sessionId, nickname, evt, cliSessionState) {
+async function handleEvent(projectRoot, agentType, provider, model, subscriber, nickname, evt, cliSessionState) {
   if (!evt || !evt.data || !evt.data.message) return;
   const prompt = evt.data.message;
   const publisher = evt.publisher || "unknown";
+  const sandbox = "workspace-write";
 
   let res = await runCliAgent({
     provider,
     model,
     prompt,
     sessionId: cliSessionState.cliSessionId,
+    sandbox,
     cwd: projectRoot,
   });
 
@@ -95,6 +98,7 @@ async function handleEvent(projectRoot, agentType, provider, model, subscriber,
         model,
         prompt,
         sessionId: null, // Let runCliAgent generate new session
+        sandbox,
         cwd: projectRoot,
       });
     }
@@ -117,20 +121,17 @@ async function handleEvent(projectRoot, agentType, provider, model, subscriber,
 
   spawnSync("ufoo", ["bus", "send", publisher, reply], {
     cwd: projectRoot,
-    env: buildEnv(agentType, sessionId, subscriber, nickname),
+    env: { ...process.env, AI_BUS_PUBLISHER: subscriber },
     stdio: "ignore",
   });
 }
 
 async function runInternalRunner({ projectRoot, agentType = "codex" }) {
-  const sessionId = generateSessionId();
+  // Internal runner 必须由 daemon 启动，UFOO_SUBSCRIBER_ID 应该已经设置
+  const { subscriber, agentType: parsedAgentType, sessionId } = parseSubscriberId();
   const nickname = process.env.UFOO_NICKNAME || "";
-  const { subscriber } = joinBus(projectRoot, agentType, sessionId, nickname);
-  if (!subscriber) {
-    throw new Error("Failed to join bus for internal runner");
-  }
 
-  const queueDir = path.join(projectRoot, ".ufoo", "bus", "queues", safeSubscriber(subscriber));
+  const queueDir = path.join(getUfooPaths(projectRoot).busQueuesDir, safeSubscriber(subscriber));
   const queueFile = path.join(queueDir, "pending.jsonl");
   const provider = agentType === "codex" ? "codex-cli" : "claude-cli";
   const model = process.env.UFOO_AGENT_MODEL || "";
@@ -138,7 +139,7 @@ async function runInternalRunner({ projectRoot, agentType = "codex" }) {
   // Session state management for CLI continuity
   // Use stable path based on nickname (if exists) or agent type, NOT subscriber ID
   const stableKey = nickname || `${agentType}-default`;
-  const sessionDir = path.join(projectRoot, ".ufoo", "agent", "sessions");
+  const sessionDir = path.join(getUfooPaths(projectRoot).agentDir, "sessions");
   fs.mkdirSync(sessionDir, { recursive: true });
   const stateFile = path.join(sessionDir, `${stableKey}.json`);
 
@@ -155,6 +156,8 @@ async function runInternalRunner({ projectRoot, agentType = "codex" }) {
 
   let running = true;
   let processing = false;
+  let lastHeartbeat = 0;
+  const HEARTBEAT_INTERVAL = 30000; // 30秒心跳间隔
 
   const stop = () => {
     running = false;
@@ -165,11 +168,32 @@ async function runInternalRunner({ projectRoot, agentType = "codex" }) {
 
   const cliSessionState = { cliSessionId, needsSave: false };
 
+  // 心跳更新函数
+  const updateHeartbeat = () => {
+    try {
+      spawnSync("ufoo", ["bus", "check", subscriber], {
+        cwd: projectRoot,
+        env: { ...process.env, UFOO_SUBSCRIBER_ID: subscriber },
+        stdio: "ignore",
+        timeout: 5000,
+      });
+    } catch {
+      // ignore heartbeat errors
+    }
+  };
+
   while (running) {
+    // 定期心跳更新
+    const now = Date.now();
+    if (now - lastHeartbeat > HEARTBEAT_INTERVAL) {
+      updateHeartbeat();
+      lastHeartbeat = now;
+    }
+
     if (!processing) {
       processing = true;
       try {
-        const lines = readQueue(queueFile);
+        const lines = drainQueue(queueFile);
         if (lines.length > 0) {
           const events = [];
           for (const line of lines) {
@@ -179,11 +203,10 @@ async function runInternalRunner({ projectRoot, agentType = "codex" }) {
               // ignore malformed line
             }
           }
-          truncateQueue(queueFile);
 
           for (const evt of events) {
             // eslint-disable-next-line no-await-in-loop
-            await handleEvent(projectRoot, agentType, provider, model, subscriber, sessionId, nickname, evt, cliSessionState);
+            await handleEvent(projectRoot, parsedAgentType, provider, model, subscriber, nickname, evt, cliSessionState);
           }
 
           // Persist CLI session state after processing (only if changed and for claude)
@@ -199,6 +222,10 @@ async function runInternalRunner({ projectRoot, agentType = "codex" }) {
               // ignore save errors
             }
           }
+
+          // 处理消息后更新心跳
+          updateHeartbeat();
+          lastHeartbeat = now;
         }
       } finally {
         processing = false;