@markusylisiurunen/tau 0.2.80 → 0.2.82

package/dist/tui/chat_controller/diff_review_service.js

@@ -0,0 +1,258 @@
+export class DiffReviewService {
+    view;
+    interruptLifecycle;
+    refreshStatus;
+    startTurnTimer;
+    stopTurnTimer;
+    getDiffToolConfig;
+    startSession;
+    onReviewReturned;
+    state;
+    constructor(options) {
+        this.view = options.view;
+        this.interruptLifecycle = options.interruptLifecycle;
+        this.refreshStatus = options.refreshStatus;
+        this.startTurnTimer = options.startTurnTimer;
+        this.stopTurnTimer = options.stopTurnTimer;
+        this.getDiffToolConfig = options.getDiffToolConfig;
+        this.startSession = options.startSession;
+        this.onReviewReturned = options.onReviewReturned;
+    }
+    isActive() {
+        return this.state !== undefined;
+    }
+    getCommandHint(defaultHint) {
+        if (!this.state) {
+            return defaultHint;
+        }
+        return this.state.phase === "preparing"
+            ? "starting diff review, esc to cancel"
+            : "diff review active, finish in the tool or press esc to cancel";
+    }
+    async start(argsText) {
+        if (this.state) {
+            this.view.addSystemMessage("diff review is already active.", "warn");
+            return;
+        }
+        const diffTool = this.getDiffToolConfig();
+        if (!diffTool) {
+            this.view.addSystemMessage("configure diffTool in config.json before using /diff.", "error");
+            return;
+        }
+        let diffArgs;
+        try {
+            diffArgs = parseDiffArgsText(argsText);
+        }
+        catch (error) {
+            this.view.addSystemMessage(`invalid /diff arguments: ${error.message}`, "error");
+            return;
+        }
+        const state = {
+            phase: "preparing",
+            messageId: "",
+            diffCommand: formatDiffReviewCommand(diffArgs),
+            abortController: new AbortController(),
+            cancelRequested: false,
+            reviewAgentActivity: { status: "idle" },
+            messageFinalized: false,
+        };
+        state.messageId = this.view.addMessage(buildDiffReviewMessage(state));
+        this.state = state;
+        this.view.startWorkingIcon();
+        this.startTurnTimer();
+        this.refreshStatus();
+        const busyTask = {
+            requestInterrupt: () => {
+                if (this.state !== state) {
+                    return false;
+                }
+                if (state.phase === "preparing") {
+                    if (state.abortController.signal.aborted) {
+                        return false;
+                    }
+                    state.abortController.abort();
+                    return true;
+                }
+                if (!state.session || state.cancelRequested) {
+                    return false;
+                }
+                state.cancelRequested = true;
+                void state.session.cancel("controller_cancelled");
+                return true;
+            },
+        };
+        this.interruptLifecycle.beginBusyTask(busyTask);
+        try {
+            const started = await this.startSession({
+                diffArgs,
+                diffTool,
+                signal: state.abortController.signal,
+            });
+            if (state.abortController.signal.aborted) {
+                await started.session.cancel("controller_cancelled");
+                finalizeDiffReviewMessage(state, this.view, "cancelled", "cancelled in Tau");
+                return;
+            }
+            state.phase = "active";
+            state.session = started.session;
+            updateDiffReviewUiState(state, started.session.getUiState(), this.view);
+            state.removeUiStateListener = started.session.onUiStateChange((uiState) => {
+                if (this.state !== state) {
+                    return;
+                }
+                updateDiffReviewUiState(state, uiState, this.view);
+            });
+            this.refreshStatus();
+            const result = await started.result;
+            this.handleResult(state, result);
+        }
+        catch (error) {
+            if (state.abortController.signal.aborted) {
+                finalizeDiffReviewMessage(state, this.view, "cancelled", "cancelled in Tau");
+            }
+            else {
+                const message = error.message;
+                finalizeDiffReviewMessage(state, this.view, "failed", message);
+                this.view.addSystemMessage(`diff review failed: ${message}`, "error");
+            }
+        }
+        finally {
+            if (!state.messageFinalized && state.abortController.signal.aborted) {
+                finalizeDiffReviewMessage(state, this.view, "cancelled", "cancelled in Tau");
+            }
+            state.removeUiStateListener?.();
+            state.removeUiStateListener = undefined;
+            if (this.state === state) {
+                this.state = undefined;
+            }
+            this.interruptLifecycle.endBusyTask(busyTask);
+            this.view.stopWorkingIcon();
+            this.stopTurnTimer();
+            this.refreshStatus();
+        }
+    }
+    async cancel() {
+        const state = this.state;
+        if (!state) {
+            return;
+        }
+        if (!state.abortController.signal.aborted) {
+            state.abortController.abort();
+        }
+        if (state.session) {
+            await state.session.close();
+        }
+    }
+    handleResult(state, result) {
+        if (result.status === "returned") {
+            finalizeDiffReviewMessage(state, this.view, "returned", "review added to the conversation");
+            this.onReviewReturned({
+                diffCommand: state.diffCommand,
+                review: result.review,
+            });
+            this.view.addSystemMessage("diff review added to the conversation. tau did not run yet.", "success");
+            return;
+        }
+        if (result.reason === "tool_disconnected") {
+            finalizeDiffReviewMessage(state, this.view, "cancelled", "diff tool disconnected");
+            this.view.addSystemMessage("diff review tool disconnected or never connected before returning a review.", "warn");
+            return;
+        }
+        if (result.reason === "tool_cancelled") {
+            finalizeDiffReviewMessage(state, this.view, "cancelled", "cancelled in the diff tool");
+            this.view.addSystemMessage("diff review cancelled.", "warn");
+            return;
+        }
+        finalizeDiffReviewMessage(state, this.view, "cancelled", "cancelled in Tau");
+    }
+}
+function formatDiffReviewCommand(diffArgs) {
+    return diffArgs.length > 0 ? `git diff ${diffArgs.join(" ")}` : "git diff";
+}
+function buildDiffReviewMessage(state, args) {
+    const status = args?.status ?? state.phase;
+    return {
+        type: "diff_review",
+        status,
+        command: state.diffCommand,
+        ...(status === "active" && state.diffToolUiText ? { uiText: state.diffToolUiText } : {}),
+        ...(status === "active" ? { reviewAgent: state.reviewAgentActivity } : {}),
+        ...(args?.detail ? { detail: args.detail } : {}),
+    };
+}
+function updateDiffReviewMessage(state, view, args) {
+    view.updateMessage(state.messageId, buildDiffReviewMessage(state, args));
+}
+function finalizeDiffReviewMessage(state, view, status, detail) {
+    if (state.messageFinalized) {
+        return;
+    }
+    state.messageFinalized = true;
+    updateDiffReviewMessage(state, view, { status, detail });
+}
+function updateDiffReviewUiState(state, uiState, view) {
+    state.diffToolUiText = uiState.diffToolUiText;
+    state.reviewAgentActivity = uiState.reviewAgent;
+    if (!state.messageFinalized) {
+        updateDiffReviewMessage(state, view);
+    }
+}
+function parseDiffArgsText(argsText) {
+    const input = argsText.trim();
+    if (!input) {
+        return [];
+    }
+    const args = [];
+    let current = "";
+    let quote;
+    let escaping = false;
+    for (let index = 0; index < input.length; index += 1) {
+        const char = input[index];
+        if (escaping) {
+            current += char;
+            escaping = false;
+            continue;
+        }
+        if (char === "\\") {
+            if (quote === "'") {
+                current += char;
+            }
+            else {
+                escaping = true;
+            }
+            continue;
+        }
+        if (quote) {
+            if (char === quote) {
+                quote = undefined;
+            }
+            else {
+                current += char;
+            }
+            continue;
+        }
+        if (char === '"' || char === "'") {
+            quote = char;
+            continue;
+        }
+        if (/\s/.test(char)) {
+            if (current.length > 0) {
+                args.push(current);
+                current = "";
+            }
+            continue;
+        }
+        current += char;
+    }
+    if (escaping) {
+        throw new Error("unterminated escape sequence");
+    }
+    if (quote) {
+        throw new Error("unterminated quoted string");
+    }
+    if (current.length > 0) {
+        args.push(current);
+    }
+    return args;
+}
+//# sourceMappingURL=diff_review_service.js.map

