@markusylisiurunen/tau 0.2.57 → 0.2.59

package/dist/tui/chat_controller.js

@@ -19,7 +19,7 @@ import { TOOL_NAME_BASH, TOOL_NAME_EDIT } from "../core/tools/tool_names.js";
 import { REASONING_LEVELS, } from "../core/types.js";
 import { resolveAgentCwd, resolveSandboxPath } from "../core/utils/agent_environment.js";
 import { findAgentsFilesFromCwdToHome } from "../core/utils/agents_files.js";
-import { buildProjectContextBlock, buildSkillsIndexBlock, findAgentsFilesInScopeDetailed, formatCwdChangeNotice, formatRiskLevelChangeNotice, } from "../core/utils/context.js";
+import { buildProjectContextBlock, buildSkillsIndexBlock, findAgentsFilesInScopeDetailed, formatCwdChangeNotice, formatProjectContextChangeNotice, formatRiskLevelChangeNotice, } from "../core/utils/context.js";
 import { formatAdaptiveNumber, formatCwd, formatTokenWindow } from "../core/utils/format.js";
 import { getGitRoot } from "../core/utils/git.js";
 import { buildLineDiff, collapseLongUnchangedDiffRuns } from "../core/utils/line_diff.js";
@@ -99,8 +99,7 @@ export class ChatController {
     showThinking = false;
     compactToolUi = true;
     commandHint;
-    assistantTurnInterruptRequested = false;
-    currentTurnAbort;
+    activeBusyTask;
     riskLevel = "read-only";
     projectContextBlock;
     projectFiles = [];
@@ -111,6 +110,7 @@ export class ChatController {
     agentsConfigErrors;
     pendingRiskLevelChange;
     pendingCwdChange;
+    pendingProjectContextChange;
     expandedFilesInCurrentPrompt = new Set();
     expandedSkillsInCurrentPrompt = new Set();
     assistantState;
@@ -327,7 +327,7 @@ export class ChatController {
             void this.runSpeakTransition(() => this.stopSpeakCapture());
             return;
         }
-        this.interruptAssistantTurn();
+        this.interruptActiveTask();
     }
     onEvent(event) {
         switch (event.type) {
@@ -710,6 +710,7 @@ export class ChatController {
         }
         const nextCwd = this.deps.env.cwd();
         const previousAgentCwd = this.agentCwd;
+        const previousProjectContextBlock = this.projectContextBlock;
         this.agentCwd =
             this.sandboxEnabled && this.sandboxRootReal
                 ? resolveSandboxPath({
@@ -723,6 +724,7 @@ export class ChatController {
                     sandboxConfig: this.config.sandbox,
                 });
         this.refreshProjectContext(nextCwd);
+        this.updatePendingProjectContextChange(previousProjectContextBlock, this.projectContextBlock);
         this.projectFiles = [];
         this.refreshProjectFilesInBackground();
         this.expandedFilesInCurrentPrompt.clear();
@@ -795,20 +797,47 @@ export class ChatController {
             readFile: this.deps.fs.readFile,
         });
     }
-    interruptAssistantTurn() {
-        if (!this.isStreaming)
+    updatePendingProjectContextChange(previous, next) {
+        if (previous === next) {
             return;
-        if (this.runtime.isTurnRunning) {
-            if (this.assistantTurnInterruptRequested)
-                return;
-            this.assistantTurnInterruptRequested = true;
-            this.runtime.interruptTurn();
-            this.view.addSystemMessage("interrupted", "error");
+        }
+        const from = this.pendingProjectContextChange?.from ?? previous;
+        if (from === next) {
+            this.pendingProjectContextChange = undefined;
             return;
         }
-        if (this.currentTurnAbort?.signal.aborted)
+        this.pendingProjectContextChange = { from, to: next };
+    }
+    createAbortBusyTask() {
+        const abortController = new AbortController();
+        return {
+            signal: abortController.signal,
+            busyTask: {
+                requestInterrupt: () => {
+                    if (abortController.signal.aborted) {
+                        return false;
+                    }
+                    abortController.abort();
+                    return true;
+                },
+            },
+        };
+    }
+    beginBusyTask(task) {
+        this.activeBusyTask = task;
+    }
+    endBusyTask(task) {
+        if (this.activeBusyTask === task) {
+            this.activeBusyTask = undefined;
+        }
+    }
+    interruptActiveTask() {
+        if (!this.isStreaming)
+            return;
+        if (!this.activeBusyTask)
+            return;
+        if (!this.activeBusyTask.requestInterrupt())
             return;
-        this.currentTurnAbort?.abort();
         this.view.addSystemMessage("interrupted", "error");
     }
     // Input Handling --------------------------------------------------------------------------------
@@ -1116,8 +1145,14 @@ export class ChatController {
         if (this.pendingCwdChange) {
             notices.push(formatCwdChangeNotice(this.pendingCwdChange));
         }
+        if (this.pendingProjectContextChange) {
+            notices.push(formatProjectContextChangeNotice({
+                projectContextBlock: this.pendingProjectContextChange.to,
+            }));
+        }
         this.pendingRiskLevelChange = undefined;
         this.pendingCwdChange = undefined;
+        this.pendingProjectContextChange = undefined;
         const systemNotice = notices.length > 0 ? notices.join("\n") : undefined;
         const baseTextForModel = opts?.textForModel ?? text;
         const textForModel = systemNotice ? `${systemNotice}\n\n${baseTextForModel}` : baseTextForModel;
@@ -1541,6 +1576,9 @@ export class ChatController {
         this.isBashMode = false;
         this.isBashIncognito = false;
         this.isMemoryMode = false;
+        this.pendingRiskLevelChange = undefined;
+        this.pendingCwdChange = undefined;
+        this.pendingProjectContextChange = undefined;
         try {
             const report = await this.refreshReloadableContent("new-session");
             this.applyReloadMessages(report.messages);
@@ -1603,32 +1641,46 @@ export class ChatController {
         this.view.addSystemMessage("summarizing session...", "success");
         this.isStreaming = true;
         this.view.startWorkingIcon();
+        const { busyTask, signal } = this.createAbortBusyTask();
+        this.beginBusyTask(busyTask);
         try {
             const result = await this.engine.compact({
                 mode: "only-summary",
                 guidance,
+                signal,
             });
             this.applyCompactedHistoryUi(result.compactionMessage);
             this.view.addSystemMessage("session compacted. previous context has been summarized.", "success");
         }
         catch (err) {
-            this.handleCompactionError(err);
+            if (!signal.aborted) {
+                this.handleCompactionError(err);
+            }
         }
         finally {
+            this.endBusyTask(busyTask);
             this.view.stopWorkingIcon();
             this.isStreaming = false;
             this.view.requestRender();
-            void this.drainQueuedUserMessages();
+            if (signal.aborted) {
+                this.dequeueQueuedUserMessagesIntoEditor();
+            }
+            else {
+                void this.drainQueuedUserMessages();
+            }
         }
     }
     async compactSessionSummaryAndLast(guidance) {
         this.view.addSystemMessage("summarizing session...", "success");
         this.isStreaming = true;
         this.view.startWorkingIcon();
+        const { busyTask, signal } = this.createAbortBusyTask();
+        this.beginBusyTask(busyTask);
         try {
             const result = await this.engine.compact({
                 mode: "with-last-assistant",
                 guidance,
+                signal,
             });
             this.applyCompactedHistoryUi(result.compactionMessage);
             const successText = result.includedLastAssistant
@@ -1637,13 +1689,21 @@ export class ChatController {
             this.view.addSystemMessage(successText, "success");
         }
         catch (err) {
-            this.handleCompactionError(err);
+            if (!signal.aborted) {
+                this.handleCompactionError(err);
+            }
         }
         finally {
+            this.endBusyTask(busyTask);
             this.view.stopWorkingIcon();
             this.isStreaming = false;
             this.view.requestRender();
-            void this.drainQueuedUserMessages();
+            if (signal.aborted) {
+                this.dequeueQueuedUserMessagesIntoEditor();
+            }
+            else {
+                void this.drainQueuedUserMessages();
+            }
         }
     }
     pruneToolResults(strategy, extra) {
@@ -1815,13 +1875,15 @@ export class ChatController {
         this.view.addSystemMessage("sampling prune candidates...", "success");
         this.isStreaming = true;
         this.view.startWorkingIcon();
+        const { busyTask, signal } = this.createAbortBusyTask();
+        this.beginBusyTask(busyTask);
         try {
             const prompt = this.buildSmartPrunePrompt({
                 history,
                 targetTokens,
                 guidance: parsed.guidance,
             });
-            const selection = await this.requestSmartPruneSelection(prompt);
+            const selection = await this.requestSmartPruneSelection(prompt, signal);
             if (selection.length === 0) {
                 const summary = getEditSummary();
                 if (this.hasAnyPrunedEditChanges(summary)) {
@@ -1858,13 +1920,21 @@ export class ChatController {
             this.view.addSystemMessage(this.buildPruneSummaryMessage(summary, toPrune.length, prunedBytes), "success");
         }
         catch (err) {
-            this.view.addSystemMessage(`prune failed: ${err.message}`, "error");
+            if (!signal.aborted) {
+                this.view.addSystemMessage(`prune failed: ${err.message}`, "error");
+            }
         }
         finally {
+            this.endBusyTask(busyTask);
             this.view.stopWorkingIcon();
             this.isStreaming = false;
             this.view.requestRender();
-            void this.drainQueuedUserMessages();
+            if (signal.aborted) {
+                this.dequeueQueuedUserMessagesIntoEditor();
+            }
+            else {
+                void this.drainQueuedUserMessages();
+            }
         }
     }
     parsePruneFraction(extra) {
@@ -2301,7 +2371,7 @@ export class ChatController {
         }
         return selected;
     }
-    async requestSmartPruneSelection(prompt) {
+    async requestSmartPruneSelection(prompt, signal) {
         let apiKey;
         try {
             apiKey = await this.credentialResolver.getApiKey(this.currentPersona.model.provider, { sessionId: this.engine.sessionId });
@@ -2335,6 +2405,7 @@ export class ChatController {
         }, {
             ...(reasoning ? { reasoning } : {}),
             sessionId: `tau-prune-${randomUUID()}`,
+            ...(signal ? { signal } : {}),
             ...(apiKey && { apiKey }),
         });
         const final = await stream.result();
@@ -2655,9 +2726,23 @@ export class ChatController {
         this.view.startWorkingIcon();
         this.startTurnTimer();
         this.assistantState = undefined;
-        this.assistantTurnInterruptRequested = false;
         this.startTurnCaffeinate();
         let runResult = { aborted: false };
+        let interruptRequested = false;
+        const busyTask = {
+            requestInterrupt: () => {
+                if (interruptRequested) {
+                    return false;
+                }
+                const interrupted = this.runtime.interruptTurn();
+                if (!interrupted) {
+                    return false;
+                }
+                interruptRequested = true;
+                return true;
+            },
+        };
+        this.beginBusyTask(busyTask);
         try {
             runResult = await this.runtime.runTurn((event) => this.onEvent(event));
         }
@@ -2666,13 +2751,13 @@ export class ChatController {
             this.view.addSystemMessage(message, "error");
         }
         finally {
+            this.endBusyTask(busyTask);
             await this.stopTurnCaffeinate();
             const reason = runResult.aborted ? "aborted" : "interrupted";
             this.view.finalizeToolUiPending(reason);
             this.view.stopWorkingIcon();
             this.stopTurnTimer();
             this.isStreaming = false;
-            this.assistantTurnInterruptRequested = false;
             this.view.clearToolUiTransientState();
             this.pendingIdleNotification = true;
             this.view.requestRender();
@@ -2687,8 +2772,8 @@ export class ChatController {
     // Direct Bash Execution (user ! commands) -------------------------------------------------------
     async runBashCommand(command, opts) {
         this.isStreaming = true;
-        const abortController = new AbortController();
-        this.currentTurnAbort = abortController;
+        const { busyTask, signal } = this.createAbortBusyTask();
+        this.beginBusyTask(busyTask);
         let wasAborted = false;
         this.startTurnTimer();
         const toolCallId = `bash-user-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
@@ -2705,7 +2790,7 @@ export class ChatController {
             const startedAt = Date.now();
             const { output, exitCode, truncated: captureTruncated, } = await this.toolBackend.runBash(command, {
                 cwd: effectiveWorkingDirectory,
-                signal: abortController.signal,
+                signal,
             });
             const durationMs = Math.max(0, Date.now() - startedAt);
             const truncationInfo = await prepareBashOutput(output, captureTruncated, getBashOutputPolicy({ mode: "user" }), this.toolBackend);
@@ -2744,11 +2829,9 @@ export class ChatController {
             this.refreshStatus();
         }
         finally {
-            wasAborted = abortController.signal.aborted;
+            wasAborted = signal.aborted;
+            this.endBusyTask(busyTask);
             this.isStreaming = false;
-            if (this.currentTurnAbort === abortController) {
-                this.currentTurnAbort = undefined;
-            }
             this.stopTurnTimer();
             this.view.requestRender();
             if (wasAborted) {