@markusylisiurunen/tau 0.2.81 → 0.2.83

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();
@@ -821,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");
@@ -936,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":
@@ -1066,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;
@@ -1125,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));
@@ -1148,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();
@@ -1425,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);
@@ -1548,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,
@@ -1663,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: [