@dreb/coding-agent 2.46.0 → 2.47.0

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

@@ -35,6 +35,7 @@ import { parseGitUrl } from "../../utils/git.js";
 import { extractCopyableText, extractThinkingText, getMessagePreview, getMessageRoleLabel, toSingleLinePreview, } from "../../utils/message-text.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { ArminComponent } from "./components/armin.js";
+import { AskUserComponent } from "./components/ask-user.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
@@ -136,6 +137,8 @@ export class InteractiveMode {
     extensionSelector = undefined;
     extensionInput = undefined;
     extensionEditor = undefined;
+    extensionAsk = undefined;
+    extensionDialogQueue = Promise.resolve();
     extensionTerminalInputUnsubscribers = new Set();
     // Extension widgets (components rendered above/below the editor)
     extensionWidgetsAbove = new Map();
@@ -1184,6 +1187,9 @@ export class InteractiveMode {
         if (this.extensionEditor) {
             this.hideExtensionEditor();
         }
+        if (this.extensionAsk) {
+            this.hideExtensionAsk();
+        }
         this.ui.hideOverlay();
         this.clearExtensionTerminalInputListeners();
         this.setExtensionFooter(undefined);
@@ -1406,9 +1412,22 @@ export class InteractiveMode {
      */
     createExtensionUIContext() {
         return {
-            select: (title, options, opts) => this.showExtensionSelector(title, options, opts),
-            confirm: (title, message, opts) => this.showExtensionConfirm(title, message, opts),
-            input: (title, placeholder, opts) => this.showExtensionInput(title, placeholder, opts),
+            select: (title, options, opts) => this.enqueueExtensionDialog(() => this.showExtensionSelector(title, options, opts), {
+                signal: opts?.signal,
+                abortedValue: undefined,
+            }),
+            confirm: (title, message, opts) => this.enqueueExtensionDialog(() => this.showExtensionConfirm(title, message, opts), {
+                signal: opts?.signal,
+                abortedValue: false,
+            }),
+            input: (title, placeholder, opts) => this.enqueueExtensionDialog(() => this.showExtensionInput(title, placeholder, opts), {
+                signal: opts?.signal,
+                abortedValue: undefined,
+            }),
+            ask: (request, opts) => this.enqueueExtensionDialog(() => this.showExtensionAsk(request, opts), {
+                signal: opts?.signal,
+                abortedValue: undefined,
+            }),
             notify: (message, type) => this.showExtensionNotify(message, type),
             onTerminalInput: (handler) => this.addExtensionTerminalInputListener(handler),
             setStatus: (key, text) => this.setExtensionStatus(key, text),
@@ -1417,11 +1436,11 @@ export class InteractiveMode {
             setFooter: (factory) => this.setExtensionFooter(factory),
             setHeader: (factory) => this.setExtensionHeader(factory),
             setTitle: (title) => this.ui.terminal.setTitle(title),
-            custom: (factory, options) => this.showExtensionCustom(factory, options),
+            custom: (factory, options) => this.enqueueExtensionDialog(() => this.showExtensionCustom(factory, options)),
             pasteToEditor: (text) => this.editor.handleInput(`\x1b[200~${text}\x1b[201~`),
             setEditorText: (text) => this.editor.setText(text),
             getEditorText: () => this.editor.getExpandedText?.() ?? this.editor.getText(),
-            editor: (title, prefill) => this.showExtensionEditor(title, prefill),
+            editor: (title, prefill) => this.enqueueExtensionDialog(() => this.showExtensionEditor(title, prefill)),
             setEditorComponent: (factory) => this.setCustomEditorComponent(factory),
             get theme() {
                 return theme;
@@ -1447,6 +1466,32 @@ export class InteractiveMode {
             setToolsExpanded: (expanded) => this.setToolsExpanded(expanded),
         };
     }
+    /** Serialize every blocking extension dialog that can take over keyboard focus. */
+    enqueueExtensionDialog(open, opts) {
+        if (!opts?.signal) {
+            const result = this.extensionDialogQueue.then(open, open);
+            this.extensionDialogQueue = result.then(() => undefined, () => undefined);
+            return result;
+        }
+        const { signal, abortedValue } = opts;
+        if (signal.aborted)
+            return Promise.resolve(abortedValue);
+        // Settle the caller as soon as a queued dialog aborts, even if an earlier
+        // unbounded dialog still owns the UI. Its queue slot remains as a no-op so
+        // later dialogs keep their FIFO order.
+        let onQueuedAbort;
+        const aborted = new Promise((resolve) => {
+            onQueuedAbort = () => resolve(abortedValue);
+            signal.addEventListener("abort", onQueuedAbort, { once: true });
+        });
+        const run = () => {
+            signal.removeEventListener("abort", onQueuedAbort);
+            return signal.aborted ? Promise.resolve(abortedValue) : open();
+        };
+        const queued = this.extensionDialogQueue.then(run, run);
+        this.extensionDialogQueue = queued.then(() => undefined, () => undefined);
+        return Promise.race([queued, aborted]).finally(() => signal.removeEventListener("abort", onQueuedAbort));
+    }
     /**
      * Show a selector for extensions.
      */
@@ -1528,6 +1573,48 @@ export class InteractiveMode {
         this.extensionInput = undefined;
         this.restoreEditorComponent();
     }
+    /**
+     * Show a rich ask_user question for extensions/built-in tools.
+     */
+    showExtensionAsk(request, opts) {
+        return new Promise((resolve) => {
+            if (opts?.signal?.aborted) {
+                resolve(undefined);
+                return;
+            }
+            const onAbort = () => {
+                this.hideExtensionAsk();
+                resolve(undefined);
+            };
+            opts?.signal?.addEventListener("abort", onAbort, { once: true });
+            this.extensionAsk = new AskUserComponent(request, (result) => {
+                opts?.signal?.removeEventListener("abort", onAbort);
+                this.hideExtensionAsk();
+                resolve(result);
+            }, () => {
+                opts?.signal?.removeEventListener("abort", onAbort);
+                this.hideExtensionAsk();
+                // The question-level escape action means stop the whole turn, not
+                // continue without an answer. Mirror the default editor's Escape
+                // behavior, including background-agent and queued-message cleanup.
+                this.cancelBackgroundAgents();
+                this.restoreQueuedMessagesToEditor({ abort: true });
+                resolve(undefined);
+            }, { tui: this.ui, timeout: opts?.timeout });
+            this.editorContainer.clear();
+            this.editorContainer.addChild(this.extensionAsk);
+            this.ui.setFocus(this.extensionAsk);
+            this.ui.requestRender();
+        });
+    }
+    /**
+     * Hide the ask_user question.
+     */
+    hideExtensionAsk() {
+        this.extensionAsk?.dispose();
+        this.extensionAsk = undefined;
+        this.restoreEditorComponent();
+    }
     /**
      * Show a multi-line editor for extensions (with Ctrl+G support).
      */