u-foo 3.0.27 → 3.0.29

package/package.json

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

package/src/code/contextWindow.js

@@ -24,6 +24,8 @@ function contextTokensFromUsage(usage = null) {
   const input = toTokenCount(usage.input);
   const cacheRead = toTokenCount(usage.cacheRead);
   const cacheCreation = toTokenCount(usage.cacheCreation);
+  if (usage.inputIncludesCache === true) return input;
+  if (usage.inputIncludesCache === false) return input + cacheRead + cacheCreation;
   if (cacheCreation > 0) return input + cacheRead + cacheCreation;
   // Anthropic exclusive split: input can be smaller than cache_read alone.
   if (cacheRead > 0 && input < cacheRead) return input + cacheRead + cacheCreation;

package/src/code/nativeRunner.js

@@ -96,6 +96,7 @@ const DEFAULT_KIMI_MODEL = "k3";
 // for non-trivial tasks while still catching runaway loops. Override via env.
 const DEFAULT_MAX_NATIVE_TOOL_CALLS = 100;
 const DEFAULT_MAX_NATIVE_TOOL_ERRORS = 20;
+const MAX_EMPTY_TERMINAL_RETRIES = 2;
 const DEFAULT_NATIVE_TIMEOUT_MS = 43200000; // 12 hours
 /** Max text-only auto-continues while a plan is waiting on a task (per user submit). */
 const DEFAULT_MAX_PLAN_AUTO_CONTINUES = 24;
@@ -213,7 +214,8 @@ function readOpenAiUsage(raw) {
     input: toUsageInt(raw.prompt_tokens),
     output: toUsageInt(raw.completion_tokens),
     cacheRead: toUsageInt(details.cached_tokens),
-    cacheCreation: 0,
+    cacheCreation: toUsageInt(details.created_cache_tokens),
+    inputIncludesCache: true,
   };
 }
 
@@ -226,6 +228,7 @@ function readAnthropicUsage(raw, { includeOutput = false } = {}) {
     output: includeOutput ? toUsageInt(raw.output_tokens) : 0,
     cacheRead: toUsageInt(raw.cache_read_input_tokens),
     cacheCreation: toUsageInt(raw.cache_creation_input_tokens),
+    inputIncludesCache: false,
   };
 }
 
