@phi-code-admin/phi-code 0.96.1 → 0.97.1

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

@@ -20,7 +20,7 @@ import { DefaultPackageManager } from "../../core/package-manager.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
-import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
+import { BUILTIN_SLASH_COMMANDS, matchBareBuiltinWithArgs } from "../../core/slash-commands.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
@@ -123,6 +123,12 @@ export class InteractiveMode {
     version;
     isInitialized = false;
     onInputCallback;
+    // Submissions typed while the main loop was busy (prompt preflight) or a
+    // session rebuild was in flight (/new). Queued and replayed instead of
+    // silently dropped — a prompt typed right after /new used to disappear
+    // with no feedback.
+    pendingSubmissions = [];
+    sessionTransitioning = false;
     // Input mode: "act" sends messages to the agent directly; "plan" routes the next
     // message through the /plan orchestrator (5 sequential phases, one model per phase).
     // Toggled with Tab (when the editor is empty); shown by the footer Act/Plan indicator.
@@ -2098,9 +2104,17 @@ export class InteractiveMode {
                 return;
             }
             if (text === "/debug") {
-                this.handleDebugCommand();
-                this.editor.setText("");
-                return;
+                // An extension may own /debug (the debug orchestrator does). The TUI
+                // debug overlay only claims the bare form when nothing else does —
+                // otherwise it would silently shadow the extension command.
+                const extensionOwnsDebug = this.session.extensionRunner
+                    .getRegisteredCommands()
+                    .some((command) => command.name === "debug" || command.invocationName === "debug");
+                if (!extensionOwnsDebug) {
+                    this.handleDebugCommand();
+                    this.editor.setText("");
+                    return;
+                }
             }
             if (text === "/arminsayshi") {
                 this.handleArminSaysHi();
@@ -2122,6 +2136,18 @@ export class InteractiveMode {
                 await this.shutdown();
                 return;
             }
+            // A bare builtin invoked with arguments used to leak to the model as
+            // prose ("/new please"). Surface it instead — unless an extension
+            // registered a command with that name (it then owns the arguments).
+            const bareWithArgs = matchBareBuiltinWithArgs(text);
+            if (bareWithArgs &&
+                !this.session.extensionRunner
+                    .getRegisteredCommands()
+                    .some((command) => command.name === bareWithArgs || command.invocationName === bareWithArgs)) {
+                this.showWarning(`/${bareWithArgs} takes no arguments. Run \`/${bareWithArgs}\` alone.`);
+                this.editor.setText(text);
+                return;
+            }
             // Handle bash command (! for normal, !! for excluded from context)
             if (text.startsWith("!")) {
                 const isExcluded = text.startsWith("!!");
@@ -2164,7 +2190,14 @@ export class InteractiveMode {
             // Normal message submission
             // First, move any pending bash components to chat
             this.flushPendingBashComponents();
-            if (this.onInputCallback) {
+            if (this.sessionTransitioning || !this.onInputCallback) {
+                // The main loop is busy (prompt preflight) or the session is being
+                // rebuilt (/new in flight): queue and replay once ready instead of
+                // dropping the message on the floor.
+                this.pendingSubmissions.push(text);
+                this.showStatus("Message queued — sending when the session is ready");
+            }
+            else {
                 this.onInputCallback(text);
             }
             this.editor.addToHistory?.(text);
@@ -2650,6 +2683,14 @@ export class InteractiveMode {
         }
     }
     async getUserInput() {
+        // Replay submissions queued while the loop was busy — but never during a
+        // session rebuild (drainPendingSubmissions fires when it completes).
+        if (!this.sessionTransitioning) {
+            const queued = this.pendingSubmissions.shift();
+            if (queued !== undefined) {
+                return queued;
+            }
+        }
         return new Promise((resolve) => {
             this.onInputCallback = (text) => {
                 this.onInputCallback = undefined;
@@ -2657,6 +2698,20 @@ export class InteractiveMode {
             };
         });
     }
+    /**
+     * Hand one queued submission to the waiting main loop, if any. Called when
+     * a session transition completes; the loop drains the rest through
+     * getUserInput() as it comes back around.
+     */
+    drainPendingSubmissions() {
+        if (this.sessionTransitioning)
+            return;
+        const callback = this.onInputCallback;
+        if (!callback || this.pendingSubmissions.length === 0)
+            return;
+        const next = this.pendingSubmissions.shift();
+        callback(next);
+    }
     rebuildChatFromMessages() {
         this.chatContainer.clear();
         const context = this.sessionManager.buildSessionContext();
@@ -4530,6 +4585,9 @@ export class InteractiveMode {
             this.loadingAnimation = undefined;
         }
         this.statusContainer.clear();
+        // While the runtime rebuilds, submissions are queued (not sent into the
+        // half-torn-down session) and replayed by the finally below.
+        this.sessionTransitioning = true;
         try {
             const result = await this.runtimeHost.newSession();
             if (result.cancelled) {
@@ -4543,6 +4601,10 @@ export class InteractiveMode {
         catch (error) {
             await this.handleFatalRuntimeError("Failed to create session", error);
         }
+        finally {
+            this.sessionTransitioning = false;
+            this.drainPendingSubmissions();
+        }
     }
     handleDebugCommand() {
         const width = this.ui.terminal.columns;