package/dist/tui/chat_controller/diff_review_service.js.map

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

package/dist/tui/chat_controller/interrupt_lifecycle.js

@@ -23,9 +23,7 @@ export class InterruptLifecycle {
             this.activeBusyTask = undefined;
         }
     }
-    interruptActiveTask(isStreaming) {
-        if (!isStreaming)
-            return false;
+    interruptActiveTask() {
         if (!this.activeBusyTask)
             return false;
         return this.activeBusyTask.requestInterrupt();

package/dist/tui/chat_controller/interrupt_lifecycle.js.map

@@ -1 +1 @@
-{"version":3,"file":"interrupt_lifecycle.js","sourceRoot":"","sources":["../../../src/tui/chat_controller/interrupt_lifecycle.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,kBAAkB;IACrB,cAAc,CAAY;IAElC,mBAAmB;QACjB,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,QAAQ,EAAE;gBACR,gBAAgB,EAAE,GAAG,EAAE;oBACrB,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnC,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,eAAe,CAAC,KAAK,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,IAAc;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,WAAW,CAAC,IAAc;QACxB,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,WAAoB;QACtC,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,KAAK,CAAC;QACvC,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAChD,CAAC;CACF"}
+{"version":3,"file":"interrupt_lifecycle.js","sourceRoot":"","sources":["../../../src/tui/chat_controller/interrupt_lifecycle.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,kBAAkB;IACrB,cAAc,CAAY;IAElC,mBAAmB;QACjB,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,QAAQ,EAAE;gBACR,gBAAgB,EAAE,GAAG,EAAE;oBACrB,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnC,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,eAAe,CAAC,KAAK,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;aACF;SACF,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,IAAc;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,WAAW,CAAC,IAAc;QACxB,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;IACH,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,KAAK,CAAC;QACvC,OAAO,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAChD,CAAC;CACF"}

package/dist/tui/chat_controller.js

@@ -10,6 +10,7 @@ import { AuthStorage } from "../core/auth/auth_storage.js";
 import { createCredentialResolver, } from "../core/auth/credential_resolver.js";
 import { createCommandRegistry, getRiskLevelDescription, } from "../core/commands/index.js";
 import { createDefaultConfigDeps, getMistralApiKey, loadRuntimeConfig, } from "../core/config/index.js";
+import { startDiffReviewSession as startCoreDiffReviewSession } from "../core/diff_review/index.js";
 import { ChatRuntime } from "../core/runtime/chat_runtime.js";
 import { createDefaultCoreDeps } from "../core/runtime/deps.js";
 import { resolvePersonaSkillsForPromptContext, resolveProjectContextForPromptContext, resolveRuntimePromptBootstrap, } from "../core/runtime/runtime_bootstrap.js";
@@ -28,6 +29,7 @@ import { transcribeMistralAudio } from "../core/utils/mistral_transcription.js";
 import { streamModel } from "../core/utils/model_stream.js";
 import { listProjectFilesAsync } from "../core/utils/project_files.js";
 import { APP_VERSION } from "../core/version.js";
+import { DiffReviewService, } from "./chat_controller/diff_review_service.js";
 import { InterruptLifecycle } from "./chat_controller/interrupt_lifecycle.js";
 import { QueuedUserMessages } from "./chat_controller/queued_user_messages.js";
 import { SessionMaintenanceService, } from "./chat_controller/session_maintenance_service.js";
@@ -70,6 +72,7 @@ export class ChatController {
     bashCommands;
     initialUserMessage;
     config;
+    defaultDiffTool;
     activeThemeId;
     credentialResolver;
     authPath;
@@ -89,6 +92,7 @@ export class ChatController {
     isStreaming = false;
     queuedMessageBuffer;
     interruptLifecycle;
+    diffReviewService;
     maintenanceService;
     isBashMode = false;
     isBashIncognito = false;
@@ -134,6 +138,7 @@ export class ChatController {
         this.bashCommands = options.bashCommands ?? [];
         this.initialUserMessage = options.initialUserMessage;
         this.config = options.config ?? {};
+        this.defaultDiffTool = options.defaultDiffTool;
         this.sandboxEnabled = options.sandboxEnabled;
         this.caffeinated = options.caffeinated ?? false;
         this.sandboxRootReal = this.sandboxEnabled ? this.resolveSandboxRoot(cwd) : undefined;
@@ -211,6 +216,16 @@ export class ChatController {
         });
         this.engine = this.runtime.session;
         this.eventUnsubscribe = this.engine.onEvent((event) => this.onEvent(event));
+        this.diffReviewService = new DiffReviewService({
+            view: this.view,
+            interruptLifecycle: this.interruptLifecycle,
+            refreshStatus: () => this.refreshStatus(),
+            startTurnTimer: () => this.startTurnTimer(),
+            stopTurnTimer: () => this.stopTurnTimer(),
+            getDiffToolConfig: () => this.resolveDiffToolConfig(),
+            startSession: (args) => this.startDiffReviewSession(args),
+            onReviewReturned: (review) => this.handleReturnedDiffReview(review),
+        });
         this.maintenanceService = new SessionMaintenanceService({
             engine: this.engine,
             view: this.view,
@@ -227,6 +242,7 @@ export class ChatController {
             newSession: () => this.clearSession(),
             rewind: () => this.startRewindFlow(),
             cd: (path) => this.changeDirectory(path),
+            diff: (argsText) => this.startDiffReview(argsText),
             compactSummaryOnly: (extra) => this.compactSessionSummaryOnly(extra),
             compactSummaryAndLast: (extra) => this.compactSessionSummaryAndLast(extra),
             pruneEarliest: (extra) => this.pruneToolResults("earliest", extra),
@@ -305,6 +321,7 @@ export class ChatController {
         if (this.speakTransition) {
             await this.speakTransition;
         }
+        await this.cancelDiffReview();
         await this.cancelSpeakCapture();
         await this.stopTurnCaffeinate();
         if (!this.toolBackendDispose)
@@ -475,7 +492,7 @@ export class ChatController {
                 duration,
                 riskLevel: this.riskLevel,
                 sandboxed: this.sandboxEnabled,
-                commandHint: this.commandHint,
+                commandHint: this.getActiveCommandHint(),
             },
             editor: {
                 mode: this.getInputMode(),
@@ -497,6 +514,9 @@ export class ChatController {
             return "memory";
         return "normal";
     }
+    getActiveCommandHint() {
+        return this.diffReviewService.getCommandHint(this.commandHint);
+    }
     // Context & Cost Tracking -----------------------------------------------------------------------
     getContextUsageString() {
         const last = this.getLastAssistantMessage();
@@ -505,10 +525,13 @@ export class ChatController {
             : this.currentPersona.model.contextWindow;
         const { input, read, write, output } = this.getSessionTotals();
         const stats = `↑${formatTokenWindow(input)} ↓${formatTokenWindow(output)} (r${formatTokenWindow(read)} w${formatTokenWindow(write)})`;
-        const promptTokensSent = last
-            ? (last.usage?.input ?? 0) + (last.usage?.cacheRead ?? 0) + (last.usage?.cacheWrite ?? 0)
+        const contextWindowUsageTokens = last
+            ? (last.usage?.input ?? 0) +
+                (last.usage?.cacheRead ?? 0) +
+                (last.usage?.cacheWrite ?? 0) +
+                (last.usage?.output ?? 0)
             : 0;
-        const percent = windowTokens > 0 ? (promptTokensSent / windowTokens) * 100 : 0;
+        const percent = windowTokens > 0 ? (contextWindowUsageTokens / windowTokens) * 100 : 0;
         const percentStr = `${formatAdaptiveNumber(percent, 1, 3)}%`;
         return `${stats} · ${percentStr}/${formatTokenWindow(windowTokens)}`;
     }
@@ -818,7 +841,7 @@ export class ChatController {
         this.interruptLifecycle.endBusyTask(task);
     }
     interruptActiveTask() {
-        if (!this.interruptLifecycle.interruptActiveTask(this.isStreaming)) {
+        if (!this.interruptLifecycle.interruptActiveTask()) {
             return;
         }
         this.view.addSystemMessage("interrupted", "error");
@@ -933,6 +956,8 @@ export class ChatController {
                 return "rewind context to a selected prior user message";
             case "cd":
                 return "change directory: /cd <path>";
+            case "diff":
+                return "open the external diff review tool: /diff [git diff args...]";
             case "compactSummaryOnly":
                 return "summarize session and start new, optional prompt";
             case "compactSummaryAndLast":
@@ -1063,6 +1088,12 @@ export class ChatController {
     async handleSubmit(text) {
         const trimmed = text.trim();
         const isSingleLine = this.isSingleLineInput(text);
+        if (this.diffReviewService.isActive()) {
+            if (trimmed) {
+                this.view.addSystemMessage("diff review is active. finish it in the diff tool or press esc to cancel.", "warn");
+            }
+            return;
+        }
         if (!trimmed) {
             if (this.isStreaming)
                 return;
@@ -1122,14 +1153,28 @@ export class ChatController {
             }
             const agentsFilePath = this.getMemoryModeFilePath();
             const textForModel = this.formatMemoryModeUserMessage(agentsFilePath, request);
-            await this.sendUserMessage(request, { textForModel, isMemoryMode: true });
+            await this.sendUserMessage(request, { textForModel, kind: "memory" });
             return;
         }
         await this.sendUserMessage(trimmed);
     }
     async sendUserMessage(text, opts) {
+        this.addUserMessageToMainSession(text, opts);
+        await this.runAssistantTurn();
+    }
+    addUserMessageToMainSession(text, opts) {
         this.expandedFilesInCurrentPrompt.clear();
         this.expandedSkillsInCurrentPrompt.clear();
+        const textForModel = this.applyPendingUserNotices(opts?.textForModel ?? text);
+        const historyEntryId = this.engine.addUserText(textForModel);
+        this.view.addMessage({
+            type: "user",
+            text,
+            ...(opts?.kind ? { kind: opts.kind } : {}),
+        }, historyEntryId);
+        return historyEntryId;
+    }
+    applyPendingUserNotices(textForModel) {
         const notices = [];
         if (this.pendingRiskLevelChange) {
             notices.push(formatRiskLevelChangeNotice(this.pendingRiskLevelChange));
@@ -1145,16 +1190,10 @@ export class ChatController {
         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;
-        const historyEntryId = this.engine.addUserText(textForModel);
-        this.view.addMessage({
-            type: "user",
-            text,
-            isMemoryMode: opts?.isMemoryMode,
-        }, historyEntryId);
-        await this.runAssistantTurn();
+        if (notices.length === 0) {
+            return textForModel;
+        }
+        return `${notices.join("\n")}\n\n${textForModel}`;
     }
     async sendInitialUserMessage(text) {
         const trimmed = text.trim();
@@ -1422,6 +1461,22 @@ export class ChatController {
         ].join("\n");
         return ["<system>", system, "</system>", "", request].join("\n");
     }
+    formatDiffReviewUserMessage(review) {
+        const system = [
+            "Diff review mode: the following user message is returned review feedback from the diff review tool.",
+            `Diff command: ${review.diffCommand}`,
+            "",
+            "Treat the message as review findings and feedback about that diff, not as a generic new request.",
+            "Do not mention this surrounding instruction in your response.",
+        ].join("\n");
+        return ["<system>", system, "</system>", "", review.review].join("\n");
+    }
+    handleReturnedDiffReview(review) {
+        this.addUserMessageToMainSession(review.review, {
+            textForModel: this.formatDiffReviewUserMessage(review),
+            kind: "review",
+        });
+    }
     // Command Handling ------------------------------------------------------------------------------
     async handleCommand(raw) {
         const cmd = this.commandRegistry.parse(raw);
@@ -1545,6 +1600,61 @@ export class ChatController {
             this.view.addSystemMessage(`clipboard copy failed: ${err.message}`, "error");
         }
     }
+    async startDiffReview(argsText) {
+        if (this.diffReviewService.isActive()) {
+            this.view.addSystemMessage("diff review is already active.", "warn");
+            return;
+        }
+        if (!this.isDiffReviewIdle()) {
+            this.view.addSystemMessage("wait for tau to become idle before starting /diff.", "warn");
+            return;
+        }
+        await this.diffReviewService.start(argsText);
+    }
+    isDiffReviewIdle() {
+        return (!this.isStreaming &&
+            !this.speakRecording &&
+            !this.speakTransition &&
+            !this.isTranscribingSpeak &&
+            !this.diffReviewService.isActive());
+    }
+    resolveDiffToolConfig() {
+        return this.config.diffTool ?? this.defaultDiffTool;
+    }
+    async startDiffReviewSession(args) {
+        return await startCoreDiffReviewSession({
+            cwd: this.deps.env.cwd(),
+            diffArgs: args.diffArgs,
+            signal: args.signal,
+            diffTool: args.diffTool,
+            persona: this.currentPersona,
+            config: this.config,
+            discoveredSkills: this.skills,
+            includeAgentContext: this.includeAgentContext,
+            deps: this.deps,
+        });
+    }
+    async resolveCurrentPersonaApiKey() {
+        let apiKey;
+        try {
+            apiKey = await this.credentialResolver.getApiKey(this.currentPersona.model.provider, {
+                sessionId: this.engine.sessionId,
+            });
+        }
+        catch (error) {
+            if (this.currentPersona.model.provider === "openai-codex") {
+                throw new Error(formatCodexAuthError(this.authPath, error?.message));
+            }
+            throw error;
+        }
+        if (!apiKey && this.currentPersona.model.provider === "openai-codex") {
+            throw new Error(formatCodexAuthError(this.authPath));
+        }
+        return apiKey;
+    }
+    async cancelDiffReview() {
+        await this.diffReviewService.cancel();
+    }
     startRewindFlow() {
         const candidates = this.engine.listRewindCandidates().map((candidate) => ({
             id: candidate.historyEntryId,
@@ -1660,21 +1770,7 @@ export class ChatController {
         await this.maintenanceService.pruneToolResultsSmart(extra);
     }
     async requestSmartPruneSelection(prompt, signal) {
-        let apiKey;
-        try {
-            apiKey = await this.credentialResolver.getApiKey(this.currentPersona.model.provider, {
-                sessionId: this.engine.sessionId,
-            });
-        }
-        catch (error) {
-            if (this.currentPersona.model.provider === "openai-codex") {
-                throw new Error(formatCodexAuthError(this.authPath, error?.message));
-            }
-            throw error;
-        }
-        if (!apiKey && this.currentPersona.model.provider === "openai-codex") {
-            throw new Error(formatCodexAuthError(this.authPath));
-        }
+        const apiKey = await this.resolveCurrentPersonaApiKey();
         const reasoning = this.clampPruneReasoning(this.currentPersona.settings.reasoning);
         const stream = streamModel(this.currentPersona.model, {
             systemPrompt: [