u-foo 2.3.30 → 2.3.31

package/package.json

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

package/src/code/agent.js

@@ -491,6 +491,8 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
   const runNativeAgentImpl = typeof options.runNativeAgentImpl === "function"
     ? options.runNativeAgentImpl
     : runNativeAgentTask;
+  const onPhase = typeof options.onPhase === "function" ? options.onPhase : null;
+  const onThinkingDelta = typeof options.onThinkingDelta === "function" ? options.onThinkingDelta : null;
   const invokeNative = (sessionIdValue = "", timeoutOverrideMs = timeoutMs) => runNativeAgentImpl({
     workspaceRoot,
     provider,
@@ -501,6 +503,8 @@ async function runNaturalLanguageTask(task = "", state = {}, options = {}) {
     sessionId: String(sessionIdValue || ""),
     timeoutMs: timeoutOverrideMs,
     onStreamDelta: onStream,
+    onThinkingDelta,
+    onPhase,
     onToolEvent: (event) => {
       pushToolLog(event);
     },

package/src/code/nativeRunner.js

@@ -512,12 +512,23 @@ function runCoreTool({ tool = "", args = {}, workspaceRoot = process.cwd(), onTo
   return result;
 }
 
+function emitPhase(callback, event = {}) {
+  if (typeof callback !== "function") return;
+  try {
+    callback(event);
+  } catch {
+    // ignore phase callback failures
+  }
+}
+
 async function runOpenAiLikeTurn({
   url = "",
   apiKey = "",
   model = "",
   messages = [],
   onTextDelta = null,
+  onThinkingDelta = null,
+  onPhase = null,
   signal = null,
   timeoutMs = 300000,
 } = {}) {
@@ -540,6 +551,8 @@ async function runOpenAiLikeTurn({
 
   const request = createRequestController({ signal, timeoutMs });
 
+  emitPhase(onPhase, { type: "request_start" });
+
   try {
     const response = await fetch(url, {
       method: "POST",
@@ -574,6 +587,7 @@ async function runOpenAiLikeTurn({
     const toolCallMap = new Map();
     let rawBuffer = "";
     let responseText = "";
+    const announcedToolNames = new Set();
 
     while (true) {
       const { done, value } = await reader.read();
@@ -599,8 +613,19 @@ async function runOpenAiLikeTurn({
 
         const delta = choice.delta && typeof choice.delta === "object" ? choice.delta : {};
 
+        const reasoningChunk = typeof delta.reasoning_content === "string"
+          ? delta.reasoning_content
+          : (typeof delta.reasoning === "string" ? delta.reasoning : "");
+        if (reasoningChunk) {
+          emitPhase(onPhase, { type: "thinking_delta", text: reasoningChunk });
+          if (typeof onThinkingDelta === "function") {
+            onThinkingDelta(reasoningChunk);
+          }
+        }
+
         if (typeof delta.content === "string" && delta.content) {
           responseText += delta.content;
+          emitPhase(onPhase, { type: "text_delta", text: delta.content });
           if (typeof onTextDelta === "function") {
             onTextDelta(delta.content);
           }
@@ -629,6 +654,13 @@ async function runOpenAiLikeTurn({
             }
 
             toolCallMap.set(index, previous);
+
+            const toolName = previous.function.name;
+            const announceKey = `${index}:${toolName}`;
+            if (toolName && !announcedToolNames.has(announceKey)) {
+              announcedToolNames.add(announceKey);
+              emitPhase(onPhase, { type: "tool_request", name: toolName });
+            }
           }
         }
       }
@@ -716,6 +748,8 @@ async function runAnthropicTurn({
   systemPrompt = "",
   messages = [],
   onTextDelta = null,
+  onThinkingDelta = null,
+  onPhase = null,
   signal = null,
   timeoutMs = 300000,
 } = {}) {
@@ -741,6 +775,8 @@ async function runAnthropicTurn({
 
   const request = createRequestController({ signal, timeoutMs });
 
+  emitPhase(onPhase, { type: "request_start" });
+
   try {
     const response = await fetch(url, {
       method: "POST",
@@ -811,6 +847,12 @@ async function runAnthropicTurn({
               type: "text",
               text: String(contentBlock.text || ""),
             });
+          } else if (contentBlock.type === "thinking") {
+            blockMap.set(index, {
+              order: index,
+              type: "thinking",
+              text: String(contentBlock.thinking || ""),
+            });
           } else if (contentBlock.type === "tool_use") {
             blockMap.set(index, {
               order: index,
@@ -822,6 +864,10 @@ async function runAnthropicTurn({
                 : {},
               inputJson: "",
             });
+            const toolName = String(contentBlock.name || "");
+            if (toolName) {
+              emitPhase(onPhase, { type: "tool_request", name: toolName });
+            }
           }
           continue;
         }
@@ -840,6 +886,7 @@ async function runAnthropicTurn({
             blockMap.set(index, current);
             if (deltaText) {
               responseText += deltaText;
+              emitPhase(onPhase, { type: "text_delta", text: deltaText });
               if (typeof onTextDelta === "function") {
                 onTextDelta(deltaText);
               }
@@ -847,6 +894,20 @@ async function runAnthropicTurn({
             continue;
           }
 
+          if (delta.type === "thinking_delta") {
+            const deltaText = String(delta.thinking || "");
+            current.type = "thinking";
+            current.text = `${String(current.text || "")}${deltaText}`;
+            blockMap.set(index, current);
+            if (deltaText) {
+              emitPhase(onPhase, { type: "thinking_delta", text: deltaText });
+              if (typeof onThinkingDelta === "function") {
+                onThinkingDelta(deltaText);
+              }
+            }
+            continue;
+          }
+
           if (delta.type === "input_json_delta") {
             current.type = "tool_use";
             current.inputJson = `${String(current.inputJson || "")}${String(delta.partial_json || "")}`;
@@ -859,6 +920,7 @@ async function runAnthropicTurn({
 
     const assistantContent = Array.from(blockMap.values())
       .sort((a, b) => a.order - b.order)
+      .filter((item) => item.type !== "thinking")
       .map((item) => {
         if (item.type === "text") {
           return {
@@ -919,6 +981,8 @@ async function runNativeLoopOpenAi({
   apiKey = "",
   timeoutMs = 300000,
   onStreamDelta = null,
+  onThinkingDelta = null,
+  onPhase = null,
   onToolEvent = null,
   signal = null,
   guards,
@@ -957,6 +1021,8 @@ async function runNativeLoopOpenAi({
       messages,
       signal,
       timeoutMs,
+      onPhase,
+      onThinkingDelta,
       onTextDelta: (chunk) => {
         const text = String(chunk || "");
         if (!text) return;
@@ -1061,6 +1127,8 @@ async function runNativeLoopAnthropic({
   apiKey = "",
   timeoutMs = 300000,
   onStreamDelta = null,
+  onThinkingDelta = null,
+  onPhase = null,
   onToolEvent = null,
   signal = null,
   guards,
@@ -1098,6 +1166,8 @@ async function runNativeLoopAnthropic({
       messages,
       signal,
       timeoutMs,
+      onPhase,
+      onThinkingDelta,
       onTextDelta: (chunk) => {
         const text = String(chunk || "");
         if (!text) return;
@@ -1198,6 +1268,8 @@ async function runNativeAgentTask({
   sessionId = "",
   timeoutMs = 300000,
   onStreamDelta = null,
+  onThinkingDelta = null,
+  onPhase = null,
   onToolEvent = null,
   signal = null,
 } = {}) {
@@ -1238,6 +1310,8 @@ async function runNativeAgentTask({
       apiKey: runtime.apiKey,
       timeoutMs,
       onStreamDelta,
+      onThinkingDelta,
+      onPhase,
       onToolEvent,
       signal,
       guards,

package/src/code/tui.js

@@ -1615,29 +1615,44 @@ function runUcodeTui({
       }
 
       if (result.kind === "nl") {
-        const statusMessages = [
-          "Thinking...",
-          "Processing your request...",
-          "Analyzing...",
-          "Working on it...",
-        ];
-        const randomStatus = statusMessages[Math.floor(Math.random() * statusMessages.length)];
         const abortController = new AbortController();
         const escapeStripper = createEscapeTagStripper();
         pendingTask = {
           abortController,
           startedAt: Date.now(),
         };
-        updateStatus(randomStatus, "thinking", {
-          showTimer: true,
-          startedAt: pendingTask.startedAt,
-        });
+        const TOOL_LABELS = {
+          read: "Reading file",
+          write: "Writing file",
+          edit: "Editing file",
+          bash: "Running command",
+        };
+        const setNlStatus = (msg) => {
+          updateStatus(msg, "thinking", {
+            showTimer: true,
+            startedAt: pendingTask.startedAt,
+          });
+        };
+        setNlStatus("Waiting for model...");
         let streamState = null;
         let renderedToolLogCount = 0;
         let nlResult = null;
         try {
           nlResult = await runNaturalLanguageTask(result.task, state, {
             signal: abortController.signal,
+            onPhase: (event) => {
+              if (!event || typeof event !== "object") return;
+              if (event.type === "request_start") {
+                setNlStatus("Waiting for model...");
+              } else if (event.type === "thinking_delta") {
+                setNlStatus("Thinking...");
+              } else if (event.type === "text_delta") {
+                setNlStatus("Generating response...");
+              } else if (event.type === "tool_request") {
+                const label = TOOL_LABELS[String(event.name || "").toLowerCase()] || `Calling ${event.name}`;
+                setNlStatus(`${label}...`);
+              }
+            },
             onDelta: (delta) => {
               const text = escapeStripper.write(String(delta || ""));
               if (!text) return;
@@ -1648,6 +1663,10 @@ function runUcodeTui({
             },
             onToolLog: (entry) => {
               renderedToolLogCount += 1;
+              if (entry && entry.tool && entry.phase === "start") {
+                const label = TOOL_LABELS[String(entry.tool || "").toLowerCase()] || `Calling ${entry.tool}`;
+                setNlStatus(`${label}...`);
+              }
               logToolHint(entry);
             },
           });