@code-yeongyu/senpi 2026.7.10 → 2026.7.13

package/dist/modes/interactive/interactive-mode.js

@@ -6,7 +6,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, ProcessTerminal, Spacer, sanitizeTerminalLabel, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, expandTildePath, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -26,7 +26,7 @@ import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
-import { copyToClipboard } from "../../utils/clipboard.js";
+import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
@@ -34,6 +34,7 @@ import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { checkForNewPiVersion, getReleaseChangelogUrl } from "../../utils/version-check.js";
 import { abortedErrorLabel } from "./aborted-error-label.js";
+import { transferCompactionQueue, waitForPromptDisposition, } from "./compaction-queue-transfer.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
@@ -173,7 +174,6 @@ export function formatResumeCommand(sessionManager) {
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
-const BEDROCK_PROVIDER_ID = "amazon-bedrock";
 // isApiKeyLoginProvider now lives in core/auth-providers.ts so the RPC login path
 // (neo) and the classic selectors share ONE source of truth. Re-exported here to
 // keep the existing public import (test/oauth-selector.test.ts) working, and used
@@ -279,6 +279,9 @@ export class InteractiveMode {
         this.autoCompactionProgressText = "";
         // Messages queued while compaction is running
         this.compactionQueuedMessages = [];
+        this.compactionInFlightMessages = [];
+        this.compactionTransferAbortControllers = new Map();
+        this.compactionQueueGeneration = 0;
         // Shutdown state
         this.shutdownRequested = false;
         // Extension UI state
@@ -567,7 +570,7 @@ export class InteractiveMode {
                 rawKeyHint("!!", "to run bash (no context)"),
                 hint("app.message.followUp", "to queue follow-up"),
                 hint("app.message.dequeue", "to edit all queued messages"),
-                hint("app.clipboard.pasteImage", "to paste image"),
+                hint("app.clipboard.pasteImage", "to paste image (with text fallback)"),
                 rawKeyHint("drop files", "to attach"),
             ].join("\n");
             const compactInstructions = [
@@ -693,7 +696,7 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
-                await this.session.prompt(userInput);
+                await this.session.prompt(userInput, { streamingBehavior: "steer" });
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -1365,7 +1368,13 @@ export class InteractiveMode {
         this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
+        for (const controller of this.compactionTransferAbortControllers.values())
+            controller.abort();
+        this.compactionQueueGeneration += 1;
+        this.compactionQueueFlushTail = undefined;
         this.compactionQueuedMessages = [];
+        this.compactionInFlightMessages = [];
+        this.compactionTransferAbortControllers.clear();
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
         this.clearPendingTools();
@@ -2271,6 +2280,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
+        this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand());
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
         this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
@@ -2284,26 +2294,30 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
         };
-        // Handle clipboard image paste (triggered on Ctrl+V)
+        // Handle clipboard paste (triggered on Ctrl+V). Images are attached by path;
+        // otherwise, paste plain text from the system clipboard.
         this.defaultEditor.onPasteImage = () => {
-            this.handleClipboardImagePaste();
+            void this.handleClipboardPaste();
         };
     }
-    async handleClipboardImagePaste() {
+    async handleClipboardPaste() {
         try {
             const image = await readClipboardImage();
-            if (!image) {
+            if (image) {
+                const tmpDir = os.tmpdir();
+                const ext = extensionForImageMimeType(image.mimeType) ?? "png";
+                const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
+                const filePath = path.join(tmpDir, fileName);
+                fs.writeFileSync(filePath, Buffer.from(image.bytes));
+                this.editor.insertTextAtCursor?.(filePath);
+                this.ui.requestRender();
                 return;
             }
-            // Write to temp file
-            const tmpDir = os.tmpdir();
-            const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-            const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
-            const filePath = path.join(tmpDir, fileName);
-            fs.writeFileSync(filePath, Buffer.from(image.bytes));
-            // Insert file path directly
-            this.editor.insertTextAtCursor?.(filePath);
-            this.ui.requestRender();
+            const text = await readClipboardText();
+            if (text) {
+                this.editor.insertTextAtCursor?.(text);
+                this.ui.requestRender();
+            }
         }
         catch {
             // Silently ignore clipboard errors (may not have permission, etc.)
@@ -2690,6 +2704,9 @@ export class InteractiveMode {
             case "agent_settled":
                 await this.checkShutdownRequested();
                 break;
+            case "continuation_error":
+                this.showError(sanitizeTerminalLabel(event.errorMessage));
+                break;
             case "compaction_start": {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
@@ -3461,10 +3478,12 @@ export class InteractiveMode {
         return {
             steering: [
                 ...this.session.getSteeringMessages(),
+                ...this.compactionInFlightMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text),
                 ...this.compactionQueuedMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text),
             ],
             followUp: [
                 ...this.session.getFollowUpMessages(),
+                ...this.compactionInFlightMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text),
                 ...this.compactionQueuedMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text),
             ],
         };
@@ -3475,12 +3494,13 @@ export class InteractiveMode {
      */
     clearAllQueues() {
         const { steering, followUp } = this.session.clearQueue();
-        const compactionSteering = this.compactionQueuedMessages
-            .filter((msg) => msg.mode === "steer")
-            .map((msg) => msg.text);
-        const compactionFollowUp = this.compactionQueuedMessages
-            .filter((msg) => msg.mode === "followUp")
-            .map((msg) => msg.text);
+        const compactionMessages = [...this.compactionInFlightMessages, ...this.compactionQueuedMessages];
+        const compactionSteering = compactionMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text);
+        const compactionFollowUp = compactionMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text);
+        for (const controller of this.compactionTransferAbortControllers.values())
+            controller.abort();
+        this.compactionInFlightMessages = [];
+        this.compactionTransferAbortControllers.clear();
         this.compactionQueuedMessages = [];
         return {
             steering: [...steering, ...compactionSteering],
@@ -3564,72 +3584,70 @@ export class InteractiveMode {
         return !!extensionRunner.getCommand(commandName);
     }
     async flushCompactionQueue(options) {
-        if (this.compactionQueuedMessages.length === 0) {
-            return;
-        }
-        const queuedMessages = [...this.compactionQueuedMessages];
-        this.compactionQueuedMessages = [];
-        this.updatePendingMessagesDisplay();
-        const restoreQueue = (error) => {
-            this.session.clearQueue();
-            this.compactionQueuedMessages = queuedMessages;
+        const session = this.session;
+        const generation = this.compactionQueueGeneration ?? 0;
+        const previousFlush = this.compactionQueueFlushTail;
+        const runTransfer = async () => {
+            if ((this.compactionQueueGeneration ?? 0) !== generation || this.session !== session)
+                return;
+            await transferCompactionQueue({
+                takeBatch: () => {
+                    const batch = this.compactionQueuedMessages;
+                    this.compactionQueuedMessages = [];
+                    this.compactionInFlightMessages.push(...batch);
+                    for (const message of batch) {
+                        this.compactionTransferAbortControllers.set(message, new AbortController());
+                    }
+                    this.updatePendingMessagesDisplay();
+                    return batch;
+                },
+                commitAccepted: (message) => {
+                    const index = this.compactionInFlightMessages.indexOf(message);
+                    if (index === -1)
+                        return false;
+                    this.compactionInFlightMessages.splice(index, 1);
+                    this.compactionTransferAbortControllers.delete(message);
+                    this.updatePendingMessagesDisplay();
+                    return true;
+                },
+                restoreUndelivered: (messages) => {
+                    const restorable = messages.filter((message) => this.compactionInFlightMessages.includes(message));
+                    const restorableSet = new Set(restorable);
+                    this.compactionInFlightMessages = this.compactionInFlightMessages.filter((message) => !restorableSet.has(message));
+                    for (const message of restorable)
+                        this.compactionTransferAbortControllers.delete(message);
+                    this.compactionQueuedMessages = [...restorable, ...this.compactionQueuedMessages];
+                    this.updatePendingMessagesDisplay();
+                    return restorable.length;
+                },
+                isCommand: (message) => this.isExtensionCommand(message.text),
+                deliverCommand: (message) => session.prompt(message.text),
+                deliverFirstPrompt: (message) => waitForPromptDisposition((preflightResult, promptDisposition) => session.prompt(message.text, {
+                    streamingBehavior: message.mode,
+                    preflightResult,
+                    promptDisposition,
+                    signal: this.compactionTransferAbortControllers.get(message)?.signal,
+                }), (error) => {
+                    if ((this.compactionQueueGeneration ?? 0) !== generation || this.session !== session)
+                        return;
+                    this.showError(`Queued prompt failed after acceptance: ${error instanceof Error ? error.message : String(error)}`);
+                }),
+                deliverQueued: (message) => message.mode === "followUp" ? session.followUp(message.text) : session.steer(message.text),
+                reportFailure: (error, undeliveredCount) => {
+                    this.showError(`Failed to send queued message${undeliveredCount === 1 ? "" : "s"}: ${error instanceof Error ? error.message : String(error)}`);
+                },
+            }, options);
             this.updatePendingMessagesDisplay();
-            this.showError(`Failed to send queued message${queuedMessages.length > 1 ? "s" : ""}: ${error instanceof Error ? error.message : String(error)}`);
         };
+        const currentFlush = previousFlush ? previousFlush.then(runTransfer, runTransfer) : runTransfer();
+        const settledFlush = currentFlush.catch(() => undefined);
+        this.compactionQueueFlushTail = settledFlush;
         try {
-            if (options?.willRetry) {
-                // When retry is pending, queue messages for the retry turn
-                for (const message of queuedMessages) {
-                    if (this.isExtensionCommand(message.text)) {
-                        await this.session.prompt(message.text);
-                    }
-                    else if (message.mode === "followUp") {
-                        await this.session.followUp(message.text);
-                    }
-                    else {
-                        await this.session.steer(message.text);
-                    }
-                }
-                this.updatePendingMessagesDisplay();
-                return;
-            }
-            // Find first non-extension-command message to use as prompt
-            const firstPromptIndex = queuedMessages.findIndex((message) => !this.isExtensionCommand(message.text));
-            if (firstPromptIndex === -1) {
-                // All extension commands - execute them all
-                for (const message of queuedMessages) {
-                    await this.session.prompt(message.text);
-                }
-                return;
-            }
-            // Execute any extension commands before the first prompt
-            const preCommands = queuedMessages.slice(0, firstPromptIndex);
-            const firstPrompt = queuedMessages[firstPromptIndex];
-            const rest = queuedMessages.slice(firstPromptIndex + 1);
-            for (const message of preCommands) {
-                await this.session.prompt(message.text);
-            }
-            // Send first prompt (starts streaming)
-            const promptPromise = this.session.prompt(firstPrompt.text).catch((error) => {
-                restoreQueue(error);
-            });
-            // Queue remaining messages
-            for (const message of rest) {
-                if (this.isExtensionCommand(message.text)) {
-                    await this.session.prompt(message.text);
-                }
-                else if (message.mode === "followUp") {
-                    await this.session.followUp(message.text);
-                }
-                else {
-                    await this.session.steer(message.text);
-                }
-            }
-            this.updatePendingMessagesDisplay();
-            void promptPromise;
+            await currentFlush;
         }
-        catch (error) {
-            restoreQueue(error);
+        finally {
+            if (this.compactionQueueFlushTail === settledFlush)
+                this.compactionQueueFlushTail = undefined;
         }
     }
     /** Move pending bash components from pending area to chat */
@@ -4204,6 +4222,19 @@ export class InteractiveMode {
                 this.sessionManager.appendLabelChange(entryId, label);
                 this.ui.requestRender();
             }, initialSelectedId, initialFilterMode);
+            selector.onCopy = async (text) => {
+                if (!text) {
+                    this.showError("Selected entry has no text to copy");
+                    return;
+                }
+                try {
+                    await copyToClipboard(text);
+                    this.showStatus("Copied selected message to clipboard");
+                }
+                catch (error) {
+                    this.showError(error instanceof Error ? error.message : String(error));
+                }
+            };
             return { component: selector, focus: selector };
         });
     }
@@ -4337,9 +4368,6 @@ export class InteractiveMode {
         if (providerOption.authType === "oauth") {
             await this.showLoginDialog(providerOption.id, providerOption.name);
         }
-        else if (providerOption.id === BEDROCK_PROVIDER_ID) {
-            this.showBedrockSetupDialog(providerOption.id, providerOption.name);
-        }
         else {
             await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
         }
@@ -4509,30 +4537,18 @@ export class InteractiveMode {
             }
         }
     }
-    showBedrockSetupDialog(providerId, providerName) {
-        const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
-        };
-        const dialog = new LoginDialogComponent(this.ui, providerId, () => restoreEditor(), providerName, "Amazon Bedrock setup");
-        dialog.showInfo([
-            theme.fg("text", "Amazon Bedrock uses AWS credentials instead of a single API key."),
-            theme.fg("text", "Configure an AWS profile, IAM keys, bearer token, or role-based credentials."),
-            theme.fg("muted", "See:"),
-            theme.fg("accent", `  ${path.join(getDocsPath(), "providers.md")}`),
-        ]);
-        this.editorContainer.clear();
-        this.editorContainer.addChild(dialog);
-        this.ui.setFocus(dialog);
-        this.ui.requestRender();
-    }
     async showApiKeyLoginDialog(providerId, providerName) {
         const previousModel = this.session.model;
         const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
             // Completion handled below
         }, providerName);
