@markusylisiurunen/tau 0.3.25 → 0.3.26

package/README.md

@@ -35,7 +35,7 @@ for built-in providers and features, use these `apiKeys` entries: `anthropic`, `
 
 `parallel` is only needed for `web_search`/`web_fetch` usage in sub-agents and can be provided through `apiKeys.parallel` or `PARALLEL_API_KEY` (`PARALLEL_API_KEY` takes precedence).
 
-`/listen` and Telegram audio transcription use Mistral by default (`apiKeys.mistral` or `MISTRAL_API_KEY`, with `MISTRAL_API_KEY` taking precedence). set `speechToText.provider` to `gemini` to use Gemini 3.5 Flash instead (`apiKeys.google` or `GEMINI_API_KEY`). `/listen` also requires `ffmpeg` on your system and is currently supported only on macOS.
+`/listen` and Telegram audio transcription use Mistral by default (`apiKeys.mistral` or `MISTRAL_API_KEY`, with `MISTRAL_API_KEY` taking precedence). set `speechToText.provider` to `gemini` to use Gemini 3.6 Flash instead (`apiKeys.google` or `GEMINI_API_KEY`). `/listen` also requires `ffmpeg` on your system and is currently supported only on macOS.
 
 `tau tool pdf-unpack` uses Mistral OCR (`apiKeys.mistral` or `MISTRAL_API_KEY`) and requires `pdftoppm` from Poppler on your system.
 
@@ -475,7 +475,7 @@ the prune commands drop bash tool results from the active context without summar
 
 `/listen` (or `ctrl+y`) starts microphone recording on macOS, including while the assistant is working. while recording, editor typing is disabled, and `ctrl+y` stops recording and starts transcription at the cursor using the configured speech-to-text provider. `esc` stops recording first without interrupting the assistant; press it again to interrupt active work. recording also auto-stops after 5 minutes. on Linux, `/listen` is currently unavailable and tau shows a warning.
 
-`/speak` rewrites the last assistant message into naturally speakable text with Gemini 3.5 Flash, synthesizes audio with Gemini 3.1 Flash TTS, and starts playing on macOS at 1.4x speed as soon as the first speech chunk is ready.
+`/speak` rewrites the last assistant message into naturally speakable text with Gemini 3.6 Flash, synthesizes audio with Gemini 3.1 Flash TTS, and starts playing on macOS at 1.4x speed as soon as the first speech chunk is ready.
 
 `/rewind` opens a picker over prior user messages in the current context. it truncates history from the selected message onward (including the selected message) and prefills the editor with that message so you can retry from there.
 
@@ -573,7 +573,7 @@ the `defaultPersona` field specifies which persona to use when starting the app.
 
 the `defaultTheme` field sets the theme id to load at startup. it must be non-empty, and matching is exact/case-sensitive. if not specified, it defaults to `gold`.
 
-`speechToText.provider` selects the `/listen` and Telegram audio transcription provider. supported values are `mistral` (default, uses Voxtral) and `gemini` (uses Gemini 3.5 Flash with minimal thinking).
+`speechToText.provider` selects the `/listen` and Telegram audio transcription provider. supported values are `mistral` (default, uses Voxtral) and `gemini` (uses Gemini 3.6 Flash with minimal thinking).
 
 `cloudflareSandbox.bridges` configures host-owned Cloudflare Sandbox bridge targets for hosted sessions. session requests refer to a bridge by id and a pre-existing sandbox id; Tau does not create sandboxes, clone repos, install dependencies, inject secrets, or run readiness checks during `session.create`. paths such as `cwd` are real paths inside the sandbox execution environment. Tau resolves session config/content from that execution environment cwd when creating the session and on `/reload`; bridge credentials stay on the host through either `apiKey` or `apiKeyEnv` and are not stored in session snapshots.
 
@@ -737,7 +737,7 @@ tau connects your terminal to large language models, giving them tools to intera
 
 the model sees your messages, any file contents you've shared, and the results of tool calls. it doesn't have ambient access to your filesystem; it only sees what you show it or what it explicitly requests through tools.
 
-tool calls are displayed in the UI so you can see exactly what the model is doing. use `ctrl+o` to toggle between compact and detailed views.
+tool calls are displayed as soon as the model identifies the tool, before its arguments finish streaming, so you can see what the model is preparing and executing. use `ctrl+o` to toggle between compact and detailed views.
 
 ## tool output truncation
 

package/dist/core/session/runner.js

@@ -1,17 +1,59 @@
 import { createToolError } from "../utils/messages.js";
 import { MessageAccumulator } from "./message_accumulator.js";
 const ASSISTANT_PARTIAL_MIN_INTERVAL_MS = 33;
+function getStreamingToolCallIdentity(event) {
+    const content = event.partial.content[event.contentIndex];
+    if (content?.type !== "toolCall" || !content.id.trim() || !content.name.trim()) {
+        return undefined;
+    }
+    return { toolCallId: content.id, toolName: content.name };
+}
 export async function* runModelSubturn(options) {
     const { model, context, modelRuntime, streamOptions, signal, emitPartials, retry } = options;
-    let hasEmittedToolCall = false;
+    let hasEmittedCompletedToolCall = false;
     const runAttempt = async function* (attemptOptions) {
         const stream = modelRuntime.streamModel(model, context, attemptOptions);
         const accumulator = emitPartials ? new MessageAccumulator() : undefined;
         let lastPartialEmittedAt = 0;
         let hasPendingPartial = false;
-        let emittedToolCallCount = 0;
+        let emittedCompletedToolCallCount = 0;
         const toolCallOrder = [];
         const completedToolCalls = new Map();
+        const streamingToolCalls = new Map();
+        const trackStreamingToolCall = (event) => {
+            const contentIndex = event.contentIndex;
+            const current = streamingToolCalls.get(contentIndex);
+            const next = getStreamingToolCallIdentity(event);
+            if (current &&
+                next &&
+                current.toolCallId === next.toolCallId &&
+                current.toolName === next.toolName) {
+                return undefined;
+            }
+            const duplicate = next
+                ? [...streamingToolCalls].some(([index, identity]) => index !== contentIndex && identity.toolCallId === next.toolCallId)
+                : false;
+            if (!next || duplicate) {
+                if (!current) {
+                    return undefined;
+                }
+                streamingToolCalls.delete(contentIndex);
+                return { type: "tool_call_discarded", toolCallId: current.toolCallId, contentIndex };
+            }
+            streamingToolCalls.set(contentIndex, next);
+            return { type: "tool_call_streaming", ...next, contentIndex };
+        };
+        const discardStreamingToolCalls = () => {
+            const events = [...streamingToolCalls]
+                .sort(([left], [right]) => left - right)
+                .map(([contentIndex, identity]) => ({
+                type: "tool_call_discarded",
+                toolCallId: identity.toolCallId,
+                contentIndex,
+            }));
+            streamingToolCalls.clear();
+            return events;
+        };
         const emitPartialIfPending = async function* () {
             if (!accumulator || !hasPendingPartial) {
                 return;
@@ -21,9 +63,9 @@ export async function* runModelSubturn(options) {
             if (!snapshot.hasTextStarted && !snapshot.hasAnyThinking && snapshot.toolCalls.length === 0) {
                 return;
             }
-            if (snapshot.toolCalls.length > emittedToolCallCount) {
-                hasEmittedToolCall = true;
-                emittedToolCallCount = snapshot.toolCalls.length;
+            if (snapshot.toolCalls.length > emittedCompletedToolCallCount) {
+                hasEmittedCompletedToolCall = true;
+                emittedCompletedToolCallCount = snapshot.toolCalls.length;
             }
             yield { type: "assistant_partial", snapshot };
             lastPartialEmittedAt = Date.now();
@@ -49,6 +91,10 @@ export async function* runModelSubturn(options) {
                     if (!accumulator) {
                         continue;
                     }
+                    const streamingEvent = trackStreamingToolCall(event);
+                    if (streamingEvent) {
+                        yield streamingEvent;
+                    }
                     if (toolCallOrder.includes(event.contentIndex)) {
                         throw new Error(`model stream started tool call index ${event.contentIndex} twice`);
                     }
@@ -56,10 +102,24 @@ export async function* runModelSubturn(options) {
                     toolCallOrder.sort((left, right) => left - right);
                     continue;
                 }
+                if (event.type === "toolcall_delta") {
+                    if (!accumulator) {
+                        continue;
+                    }
+                    const streamingEvent = trackStreamingToolCall(event);
+                    if (streamingEvent) {
+                        yield streamingEvent;
+                    }
+                    continue;
+                }
                 if (event.type === "toolcall_end") {
                     if (!accumulator) {
                         continue;
                     }
+                    const streamingEvent = trackStreamingToolCall(event);
+                    if (streamingEvent) {
+                        yield streamingEvent;
+                    }
                     if (!toolCallOrder.includes(event.contentIndex)) {
                         throw new Error(`model stream completed tool call at index ${event.contentIndex} without starting it`);
                     }
@@ -72,6 +132,7 @@ export async function* runModelSubturn(options) {
                         }
                         toolCallOrder.shift();
                         completedToolCalls.delete(contentIndex);
+                        streamingToolCalls.delete(contentIndex);
                         accumulator.processEvent(completed);
                         hasPendingPartial = true;
                         yield* emitPartialIfPending();
@@ -81,9 +142,15 @@ export async function* runModelSubturn(options) {
         }
         catch (error) {
             yield* emitPartialIfPending();
+            for (const discarded of discardStreamingToolCalls()) {
+                yield discarded;
+            }
             throw error;
         }
         yield* emitPartialIfPending();
+        for (const discarded of discardStreamingToolCalls()) {
+            yield discarded;
+        }
         return await stream.result();
     };
     const retryNotice = retry?.notice
@@ -119,7 +186,7 @@ export async function* runModelSubturn(options) {
     while (true) {
         try {
             const result = yield* runAttempt(streamOptions);
-            if (!hasEmittedToolCall &&
+            if (!hasEmittedCompletedToolCall &&
                 attempt < maxRetries &&
                 retry?.shouldRetryAfterError?.({ error: result, model })) {
                 attempt += 1;
@@ -136,7 +203,7 @@ export async function* runModelSubturn(options) {
             return result;
         }
         catch (error) {
-            if (!hasEmittedToolCall &&
+            if (!hasEmittedCompletedToolCall &&
                 attempt < maxRetries &&
                 retry?.shouldRetryAfterError?.({ error, model })) {
                 attempt += 1;
@@ -177,14 +244,27 @@ function prepareToolCall(toolCall, options) {
     }
     return { type: "ready", toolCall, definition };
 }
-function createToolQueuedEvent(toolCall) {
+function createToolQueuedEvent(prepared, context) {
+    const { toolCall, definition } = prepared;
     return {
         type: "tool_ui",
         uiEvent: {
             type: "tool_call_queued",
             toolCallId: toolCall.id,
             toolName: toolCall.name,
-            headerTarget: toolCall.name,
+            headerTarget: definition.getDisplayTarget(toolCall, context),
+        },
+    };
+}
+function createToolBlockedEvent(result, reason) {
+    return {
+        type: "tool_ui",
+        uiEvent: {
+            type: "tool_call_blocked",
+            toolCallId: result.toolCallId,
+            toolName: result.toolName,
+            headerTarget: result.toolName,
+            reason,
         },
     };
 }
@@ -205,14 +285,14 @@ export class SequentialToolCallRunner {
     enqueue(toolCall) {
         const prepared = prepareToolCall(toolCall, this.options);
         this.enqueuePrepared(prepared);
-        return prepared.type === "ready" ? createToolQueuedEvent(toolCall) : undefined;
+        return prepared.type === "ready"
+            ? createToolQueuedEvent(prepared, this.options.dispatchContext)
+            : createToolBlockedEvent(prepared.result, prepared.message);
     }
     enqueueRejected(toolCall, message) {
-        this.enqueuePrepared({
-            type: "rejected",
-            message,
-            result: createToolError(toolCall, message),
-        });
+        const result = createToolError(toolCall, message);
+        this.enqueuePrepared({ type: "rejected", message, result });
+        return createToolBlockedEvent(result, message);
     }
     enqueuePrepared(prepared) {
         if (this.finished) {
@@ -324,6 +404,7 @@ export async function* runToolCalls(options) {
             continue;
         }
         resultsByIndex.set(index, prepared.result);
+        yield createToolBlockedEvent(prepared.result, prepared.message);
         yield { type: "notice", severity: "error", text: prepared.message };
     }
     for (const prepared of preparedCalls) {
@@ -331,7 +412,7 @@ export async function* runToolCalls(options) {
             break;
         }
         if (prepared.type === "ready") {
-            yield createToolQueuedEvent(prepared.toolCall);
+            yield createToolQueuedEvent(prepared, dispatchContext);
         }
     }
     for (const [index, prepared] of preparedCalls.entries()) {

package/dist/core/session/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/core/session/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/core/session/runner.ts"],"names":[],"mappings":"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"}

package/dist/core/session/session_engine.js

@@ -829,8 +829,9 @@ export class SessionEngine {
         const toolStream = toolRunner[Symbol.asyncIterator]();
         const pendingToolResults = [];
         const recoveryToolResults = [];
-        const streamedToolCalls = [];
-        const streamedToolCallIds = new Set();
+        const admittedToolCalls = [];
+        const admittedToolCallIds = new Set();
+        const streamingToolCallIdsByContentIndex = new Map();
         let modelDone = false;
         let toolDone = false;
         let shouldNoteProviderError = false;
@@ -857,7 +858,7 @@ export class SessionEngine {
                         finalMessage = next.result.value;
                         void toolRunner.finish().catch(() => undefined);
                         try {
-                            const reconciliation = reconcileStreamedToolCalls(finalMessage, streamedToolCalls);
+                            const reconciliation = reconcileAdmittedToolCalls(finalMessage, admittedToolCalls);
                             finalMessage = reconciliation.message;
                             toolRecoveryMode = reconciliation.recover
                                 ? finalMessage.stopReason === "aborted" || signal.aborted
@@ -922,46 +923,93 @@ export class SessionEngine {
                     }
                     const event = next.result.value;
                     modelNext = modelStream.next().then((result) => ({ source: "model", result }), (error) => ({ source: "model_error", error }));
+                    if (event.type === "tool_call_streaming") {
+                        const replacesToolCallId = streamingToolCallIdsByContentIndex.get(event.contentIndex);
+                        if (signal.aborted || admittedToolCallIds.has(event.toolCallId)) {
+                            if (replacesToolCallId) {
+                                streamingToolCallIdsByContentIndex.delete(event.contentIndex);
+                                const discardedEvent = {
+                                    type: "tool_call_discarded",
+                                    historyEntryId,
+                                    toolCallId: replacesToolCallId,
+                                    contentIndex: event.contentIndex,
+                                };
+                                this.emitEvent(discardedEvent);
+                                yield discardedEvent;
+                            }
+                            continue;
+                        }
+                        streamingToolCallIdsByContentIndex.set(event.contentIndex, event.toolCallId);
+                        const streamingEvent = {
+                            type: "tool_call_streaming",
+                            historyEntryId,
+                            toolCallId: event.toolCallId,
+                            toolName: event.toolName,
+                            contentIndex: event.contentIndex,
+                            ...(replacesToolCallId ? { replacesToolCallId } : {}),
+                        };
+                        this.emitEvent(streamingEvent);
+                        yield streamingEvent;
+                        continue;
+                    }
+                    if (event.type === "tool_call_discarded") {
+                        if (streamingToolCallIdsByContentIndex.get(event.contentIndex) !== event.toolCallId) {
+                            continue;
+                        }
+                        streamingToolCallIdsByContentIndex.delete(event.contentIndex);
+                        const discardedEvent = {
+                            type: "tool_call_discarded",
+                            historyEntryId,
+                            toolCallId: event.toolCallId,
+                            contentIndex: event.contentIndex,
+                        };
+                        this.emitEvent(discardedEvent);
+                        yield discardedEvent;
+                        continue;
+                    }
                     if (event.type === "assistant_partial") {
                         if (signal.aborted) {
                             continue;
                         }
-                        const queuedEvents = [];
-                        for (const streamedToolCall of event.snapshot.toolCalls.slice(streamedToolCalls.length)) {
-                            const invalidId = !streamedToolCall.id.trim();
-                            const duplicateId = streamedToolCallIds.has(streamedToolCall.id);
+                        const admissionEvents = [];
+                        for (const admittedToolCall of event.snapshot.toolCalls.slice(admittedToolCalls.length)) {
+                            const invalidId = !admittedToolCall.id.trim();
+                            const duplicateId = admittedToolCallIds.has(admittedToolCall.id);
                             if (!invalidId && !duplicateId) {
-                                streamedToolCallIds.add(streamedToolCall.id);
-                                streamedToolCalls.push(streamedToolCall);
-                                const queuedEvent = toolRunner.enqueue(streamedToolCall);
-                                if (queuedEvent) {
-                                    queuedEvents.push(queuedEvent);
+                                admittedToolCallIds.add(admittedToolCall.id);
+                                admittedToolCalls.push(admittedToolCall);
+                                for (const [contentIndex, toolCallId] of streamingToolCallIdsByContentIndex) {
+                                    if (toolCallId === admittedToolCall.id) {
+                                        streamingToolCallIdsByContentIndex.delete(contentIndex);
+                                        break;
+                                    }
                                 }
+                                admissionEvents.push(toolRunner.enqueue(admittedToolCall));
                                 continue;
                             }
                             const toolCall = {
-                                ...streamedToolCall,
+                                ...admittedToolCall,
                                 id: `invalid-tool-call-${randomUUID()}`,
                             };
                             const message = invalidId
                                 ? "Model returned a tool call with an empty ID."
-                                : `Model returned duplicate tool call ID '${streamedToolCall.id}'.`;
-                            streamedToolCalls.push(toolCall);
-                            toolRunner.enqueueRejected(toolCall, message);
+                                : `Model returned duplicate tool call ID '${admittedToolCall.id}'.`;
+                            admittedToolCalls.push(toolCall);
+                            admissionEvents.push(toolRunner.enqueueRejected(toolCall, message));
                         }
                         const partialEvent = {
                             type: "assistant_partial",
                             historyEntryId,
                             snapshot: {
                                 ...event.snapshot,
-                                toolCalls: [...streamedToolCalls],
+                                toolCalls: [...admittedToolCalls],
                             },
                         };
                         this.emitEvent(partialEvent);
                         yield partialEvent;
-                        for (const queuedEvent of queuedEvents) {
-                            this.emitEvent(queuedEvent);
-                            yield queuedEvent;
+                        for (const admissionEvent of admissionEvents) {
+                            this.emitEvent(admissionEvent);
+                            yield admissionEvent;
                         }
                         continue;
                     }
@@ -999,7 +1047,7 @@ export class SessionEngine {
             if (toolRecoveryMode && finalMessage) {
                 const timestamp = this.deps.clock.now();
                 const recoveryResultsByToolCallId = new Map(recoveryToolResults.map((toolResult) => [toolResult.toolCallId, toolResult]));
-                const completeRecoveryToolResults = streamedToolCalls.map((toolCall) => recoveryResultsByToolCallId.get(toolCall.id) ?? {
+                const completeRecoveryToolResults = admittedToolCalls.map((toolCall) => recoveryResultsByToolCallId.get(toolCall.id) ?? {
                     role: "toolResult",
                     toolCallId: toolCall.id,
                     toolName: toolCall.name,
@@ -1014,7 +1062,7 @@ export class SessionEngine {
                 });
                 const recoveryMessage = buildToolRecoveryUserMessage({
                     errorMessage: finalMessage.errorMessage,
-                    toolCalls: streamedToolCalls,
+                    toolCalls: admittedToolCalls,
                     toolResults: completeRecoveryToolResults,
                     continueOriginalRequest: toolRecoveryMode === "continue",
                     timestamp,
@@ -1067,10 +1115,10 @@ function consumeSubturnRetry(budget) {
     budget.remaining -= 1;
     return true;
 }
-function reconcileStreamedToolCalls(message, streamedToolCalls) {
+function reconcileAdmittedToolCalls(message, admittedToolCalls) {
     const finalToolCalls = message.content.filter((content) => content.type === "toolCall");
     const isTerminalFailure = message.stopReason === "error" || message.stopReason === "aborted";
-    if (streamedToolCalls.length === 0) {
+    if (admittedToolCalls.length === 0) {
         if (!isTerminalFailure && finalToolCalls.length > 0) {
             throw new Error(`model stream completed without toolcall_end for '${finalToolCalls[0].id}'`);
         }
@@ -1084,7 +1132,7 @@ function reconcileStreamedToolCalls(message, streamedToolCalls) {
             recover: false,
         };
     }
-    if (message.stopReason === "toolUse" && isDeepStrictEqual(finalToolCalls, streamedToolCalls)) {
+    if (message.stopReason === "toolUse" && isDeepStrictEqual(finalToolCalls, admittedToolCalls)) {
         return { message, recover: false };
     }
     const errorMessage = isTerminalFailure
@@ -1097,7 +1145,7 @@ function reconcileStreamedToolCalls(message, streamedToolCalls) {
             ...message,
             content: [
                 ...message.content.filter((content) => content.type !== "toolCall"),
-                ...streamedToolCalls,
+                ...admittedToolCalls,
             ],
             ...(isTerminalFailure ? {} : { stopReason: "error", errorMessage }),
         },