@ai-agent-forge/agent-forge 0.85.2 → 0.85.4

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

@@ -875,6 +875,13 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
+                // Inputs queued during startup may be "/" commands or "!" bash
+                // lines; replay them through the normal submit path (they were
+                // queued precisely because it needs the post-startup context).
+                // Inputs arriving through onInputCallback were already filtered
+                // by the editor submit handler, so this is a no-op for them.
+                if (await this.dispatchCommandOrBash(userInput))
+                    continue;
                 await this.promptWithEmptyReplyRetry(userInput);
             }
             catch (error) {
@@ -1532,51 +1539,29 @@ export class InteractiveMode {
             // Silently ignore clipboard errors (may not have permission, etc.)
         }
     }
-    // Startup-time submissions of plain prompts are queued; the main loop
-    // dequeues and submits them automatically once startup completes.
-    // Commands ("/", "!") and empty input keep the pre-existing behavior:
-    // commands need the post-startup dispatch context, so they are restored
-    // into the editor for the user to submit again after startup.
+    // Startup-time submissions (prompts, "/" commands, and "!" bash inputs)
+    // are all queued; the main loop dequeues them automatically once startup
+    // completes. Commands and bash inputs replay through the normal submit
+    // path (dispatch table / bash handling) because they need the
+    // post-startup context — queueing is exactly what waits for it. Restoring
+    // them into the editor instead proved hazardous: the restored text
+    // concatenated with the user's next keystrokes and could be submitted to
+    // the model as a literal prompt. Empty input is ignored.
     handleStartupSubmit(text) {
         if (!text.trim())
             return;
-        if (text.startsWith("/") || text.startsWith("!")) {
-            this.editor.setText(text);
-            this.showStatus("Startup in progress — command restored to the editor, submit again once startup completes");
-            return;
-        }
         this.pendingUserInputs.push(text);
         this.showStatus("Startup in progress — input queued and will run when startup completes");
     }
     setupEditorSubmitHandler() {
-        this.defaultEditor.onSubmit = async (text) => {
-            text = text.trim();
+        this.defaultEditor.onSubmit = async (rawText) => {
+            const text = rawText.trim();
             if (!text)
                 return;
-            // Handle /commands through the dispatch table (interactive-commands.ts)
-            const dispatched = this.dispatchEditorCommand(text);
-            if (dispatched) {
-                if (dispatched.pending)
-                    await dispatched.pending;
+            // Handle /commands and bash inputs ("!"/"!!"); this is the same path
+            // the main loop uses to replay inputs queued during startup.
+            if (await this.dispatchCommandOrBash(text))
                 return;
-            }
-            // Handle bash command (! for normal, !! for excluded from context)
-            if (text.startsWith("!")) {
-                const isExcluded = text.startsWith("!!");
-                const command = isExcluded ? text.slice(2).trim() : text.slice(1).trim();
-                if (command) {
-                    if (this.facade.isBashRunning()) {
-                        this.showWarning("A bash command is already running. Press Esc to cancel it first.");
-                        this.editor.setText(text);
-                        return;
-                    }
-                    this.editor.addToHistory?.(text);
-                    await this.handleBashCommand(command, isExcluded);
-                    this.isBashMode = false;
-                    this.updateEditorBorderColor();
-                    return;
-                }
-            }
             // Queue input during compaction
             if (this.facade.isCompacting()) {
                 this.queueCompactionMessage(text, "steer");
@@ -1604,6 +1589,39 @@ export class InteractiveMode {
             this.editor.addToHistory?.(text);
         };
     }
+    /**
+     * Shared "/"-command and bash ("!"/"!!") handling for the editor submit
+     * path and the main-loop replay of inputs queued during startup. Returns
+     * true when the input was handled as a command or bash invocation; false
+     * means the caller should treat it as a normal prompt.
+     */
+    async dispatchCommandOrBash(text) {
+        // Handle /commands through the dispatch table (interactive-commands.ts)
+        const dispatched = this.dispatchEditorCommand(text);
+        if (dispatched) {
+            if (dispatched.pending)
+                await dispatched.pending;
+            return true;
+        }
+        // Handle bash command (! for normal, !! for excluded from context)
+        if (text.startsWith("!")) {
+            const isExcluded = text.startsWith("!!");
+            const command = isExcluded ? text.slice(2).trim() : text.slice(1).trim();
+            if (command) {
+                if (this.facade.isBashRunning()) {
+                    this.showWarning("A bash command is already running. Press Esc to cancel it first.");
+                    this.editor.setText(text);
+                    return true;
+                }
+                this.editor.addToHistory?.(text);
+                await this.handleBashCommand(command, isExcluded);
+                this.isBashMode = false;
+                this.updateEditorBorderColor();
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * Run a /command through COMMAND_DISPATCH_ENTRIES. Returns undefined when
      * text is not a registered command; otherwise the command has been fully