+        if (providerId === "amazon-bedrock") {
+            dialog.showDetails([
+                theme.fg("text", "You can also use an AWS profile, IAM keys, or role-based credentials."),
+                theme.fg("muted", "See:"),
+                theme.fg("accent", `  ${path.join(getDocsPath(), "providers.md")}`),
+            ]);
+        }
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
@@ -5099,6 +5115,7 @@ export class InteractiveMode {
         const toggleThinking = this.getAppKeyDisplay("app.thinking.toggle");
         const externalEditor = this.getAppKeyDisplay("app.editor.external");
         const cycleModelBackward = this.getAppKeyDisplay("app.model.cycleBackward");
+        const copyMessage = this.getAppKeyDisplay("app.message.copy");
         const followUp = this.getAppKeyDisplay("app.message.followUp");
         const dequeue = this.getAppKeyDisplay("app.message.dequeue");
         const pasteImage = this.getAppKeyDisplay("app.clipboard.pasteImage");
@@ -5142,9 +5159,10 @@ export class InteractiveMode {
 | \`${expandTools}\` | Toggle tool output expansion |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
+| \`${copyMessage}\` | Copy last assistant message |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
-| \`${pasteImage}\` | Paste image from clipboard |
+| \`${pasteImage}\` | Paste image or text from clipboard |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |