u-foo 2.3.3 → 2.3.5

package/package.json

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

package/src/chat/agentBar.js

@@ -33,8 +33,8 @@ function computeAgentBar(options = {}) {
   let windowItems = Math.max(1, Math.min(maxAgentWindow, activeAgents.length));
   let start = agentListWindowStart;
   const ufooItem = focusMode === "dashboard" && selectedAgentIndex === 0
-    ? "\x1b[90;7mucode\x1b[0m"
-    : "\x1b[36mucode\x1b[0m";
+    ? "\x1b[90;7mufoo\x1b[0m"
+    : "\x1b[36mufoo\x1b[0m";
   const ufooLen = stripAnsi(ufooItem).length;
 
   const computeStart = (items) => {
@@ -78,7 +78,7 @@ function computeAgentBar(options = {}) {
         const prefix = indicator
           ? `${indicatorColor}${indicator}\x1b[0m`
           : "";
-        const idx = s + i + 1; // +1 for ucode at index 0
+        const idx = s + i + 1; // +1 for ufoo chat at index 0
         if (focusMode === "dashboard" && idx === selectedAgentIndex) {
           return `${prefix}\x1b[90;7m${label}\x1b[0m`;
         }

package/src/code/agent.js

@@ -1119,6 +1119,7 @@ async function runUbusCommand(state = {}, options = {}) {
         // eslint-disable-next-line no-await-in-loop
         nlResult = await runNl(message.task, state, {
           onProgress: progressReporter,
+          signal: options.signal,
         });
       } catch (err) {
         sendErrors.push(`task from ${message.publisher} failed: ${err && err.message ? err.message : "task failed"}`);
@@ -1180,7 +1181,9 @@ async function runUbusCommand(state = {}, options = {}) {
         });
       }
 
-      const nlResult = await runNl(item.task, state);
+      const nlResult = await runNl(item.task, state, {
+        signal: options.signal,
+      });
       const reply = String(formatNl(nlResult, false) || "").replace(/\s+/g, " ").trim() || "Done.";
       const sendRes = shell(`ufoo bus send ${shellQuote(item.publisher)} ${shellQuote(reply.slice(0, 2000))}`);
       if (!sendRes.ok) {

package/src/code/nativeRunner.js

@@ -9,6 +9,8 @@ const { getBashToolDescription } = require("./prompts/toolDescriptions/bash");
 const CORE_TOOL_NAMES = new Set(["read", "write", "edit", "bash"]);
 const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
 const DEFAULT_ANTHROPIC_BASE_URL = "https://api.anthropic.com/v1";
+const DEFAULT_MAX_NATIVE_TOOL_CALLS = 12;
+const DEFAULT_MAX_NATIVE_TOOL_ERRORS = 1;
 
 function nowMs() {
   return Date.now();
@@ -20,6 +22,36 @@ function normalizeTimeoutMs(value) {
   return Math.max(1000, Math.floor(parsed));
 }
 
+function normalizePositiveInt(value, fallback) {
+  const parsed = Number.parseInt(String(value || ""), 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) return fallback;
+  return Math.floor(parsed);
+}
+
+function resolveNativeToolBudget(env = process.env) {
+  return {
+    maxToolCalls: normalizePositiveInt(env.UFOO_UCODE_MAX_TOOL_CALLS, DEFAULT_MAX_NATIVE_TOOL_CALLS),
+    maxToolErrors: normalizePositiveInt(env.UFOO_UCODE_MAX_TOOL_ERRORS, DEFAULT_MAX_NATIVE_TOOL_ERRORS),
+  };
+}
+
+function enforceNativeToolBudget({
+  toolCallsExecuted = 0,
+  toolErrors = 0,
+  maxToolCalls = DEFAULT_MAX_NATIVE_TOOL_CALLS,
+  maxToolErrors = DEFAULT_MAX_NATIVE_TOOL_ERRORS,
+  lastTool = "",
+  lastError = "",
+} = {}) {
+  if (toolCallsExecuted > maxToolCalls) {
+    throw new Error(`tool call budget exceeded (${maxToolCalls})`);
+  }
+  if (toolErrors >= maxToolErrors) {
+    const detail = [lastTool, lastError].filter(Boolean).join(": ");
+    throw new Error(`tool error budget exceeded (${maxToolErrors})${detail ? `: ${detail}` : ""}`);
+  }
+}
+
 function createGuards({ signal = null, timeoutMs = 300000 } = {}) {
   const startedAt = nowMs();
   const budgetMs = normalizeTimeoutMs(timeoutMs);
@@ -907,6 +939,8 @@ async function runNativeLoopOpenAi({
   let aggregated = "";
   let streamed = false;
   let toolCallsExecuted = 0;
+  let toolErrors = 0;
+  const toolBudget = resolveNativeToolBudget();
 
   while (true) {
     guards.ensureActive();
@@ -991,6 +1025,17 @@ async function runNativeLoopOpenAi({
         onToolEvent,
       });
       toolCallsExecuted += 1;
+      if (!toolResult || toolResult.ok === false) {
+        toolErrors += 1;
+      }
+      enforceNativeToolBudget({
+        toolCallsExecuted,
+        toolErrors,
+        maxToolCalls: toolBudget.maxToolCalls,
+        maxToolErrors: toolBudget.maxToolErrors,
+        lastTool: toolCall.function.name,
+        lastError: toolResult && toolResult.error ? String(toolResult.error) : "",
+      });
       messages.push({
         role: "tool",
         tool_call_id: toolCall.id,
@@ -1034,6 +1079,8 @@ async function runNativeLoopAnthropic({
   let aggregated = "";
   let streamed = false;
   let toolCallsExecuted = 0;
+  let toolErrors = 0;
+  const toolBudget = resolveNativeToolBudget();
 
   while (true) {
     guards.ensureActive();
@@ -1109,6 +1156,17 @@ async function runNativeLoopAnthropic({
         onToolEvent,
       });
       toolCallsExecuted += 1;
+      if (!toolResult || toolResult.ok === false) {
+        toolErrors += 1;
+      }
+      enforceNativeToolBudget({
+        toolCallsExecuted,
+        toolErrors,
+        maxToolCalls: toolBudget.maxToolCalls,
+        maxToolErrors: toolBudget.maxToolErrors,
+        lastTool: call.name,
+        lastError: toolResult && toolResult.error ? String(toolResult.error) : "",
+      });
       toolResults.push({
         type: "tool_result",
         tool_use_id: String(call.id || ""),

package/src/code/taskDecomposer.js

@@ -147,8 +147,9 @@ async function runDecomposedTask({
         }
       }
 
-      // Stop on error for critical steps
-      if (!stepResult.ok && (step.id === "identify" || step.id === "locate")) {
+      // Stop on any step failure. A failed tool/provider call means the
+      // current plan is no longer reliable, and continuing can trigger loops.
+      if (!stepResult.ok) {
         return {
           ok: false,
           error: `Failed at ${step.name}: ${stepResult.error}`,
@@ -266,4 +267,4 @@ module.exports = {
   runDecomposedTask,
   compileSummary,
   createBusProgressReporter,
-};
+};

package/src/code/tui.js

@@ -993,6 +993,7 @@ function runUcodeTui({
         const ubusResult = await runUbusCommand(state, {
           workspaceRoot,
           subscriberId: autoBusSubscriberId,
+          signal: abortController.signal,
           onMessageReceived: (msg) => {
             // Display the incoming message immediately
             const { extractAgentNickname } = require("./agent");
@@ -1254,59 +1255,63 @@ function runUcodeTui({
         });
         let streamState = null;
         let renderedToolLogCount = 0;
-        const nlResult = await runNaturalLanguageTask(result.task, state, {
-          signal: abortController.signal,
-          onDelta: (delta) => {
-            const text = escapeStripper.write(String(delta || ""));
-            if (!text) return;
+        let nlResult = null;
+        try {
+          nlResult = await runNaturalLanguageTask(result.task, state, {
+            signal: abortController.signal,
+            onDelta: (delta) => {
+              const text = escapeStripper.write(String(delta || ""));
+              if (!text) return;
+              if (!streamState) {
+                streamState = createNlStreamState();
+              }
+              appendNlStreamDelta(streamState, text);
+            },
+            onToolLog: (entry) => {
+              renderedToolLogCount += 1;
+              logToolHint(entry);
+            },
+          });
+          const tail = escapeStripper.flush();
+          if (tail) {
             if (!streamState) {
               streamState = createNlStreamState();
             }
-            appendNlStreamDelta(streamState, text);
-          },
-          onToolLog: (entry) => {
-            renderedToolLogCount += 1;
-            logToolHint(entry);
-          },
-        });
-        const tail = escapeStripper.flush();
-        if (tail) {
-          if (!streamState) {
-            streamState = createNlStreamState();
+            appendNlStreamDelta(streamState, tail);
           }
-          appendNlStreamDelta(streamState, tail);
-        }
-        pendingTask = null;
-        updateStatus("", "none");
-        let finalStreamInfo = { lastChar: "" };
-        if (streamState) {
-          finalStreamInfo = finalizeNlStream(streamState);
-        }
-        if (Array.isArray(nlResult && nlResult.logs) && nlResult.logs.length > renderedToolLogCount) {
-          for (const entry of nlResult.logs.slice(renderedToolLogCount)) {
-            logToolHint(entry);
+          let finalStreamInfo = { lastChar: "" };
+          if (streamState) {
+            finalStreamInfo = finalizeNlStream(streamState);
           }
-        }
-        const streamed = Boolean(nlResult && nlResult.streamed);
-        const hasVisibleStreamText = Boolean(
-          streamState
-          && typeof streamState.full === "string"
-          && /[^\s]/.test(streamState.full)
-        );
-        const streamLastChar = nlResult && typeof nlResult.streamLastChar === "string"
-          ? nlResult.streamLastChar.slice(-1)
-          : finalStreamInfo.lastChar;
-        if (streamed && hasVisibleStreamText && streamLastChar !== "\n") {
-          logBox.log("");
-          screen.render();
-        }
-        const shouldSkipSummary = Boolean(streamed && nlResult && nlResult.ok && hasVisibleStreamText);
-        if (!shouldSkipSummary) {
-          logText(formatNlResult(nlResult, false));
-        }
-        const persisted = persistSessionState(state);
-        if (!persisted || persisted.ok === false) {
-          logText(`Error: failed to persist session ${state.sessionId}: ${(persisted && persisted.error) || "unknown error"}`);
+          if (Array.isArray(nlResult && nlResult.logs) && nlResult.logs.length > renderedToolLogCount) {
+            for (const entry of nlResult.logs.slice(renderedToolLogCount)) {
+              logToolHint(entry);
+            }
+          }
+          const streamed = Boolean(nlResult && nlResult.streamed);
+          const hasVisibleStreamText = Boolean(
+            streamState
+            && typeof streamState.full === "string"
+            && /[^\s]/.test(streamState.full)
+          );
+          const streamLastChar = nlResult && typeof nlResult.streamLastChar === "string"
+            ? nlResult.streamLastChar.slice(-1)
+            : finalStreamInfo.lastChar;
+          if (streamed && hasVisibleStreamText && streamLastChar !== "\n") {
+            logBox.log("");
+            screen.render();
+          }
+          const shouldSkipSummary = Boolean(streamed && nlResult && nlResult.ok && hasVisibleStreamText);
+          if (!shouldSkipSummary) {
+            logText(formatNlResult(nlResult, false));
+          }
+          const persisted = persistSessionState(state);
+          if (!persisted || persisted.ok === false) {
+            logText(`Error: failed to persist session ${state.sessionId}: ${(persisted && persisted.error) || "unknown error"}`);
+          }
+        } finally {
+          pendingTask = null;
+          updateStatus("", "none");
         }
       }
     };

package/src/daemon/ops.js

@@ -44,6 +44,10 @@ function toTmuxBinary(agent = "") {
   return "";
 }
 
+function resolveUfooRunnerPath() {
+  return path.resolve(__dirname, "../../bin/ufoo.js");
+}
+
 function normalizeLaunchScope(value, fallback = "inplace") {
   const raw = String(value || "").trim().toLowerCase();
   if (!raw) return fallback;
@@ -546,7 +550,7 @@ async function spawnManagedHostAgent(
   if (hasPreRegisteredSubscriber) {
     // Group mode: use ufoo launcher for activity_state monitoring
     // This enables ReadyDetector and bootstrap to work correctly
-    const ufooRunner = path.join(projectRoot, "bin", "ufoo.js");
+    const ufooRunner = resolveUfooRunnerPath();
     const launchCmd = `${shellEscape(process.execPath)} ${shellEscape(ufooRunner)} agent-pty-runner ${shellEscape(normalizedAgent)}${argText}`.trim();
     runCmd = titleCmd
       ? `cd ${shellEscape(projectRoot)} && ${titleCmd} && ${launchCmd}`
@@ -591,7 +595,7 @@ async function spawnManagedHostAgent(
 }
 
 async function spawnInternalAgent(projectRoot, agent, count = 1, nickname = "", processManager = null, extraEnv = {}) {
-  const runner = path.join(projectRoot, "bin", "ufoo.js");
+  const runner = resolveUfooRunnerPath();
   const logDir = getUfooPaths(projectRoot).runDir;
   fs.mkdirSync(logDir, { recursive: true });
 
@@ -624,17 +628,18 @@ async function spawnInternalAgent(projectRoot, agent, count = 1, nickname = "",
     bus.loadBusData();
     process.env.UFOO_PARENT_PID = String(originalPid);
 
-    // For ucode/ufoo agents, default nickname to "ucode" if not specified
-    const defaultNickname = agentType === "ufoo-code" ? "ucode" : agent;
-    const finalNickname = count > 1 ? `${nickname || defaultNickname}-${i + 1}` : (nickname || defaultNickname);
+    const requestedNickname = nickname
+      ? (count > 1 ? `${nickname}-${i + 1}` : nickname)
+      : "";
     const usePty = process.env.UFOO_INTERNAL_PTY !== "0";
     const launchMode = usePty ? "internal-pty" : "internal";
 
     // 传递 launch_mode 和 parent PID 到 join
-    await bus.subscriberManager.join(sessionId, agentType, finalNickname, {
+    const joinResult = await bus.subscriberManager.join(sessionId, agentType, requestedNickname, {
       launchMode,
       parentPid: originalPid,
     });
+    const finalNickname = joinResult.nickname || requestedNickname || "";
     bus.saveBusData();
 
     const runnerCmd = usePty ? "agent-pty-runner" : "agent-runner";