@markusylisiurunen/tau 0.3.79 → 0.3.81

package/dist/tui/session_chat_controller.js

@@ -379,6 +379,10 @@ export class SessionChatController {
         if (this.snapshot.catalog.skills.length > 0) {
             parts.push(`${this.snapshot.catalog.skills.length} skills`);
         }
+        if (this.snapshot.catalog.mcpServers.length > 0) {
+            const count = this.snapshot.catalog.mcpServers.length;
+            parts.push(`${count} MCP server${count === 1 ? "" : "s"}`);
+        }
         if (this.configuredClientToolNames.length > 0) {
             const count = this.configuredClientToolNames.length;
             parts.push(`${count} client tool${count === 1 ? "" : "s"}`);
@@ -411,6 +415,12 @@ export class SessionChatController {
                 lines.push(`  ${clientToolName}`);
             }
         }
+        if (this.snapshot.catalog.mcpServers.length > 0) {
+            lines.push("", "mcp servers:");
+            for (const name of this.snapshot.catalog.mcpServers) {
+                lines.push(`  ${name}`);
+            }
+        }
         lines.push("", this.formatSessionIdentityText());
         return lines;
     }
@@ -576,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) {
@@ -658,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) {
@@ -682,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;
@@ -698,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,
@@ -716,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);
@@ -734,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(),
@@ -759,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) {
@@ -773,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) {
@@ -804,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) {
@@ -919,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;
                 }
@@ -957,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);
@@ -971,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,
@@ -992,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() {
@@ -1197,7 +1247,6 @@ export class SessionChatController {
             case "fly-sprite":
                 return {
                     kind: "fly-sprite",
-                    apiId: snapshot.apiId,
                     spriteName: snapshot.spriteName,
                     cwd: snapshot.cwd,
                 };