@@ -1431,7 +1434,13 @@ async function runAnthropicTurn({
   let responseText = "";
   let nextSyntheticBlockIndex = 0;
   let lastBlockIndex = -1;
-  const turnUsage = { input: 0, output: 0, cacheRead: 0, cacheCreation: 0 };
+  const turnUsage = {
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheCreation: 0,
+    inputIncludesCache: false,
+  };
 
   return runSseRequest({
     url,
@@ -1806,6 +1815,7 @@ async function runNativeLoop({
   let streamed = false;
   let toolCallsExecuted = 0;
   let toolErrors = 0;
+  let emptyTerminalRetries = 0;
   let executionState = initialExecutionState && typeof initialExecutionState === "object"
     ? initialExecutionState
     : emptyExecutionState();
@@ -1979,6 +1989,22 @@ async function runNativeLoop({
 
     if (toolCalls.length === 0) {
       const text = String(turnResult.text || "").trim();
+      if (!text && toolCallsExecuted > 0) {
+        if (emptyTerminalRetries >= MAX_EMPTY_TERMINAL_RETRIES) {
+          throw new Error("model returned an empty response after tool execution");
+        }
+        emptyTerminalRetries += 1;
+        providerMessages.push({
+          role: "user",
+          content: [
+            "Continue the current task after the tool results.",
+            "Call any remaining tools, or provide a concrete final answer to the user.",
+            "Do not end the turn with an empty response.",
+          ].join(" "),
+        });
+        continue;
+      }
+      emptyTerminalRetries = 0;
       const sideEffects = parseStructuredSideEffects(text);
       const planCommand = sideEffects ? normalizePlanGraphCommand(sideEffects) : null;
       if (planCommand) {
@@ -2032,6 +2058,7 @@ async function runNativeLoop({
 
     // A tool-using turn resets the empty auto-continue streak (progress possible).
     consecutiveEmptyAutoContinues = 0;
+    emptyTerminalRetries = 0;
 
     const pendingCalls = transport.prepareToolCalls({
       messages: providerMessages,

package/src/code/usageStore.js

@@ -59,9 +59,22 @@ function createUsageSummary() {
     output: 0,
     cacheRead: 0,
     cacheCreation: 0,
+    cacheInput: 0,
   };
 }
 
+function promptTokenTotal(row = {}) {
+  const input = toUsageCount(row.input);
+  const provider = String(row.provider || "").trim().toLowerCase();
+  // OpenAI-compatible usage.prompt_tokens already includes cached tokens.
+  // Anthropic reports uncached, cache-read, and cache-creation tokens as
+  // disjoint counters, so reconstruct the total prompt-token denominator.
+  if (provider === "anthropic") {
+    return input + toUsageCount(row.cacheRead) + toUsageCount(row.cacheCreation);
+  }
+  return input;
+}
+
 function summarizeSessionUsage({ workspaceRoot = process.cwd(), sessionId = "" } = {}) {
   const summary = createUsageSummary();
   const targetSessionId = String(sessionId || "").trim();
@@ -88,6 +101,7 @@ function summarizeSessionUsage({ workspaceRoot = process.cwd(), sessionId = "" }
     summary.output += toUsageCount(row.output);
     summary.cacheRead += toUsageCount(row.cacheRead);
     summary.cacheCreation += toUsageCount(row.cacheCreation);
+    summary.cacheInput += promptTokenTotal(row);
   }
   return summary;
 }
@@ -98,11 +112,14 @@ function formatSessionUsageStatus(summary = {}) {
   const output = Number(source.output) || 0;
   const cacheRead = Number(source.cacheRead) || 0;
   const cacheCreation = Number(source.cacheCreation) || 0;
-  const denominator = cacheRead + input;
+  const reportedCacheInput = Number(source.cacheInput);
+  const denominator = Number.isFinite(reportedCacheInput) && reportedCacheInput > 0
+    ? reportedCacheInput
+    : input;
   const hitRate = denominator > 0 ? (cacheRead / denominator) * 100 : 0;
   return [
     `Session tokens: input=${input} output=${output} cache_read=${cacheRead} cache_creation=${cacheCreation}`,
-    `Cache hit rate: ${hitRate.toFixed(1)}% (cache_read/(cache_read+input))`,
+    `Cache hit rate: ${hitRate.toFixed(1)}% (cache_read/prompt_input)`,
   ].join("\n");
 }
 

package/src/ui/format/index.js

@@ -835,7 +835,9 @@ function buildMergedToolExpandedLines(entries = []) {
     : [];
   const maxLength = 120;
   return list.map((item) => {
-    const base = `${formatToolDisplayName(item.tool)}${item.detail ? ` ${item.detail}` : ""}`;
+    const base = `${formatToolDisplayName(item.tool)}${item.detail ? ` ${item.detail}` : ""}`
+      .replace(/\s+/g, " ")
+      .trim();
     let line;
     if (!item.isError) {
       line = base;

package/src/ui/rustUcodeHost.js

@@ -203,6 +203,31 @@ function createThinkingLogPublisher(publish, thinkingStatus, streamId) {
   return { id, onThinkingDelta, stop };
 }
 
+function createLeadingWhitespaceNormalizer() {
+  let hasVisibleText = false;
+  return (delta) => {
+    const text = String(delta || "");
+    if (hasVisibleText || !text) return text;
+    const visible = text.replace(/^\s+/u, "");
+    if (!visible) return "";
+    hasVisibleText = true;
+    return visible;
+  };
+}
+
+function appendNaturalLanguageResult(nlResult, formatNlResult, appendLog) {
+  if (typeof formatNlResult !== "function" || typeof appendLog !== "function" || !nlResult) {
+    return false;
+  }
+  // Successful streamed text is already present in the mutable stream entry.
+  // Appending summary + formatted summary here duplicated the same answer.
+  if (nlResult.ok !== false && nlResult.streamed) return false;
+  const formatted = String(formatNlResult(nlResult) || "").trim();
+  if (!formatted) return false;
+  appendLog(formatted, nlResult.ok === false ? "error" : "assistant");
+  return true;
+}
+
 async function runUcodeRust(props = {}) {
   const plan = resolveTuiLaunchPlan({
     mode: props.tuiMode || process.env.UFOO_TUI || "rust",
@@ -562,6 +587,7 @@ async function runUcodeRust(props = {}) {
       thinking.reset();
       publish("stream.start", { id: streamId });
       const thinkingLog = createThinkingLogPublisher(publish, thinking, streamId);
+      const normalizeStreamDelta = createLeadingWhitespaceNormalizer();
       let responseStarted = false;
       const beginResponse = () => {
         if (responseStarted) return;
@@ -573,8 +599,10 @@ async function runUcodeRust(props = {}) {
         const result = await submit(answerText, props.state, {
           signal: abort.signal,
           onDelta: (delta) => {
+            const visibleDelta = normalizeStreamDelta(delta);
+            if (!visibleDelta) return;
             beginResponse();
-            publish("stream.delta", { id: streamId, text: String(delta || "") });
+            publish("stream.delta", { id: streamId, text: visibleDelta });
           },
           onThinkingDelta: (delta) => {
             if (!responseStarted) thinkingLog.onThinkingDelta(delta);
@@ -621,6 +649,7 @@ async function runUcodeRust(props = {}) {
       thinking.reset();
       publish("stream.start", { id: streamId });
       const thinkingLog = createThinkingLogPublisher(publish, thinking, streamId);
+      const normalizeStreamDelta = createLeadingWhitespaceNormalizer();
       let responseStarted = false;
       const beginResponse = () => {
         if (responseStarted) return;
@@ -632,8 +661,10 @@ async function runUcodeRust(props = {}) {
         const nlResult = await props.runNaturalLanguageTask(text, props.state, {
           signal: abort.signal,
           onDelta: (delta) => {
+            const visibleDelta = normalizeStreamDelta(delta);
+            if (!visibleDelta) return;
             beginResponse();
-            publish("stream.delta", { id: streamId, text: String(delta || "") });
+            publish("stream.delta", { id: streamId, text: visibleDelta });
           },
           onThinkingDelta: (delta) => {
             if (!responseStarted) thinkingLog.onThinkingDelta(delta);
@@ -656,11 +687,7 @@ async function runUcodeRust(props = {}) {
         tools.flush();
         thinkingLog.stop();
         publish("stream.done", { id: streamId });
-        if (nlResult && nlResult.summary) appendLog(nlResult.summary, "system");
-        if (typeof props.formatNlResult === "function" && nlResult) {
-          const formatted = props.formatNlResult(nlResult);
-          if (formatted) appendLog(formatted, "assistant");
-        }
+        appendNaturalLanguageResult(nlResult, props.formatNlResult, appendLog);
         persistIfNeeded();
         publishPlan();
         publishUsageFromResult(nlResult);
@@ -782,7 +809,7 @@ async function runUcodeRust(props = {}) {
       if (name === "task.cancel") {
         controller.cancelTask();
         publish("status.set", { text: "cancelling…", busy: true });
-        appendLog("⚙ Cancellation requested. Stopping the current task...", "system");
+        appendLog("• Cancellation requested. Stopping the current task...", "system");
         return { ok: true };
       }
       if (name === "completion.request") {
@@ -1070,6 +1097,8 @@ module.exports = {
   normalizeToolLogEntry,
   splitUcodeBannerRow,
   createThinkingLogPublisher,
+  createLeadingWhitespaceNormalizer,
+  appendNaturalLanguageResult,
   buildUcodeAgentsSnapshot,
   buildUcodeCompletionItems,
 };