@markusylisiurunen/tau 0.3.80 → 0.3.81

package/dist/sdk/code_mode.js

@@ -1,4 +1,4 @@
-import { createTauCodeModeExecutionEnvironmentFiles, executeTauCodeMode, validateTauCodeModeDefinition, } from "../code_mode/runtime.js";
+import { CODE_MODE_MAX_OUTPUT_TOKENS_DESCRIPTION, executeTauCodeMode, parseCodeModeArguments, TAU_CODE_MODE_MAX_OUTPUT_TOKENS, validateTauCodeModeDefinition, } from "../code_mode/runtime.js";
 import { truncateTauClientToolText } from "./client_tool_presentation.js";
 export function createTauCodeModeClientTool(options) {
     const definition = {
@@ -19,9 +19,15 @@ export function createTauCodeModeClientTool(options) {
             parameters: {
                 type: "object",
                 properties: {
+                    maxOutputTokens: {
+                        type: "integer",
+                        minimum: 1,
+                        maximum: TAU_CODE_MODE_MAX_OUTPUT_TOKENS,
+                        description: CODE_MODE_MAX_OUTPUT_TOKENS_DESCRIPTION,
+                    },
                     code: {
                         type: "string",
-                        description: "JavaScript source to execute. Use console output for text and await image(block) to return images.",
+                        description: "JavaScript source to execute. Use printText(text) for text and await printImage(block) to return images.",
                     },
                 },
                 required: ["code"],
@@ -29,12 +35,13 @@ export function createTauCodeModeClientTool(options) {
             },
             ...(options.timeoutMs === undefined ? {} : { executionTimeoutMs: options.timeoutMs }),
         },
-        describe: (args) => createCodeModePresentation(parseCodeArguments(args)),
+        describe: (args) => createCodeModePresentation(parseCodeModeArguments(args).code),
         execute: async (args, context) => {
-            const code = parseCodeArguments(args);
+            const { code, maxOutputTokens } = parseCodeModeArguments(args);
             const result = await executeTauCodeMode({
                 ...definition,
                 code,
+                maxOutputTokens,
                 signal: context.signal,
                 invocation: {
                     sessionId: context.sessionId,
@@ -42,7 +49,6 @@ export function createTauCodeModeClientTool(options) {
                     callId: context.callId,
                 },
                 executionEnvironment: context.executionEnvironment,
-                files: createTauCodeModeExecutionEnvironmentFiles(context.agentId, context.executionEnvironment),
             });
             return { ...result, presentation: createCodeModePresentation(code) };
         },
@@ -54,16 +60,4 @@ function createCodeModePresentation(code) {
         subjectWrap: "character",
     };
 }
-function parseCodeArguments(value) {
-    if (typeof value !== "object" || value === null) {
-        throw new Error("code-mode client tool arguments must be an object");
-    }
-    const args = value;
-    if (typeof args.code !== "string" ||
-        !args.code.trim() ||
-        Object.keys(args).some((key) => key !== "code")) {
-        throw new Error("code-mode client tool arguments must contain exactly one non-empty 'code' string");
-    }
-    return args.code;
-}
 //# sourceMappingURL=code_mode.js.map

package/dist/sdk/code_mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"code_mode.js","sourceRoot":"","sources":["../../src/sdk/code_mode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"code_mode.js","sourceRoot":"","sources":["../../src/sdk/code_mode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uCAAuC,EACvC,kBAAkB,EAClB,sBAAsB,EACtB,+BAA+B,EAE/B,6BAA6B,GAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAO1E,MAAM,UAAU,2BAA2B,CACzC,OAAwC;IAExC,MAAM,UAAU,GAA0B;QACxC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5E,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;KACzF,CAAC;IACF,6BAA6B,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,eAAe,EAAE;wBACf,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,CAAC;wBACV,OAAO,EAAE,+BAA+B;wBACxC,WAAW,EAAE,uCAAuC;qBACrD;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;wBACd,WAAW,EACT,0GAA0G;qBAC7G;iBACF;gBACD,QAAQ,EAAE,CAAC,MAAM,CAAC;gBAClB,oBAAoB,EAAE,KAAK;aAC5B;YACD,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;SACtF;QACD,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;QACjF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC/D,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;gBACtC,GAAG,UAAU;gBACb,IAAI;gBACJ,eAAe;gBACf,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE;oBACV,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB;gBACD,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;aACnD,CAAC,CAAC;YACH,OAAO,EAAE,GAAG,MAAM,EAAE,YAAY,EAAE,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC;QACvE,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAY;IAC9C,OAAO;QACL,OAAO,EAAE,yBAAyB,CAAC,IAAI,CAAC;QACxC,WAAW,EAAE,WAAoB;KAClC,CAAC;AACJ,CAAC"}

package/dist/sdk/index.d.ts

@@ -1,5 +1,5 @@
 export type { BuildTauCodeModeToolDescriptionOptions, ExecuteTauCodeModeOptions, TauCodeModeApi, TauCodeModeDefinition, TauCodeModeExecutionStatus, TauCodeModeHandler, TauCodeModeHandlerContext, TauCodeModeInvocation, TauCodeModeJsonValue, TauCodeModePersistOutput, TauCodeModeResult, } from "../code_mode/runtime.js";
-export { buildTauCodeModeToolDescription, executeTauCodeMode, TAU_CODE_MODE_DEFAULT_TIMEOUT_MS, TAU_CODE_MODE_MAX_OUTPUT_TOKENS, } from "../code_mode/runtime.js";
+export { buildTauCodeModeToolDescription, executeTauCodeMode, TAU_CODE_MODE_DEFAULT_MAX_OUTPUT_TOKENS, TAU_CODE_MODE_DEFAULT_TIMEOUT_MS, TAU_CODE_MODE_MAX_OUTPUT_TOKENS, } from "../code_mode/runtime.js";
 export type { SessionProtocolDelta, SessionProtocolFeedbackEvent, SessionProtocolFeedbackTone, SessionProtocolPendingUserMessage, SessionProtocolPendingUserMessagesMessage, SessionProtocolPendingUserMessagesState, SessionProtocolSnapshot, SessionProtocolSubagentActivitiesAgentState, SessionProtocolSubagentActivitiesChange, SessionProtocolSubagentActivitiesMessage, SessionProtocolSubagentActivitiesState, SessionProtocolSubagentActivity, SessionProtocolTurnRecord, } from "../protocol/index.js";
 export { applySessionProtocolDelta, applySessionProtocolSubagentActivitiesMessage, } from "../protocol/index.js";
 export type { SessionProtocolDeltaListener, SessionProtocolEphemeralListener, SessionProtocolFailureListener, SessionProtocolPendingUserMessagesListener, SessionProtocolSubagentActivitiesListener, SessionProtocolTransport, TauSessionProtocolError, TauSessionProtocolErrorCode, WebSocketSessionProtocolTransportOptions, } from "../transport/index.js";

package/dist/sdk/index.js

@@ -1,4 +1,4 @@
-export { buildTauCodeModeToolDescription, executeTauCodeMode, TAU_CODE_MODE_DEFAULT_TIMEOUT_MS, TAU_CODE_MODE_MAX_OUTPUT_TOKENS, } from "../code_mode/runtime.js";
+export { buildTauCodeModeToolDescription, executeTauCodeMode, TAU_CODE_MODE_DEFAULT_MAX_OUTPUT_TOKENS, TAU_CODE_MODE_DEFAULT_TIMEOUT_MS, TAU_CODE_MODE_MAX_OUTPUT_TOKENS, } from "../code_mode/runtime.js";
 export { applySessionProtocolDelta, applySessionProtocolSubagentActivitiesMessage, } from "../protocol/index.js";
 export { TauSessionClientError, TauSessionProtocolResponseError, TauTransportError, WebSocketSessionProtocolTransport, } from "../transport/index.js";
 export { createTauSdkClient, createTauSdkWebSocketClient } from "./client.js";

package/dist/sdk/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sdk/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,+BAA+B,EAC/B,kBAAkB,EAClB,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,yBAAyB,CAAC;AAgBjC,OAAO,EACL,yBAAyB,EACzB,6CAA6C,GAC9C,MAAM,sBAAsB,CAAC;AAY9B,OAAO,EACL,qBAAqB,EACrB,+BAA+B,EAC/B,iBAAiB,EACjB,iCAAiC,GAClC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EACL,uBAAuB,EACvB,wCAAwC,GAIzC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,2BAA2B,GAE5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,qBAAqB,GAKtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAgE/D,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhG,MAAM,UAAU,0BAA0B,CACxC,QAAgE,EAChE,kBAA0B;IAE1B,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;QACtD,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC;QACpC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,QAAgE,EAChE,kBAA0B;IAE1B,MAAM,MAAM,GAAG,0BAA0B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IACxE,OAAO,MAAM,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sdk/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,+BAA+B,EAC/B,kBAAkB,EAClB,uCAAuC,EACvC,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,yBAAyB,CAAC;AAgBjC,OAAO,EACL,yBAAyB,EACzB,6CAA6C,GAC9C,MAAM,sBAAsB,CAAC;AAY9B,OAAO,EACL,qBAAqB,EACrB,+BAA+B,EAC/B,iBAAiB,EACjB,iCAAiC,GAClC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EACL,uBAAuB,EACvB,wCAAwC,GAIzC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,2BAA2B,GAE5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAGL,qBAAqB,GAKtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAgE/D,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhG,MAAM,UAAU,0BAA0B,CACxC,QAAgE,EAChE,kBAA0B;IAE1B,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;QACtD,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC;QACpC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,QAAgE,EAChE,kBAA0B;IAE1B,MAAM,MAAM,GAAG,0BAA0B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IACxE,OAAO,MAAM,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC"}

package/dist/tui/session_chat_controller.js

@@ -586,13 +586,18 @@ export class SessionChatController {
             this.view.showFooterNotice("interrupted", "default");
             return;
         }
-        if (this.listenStartupAbortController) {
-            this.listenStartupAbortController.abort(LISTEN_CAPTURE_START_CANCELLED);
-            this.view.showFooterNotice("interrupted", "default");
-            return;
-        }
-        if (this.listenRecording) {
-            void this.runListenTransition(() => this.stopListenCapture());
+        if (this.listenStartupAbortController ||
+            this.listenRecording ||
+            this.listenTransition ||
+            this.listenPreview) {
+            this.listenStartupAbortController?.abort(LISTEN_CAPTURE_START_CANCELLED);
+            this.activeListenTranscription?.abort();
+            this.endListenPreview();
+            this.listenActivityLabel = undefined;
+            if (this.listenRecording) {
+                void this.runListenTransition(() => this.cancelListenCapture());
+            }
+            this.refreshStatus();
             return;
         }
         if (this.speakTask) {
@@ -668,14 +673,24 @@ export class SessionChatController {
             return;
         }
         this.pendingAutoSpeak = undefined;
-        await this.runListenTransition(async () => {
-            if (this.speakTask) {
-                this.speakTask.abortController.abort();
-                await this.speakTask.completion.catch(() => { });
+        const abortController = new AbortController();
+        this.listenStartupAbortController = abortController;
+        try {
+            await this.runListenTransition(async () => {
+                if (this.speakTask) {
+                    this.speakTask.abortController.abort();
+                    await this.speakTask.completion.catch(() => { });
+                }
+                if (!this.disposed && !abortController.signal.aborted) {
+                    await this.startListenCapture(abortController);
+                }
+            });
+        }
+        finally {
+            if (this.listenStartupAbortController === abortController) {
+                this.listenStartupAbortController = undefined;
             }
-            if (!this.disposed)
-                await this.startListenCapture();
-        });
+        }
     }
     async runListenTransition(task) {
         if (this.listenTransition) {
@@ -692,7 +707,7 @@ export class SessionChatController {
             }
         }
     }
-    async startListenCapture() {
+    async startListenCapture(abortController) {
         if (this.deps.env.platform() !== "darwin") {
             this.view.showFooterNotice("/listen is currently supported only on macOS.", "default");
             return;
@@ -708,15 +723,14 @@ export class SessionChatController {
         const retainedAudio = this.retainedListenAudio;
         let audioPath;
         let transcription;
-        let abortController;
         let completion;
         try {
             audioPath = await createListenTempFilePath(this.deps);
             if (this.disposed)
                 throw new Error("speech recording startup cancelled");
+            abortController.signal.throwIfAborted();
             transcription = this.createSpeechTranscription("streaming");
-            abortController = new AbortController();
-            this.listenStartupAbortController = abortController;
+            this.activeListenTranscription = transcription;
             const capture = startListenAudioCapture({
                 deps: this.deps,
                 audioPath,
@@ -726,12 +740,7 @@ export class SessionChatController {
             });
             completion = capture.completion;
             await this.waitForListenCaptureStart(capture.started, abortController);
-            if (abortController.signal.aborted) {
-                throw abortController.signal.reason;
-            }
-            if (this.listenStartupAbortController === abortController) {
-                this.listenStartupAbortController = undefined;
-            }
+            abortController.signal.throwIfAborted();
             if (retainedAudio) {
                 try {
                     await deleteListenTempFile(retainedAudio.audioPath);
@@ -744,13 +753,16 @@ export class SessionChatController {
                     transcription.abort();
                     await completion.catch(() => undefined);
                     await cleanupListenTempFile(audioPath);
-                    this.view.addTranscriptNotice("failed to replace retained recording", "error", [
-                        error.message,
-                        `recording retained at ${retainedAudio.audioPath}`,
-                    ]);
+                    if (abortController.signal.reason !== LISTEN_CAPTURE_START_CANCELLED && !this.disposed) {
+                        this.view.addTranscriptNotice("failed to replace retained recording", "error", [
+                            error.message,
+                            `recording retained at ${retainedAudio.audioPath}`,
+                        ]);
+                    }
                     return;
                 }
             }
+            abortController.signal.throwIfAborted();
             const recording = {
                 audioPath,
                 startedAt: Date.now(),
@@ -769,8 +781,8 @@ export class SessionChatController {
             void this.watchListenRecording(recording);
         }
         catch (err) {
-            const cancelled = this.disposed || abortController?.signal.reason === LISTEN_CAPTURE_START_CANCELLED;
-            abortController?.abort();
+            const cancelled = this.disposed || abortController.signal.reason === LISTEN_CAPTURE_START_CANCELLED;
+            abortController.abort();
             transcription?.abort();
             await completion?.catch(() => undefined);
             if (audioPath) {
@@ -783,11 +795,9 @@ export class SessionChatController {
             }
         }
         finally {
+            this.activeListenTranscription = undefined;
             if (!this.listenRecording)
                 this.endListenPreview();
-            if (this.listenStartupAbortController === abortController) {
-                this.listenStartupAbortController = undefined;
-            }
         }
     }
     async waitForListenCaptureStart(started, abortController) {
@@ -814,25 +824,41 @@ export class SessionChatController {
         const recording = this.listenRecording;
         if (!recording)
             return;
+        const preview = this.listenPreview;
         recording.stopRequested = true;
         this.clearListenRecordingMaxDurationTimeout(recording);
         this.listenRecording = undefined;
+        this.activeListenTranscription = recording.transcription;
         this.refreshStatus();
         recording.abortController.abort();
         try {
-            await recording.completion;
+            try {
+                await recording.completion;
+            }
+            catch (err) {
+                if (this.listenPreview === preview) {
+                    this.view.addTranscriptNotice("failed to record audio", "error", [
+                        err.message,
+                    ]);
+                }
+                recording.transcription.abort();
+                this.endListenPreview();
+                await cleanupListenTempFile(recording.audioPath);
+                return;
+            }
+            if (this.listenPreview !== preview || this.disposed) {
+                recording.transcription.abort();
+                await cleanupListenTempFile(recording.audioPath);
+                return;
+            }
+            const durationMs = Math.min(Math.max(Date.now() - recording.startedAt, 0), SPEECH_TO_TEXT_CLIENT_MAX_DURATION_MS);
+            const transcribed = await this.transcribeListenAudioFile(recording.audioPath, durationMs, recording.transcription);
+            if (mode && transcribed && !this.disposed)
+                this.view.submitEditor(mode);
         }
-        catch (err) {
-            recording.transcription.abort();
-            this.endListenPreview();
-            this.view.addTranscriptNotice("failed to record audio", "error", [err.message]);
-            await cleanupListenTempFile(recording.audioPath);
-            return;
+        finally {
+            this.activeListenTranscription = undefined;
         }
-        const durationMs = Math.min(Math.max(Date.now() - recording.startedAt, 0), SPEECH_TO_TEXT_CLIENT_MAX_DURATION_MS);
-        const transcribed = await this.transcribeListenAudioFile(recording.audioPath, durationMs, recording.transcription);
-        if (mode && transcribed && !this.disposed)
-            this.view.submitEditor(mode);
     }
     async retryRetainedListenAudio() {
         if (this.pendingEditorMutations > 0) {
@@ -929,26 +955,28 @@ export class SessionChatController {
             }
             catch (error) {
                 transcription?.abort();
-                this.view.addTranscriptNotice("failed to read speech recording", "error", [
-                    error.message,
-                ]);
+                if (this.listenPreview === preview) {
+                    this.view.addTranscriptNotice("failed to read speech recording", "error", [
+                        error.message,
+                    ]);
+                }
                 if (this.retainedListenAudio?.audioPath === audioPath) {
                     this.retainedListenAudio = undefined;
                 }
                 await cleanupListenTempFile(audioPath);
                 return false;
             }
-            if (audio.byteLength < LISTEN_RECORDING_MIN_BYTES) {
+            if (this.disposed || this.listenPreview !== preview) {
                 transcription?.abort();
-                this.view.showFooterNotice("recording too short, try again", "default");
                 if (this.retainedListenAudio?.audioPath === audioPath) {
                     this.retainedListenAudio = undefined;
                 }
                 await cleanupListenTempFile(audioPath);
                 return false;
             }
-            if (this.disposed) {
+            if (audio.byteLength < LISTEN_RECORDING_MIN_BYTES) {
                 transcription?.abort();
+                this.view.showFooterNotice("recording too short, try again", "default");
                 if (this.retainedListenAudio?.audioPath === audioPath) {
                     this.retainedListenAudio = undefined;
                 }
@@ -967,10 +995,6 @@ export class SessionChatController {
                 });
                 if (this.listenPreview !== preview)
                     return false;
-                preview.commit(text);
-                if (text.trim() && !this.editorHiddenSystemMessages.includes(TRANSCRIPTION_GUIDANCE)) {
-                    this.editorHiddenSystemMessages.push(TRANSCRIPTION_GUIDANCE);
-                }
                 this.retainedListenAudio = undefined;
                 try {
                     await deleteListenTempFile(audioPath);
@@ -981,9 +1005,17 @@ export class SessionChatController {
                         `recording remains at ${audioPath}; delete it manually`,
                     ]);
                 }
+                if (this.listenPreview !== preview)
+                    return false;
+                preview.commit(text);
+                if (text.trim() && !this.editorHiddenSystemMessages.includes(TRANSCRIPTION_GUIDANCE)) {
+                    this.editorHiddenSystemMessages.push(TRANSCRIPTION_GUIDANCE);
+                }
                 return Boolean(text.trim());
             }
             catch (error) {
+                if (this.listenPreview !== preview)
+                    return false;
                 this.retainedListenAudio = { audioPath, durationMs };
                 this.view.addTranscriptNotice("failed to transcribe speech", "error", [
                     error.message,
@@ -1002,7 +1034,15 @@ export class SessionChatController {
             }
         }
         finally {
-            this.endListenPreview();
+            if (this.listenPreview !== preview) {
+                if (this.retainedListenAudio?.audioPath === audioPath) {
+                    this.retainedListenAudio = undefined;
+                }
+                await cleanupListenTempFile(audioPath);
+            }
+            else {
+                this.endListenPreview();
+            }
         }
     }
     async cancelListenCapture() {