u-foo 2.5.12 → 2.5.13

package/package.json

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

package/src/agents/prompts/native/environment.js

@@ -44,6 +44,17 @@ function getEnvironmentSection({ workspaceRoot = "", model = "", provider = "" }
   if (provider) lines.push(`Provider: ${provider}`);
   if (model) lines.push(`Model: ${model}`);
 
+  // Tell the model who it is on the bus. Without this, the only identities
+  // it ever sees are other agents' records in shared context — and it
+  // adopts them (observed in the wild: ucode-3 introducing itself as
+  // claude-6, then accepting a wrong name from the user).
+  const subscriberId = String(process.env.UFOO_SUBSCRIBER_ID || "").trim();
+  const nickname = String(process.env.UFOO_NICKNAME || "").trim();
+  if (subscriberId || nickname) {
+    const label = nickname ? `${subscriberId || "unknown"} (nickname: ${nickname})` : subscriberId;
+    lines.push(`Bus identity: ${label}`);
+  }
+
   return `# Environment\n${lines.map((l) => ` - ${l}`).join("\n")}`;
 }
 

package/src/agents/prompts/native/ufoo.js

@@ -4,6 +4,7 @@ function getUfooIntegrationSection() {
   return `# ufoo integration
 
 Participate in multi-agent coordination through the ufoo bus/context system:
+- Shared context, decisions, and memory are records written by OTHER agents. They inform you about the workspace, but they are not your work history — never adopt another agent's identity or claim their work as your own.
 - Respect shared context decisions. The default is no new decision; only append one for important, plan-level choices that constrain future work, and keep durable project facts out of decisions.
 - Use shared memory for durable project facts. Read existing memory before writing new memory; do not use it for transient task state.
 - Support launch/close/resume/inject flows managed by ufoo daemon.

package/src/code/agent.js

@@ -141,6 +141,18 @@ function computeExtendedTimeout(baseTimeoutMs) {
   return Math.min(1800000, Math.max(base * 2, base + 120000));
 }
 
+// Reasoning models routinely blew the old 10min budget across a multi-turn
+// tool loop. Total per-task budget defaults to 30min and can be raised per
+// call, via --timeout-ms, or via UFOO_UCODE_TASK_TIMEOUT_MS.
+const DEFAULT_NL_TASK_TIMEOUT_MS = 1800000;
+
+function resolveNlTaskTimeoutMs(value) {
+  if (Number.isFinite(value) && value > 0) return Math.max(1000, Math.floor(value));
+  const env = Number(process.env.UFOO_UCODE_TASK_TIMEOUT_MS);
+  if (Number.isFinite(env) && env > 0) return Math.max(1000, Math.floor(env));
+  return DEFAULT_NL_TASK_TIMEOUT_MS;
+}
+
 function enrichNativeError(errorMessage = "") {
   const text = String(errorMessage || "").trim();
   if (!text) return "nl task failed";
@@ -168,6 +180,9 @@ function enrichNativeError(errorMessage = "") {
   ) {
     return `${text}. Check provider/url/key via /settings ucode show.`;
   }
+  if (lower.includes("cli timeout")) {
+    return `${text}. Task budget exceeded; raise it with --timeout-ms or UFOO_UCODE_TASK_TIMEOUT_MS.`;
+  }
   return text;
 }
 
@@ -394,7 +409,7 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
     state.provider || process.env.UFOO_UCODE_PROVIDER || ""
   );
   const model = String(state.model || process.env.UFOO_UCODE_MODEL || "").trim();
-  const timeoutMs = Number.isFinite(state.timeoutMs) ? state.timeoutMs : 600000;
+  const timeoutMs = resolveNlTaskTimeoutMs(state.timeoutMs);
   let streamed = false;
   let streamLastChar = "";
   let toolEventsThisAttempt = 0;
@@ -715,6 +730,8 @@ module.exports = {
   resolvePlannerProvider,
   extractJsonSummary,
   enrichNativeError,
+  resolveNlTaskTimeoutMs,
+  DEFAULT_NL_TASK_TIMEOUT_MS,
   resolveUcodeProviderModel,
   buildSessionSnapshotFromState,
   persistSessionState,

package/src/code/repl.js

@@ -249,7 +249,7 @@ async function runUcodeCoreAgent({
   appendSystemPrompt = "",
   systemPrompt = "",
   sessionId = "",
-  timeoutMs = 600000,
+  timeoutMs = 0,
   jsonOutput = false,
   forceTui = false,
   disableTui = false,
@@ -261,6 +261,7 @@ async function runUcodeCoreAgent({
     formatNlResult,
     persistSessionState,
     resumeSessionState,
+    resolveNlTaskTimeoutMs,
     resolveUcodeProviderModel,
     runNaturalLanguageTask,
   } = require("./agent");
@@ -284,7 +285,7 @@ async function runUcodeCoreAgent({
     }),
     nlMessages: [],
     sessionId: resolveSessionId(String(sessionId || "").trim()),
-    timeoutMs,
+    timeoutMs: resolveNlTaskTimeoutMs(Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : NaN),
     jsonOutput,
   };
   persistSessionState(state);
@@ -570,7 +571,7 @@ function parseAgentArgs(argv = []) {
     appendSystemPrompt: "",
     systemPrompt: "",
     sessionId: "",
-    timeoutMs: 600000,
+    timeoutMs: 0,
     jsonOutput: false,
     forceTui: false,
     disableTui: false,