u-foo 2.3.10 → 2.3.12

package/src/agent/internalRunner.js

@@ -3,24 +3,20 @@ const path = require("path");
 const { getUfooPaths } = require("../ufoo/paths");
 const { spawnSync } = require("child_process");
 const EventBus = require("../bus");
+const { readJSON, writeJSON } = require("../bus/utils");
 const { runCliAgent } = require("./cliRunner");
 const { normalizeCliOutput } = require("./normalizeOutput");
 const { createActivityStatePublisher } = require("./activityStatePublisher");
 const { loadConfig, normalizeCodexInternalThreadMode } = require("../config");
-const {
-  createCodexThreadProvider,
-  defaultCodexTransportStreamFactory,
-} = require("./codexThreadProvider");
-const {
-  createClaudeThreadProvider,
-  defaultClaudeTransportStreamFactory,
-} = require("./claudeThreadProvider");
+const { createCodexThreadProvider } = require("./codexThreadProvider");
+const { createClaudeThreadProvider } = require("./claudeThreadProvider");
 const { resolveClaudeUpstreamCredentials } = require("./credentials/claude");
 const { buildUpstreamAuthFromCredential } = require("./credentials");
 const { listToolsForCallerTier, CALLER_TIERS } = require("../tools");
 const { redactToolCallPayload, redactSecrets } = require("../providerapi/redactor");
 const { buildCachedMemoryPrefix } = require("../memory");
 const { shouldForwardStreamToPublisher } = require("./publisherRouting");
+const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -131,6 +127,73 @@ function drainQueue(queueFile) {
   return content.split(/\r?\n/).filter(Boolean);
 }
 
