open-multi-agent-kit 0.96.2 → 0.97.0

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

@@ -3,12 +3,14 @@
  * allow: SIZE_OK - legacy TUI coordinator; this change only adds a two-line CONTROL status bridge.
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
  */
-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 { spawn, spawnSync } from "child_process";
 import { getProviders, } from "omk-ai";
+import { AttachmentStore } from "../../core/attachment-store.js";
+import { describePromptImageAttachment } from "../../core/prompt-attachment.js";
+import { createAttachmentStrip } from "./components/attachment-strip.js";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "omk-tui";
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
@@ -33,7 +35,7 @@ import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
-import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
+import { readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { openBrowser } from "../../utils/open-browser.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
@@ -219,7 +221,11 @@ export class InteractiveMode {
     version;
     isInitialized = false;
     onInputCallback;
-    pendingUserInputs = [];
+    pendingPromptPayloads = [];
+    attachmentStore = new AttachmentStore();
+    draftAttachmentIds = [];
+    attachmentStripContainer = new Container();
+    interactiveLoopActive = true;
     loadingAnimation = undefined;
     // Wall-clock start of the current agent turn, for the working loader elapsed suffix
     workingStartedAt = undefined;
@@ -652,6 +658,7 @@ export class InteractiveMode {
         this.ui.addChild(this.statusContainer);
         this.renderWidgets(); // Initialize with default spacer
         this.ui.addChild(this.widgetContainerAbove);
+        this.ui.addChild(this.attachmentStripContainer);
         this.ui.addChild(this.editorContainer);
         this.ui.addChild(this.widgetContainerBelow);
         this.ui.addChild(this.noticeContainer);
@@ -780,13 +787,17 @@ export class InteractiveMode {
             }
         }
         // Main interactive loop
-        while (true) {
-            const userInput = await this.getUserInput();
+        while (this.interactiveLoopActive) {
+            const payload = await this.getUserInput();
             const previousTermination = this.session.lastTermination;
             try {
-                await this.session.prompt(userInput);
+                await this.session.prompt(payload.text, payload.images ? { images: payload.images } : undefined);
+                // Acceptance: release exactly the attachments that were sent.
+                if (payload.imageIds && payload.imageIds.length > 0)
+                    this.consumeDraftAttachments(payload.imageIds);
             }
             catch (error) {
+                // Preflight/model failure: attachments stay attached for retry.
                 this.showPromptError(error, previousTermination);
             }
         }
@@ -1234,9 +1245,10 @@ export class InteractiveMode {
             const body = visibleLabels.length > 0 ? `${visibleLabels.join(", ")}${suffix}` : "(none)";
             return theme.fg("dim", `  ${body}`);
         };
-        const addLoadedSection = (name, collapsedBody, expandedBody = collapsedBody, color = "mdHeading") => {
+        const addLoadedSection = (name, collapsedBody, expandedBody, color = "mdHeading") => {
+            const resolvedExpandedBody = expandedBody ?? collapsedBody;
             const getCollapsedBody = typeof collapsedBody === "function" ? collapsedBody : () => collapsedBody;
-            const getExpandedBody = typeof expandedBody === "function" ? expandedBody : () => expandedBody;
+            const getExpandedBody = typeof resolvedExpandedBody === "function" ? resolvedExpandedBody : () => resolvedExpandedBody;
             const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${getCollapsedBody()}`, () => `${sectionHeader(name, color)}\n${getExpandedBody()}`, this.getStartupExpansionState(), 0, 0);
             this.chatContainer.addChild(section);
             this.chatContainer.addChild(new Spacer(1));
@@ -2216,18 +2228,98 @@ export class InteractiveMode {
             if (!image) {
                 return;
             }
-            // Write to temp file
-            const tmpDir = os.tmpdir();
-            const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-            const fileName = `omk-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();
+            let attachment;
+            try {
+                attachment = this.attachmentStore.put(new Uint8Array(image.bytes), "clipboard");
+            }
+            catch (error) {
+                this.showWarning(error instanceof Error ? error.message : String(error));
+                return;
+            }
+            this.draftAttachmentIds.push(attachment.id);
+            this.refreshAttachmentStrip();
         }
-        catch {
-            // Silently ignore clipboard errors (may not have permission, etc.)
+        catch (error) {
+            this.showWarning(`Clipboard paste failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    /** Rebuild the preview strip above the editor from the current draft ids. */
+    refreshAttachmentStrip() {
+        this.attachmentStripContainer.clear();
+        const items = this.draftAttachmentIds
+            .map((id) => this.attachmentStore.get(id))
+            .filter((item) => item !== undefined);
+        if (items.length > 0) {
+            this.attachmentStripContainer.addChild(createAttachmentStrip(items, (id) => this.attachmentStore.getBytes(id)));
+        }
+        this.ui.requestRender();
+    }
+    materializeDraftImages(ids) {
+        return this.attachmentStore.materializeImages(ids);
+    }
+    /** Release exactly the attachments that were accepted with a sent prompt. */
+    consumeDraftAttachments(ids) {
+        for (const id of ids) {
+            this.attachmentStore.remove(id);
+            const index = this.draftAttachmentIds.indexOf(id);
+            if (index >= 0)
+                this.draftAttachmentIds.splice(index, 1);
+        }
+        this.refreshAttachmentStrip();
+    }
+    clearDraftAttachments() {
+        this.draftAttachmentIds = [];
+        this.attachmentStore.clear();
+        this.refreshAttachmentStrip();
+    }
+    removeLastDraftAttachment() {
+        const id = this.draftAttachmentIds.pop();
+        if (id)
+            this.attachmentStore.remove(id);
+        this.refreshAttachmentStrip();
+    }
+    isVisionCapable() {
+        const model = this.session.model;
+        return Array.isArray(model?.input) ? model.input.includes("image") : true;
+    }
+    handleAttachCommand(argument) {
+        const [verb, rest] = argument.split(/\s+/);
+        switch (verb ?? "") {
+            case "":
+            case "list": {
+                const items = this.draftAttachmentIds
+                    .map((id) => this.attachmentStore.get(id))
+                    .filter((item) => item !== undefined);
+                if (items.length === 0) {
+                    this.showStatus("No image attachments.");
+                }
+                else {
+                    this.showStatus(items.map((item, index) => `${index + 1}. ${describePromptImageAttachment(item)}`).join(" · "));
+                }
+                break;
+            }
+            case "clear":
+                this.clearDraftAttachments();
+                this.showStatus("Image attachments cleared.");
+                break;
+            case "remove":
+            case "rm": {
+                const position = Number.parseInt(rest ?? "", 10);
+                if (Number.isFinite(position) && position >= 1 && position <= this.draftAttachmentIds.length) {
+                    const id = this.draftAttachmentIds.splice(position - 1, 1)[0];
+                    if (id)
+                        this.attachmentStore.remove(id);
+                }
+                else {
+                    this.removeLastDraftAttachment();
+                }
+                this.refreshAttachmentStrip();
+                this.showStatus("Image attachment removed.");
+                break;
+            }
+            default:
+                this.showStatus("Usage: /attach [list|clear|remove [n]]");
+                break;
         }
     }
     parseBangInput(text) {
@@ -2245,9 +2337,16 @@ export class InteractiveMode {
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
-            if (!text)
+            const draftImageIds = [...(this.draftAttachmentIds ?? [])];
+            const hasAttachments = draftImageIds.length > 0;
+            if (!text && !hasAttachments)
                 return;
             // Handle commands
+            if (text === "/attach" || text.startsWith("/attach ")) {
+                this.editor.setText("");
+                this.handleAttachCommand(text.slice("/attach".length).trim());
+                return;
+            }
             if (text === "/settings") {
                 this.showSettingsSelector();
                 this.editor.setText("");
@@ -2409,8 +2508,26 @@ export class InteractiveMode {
                     return;
                 }
             }
+            let draftImages;
+            if (hasAttachments) {
+                try {
+                    draftImages = this.materializeDraftImages(draftImageIds);
+                }
+                catch (error) {
+                    this.showWarning(error instanceof Error ? error.message : String(error));
+                    return;
+                }
+                if (!this.isVisionCapable()) {
+                    this.showWarning("The selected model cannot accept images. Switch model (/model) or run /attach clear.");
+                    return;
+                }
+            }
             // Queue input during compaction (extension commands execute immediately)
             if (this.session.isCompacting) {
+                if (hasAttachments) {
+                    this.showWarning("Attachments are held while compaction finishes — resubmit after it completes.");
+                    return;
+                }
                 if (this.isExtensionCommand(text)) {
                     this.editor.addToHistory?.(text);
                     this.editor.setText("");
@@ -2426,7 +2543,10 @@ export class InteractiveMode {
             if (this.session.isStreaming) {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
-                await this.session.prompt(text, { streamingBehavior: "steer" });
+                await this.session.prompt(text, draftImages ? { images: draftImages, streamingBehavior: "steer" } : { streamingBehavior: "steer" });
+                // Queued without throwing: acceptance — release exactly what was sent.
+                if (draftImageIds.length > 0)
+                    this.consumeDraftAttachments(draftImageIds);
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 return;
@@ -2434,11 +2554,14 @@ export class InteractiveMode {
             // Normal message submission
             // First, move any pending bash components to chat
             this.flushPendingBashComponents();
+            const payload = draftImages
+                ? { text, images: draftImages, imageIds: draftImageIds }
+                : { text };
             if (this.onInputCallback) {
-                this.onInputCallback(text);
+                this.onInputCallback(payload);
             }
             else {
-                this.pendingUserInputs.push(text);
+                this.pendingPromptPayloads.push(payload);
             }
             this.editor.addToHistory?.(text);
         };
@@ -2978,14 +3101,14 @@ export class InteractiveMode {
         }
     }
     async getUserInput() {
-        const queuedInput = this.pendingUserInputs.shift();
-        if (queuedInput !== undefined) {
-            return queuedInput;
+        const queuedPayload = this.pendingPromptPayloads.shift();
+        if (queuedPayload !== undefined) {
+            return queuedPayload;
         }
         return new Promise((resolve) => {
-            this.onInputCallback = (text) => {
+            this.onInputCallback = (payload) => {
                 this.onInputCallback = undefined;
-                resolve(text);
+                resolve(payload);
             };
         });
     }
@@ -3028,6 +3151,7 @@ export class InteractiveMode {
      */
     isShuttingDown = false;
     async shutdown(options) {
+        this.interactiveLoopActive = false;
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
@@ -5022,34 +5146,31 @@ export class InteractiveMode {
     /**
      * Get capitalized display string for an editor keybinding action.
      */
-    getEditorKeyDisplay(action) {
-        return keyDisplayText(action);
-    }
     handleHotkeysCommand() {
         // Navigation keybindings
-        const cursorUp = this.getEditorKeyDisplay("tui.editor.cursorUp");
-        const cursorDown = this.getEditorKeyDisplay("tui.editor.cursorDown");
-        const cursorLeft = this.getEditorKeyDisplay("tui.editor.cursorLeft");
-        const cursorRight = this.getEditorKeyDisplay("tui.editor.cursorRight");
-        const cursorWordLeft = this.getEditorKeyDisplay("tui.editor.cursorWordLeft");
-        const cursorWordRight = this.getEditorKeyDisplay("tui.editor.cursorWordRight");
-        const cursorLineStart = this.getEditorKeyDisplay("tui.editor.cursorLineStart");
-        const cursorLineEnd = this.getEditorKeyDisplay("tui.editor.cursorLineEnd");
-        const jumpForward = this.getEditorKeyDisplay("tui.editor.jumpForward");
-        const jumpBackward = this.getEditorKeyDisplay("tui.editor.jumpBackward");
-        const pageUp = this.getEditorKeyDisplay("tui.editor.pageUp");
-        const pageDown = this.getEditorKeyDisplay("tui.editor.pageDown");
+        const cursorUp = keyDisplayText("tui.editor.cursorUp");
+        const cursorDown = keyDisplayText("tui.editor.cursorDown");
+        const cursorLeft = keyDisplayText("tui.editor.cursorLeft");
+        const cursorRight = keyDisplayText("tui.editor.cursorRight");
+        const cursorWordLeft = keyDisplayText("tui.editor.cursorWordLeft");
+        const cursorWordRight = keyDisplayText("tui.editor.cursorWordRight");
+        const cursorLineStart = keyDisplayText("tui.editor.cursorLineStart");
+        const cursorLineEnd = keyDisplayText("tui.editor.cursorLineEnd");
+        const jumpForward = keyDisplayText("tui.editor.jumpForward");
+        const jumpBackward = keyDisplayText("tui.editor.jumpBackward");
+        const pageUp = keyDisplayText("tui.editor.pageUp");
+        const pageDown = keyDisplayText("tui.editor.pageDown");
         // Editing keybindings
-        const submit = this.getEditorKeyDisplay("tui.input.submit");
-        const newLine = this.getEditorKeyDisplay("tui.input.newLine");
-        const deleteWordBackward = this.getEditorKeyDisplay("tui.editor.deleteWordBackward");
-        const deleteWordForward = this.getEditorKeyDisplay("tui.editor.deleteWordForward");
-        const deleteToLineStart = this.getEditorKeyDisplay("tui.editor.deleteToLineStart");
-        const deleteToLineEnd = this.getEditorKeyDisplay("tui.editor.deleteToLineEnd");
-        const yank = this.getEditorKeyDisplay("tui.editor.yank");
-        const yankPop = this.getEditorKeyDisplay("tui.editor.yankPop");
-        const undo = this.getEditorKeyDisplay("tui.editor.undo");
-        const tab = this.getEditorKeyDisplay("tui.input.tab");
+        const submit = keyDisplayText("tui.input.submit");
+        const newLine = keyDisplayText("tui.input.newLine");
+        const deleteWordBackward = keyDisplayText("tui.editor.deleteWordBackward");
+        const deleteWordForward = keyDisplayText("tui.editor.deleteWordForward");
+        const deleteToLineStart = keyDisplayText("tui.editor.deleteToLineStart");
+        const deleteToLineEnd = keyDisplayText("tui.editor.deleteToLineEnd");
+        const yank = keyDisplayText("tui.editor.yank");
+        const yankPop = keyDisplayText("tui.editor.yankPop");
+        const undo = keyDisplayText("tui.editor.undo");
+        const tab = keyDisplayText("tui.input.tab");
         // App keybindings
         const interrupt = this.getAppKeyDisplay("app.interrupt");
         const clear = this.getAppKeyDisplay("app.clear");