muonroi-cli 1.7.1 → 1.7.2

package/dist/src/generated/version.d.ts

@@ -1,2 +1,2 @@
-export declare const PACKAGE_VERSION = "1.7.1";
+export declare const PACKAGE_VERSION = "1.7.2";
 export declare const PACKAGE_DESCRIPTION = "BYOK AI coding agent with multi-model council debate, role-based routing, and auto-compact.";

package/dist/src/generated/version.js

@@ -1,5 +1,5 @@
 // AUTO-GENERATED by scripts/sync-version.cjs. DO NOT EDIT BY HAND.
 // Sourced from package.json at build time so it survives bun --compile bundling.
-export const PACKAGE_VERSION = "1.7.1";
+export const PACKAGE_VERSION = "1.7.2";
 export const PACKAGE_DESCRIPTION = "BYOK AI coding agent with multi-model council debate, role-based routing, and auto-compact.";
 //# sourceMappingURL=version.js.map

package/dist/src/index.js

@@ -391,6 +391,7 @@ async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi,
     const { createRoot } = await import("@opentui/react");
     const { createElement } = await import("react");
     const { App } = await import("./ui/app.js");
+    const { relaunchWithSession } = await import("./ui/utils/relaunch.js");
     const renderer = await createCliRenderer({
         exitOnCtrlC: false,
         // We manage SIGINT ourselves (orchestrator abort → agent cleanup → renderer destroy).
@@ -441,64 +442,106 @@ async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi,
         process.env.TERM_PROGRAM === "WezTerm" ||
         process.env.TERM_PROGRAM === "wezterm" ||
         process.env.MUONROI_FORCE_SHELL_HOLD === "1";
-    const onExit = () => {
-        void agent.cleanup().finally(() => {
-            // Restore terminal state from JS before the native destroyRenderer runs
-            restoreTerminalSync();
-            renderer.destroy();
-            // Restore terminal modes BEFORE spawning child shell. Use synchronous
-            // writes to stdout's underlying fd so escape codes flush before the
-            // child inherits stdin — async process.stdout.write() can buffer past
-            // the spawn() boundary, leaving the terminal in mouse-tracking mode.
-            const writeSync = (seq) => {
-                try {
-                    const fs = require("node:fs");
-                    fs.writeSync(1, seq);
-                }
-                catch {
-                    /* fall back to async */
-                    try {
-                        process.stdout.write(seq);
-                    }
-                    catch {
-                        /* noop */
-                    }
-                }
-            };
+    // Restore the terminal to a clean main-screen state: undo Kitty keyboard,
+    // raw mode, mouse tracking, bracketed paste, and alt-screen. Shared by the
+    // /exit path AND the session-resume relaunch — a relaunch that skips this
+    // leaves the child (and, once the parent exits, the shell) with a terminal
+    // still in mouse-tracking/alt-screen mode, so stray escape bytes get parsed
+    // by the shell as a bogus command ("'…' is not recognized … operable
+    // program or batch file").
+    function restoreTerminalForHandoff() {
+        // Restore terminal state from JS before the native destroyRenderer runs
+        restoreTerminalSync();
+        renderer.destroy();
+        // Use synchronous writes to stdout's underlying fd so escape codes flush
+        // before the child inherits stdin — async process.stdout.write() can buffer
+        // past the spawn() boundary, leaving the terminal in mouse-tracking mode.
+        const writeSync = (seq) => {
             try {
-                // 1. Take stdin out of raw mode + pause it so no buffered keystrokes
-                //    (or in-flight mouse-event bytes) hit the child shell.
-                if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
-                    try {
-                        process.stdin.setRawMode(false);
-                    }
-                    catch {
-                        /* noop */
-                    }
-                }
+                const fs = require("node:fs");
+                fs.writeSync(1, seq);
+            }
+            catch {
+                /* fall back to async */
                 try {
-                    process.stdin.pause();
+                    process.stdout.write(seq);
                 }
                 catch {
                     /* noop */
                 }
+            }
+        };
+        try {
+            // 1. Take stdin out of raw mode + pause it so no buffered keystrokes
+            //    (or in-flight mouse-event bytes) hit the child.
+            if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
                 try {
-                    process.stdin.unref?.();
+                    process.stdin.setRawMode(false);
                 }
                 catch {
                     /* noop */
                 }
-                // 2. Disable extended-coords first (1006/1015/1005), then the basic
-                //    tracking modes (1003→1002→1000). Wrong order leaves the terminal
-                //    emitting SGR-formatted events after the base modes are off.
-                writeSync("\x1B[?1006l\x1B[?1015l\x1B[?1005l");
-                writeSync("\x1B[?1003l\x1B[?1002l\x1B[?1000l");
-                writeSync("\x1B[?2004l\x1B[?25h"); // bracketed paste off, cursor on
-                writeSync("\x1B[?1049l\x1B[0m\x1B[!p"); // exit alt-screen, reset SGR, soft reset
+            }
+            try {
+                process.stdin.pause();
+            }
+            catch {
+                /* noop */
+            }
+            try {
+                process.stdin.unref?.();
             }
             catch {
-                // best-effort
+                /* noop */
             }
+            // 2. Disable extended-coords first (1006/1015/1005), then the basic
+            //    tracking modes (1003→1002→1000). Wrong order leaves the terminal
+            //    emitting SGR-formatted events after the base modes are off.
+            writeSync("\x1B[?1006l\x1B[?1015l\x1B[?1005l");
+            writeSync("\x1B[?1003l\x1B[?1002l\x1B[?1000l");
+            writeSync("\x1B[?2004l\x1B[?25h"); // bracketed paste off, cursor on
+            writeSync("\x1B[?1049l\x1B[0m\x1B[!p"); // exit alt-screen, reset SGR, soft reset
+        }
+        catch {
+            // best-effort
+        }
+    }
+    // Resume a different session by restarting the CLI bound to --session <id>.
+    // Routes through the SAME teardown as /exit, then supervises the child so the
+    // shell never reclaims the foreground mid-restart (which corrupted the
+    // terminal and dropped the user back to a broken prompt).
+    const onRelaunch = (sessionId) => {
+        void agent.cleanup().finally(() => {
+            restoreTerminalForHandoff();
+            // Let the terminal process the restore sequences before the child takes
+            // over stdin (mirrors the /exit shell-hold timing).
+            setTimeout(() => {
+                try {
+                    relaunchWithSession(sessionId, { supervise: true });
+                }
+                catch (err) {
+                    console.error(`[relaunch] failed: ${err?.message ?? err}`);
+                    process.exit(1);
+                }
+            }, 80);
+        });
+    };
+    const onExit = () => {
+        void agent.cleanup().finally(() => {
+            restoreTerminalForHandoff();
+            const writeSync = (seq) => {
+                try {
+                    require("node:fs").writeSync(1, seq);
+                }
+                catch {
+                    try {
+                        process.stdout.write(seq);
+                    }
+                    catch {
+                        /* noop */
+                    }
+                }
+            };
             // WezTerm (and similar single-pane terminals) closes the window when
             // the foreground process exits. To keep the pane usable after `/exit`,
             // we hand control over to an interactive shell instead of exiting.
@@ -547,6 +590,7 @@ async function startInteractive(apiKey, baseURL, model, maxToolRounds, batchApi,
         },
         initialMessage,
         onExit,
+        onRelaunch,
     }));
 }
 async function runHeadless(prompt, apiKey, baseURL, model, maxToolRounds, batchApi, sandboxMode, sandboxSettings, format, session, permissionMode = "safe", councilAutoAnswer) {

package/dist/src/storage/sessions.d.ts

@@ -8,6 +8,12 @@ export declare class SessionStore {
     /**
      * List recent sessions in this workspace (most recently updated first).
      * Used by the `/sessions` slash command for resume picking.
+     *
+     * Only sessions that actually have a persisted message are returned. Every
+     * CLI launch WITHOUT `--session` opens a fresh empty session, and test /
+     * harness runs leave behind title-only stubs — without this filter the picker
+     * fills with empty rows that resume to a blank screen, so a user picking one
+     * thinks resume is broken.
      */
     listRecentSessions(limit?: number): SessionInfo[];
     getLatestSession(): SessionInfo | null;

package/dist/src/storage/sessions.js

@@ -64,14 +64,21 @@ export class SessionStore {
     /**
      * List recent sessions in this workspace (most recently updated first).
      * Used by the `/sessions` slash command for resume picking.
+     *
+     * Only sessions that actually have a persisted message are returned. Every
+     * CLI launch WITHOUT `--session` opens a fresh empty session, and test /
+     * harness runs leave behind title-only stubs — without this filter the picker
+     * fills with empty rows that resume to a blank screen, so a user picking one
+     * thinks resume is broken.
      */
     listRecentSessions(limit = 20) {
         const rows = getDatabase()
             .prepare(`
-      SELECT id, workspace_id, title, model, mode, cwd_at_start, cwd_last, status, created_at, updated_at
-      FROM sessions
-      WHERE workspace_id = ?
-      ORDER BY updated_at DESC
+      SELECT s.id, s.workspace_id, s.title, s.model, s.mode, s.cwd_at_start, s.cwd_last, s.status, s.created_at, s.updated_at
+      FROM sessions s
+      WHERE s.workspace_id = ?
+        AND EXISTS (SELECT 1 FROM messages m WHERE m.session_id = s.id)
+      ORDER BY s.updated_at DESC
       LIMIT ?
     `)
             .all(this.workspace.id, limit);

package/dist/src/ui/app.d.ts

@@ -16,6 +16,6 @@ import "./slash/export.js";
 import "./slash/status.js";
 import type { AppProps } from "./types.js";
 export type { AppStartupConfig } from "./types.js";
-export declare function App({ agent, startupConfig, initialMessage, onExit }: AppProps): import("react").ReactNode;
+export declare function App({ agent, startupConfig, initialMessage, onExit, onRelaunch }: AppProps): import("react").ReactNode;
 export type { McpRunInfo } from "./components/message-view.js";
 export { computeMcpRunInfo } from "./components/message-view.js";

package/dist/src/ui/app.js

@@ -408,7 +408,7 @@ ${prompt}`;
 // user cannot enable a provider we are not actively maintaining UX for.
 // Hoisted to module-level so React useEffect deps stay stable across renders.
 const SPLASH_PROVIDERS = ["deepseek", "siliconflow"];
-export function App({ agent, startupConfig, initialMessage, onExit }) {
+export function App({ agent, startupConfig, initialMessage, onExit, onRelaunch }) {
     const t = dark;
     const renderer = useRenderer();
     // Set initial status bar values synchronously before first render
@@ -3929,9 +3929,15 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
             case "update":
                 setIsUpdating(true);
                 setUpdateOutput(null);
+                // Always echo into the message log — the home-screen `updateOutput`
+                // banner only renders on the splash screen, so an /update run inside an
+                // active chat would otherwise produce no visible output at all.
+                setMessages((prev) => [...prev, buildAssistantEntry("⟳ Checking for updates…")]);
                 runUpdate(startupConfig.version).then((result) => {
                     setIsUpdating(false);
-                    setUpdateOutput(result.success ? result.output : `Update failed: ${result.output}`);
+                    const text = result.success ? result.output : `Update failed: ${result.output}`;
+                    setUpdateOutput(text);
+                    setMessages((prev) => [...prev, buildAssistantEntry(text)]);
                 });
                 break;
             case "clear":
@@ -4830,9 +4836,14 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
             if (key.name === "return") {
                 setIsUpdating(true);
                 setShowUpdateModal(false);
+                // Echo into the message log too — same reason as the /update command:
+                // the updateOutput banner only renders on the home/splash screen.
+                setMessages((prev) => [...prev, buildAssistantEntry("⟳ Checking for updates…")]);
                 runUpdate(startupConfig.version).then((result) => {
                     setIsUpdating(false);
-                    setUpdateOutput(result.output);
+                    const text = result.success ? result.output : `Update failed: ${result.output}`;
+                    setUpdateOutput(text);
+                    setMessages((prev) => [...prev, buildAssistantEntry(text)]);
                 });
                 return;
             }
@@ -5228,12 +5239,21 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
                 }
                 // Close the modal first so the toast renders before the spawn.
                 setShowSessionPicker(false);
-                pushToast("info", `Resuming session ${picked.id.slice(-8)}… restarting CLI`);
-                // Defer to the next tick so OpenTUI flushes the toast frame; then
-                // spawn the child (which inherits the TTY) and exit this process.
+                pushToast("info", `Resuming session ${picked.id}… restarting CLI`);
+                // Defer to the next tick so OpenTUI flushes the toast frame, then hand
+                // off to onRelaunch — which tears down the renderer + restores the
+                // terminal (raw mode / mouse tracking / alt-screen) and supervises the
+                // child. Doing the spawn here directly (the old relaunchWithSession
+                // call) skipped that teardown and dropped the user to a corrupted
+                // shell prompt. Fall back to the legacy path only if no handler wired.
                 setTimeout(() => {
                     try {
-                        relaunchWithSession(picked.id);
+                        if (onRelaunch) {
+                            onRelaunch(picked.id);
+                        }
+                        else {
+                            relaunchWithSession(picked.id);
+                        }
                     }
                     catch (err) {
                         console.error(`[session-picker] relaunch failed: ${err?.message ?? err}`);

package/dist/src/ui/modals/session-picker-modal.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
+import { Semantic } from "@muonroi/agent-harness-opentui";
 import { bottomAlignedModalTop } from "../utils/modal.js";
 /**
  * Recent-sessions picker. Opened by `/sessions` or `/session`. Selecting a
@@ -14,15 +15,19 @@ export function SessionPickerModal({ t, sessions, focusIndex, width, height, })
     const panelHeight = Math.min(contentHeight, maxH);
     const top = bottomAlignedModalTop(height, panelHeight);
     const overlayBg = "#000000cc";
-    return (_jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Resume session" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("scrollbox", { flexGrow: 1, minHeight: 0, children: sessions.length === 0 ? (_jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "No prior sessions in this workspace." }) })) : (sessions.map((s, idx) => {
-                        const focused = idx === focusIndex;
-                        const ts = formatTimestamp(s.updatedAt);
-                        const titleRaw = s.title?.trim() || "(untitled)";
-                        const titleMax = Math.max(8, panelWidth - 38);
-                        const title = titleRaw.length > titleMax ? `${titleRaw.slice(0, titleMax - 1)}…` : titleRaw;
-                        const idShort = s.id.slice(-8);
-                        return (_jsxs("box", { backgroundColor: focused ? t.selectedBg : undefined, paddingLeft: 2, paddingRight: 2, width: "100%", flexDirection: "row", justifyContent: "space-between", children: [_jsx("text", { fg: focused ? t.selected : t.text, children: `${ts}  ${title}` }), _jsx("text", { fg: focused ? t.primary : t.textMuted, children: `${s.model}  ${idShort}` })] }, s.id));
-                    })) }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "↑↓ navigate · enter resume (restarts CLI) · esc cancel" }) })] }) }));
+    return (_jsx(Semantic, { id: "session-picker", role: "dialog", name: "Resume session", isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: t.primary, children: _jsx("b", { children: "Resume session" }) }), _jsx("text", { fg: t.textMuted, children: "esc" })] }), _jsx("scrollbox", { flexGrow: 1, minHeight: 0, children: sessions.length === 0 ? (_jsx("box", { paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "No prior sessions in this workspace." }) })) : (sessions.map((s, idx) => {
+                            const focused = idx === focusIndex;
+                            const ts = formatTimestamp(s.updatedAt);
+                            const titleRaw = s.title?.trim() || "(untitled)";
+                            const titleMax = Math.max(8, panelWidth - 38);
+                            const title = titleRaw.length > titleMax ? `${titleRaw.slice(0, titleMax - 1)}…` : titleRaw;
+                            // Show the FULL session id (not slice(-8)). The resumed-session
+                            // header displays the full id, so a truncated id here made users
+                            // think they had resumed a "different" session when it was the
+                            // same one shown in two formats.
+                            const idLabel = s.id;
+                            return (_jsx(Semantic, { id: `session-item-${idx}`, role: "listitem", name: `${title} ${idLabel}`, value: s.id, selected: focused || undefined, children: _jsxs("box", { backgroundColor: focused ? t.selectedBg : undefined, paddingLeft: 2, paddingRight: 2, width: "100%", flexDirection: "row", justifyContent: "space-between", children: [_jsx("text", { fg: focused ? t.selected : t.text, children: `${ts}  ${title}` }), _jsx("text", { fg: focused ? t.primary : t.textMuted, children: `${s.model}  ${idLabel}` })] }) }, s.id));
+                        })) }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "↑↓ navigate · enter resume (restarts CLI) · esc cancel" }) })] }) }) }));
 }
 /**
  * Compact MM-DD HH:MM timestamp for the picker rows. Trades the year for

package/dist/src/ui/modals/update-modal.js

@@ -1,10 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
+import { Semantic } from "@muonroi/agent-harness-opentui";
 import { bottomAlignedModalTop } from "../utils/modal.js";
 export function UpdateModal({ t, width, height, currentVersion, latestVersion, }) {
     const overlayBg = "#000000cc";
     const panelWidth = Math.min(60, width - 6);
     const panelHeight = 9;
     const top = bottomAlignedModalTop(height, panelHeight);
-    return (_jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: "#f59e0b", children: _jsx("b", { children: "Update Available" }) }), _jsx("text", { fg: t.textMuted, children: "esc to dismiss" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsxs("text", { fg: t.text, children: ["A new version of muonroi-cli is available: ", _jsxs("span", { style: { fg: t.textMuted }, children: ["v", currentVersion] }), " → ", _jsxs("span", { style: { fg: "#22c55e" }, children: ["v", latestVersion] })] }) }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Press enter to update now, or esc to dismiss" }) })] }) }));
+    return (_jsx(Semantic, { id: "update-modal", role: "dialog", name: "Update Available", isModal: true, children: _jsx("box", { position: "absolute", left: 0, top: 0, width: width, height: height, alignItems: "center", paddingTop: top, backgroundColor: overlayBg, children: _jsxs("box", { width: panelWidth, height: panelHeight, backgroundColor: t.backgroundPanel, paddingTop: 1, paddingBottom: 1, flexDirection: "column", children: [_jsxs("box", { flexShrink: 0, flexDirection: "row", justifyContent: "space-between", paddingLeft: 2, paddingRight: 2, children: [_jsx("text", { fg: "#f59e0b", children: _jsx("b", { children: "Update Available" }) }), _jsx("text", { fg: t.textMuted, children: "esc to dismiss" })] }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsxs("text", { fg: t.text, children: ["A new version of muonroi-cli is available: ", _jsxs("span", { style: { fg: t.textMuted }, children: ["v", currentVersion] }), " → ", _jsxs("span", { style: { fg: "#22c55e" }, children: ["v", latestVersion] })] }) }), _jsx("box", { flexShrink: 0, paddingLeft: 2, paddingRight: 2, paddingTop: 1, children: _jsx("text", { fg: t.textMuted, children: "Press enter to update now, or esc to dismiss" }) })] }) }) }));
 }
 //# sourceMappingURL=update-modal.js.map

package/dist/src/ui/types.d.ts

@@ -69,6 +69,13 @@ export interface AppProps {
     startupConfig: AppStartupConfig;
     initialMessage?: string;
     onExit?: () => void;
+    /**
+     * Restart the CLI bound to a different session id (used by the /sessions
+     * picker). Routes through the same terminal teardown as onExit and supervises
+     * the child process, so resuming never strands the user at a corrupted shell
+     * prompt.
+     */
+    onRelaunch?: (sessionId: string) => void;
 }
 export interface ActiveTurnState {
     kind: "local" | "telegram";

package/dist/src/ui/utils/relaunch.d.ts

@@ -27,6 +27,23 @@ export interface RelaunchOptions {
     onExit?: (code: number) => void;
     /** Injected spawn for tests. Defaults to the real node:child_process spawn. */
     spawnFn?: typeof spawn;
+    /**
+     * Run immediately before the spawn — used to tear down the current TUI
+     * (renderer.destroy, restore raw mode / mouse tracking / alt-screen) so the
+     * child inherits a CLEAN terminal. Without this the child (and the shell, if
+     * the parent exits) inherit a terminal still in mouse-tracking/alt-screen
+     * mode, and stray escape bytes get parsed by the shell as a command
+     * ("'…' is not recognized as an internal or external command").
+     */
+    beforeSpawn?: () => void;
+    /**
+     * When true, the parent stays alive and supervises the child: it exits with
+     * the child's exit code instead of exiting the instant the child spawns.
+     * This keeps any intermediate launcher (a `bun run` wrapper, the bun bin
+     * shim) alive so the shell does NOT regain the terminal foreground while the
+     * child is running. Required for a correct in-terminal restart on Windows.
+     */
+    supervise?: boolean;
 }
 /**
  * Spawn a fresh CLI process bound to {sessionId} and exit the current one.

package/dist/src/ui/utils/relaunch.js

@@ -26,16 +26,22 @@ export function sanitizeArgvForResume(args, sessionId) {
     const out = [];
     for (let i = 0; i < args.length; i++) {
         const a = args[i];
-        if (a === "-s" || a === "--session") {
+        if (a === "-s" || a === "--session" || a === "--mock-llm") {
             // skip the flag AND its value (if present and not another flag)
             const next = args[i + 1];
             if (next !== undefined && !next.startsWith("-"))
                 i++;
             continue;
         }
-        if (a.startsWith("--session=")) {
+        if (a.startsWith("--session=") || a.startsWith("--mock-llm=")) {
             continue; // skip the combined form
         }
+        // Transient launch-mode flags must NOT survive a resume — re-entering
+        // agent-mode (named-pipe transport) on a user-driven resume strands the
+        // child with no harness server. Drop them.
+        if (a === "--agent-mode") {
+            continue;
+        }
         out.push(a);
     }
     out.push("--session", sessionId);
@@ -60,12 +66,30 @@ export function relaunchWithSession(sessionId, opts = {}) {
     const exit = opts.onExit ?? ((code) => process.exit(code));
     const spawnImpl = opts.spawnFn ?? spawn;
     const args = sanitizeArgvForResume(argv.slice(1), sessionId);
+    // Tear down the current TUI and restore the terminal BEFORE spawning so the
+    // child inherits a clean TTY (no raw mode / mouse tracking / alt-screen).
+    if (opts.beforeSpawn) {
+        try {
+            opts.beforeSpawn();
+        }
+        catch (err) {
+            console.error(`[relaunch] beforeSpawn teardown failed: ${err?.message ?? err}`);
+        }
+    }
     const child = spawnImpl(exec, args, { stdio: "inherit", detached: false });
     child.once("error", (err) => {
         console.error(`[relaunch] spawn failed: ${err?.message ?? err}`);
         exit(1);
     });
-    // Hand the TTY to the child and exit cleanly. The child takes over rendering.
+    if (opts.supervise) {
+        // Stay alive until the child exits so any intermediate launcher (bun run
+        // wrapper / bin shim) keeps the terminal foreground for the child instead
+        // of letting the shell reclaim it mid-restart.
+        child.once("exit", (code) => exit(code ?? 0));
+        return;
+    }
+    // Legacy fast-handoff: exit the instant the child spawns. Correct only when
+    // there is no intervening launcher waiting on this process.
     child.once("spawn", () => exit(0));
 }
 //# sourceMappingURL=relaunch.js.map

package/dist/src/ui/utils/relaunch.test.js

@@ -40,6 +40,24 @@ describe("sanitizeArgvForResume", () => {
         expect(() => sanitizeArgvForResume([], "")).toThrow(/sessionId is required/);
         expect(() => sanitizeArgvForResume([], "  ")).toThrow(/sessionId is required/);
     });
+    it("strips transient launch-mode flags (--agent-mode) so resume does not re-enter agent-mode", () => {
+        expect(sanitizeArgvForResume(["--agent-mode", "-m", "grok-build-0.1"], "new-id")).toEqual([
+            "-m",
+            "grok-build-0.1",
+            "--session",
+            "new-id",
+        ]);
+    });
+    it("strips `--mock-llm <dir>` and the combined form", () => {
+        expect(sanitizeArgvForResume(["--mock-llm", "/fix/dir", "-y"], "new-id")).toEqual(["-y", "--session", "new-id"]);
+        expect(sanitizeArgvForResume(["--mock-llm=/fix/dir", "-y"], "new-id")).toEqual(["-y", "--session", "new-id"]);
+    });
+    it("strips agent-mode + mock-llm together (harness-launched resume → clean user CLI)", () => {
+        expect(sanitizeArgvForResume(["--agent-mode", "--mock-llm", "/fx", "--session", "old"], "new")).toEqual([
+            "--session",
+            "new",
+        ]);
+    });
 });
 describe("relaunchWithSession", () => {
     it("spawns the same executable with the sanitized argv + session id, then exits 0", () => {
@@ -72,6 +90,38 @@ describe("relaunchWithSession", () => {
         expect(errMock).toHaveBeenCalled();
         errMock.mockRestore();
     });
+    it("runs beforeSpawn teardown before spawning", () => {
+        const calls = [];
+        const child = new EventEmitter();
+        const spawnMock = vi.fn(() => {
+            calls.push("spawn");
+            return child;
+        });
+        relaunchWithSession("sess", {
+            argv: ["/bin/bun", "src/index.ts"],
+            onExit: () => { },
+            spawnFn: spawnMock,
+            beforeSpawn: () => calls.push("teardown"),
+        });
+        expect(calls).toEqual(["teardown", "spawn"]);
+    });
+    it("supervise: stays alive until the child exits, then propagates the exit code", () => {
+        const exitMock = vi.fn();
+        const child = new EventEmitter();
+        const spawnMock = vi.fn(() => child);
+        relaunchWithSession("sess", {
+            argv: ["/bin/bun", "src/index.ts"],
+            onExit: exitMock,
+            spawnFn: spawnMock,
+            supervise: true,
+        });
+        // Does NOT exit on spawn when supervising.
+        child.emit("spawn");
+        expect(exitMock).not.toHaveBeenCalled();
+        // Exits with the child's code when the child finally exits.
+        child.emit("exit", 3);
+        expect(exitMock).toHaveBeenCalledWith(3);
+    });
     it("throws when argv[0] is missing (cannot relaunch without an executable)", () => {
         expect(() => relaunchWithSession("sess", {
             argv: [],

package/package.json

@@ -3,7 +3,7 @@
   "workspaces": [
     "packages/*"
   ],
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "BYOK AI coding agent with multi-model council debate, role-based routing, and auto-compact.",
   "repository": {
     "type": "git",