+function parseAgentViewRawInput(message) {
+  if (typeof message !== "string" || !message.trim()) return null;
+  try {
+    const parsed = JSON.parse(message);
+    if (parsed && parsed.raw === true && typeof parsed.data === "string") {
+      return parsed.data;
+    }
+  } catch {
+    // Not a raw agent-view envelope.
+  }
+  return null;
+}
+
+function createInteractiveInputSession({ write = () => {} } = {}) {
+  let buffer = "";
+
+  function writePrompt() {
+    write("> ");
+  }
+
+  function handleRaw(data) {
+    const submissions = [];
+    const text = String(data || "");
+    for (const char of text) {
+      if (char === "\r" || char === "\n") {
+        const submitted = buffer.trim();
+        buffer = "";
+        write("\r\n");
+        if (submitted) submissions.push(submitted);
+        else writePrompt();
+        continue;
+      }
+
+      if (char === "\u0003") {
+        buffer = "";
+        write("^C\r\n");
+        writePrompt();
+        continue;
+      }
+
+      if (char === "\u007f" || char === "\b") {
+        if (buffer.length > 0) {
+          buffer = buffer.slice(0, -1);
+          write("\b \b");
+        }
+        continue;
+      }
+
+      if (char >= " " && char !== "\u007f") {
+        buffer += char;
+        write(char);
+      }
+    }
+    return submissions;
+  }
+
+  return {
+    handleRaw,
+    writePrompt,
+    writeResponsePrompt: () => {
+      write("\r\n");
+      writePrompt();
+    },
+    getBuffer: () => buffer,
+  };
+}
+
 async function handleEvent(
   projectRoot,
   agentType,
@@ -259,6 +322,9 @@ async function handleThreadedEvent({
     const plainReplyParts = [];
     for await (const event of threadRuntime.thread.runStreamed(prompt, {})) {
       if (!event || typeof event !== "object") continue;
+      if (typeof threadRuntime.syncProviderSessionId === "function") {
+        threadRuntime.syncProviderSessionId();
+      }
       if (event.type === "text_delta" && event.delta) {
         if (streamToPublisher) {
           emitStreamDelta(event.delta);
@@ -269,6 +335,9 @@ async function handleThreadedEvent({
         throw new Error(event.error || `thread turn failed for ${agentType}`);
       }
     }
+    if (typeof threadRuntime.syncProviderSessionId === "function") {
+      threadRuntime.syncProviderSessionId();
+    }
 
     if (streamToPublisher) {
       busSender.enqueue(
@@ -420,15 +489,55 @@ function buildClaudeAuthProvider(projectRoot) {
   };
 }
 
-function createThreadRuntime({ projectRoot, provider, model, extraArgs = [], subscriber = "" }) {
+function persistProviderSessionId(projectRoot, subscriber, providerSessionId) {
+  const id = String(providerSessionId || "").trim();
+  if (!projectRoot || !subscriber || !id) return false;
+  try {
+    const agentsFile = getUfooPaths(projectRoot).agentsFile;
+    const parsed = fs.existsSync(agentsFile)
+      ? readJSON(agentsFile, null)
+      : {};
+    if (!parsed) return false;
+    if (!parsed.agents || typeof parsed.agents !== "object") return false;
+    if (!parsed.agents[subscriber] || typeof parsed.agents[subscriber] !== "object") {
+      appendAgentRegistryDiagnostic(agentsFile, "provider_session_subscriber_missing", {
+        source: "agent.internalRunner.persistProviderSessionId",
+        subscriber,
+        known_ids: Object.keys(parsed.agents || {}).sort(),
+      });
+      return false;
+    }
+    if (parsed.agents[subscriber].provider_session_id === id) return false;
+    parsed.agents[subscriber].provider_session_id = id;
+    parsed.agents[subscriber].provider_session_updated_at = new Date().toISOString();
+    writeJSON(agentsFile, parsed);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function createThreadRuntime({ projectRoot, provider, model, extraArgs = [], subscriber = "", providerSessionId = "" }) {
   const disabledRuntime = {
     enabled: false,
     thread: null,
     toolRuntime: { enabled: false, mode: "disabled", tools: [] },
     close: async () => {},
     rebuildThread: async () => {},
+    syncProviderSessionId: () => false,
   };
 
+  const initialProviderSessionId = String(providerSessionId || "").trim();
+  let savedProviderSessionId = initialProviderSessionId;
+
+  function rememberProviderSessionId(thread) {
+    const id = String(thread && thread.id ? thread.id : "").trim();
+    if (!id || id === savedProviderSessionId) return false;
+    const changed = persistProviderSessionId(projectRoot, subscriber, id);
+    if (changed) savedProviderSessionId = id;
+    return changed;
+  }
+
   if (provider === "codex-cli") {
     if (getCodexThreadMode(projectRoot) !== "api") {
       return disabledRuntime;
@@ -444,9 +553,10 @@ function createThreadRuntime({ projectRoot, provider, model, extraArgs = [], sub
         cwd: projectRoot,
         extraArgs,
         tools: toolRuntime.tools,
-        streamFactory: defaultCodexTransportStreamFactory,
       });
-      let thread = providerInstance.startThread();
+      let thread = initialProviderSessionId
+        ? providerInstance.resumeThread(initialProviderSessionId)
+        : providerInstance.startThread();
 
       return {
         enabled: true,
@@ -454,6 +564,9 @@ function createThreadRuntime({ projectRoot, provider, model, extraArgs = [], sub
         get thread() {
           return thread;
         },
+        syncProviderSessionId() {
+          return rememberProviderSessionId(thread);
+        },
         async rebuildThread() {
           if (thread && typeof thread.close === "function") {
             await thread.close();
@@ -463,9 +576,10 @@ function createThreadRuntime({ projectRoot, provider, model, extraArgs = [], sub
             cwd: projectRoot,
             extraArgs,
             tools: toolRuntime.tools,
-            streamFactory: defaultCodexTransportStreamFactory,
           });
-          thread = providerInstance.startThread();
+          thread = savedProviderSessionId
+            ? providerInstance.resumeThread(savedProviderSessionId)
+            : providerInstance.startThread();
         },
         async close() {
           if (thread && typeof thread.close === "function") {
@@ -482,33 +596,40 @@ function createThreadRuntime({ projectRoot, provider, model, extraArgs = [], sub
     if (getClaudeThreadMode() !== "api") {
       return disabledRuntime;
     }
-    if (typeof createClaudeThreadProvider !== "function" || typeof resolveClaudeUpstreamCredentials !== "function") {
+    if (typeof createClaudeThreadProvider !== "function") {
       return disabledRuntime;
     }
 
     try {
       let providerInstance = createClaudeThreadProvider({
         model,
-        authProvider: buildClaudeAuthProvider(projectRoot),
-        streamFactory: defaultClaudeTransportStreamFactory,
+        cwd: projectRoot,
+        extraArgs,
       });
-      let thread = providerInstance.startThread();
+      let thread = initialProviderSessionId
+        ? providerInstance.resumeThread(initialProviderSessionId)
+        : providerInstance.startThread();
 
       return {
         enabled: true,
         get thread() {
           return thread;
         },
+        syncProviderSessionId() {
+          return rememberProviderSessionId(thread);
+        },
         async rebuildThread() {
           if (thread && typeof thread.close === "function") {
             await thread.close();
           }
           providerInstance = createClaudeThreadProvider({
             model,
-            authProvider: buildClaudeAuthProvider(projectRoot),
-            streamFactory: defaultClaudeTransportStreamFactory,
+            cwd: projectRoot,
+            extraArgs,
           });
-          thread = providerInstance.startThread();
+          thread = savedProviderSessionId
+            ? providerInstance.resumeThread(savedProviderSessionId)
+            : providerInstance.startThread();
         },
         async close() {
           if (thread && typeof thread.close === "function") {
@@ -538,12 +659,14 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
   const provider = normalizedAgentType === "codex" ? "codex-cli" : "claude-cli";
   const model = process.env.UFOO_AGENT_MODEL || "";
   const busSender = createBusSender(projectRoot, subscriber);
+  const interactiveSessions = new Map();
   const threadRuntime = createThreadRuntime({
     projectRoot,
     provider,
     model,
     extraArgs,
     subscriber,
+    providerSessionId: process.env.UFOO_PROVIDER_SESSION_ID || "",
   });
 
   // Session state management for CLI continuity
@@ -586,6 +709,18 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
     activityPublisher.publish(state);
   }
 
+  function getInteractiveSession(publisher) {
+    const key = String(publisher || "unknown");
+    if (interactiveSessions.has(key)) return interactiveSessions.get(key);
+    const session = createInteractiveInputSession({
+      write: (delta) => {
+        busSender.enqueue(key, JSON.stringify({ stream: true, delta: String(delta || "") }));
+      },
+    });
+    interactiveSessions.set(key, session);
+    return session;
+  }
+
   setActivityState("ready");
 
   // 心跳更新函数
@@ -615,7 +750,6 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
       try {
         const lines = drainQueue(queueFile);
         if (lines.length > 0) {
-          setActivityState("working");
           const events = [];
           for (const line of lines) {
             try {
@@ -625,7 +759,33 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
             }
           }
 
+          const runnableEvents = [];
           for (const evt of events) {
+            const rawInput = parseAgentViewRawInput(evt && evt.data ? evt.data.message : "");
+            if (rawInput === null) {
+              runnableEvents.push(evt);
+              continue;
+            }
+
+            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) {
+            setActivityState("working");
+          }
+
+          for (const evt of runnableEvents) {
             // eslint-disable-next-line no-await-in-loop
             await handleEvent(
               projectRoot,
@@ -640,6 +800,9 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
               extraArgs,
               threadRuntime
             );
+            if (evt.__agentViewRaw) {
+              getInteractiveSession(evt.publisher || "unknown").writeResponsePrompt();
+            }
           }
 
           // Persist CLI session state after processing (only if changed and for claude)
@@ -659,7 +822,10 @@ async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs =
           // 处理消息后更新心跳
           updateHeartbeat();
           lastHeartbeat = now;
-          setActivityState("idle");
+          if (runnableEvents.length > 0) {
+            setActivityState("idle");
+          }
+          await busSender.flush();
         }
       } finally {
         processing = false;
@@ -684,4 +850,7 @@ module.exports = {
   getClaudeThreadMode,
   buildClaudeAuthProvider,
   shouldFallbackToLegacyThreadProvider,
+  parseAgentViewRawInput,
+  createInteractiveInputSession,
+  persistProviderSessionId,
 };

package/src/agent/notifier.js

@@ -1,8 +1,10 @@
 const fs = require("fs");
 const path = require("path");
 const EventBus = require("../bus");
+const { readJSON, writeJSON } = require("../bus/utils");
 const Injector = require("../bus/inject");
 const { getUfooPaths } = require("../ufoo/paths");
+const { appendAgentRegistryDiagnostic } = require("../ufoo/agentRegistryDiagnostics");
 const { shakeTerminalByTty } = require("../bus/shake");
 const { isITerm2 } = require("../terminal/detect");
 const iterm2 = require("../terminal/iterm2");
@@ -62,7 +64,8 @@ class AgentNotifier {
   getNickname() {
     try {
       if (!this.agentsFile || !fs.existsSync(this.agentsFile)) return "";
-      const data = JSON.parse(fs.readFileSync(this.agentsFile, "utf8"));
+      const data = readJSON(this.agentsFile, null);
+      if (!data) return "";
       const meta = data.agents && data.agents[this.subscriber];
       return (meta && meta.nickname) ? String(meta.nickname) : "";
     } catch {
@@ -109,11 +112,18 @@ class AgentNotifier {
   updateHeartbeat() {
     try {
       if (!this.agentsFile || !fs.existsSync(this.agentsFile)) return;
-      const data = JSON.parse(fs.readFileSync(this.agentsFile, "utf8"));
+      const data = readJSON(this.agentsFile, null);
+      if (!data) return;
       if (data.agents && data.agents[this.subscriber]) {
         data.agents[this.subscriber].last_seen = new Date().toISOString();
-        fs.writeFileSync(this.agentsFile, JSON.stringify(data, null, 2));
+        writeJSON(this.agentsFile, data);
+        return;
       }
+      appendAgentRegistryDiagnostic(this.agentsFile, "heartbeat_subscriber_missing", {
+        source: "agent.notifier.updateHeartbeat",
+        subscriber: this.subscriber,
+        known_ids: Object.keys(data.agents || {}).sort(),
+      });
     } catch {
       // 心跳更新失败时静默忽略
     }
@@ -132,7 +142,8 @@ class AgentNotifier {
   getCurrentActivityState() {
     try {
       if (!this.agentsFile || !fs.existsSync(this.agentsFile)) return "";
-      const data = JSON.parse(fs.readFileSync(this.agentsFile, "utf8"));
+      const data = readJSON(this.agentsFile, null);
+      if (!data) return "";
       const meta = data.agents && data.agents[this.subscriber];
       return meta && typeof meta.activity_state === "string"
         ? String(meta.activity_state).trim().toLowerCase()

package/src/agent/ptyRunner.js

@@ -116,11 +116,6 @@ function computeInjectedSubmitDelayMs(agentType, text) {
   return delayMs;
 }
 
-function buildPrompt(text, marker) {
-  if (!marker) return text;
-  return `${text}\n\n请在完成后输出以下标记（单独一行）：\n${marker}\n`;
-}
-
 function resolveCommand(agentType, extraArgs = []) {
   const normalizedAgent = String(agentType || "").trim().toLowerCase();
   const extra = Array.isArray(extraArgs) ? extraArgs : [];
@@ -172,9 +167,11 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
     UFOO_INTERNAL_PTY: "1",
   };
 
+  const idleMs = Number.parseInt(process.env.UFOO_INTERNAL_PTY_IDLE_MS || "", 10) || 30000;
   const eventBus = new EventBus(projectRoot);
   const activityDetector = new ActivityDetector(agentType, {
     mode: "internal-pty",
+    quietWindowMs: idleMs,
   });
   const agentsFilePath = getUfooPaths(projectRoot).agentsFile;
 
@@ -184,15 +181,11 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
   let ptyReady = false;
   let readyTimer = null;
   let currentPublisher = "";
-  let currentMarker = "";
   let pendingOutput = [];
   let outputBuffer = "";
   let flushTimer = null;
   let idleTimer = null;
   let watchdogTimer = null;
-  let suppressEcho = false;
-  let echoMarker = "";
-  let suppressTimer = null;
   let ptyProcess = null;
   let restartCount = 0;
   let lastSpawnTime = 0;
@@ -205,14 +198,11 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
   const injectServer = setupInjectServer();
   initScreenBuffer(80, 24);
   const maxChunk = 2000;
-  const idleMs = 30000;
   const watchdogMs = 120000;
   const maxQueue = 200;
   let sendQueue = Promise.resolve();
   const streamPublisherCache = new Map();
   const DROP_LINE_PATTERNS = [
-    /__UFOO_DONE_/,
-    /请在完成后输出以下标记/,
     /context left/i,
     /esc to interrupt/i,
     /for shortcuts/i,
@@ -660,8 +650,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
       detail: snap.detail,
     });
     // Quiet-window detector may classify IDLE sooner than stream fallback timer.
-    // Release queue only when no explicit marker is being awaited.
-    if (newState === "idle" && busy && !currentMarker && !suppressEcho) {
+    if (newState === "idle" && busy) {
       if (idleTimer) {
         clearTimeout(idleTimer);
         idleTimer = null;
@@ -696,49 +685,6 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
       if (!clean) return;
       outputBuffer += clean;
       activityDetector.processOutput(clean);
-      if (suppressEcho) {
-        if (echoMarker && outputBuffer.includes(echoMarker)) {
-          const idx = outputBuffer.indexOf(echoMarker);
-          outputBuffer = outputBuffer.slice(idx + echoMarker.length);
-          outputBuffer = outputBuffer.replace(/^\n+/, "");
-          suppressEcho = false;
-          currentMarker = echoMarker;
-          echoMarker = "";
-          if (suppressTimer) {
-            clearTimeout(suppressTimer);
-            suppressTimer = null;
-          }
-        } else {
-          return;
-        }
-      }
-      if (currentMarker) {
-        const idx = outputBuffer.indexOf(currentMarker);
-        if (idx !== -1) {
-          const before = outputBuffer.slice(0, idx);
-          outputBuffer = "";
-          if (before) {
-            deliverChunk(before);
-          }
-          if (currentPublisher) {
-            completePublisherResponse("marker");
-          }
-          currentMarker = "";
-          busy = false;
-          activityDetector.markIdle();
-          currentPublisher = "";
-          if (watchdogTimer) {
-            clearTimeout(watchdogTimer);
-            watchdogTimer = null;
-          }
-          if (idleTimer) {
-            clearTimeout(idleTimer);
-            idleTimer = null;
-          }
-          processQueue();
-          return;
-        }
-      }
       scheduleFlush();
       // Ready detection: during TUI startup, reset the quiet timer on each output.
       // Once output stops for READY_QUIET_MS, the TUI is considered initialized.
@@ -805,7 +751,6 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
       busy = false;
       activityDetector.markIdle();
       currentPublisher = "";
-      currentMarker = "";
 
       // If stop() was called, let the runner exit
       if (!running) return;
@@ -940,11 +885,6 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
     busy = true;
     activityDetector.markWorking();
     currentPublisher = next.publisher;
-    currentMarker = next.marker || "";
-    if (suppressTimer) {
-      clearTimeout(suppressTimer);
-      suppressTimer = null;
-    }
     flushPending();
     if (next.text) {
       if (next.raw) {
@@ -952,30 +892,16 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
       } else {
         // Write text first, then send Enter separately.
         // Codex Ink TUI requires text and submit key as separate writes.
-        // IMPORTANT: Defer marker detection until after Enter is sent,
-        // because the prompt echo (TextInput display) contains the marker text.
-        const prompt = buildPrompt(next.text, currentMarker);
-        const savedMarker = currentMarker;
-        suppressEcho = true;
-        echoMarker = savedMarker;
-        currentMarker = ""; // Disable marker detection during prompt echo & formatted display
-        ptyProcess.write(prompt);
+        ptyProcess.write(next.text);
         setTimeout(() => {
           if (ptyProcess && ptyAlive) {
+            // Drop the local TUI input echo from any forwarded stream output.
             outputBuffer = "";
             const isClaude = agentType === "claude-code";
             if (isClaude) {
               // Claude Code: send CR directly without ESC.
               // ESC before CR is interpreted as Alt+Enter (newline).
               ptyProcess.write("\r");
-              suppressTimer = setTimeout(() => {
-                suppressTimer = null;
-                if (!suppressEcho) return;
-                suppressEcho = false;
-                echoMarker = "";
-                currentMarker = savedMarker;
-                outputBuffer = "";
-              }, 1500);
             } else {
               // Codex/others: ESC dismisses autocomplete, then CR submits.
               ptyProcess.write("\x1b");
@@ -983,14 +909,6 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
                 if (ptyProcess && ptyAlive) {
                   ptyProcess.write("\r");
                 }
-                suppressTimer = setTimeout(() => {
-                  suppressTimer = null;
-                  if (!suppressEcho) return;
-                  suppressEcho = false;
-                  echoMarker = "";
-                  currentMarker = savedMarker;
-                  outputBuffer = "";
-                }, 1500);
               }, 100);
             }
           }
@@ -1001,13 +919,12 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
     watchdogTimer = setTimeout(() => {
       watchdogTimer = null;
       if (!busy) return;
-      const timeoutNote = `[internal-pty] marker timeout; restarting PTY`;
+      const timeoutNote = `[internal-pty] task timeout; restarting PTY`;
       if (currentPublisher) {
         completePublisherResponse("timeout", timeoutNote);
       }
       logNote(timeoutNote);
-      restartPty("marker timeout");
-      currentMarker = "";
+      restartPty("task timeout");
       busy = false;
       activityDetector.markIdle();
       currentPublisher = "";
@@ -1058,11 +975,10 @@ async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }
         if (messageQueue.length >= maxQueue) {
           messageQueue.shift();
         }
-        const marker = raw ? "" : `__UFOO_DONE_${Date.now()}_${Math.random().toString(16).slice(2)}__`;
         const publisher = typeof evt.publisher === "object" && evt.publisher
           ? (evt.publisher.subscriber || evt.publisher.nickname || "unknown")
           : (evt.publisher || "unknown");
-        messageQueue.push({ publisher, raw, text, marker });
+        messageQueue.push({ publisher, raw, text });
       }
     }
     processQueue();

package/src/bus/index.js

@@ -60,7 +60,8 @@ class EventBus {
     this.queueManager = new QueueManager(this.busDir);
     this.subscriberManager = new SubscriberManager(
       this.busData,
-      this.queueManager
+      this.queueManager,
+      { agentsFile: this.agentsFile }
     );
     this.messageManager = new MessageManager(
       this.busDir,