muonroi-cli 1.6.5 → 1.7.0

package/dist/src/providers/__tests__/reasoning-roundtrip.test.js

@@ -19,7 +19,8 @@
  */
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { streamText } from "ai";
-import { describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { transformThinkingModeBody } from "../strategies/thinking-mode.js";
 function makeStubProvider(name, capture) {
     return createOpenAICompatible({
         name,
@@ -113,6 +114,11 @@ describe("reasoning_content round-trip — AI SDK 2.0.42 wire shape", () => {
         expect(Array.isArray(assistantMsg.tool_calls)).toBe(true);
         expect(assistantMsg.tool_calls[0]?.id).toBe("c1");
     });
+    // NOTE: the bare provider correctly omits reasoning_content when a turn has
+    // no reasoning part — but that is exactly the shape SiliconFlow's
+    // thinking-mode validator rejects (code 20015) in a mixed history. The
+    // strategy's transformRequestBody backfills it; see the dedicated describe
+    // block below ("transformThinkingModeBody — backfill / disable").
     it("emits no reasoning_content key when there are no reasoning parts (no false positives)", async () => {
         const capture = { current: null };
         const provider = makeStubProvider("siliconflow", capture);
@@ -132,4 +138,67 @@ describe("reasoning_content round-trip — AI SDK 2.0.42 wire shape", () => {
         expect(assistantMsg.reasoning_content).toBeUndefined();
     });
 });
+describe("transformThinkingModeBody — backfill / disable (code 20015 fix)", () => {
+    const ENV = "MUONROI_DEEPSEEK_DISABLE_THINKING";
+    let saved;
+    beforeEach(() => {
+        saved = process.env[ENV];
+        delete process.env[ENV];
+    });
+    afterEach(() => {
+        if (saved === undefined)
+            delete process.env[ENV];
+        else
+            process.env[ENV] = saved;
+    });
+    it("A (default): backfills reasoning_content on a tool-call turn that lacks it", () => {
+        const body = {
+            messages: [
+                { role: "user", content: "go" },
+                // tool-call turn with NO reasoning (the real bug shape)
+                { role: "assistant", content: null, tool_calls: [{ id: "t1", type: "function" }] },
+            ],
+        };
+        const out = transformThinkingModeBody(body);
+        const asst = out.messages.find((m) => m.role === "assistant");
+        expect(asst.reasoning_content).toBe("");
+        expect(Array.isArray(asst.tool_calls)).toBe(true); // tool_calls preserved
+        expect("thinking" in out).toBe(false); // thinking still ON
+    });
+    it("A (default): leaves a real reasoning_content untouched and patches only the gap", () => {
+        const body = {
+            messages: [
+                { role: "user", content: "go" },
+                { role: "assistant", content: null, reasoning_content: "real thought", tool_calls: [{ id: "a" }] },
+                { role: "tool", content: "result" },
+                { role: "assistant", content: null, tool_calls: [{ id: "b" }] }, // gap
+            ],
+        };
+        const out = transformThinkingModeBody(body);
+        const asst = out.messages.filter((m) => m.role === "assistant");
+        expect(asst[0].reasoning_content).toBe("real thought"); // untouched
+        expect(asst[1].reasoning_content).toBe(""); // backfilled
+    });
+    it("A (default): does not touch non-assistant messages", () => {
+        const body = {
+            messages: [
+                { role: "user", content: "hi" },
+                { role: "tool", content: "r" },
+            ],
+        };
+        const out = transformThinkingModeBody(body);
+        expect("reasoning_content" in out.messages[0]).toBe(false);
+        expect("reasoning_content" in out.messages[1]).toBe(false);
+    });
+    it("B (env=1): disables thinking and does NOT backfill reasoning_content", () => {
+        process.env[ENV] = "1";
+        const body = {
+            messages: [{ role: "assistant", content: null, tool_calls: [{ id: "t1" }] }],
+        };
+        const out = transformThinkingModeBody(body);
+        expect(out.thinking).toEqual({ type: "disabled" });
+        const asst = out.messages.find((m) => m.role === "assistant");
+        expect("reasoning_content" in asst).toBe(false);
+    });
+});
 //# sourceMappingURL=reasoning-roundtrip.test.js.map

package/dist/src/providers/strategies/deepseek.strategy.js

@@ -7,19 +7,7 @@ import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { getProviderCapabilities } from "../capabilities.js";
 import { OPENAI_COMPATIBLE_BASE_URLS } from "../endpoints.js";
 import { BaseProviderStrategy } from "./base.strategy.js";
-/**
- * If MUONROI_DEEPSEEK_DISABLE_THINKING=1 (default for self-qa), inject
- * `extra_body.thinking.type="disabled"` into every DeepSeek request per
- * https://api-docs.deepseek.com/guides/thinking_mode . Cuts response time
- * 30-50% and prevents reasoning prose from leaking into JSON outputs.
- *
- * Set MUONROI_DEEPSEEK_DISABLE_THINKING=0 to keep thinking mode on for
- * chat sessions that actually benefit from reasoning.
- */
-function shouldDisableThinking() {
-    const v = process.env["MUONROI_DEEPSEEK_DISABLE_THINKING"];
-    return v === undefined ? false : v === "1" || v.toLowerCase() === "true";
-}
+import { transformThinkingModeBody } from "./thinking-mode.js";
 export class DeepSeekStrategy extends BaseProviderStrategy {
     id = "deepseek";
     capabilities = getProviderCapabilities("deepseek");
@@ -34,15 +22,10 @@ export class DeepSeekStrategy extends BaseProviderStrategy {
             // json_object form for generateObject calls, matching DeepSeek docs:
             // https://api-docs.deepseek.com/guides/json_mode .
             supportsStructuredOutputs: false,
-            transformRequestBody: (body) => {
-                if (shouldDisableThinking()) {
-                    return {
-                        ...body,
-                        thinking: { type: "disabled" },
-                    };
-                }
-                return body;
-            },
+            // Thinking-mode round-trip fix: backfill reasoning_content (default) or
+            // disable thinking (MUONROI_DEEPSEEK_DISABLE_THINKING=1). See
+            // thinking-mode.ts for the full rationale (code 20015 rejection).
+            transformRequestBody: (body) => transformThinkingModeBody(body),
         });
         return (modelId) => p(modelId);
     }

package/dist/src/providers/strategies/siliconflow.strategy.js

@@ -8,6 +8,7 @@ import { getProviderCapabilities } from "../capabilities.js";
 import { OPENAI_COMPATIBLE_BASE_URLS } from "../endpoints.js";
 import { createSiliconflowRepairFetch } from "../siliconflow-sse-repair.js";
 import { BaseProviderStrategy } from "./base.strategy.js";
+import { transformThinkingModeBody } from "./thinking-mode.js";
 export class SiliconflowStrategy extends BaseProviderStrategy {
     id = "siliconflow";
     capabilities = getProviderCapabilities("siliconflow");
@@ -17,6 +18,10 @@ export class SiliconflowStrategy extends BaseProviderStrategy {
             baseURL: opts.baseURL ?? OPENAI_COMPATIBLE_BASE_URLS.siliconflow,
             apiKey: opts.apiKey,
             fetch: createSiliconflowRepairFetch(),
+            // Thinking-mode round-trip fix (code 20015): backfill reasoning_content
+            // on every assistant turn, or disable thinking when
+            // MUONROI_DEEPSEEK_DISABLE_THINKING=1. See thinking-mode.ts.
+            transformRequestBody: (body) => transformThinkingModeBody(body),
         });
         return (modelId) => p(modelId);
     }

package/dist/src/providers/strategies/thinking-mode.d.ts

@@ -0,0 +1,35 @@
+/**
+ * src/providers/strategies/thinking-mode.ts
+ *
+ * Shared `transformRequestBody` logic for DeepSeek-family providers
+ * (deepseek + siliconflow) that run a `thinking`/reasoning mode.
+ *
+ * THE BUG (verified on a live SiliconFlow wire body): DeepSeek-V4-Flash in
+ * thinking mode rejects the WHOLE request with HTTP 400 / code 20015
+ * ("The reasoning_content in the thinking mode must be passed back to the
+ * API") whenever the history contains an assistant message that lacks a
+ * `reasoning_content` field. During multi-step tool loops some assistant
+ * turns make a tool call WITHOUT emitting a reasoning segment (e.g. a quick
+ * `todo_write`), so `@ai-sdk/openai-compatible` serializes them as
+ * `{content:null, tool_calls:[...]}` with no `reasoning_content` key — and
+ * the next request blows up. The earlier "reasoning round-trips natively"
+ * conclusion only held for histories where EVERY assistant turn had reasoning.
+ *
+ * Two mitigations, selected by `MUONROI_DEEPSEEK_DISABLE_THINKING`:
+ *
+ *   - Default (A): keep thinking ON, but backfill `reasoning_content: ""` onto
+ *     every assistant message in the wire body that is missing it, so the
+ *     thinking-mode validator always sees the field.
+ *   - Fallback (B, env=1): disable thinking entirely via
+ *     `thinking: { type: "disabled" }` (per the DeepSeek thinking_mode guide).
+ *     Sidesteps the whole class of bug, cuts latency 30-50%, and stops
+ *     reasoning prose from leaking into JSON outputs — at the cost of reasoning.
+ *
+ * https://api-docs.deepseek.com/guides/thinking_mode
+ */
+export declare function shouldDisableThinking(): boolean;
+/**
+ * The shared `transformRequestBody` for deepseek + siliconflow. Runs on the
+ * fully-serialized wire body right before fetch.
+ */
+export declare function transformThinkingModeBody<T extends Record<string, unknown>>(body: T): T;

package/dist/src/providers/strategies/thinking-mode.js

@@ -0,0 +1,73 @@
+/**
+ * src/providers/strategies/thinking-mode.ts
+ *
+ * Shared `transformRequestBody` logic for DeepSeek-family providers
+ * (deepseek + siliconflow) that run a `thinking`/reasoning mode.
+ *
+ * THE BUG (verified on a live SiliconFlow wire body): DeepSeek-V4-Flash in
+ * thinking mode rejects the WHOLE request with HTTP 400 / code 20015
+ * ("The reasoning_content in the thinking mode must be passed back to the
+ * API") whenever the history contains an assistant message that lacks a
+ * `reasoning_content` field. During multi-step tool loops some assistant
+ * turns make a tool call WITHOUT emitting a reasoning segment (e.g. a quick
+ * `todo_write`), so `@ai-sdk/openai-compatible` serializes them as
+ * `{content:null, tool_calls:[...]}` with no `reasoning_content` key — and
+ * the next request blows up. The earlier "reasoning round-trips natively"
+ * conclusion only held for histories where EVERY assistant turn had reasoning.
+ *
+ * Two mitigations, selected by `MUONROI_DEEPSEEK_DISABLE_THINKING`:
+ *
+ *   - Default (A): keep thinking ON, but backfill `reasoning_content: ""` onto
+ *     every assistant message in the wire body that is missing it, so the
+ *     thinking-mode validator always sees the field.
+ *   - Fallback (B, env=1): disable thinking entirely via
+ *     `thinking: { type: "disabled" }` (per the DeepSeek thinking_mode guide).
+ *     Sidesteps the whole class of bug, cuts latency 30-50%, and stops
+ *     reasoning prose from leaking into JSON outputs — at the cost of reasoning.
+ *
+ * https://api-docs.deepseek.com/guides/thinking_mode
+ */
+export function shouldDisableThinking() {
+    const v = process.env["MUONROI_DEEPSEEK_DISABLE_THINKING"];
+    return v === undefined ? false : v === "1" || v.toLowerCase() === "true";
+}
+/**
+ * Backfill `reasoning_content: ""` onto any assistant message that lacks a
+ * (non-empty/present) one, so SiliconFlow's thinking-mode validator never
+ * sees a reasoning-less assistant turn. Assistant turns that already carry a
+ * real `reasoning_content` are left untouched.
+ */
+function backfillReasoningContent(messages) {
+    let mutated = false;
+    const next = messages.map((m) => {
+        if (m?.role !== "assistant")
+            return m;
+        const rc = m.reasoning_content;
+        if (typeof rc === "string")
+            return m; // already present (incl. "")
+        mutated = true;
+        return { ...m, reasoning_content: "" };
+    });
+    return mutated ? next : messages;
+}
+/**
+ * The shared `transformRequestBody` for deepseek + siliconflow. Runs on the
+ * fully-serialized wire body right before fetch.
+ */
+export function transformThinkingModeBody(body) {
+    if (shouldDisableThinking()) {
+        // Fallback B: turn thinking off. No reasoning is produced, so there is
+        // nothing to backfill.
+        return { ...body, thinking: { type: "disabled" } };
+    }
+    // Default A: keep thinking on, but guarantee every assistant message carries
+    // a reasoning_content field so the validator is satisfied.
+    const messages = body["messages"];
+    if (!Array.isArray(messages))
+        return body;
+    const patched = backfillReasoningContent(messages);
+    if (patched === messages)
+        return body;
+    return { ...body, messages: patched };
+}
+//# sourceMappingURL=thinking-mode.js.map

package/dist/src/tools/registry.js

@@ -593,58 +593,58 @@ export function createBuiltinTools(bash, mode, opts) {
                     .join("\n");
             },
         });
-        // todo_write — Claude-Code-style task list. Each call REPLACES the agent's
-        // current todo snapshot; the orchestrator post-processes this tool's args
-        // into a task_list_update StreamChunk that the UI renders as a sticky
-        // checklist panel. Status flow: pending → in_progress → completed; only
-        // ONE item should be in_progress at a time. Use this when the user asks
-        // for a multi-step task (≥3 distinct steps) so progress is visible.
-        tools.todo_write = dynamicTool({
-            description: "Write the full current todo list. Replaces the previous list entirely on every call (no partial updates). Use when a user request resolves into ≥3 discrete steps so the UI can show progress. Mark exactly one item as in_progress at a time. Always emit the FULL list, not just the changed items.",
-            inputSchema: jsonSchema({
-                type: "object",
-                properties: {
-                    todos: {
-                        type: "array",
-                        description: "The full ordered list of todo items. Replaces any prior list. Keep order stable across updates so the UI doesn't reshuffle on every call.",
-                        items: {
-                            type: "object",
-                            properties: {
-                                id: { type: "string", description: "Stable id across updates (e.g. '1','2', or a slug)." },
-                                subject: { type: "string", description: "Short imperative title shown in the list." },
-                                activeForm: {
-                                    type: "string",
-                                    description: "Present-continuous form shown while in_progress (e.g. 'Reading files'). Falls back to subject when absent.",
-                                },
-                                status: {
-                                    type: "string",
-                                    enum: ["pending", "in_progress", "completed"],
-                                    description: "Item status. Only ONE item should be in_progress at any time.",
-                                },
+    }
+    // todo_write — Claude-Code-style task list. Each call REPLACES the agent's
+    // current todo snapshot; the orchestrator post-processes this tool's args
+    // into a task_list_update StreamChunk that the UI renders as a sticky
+    // checklist panel. Status flow: pending → in_progress → completed; only
+    // ONE item should be in_progress at a time. Use this when the user asks
+    // for a multi-step task (≥3 distinct steps) so progress is visible.
+    tools.todo_write = dynamicTool({
+        description: "Write the full current todo list. Replaces the previous list entirely on every call (no partial updates). Use when a user request resolves into ≥3 discrete steps so the UI can show progress. Mark exactly one item as in_progress at a time. Always emit the FULL list, not just the changed items.",
+        inputSchema: jsonSchema({
+            type: "object",
+            properties: {
+                todos: {
+                    type: "array",
+                    description: "The full ordered list of todo items. Replaces any prior list. Keep order stable across updates so the UI doesn't reshuffle on every call.",
+                    items: {
+                        type: "object",
+                        properties: {
+                            id: { type: "string", description: "Stable id across updates (e.g. '1','2', or a slug)." },
+                            subject: { type: "string", description: "Short imperative title shown in the list." },
+                            activeForm: {
+                                type: "string",
+                                description: "Present-continuous form shown while in_progress (e.g. 'Reading files'). Falls back to subject when absent.",
+                            },
+                            status: {
+                                type: "string",
+                                enum: ["pending", "in_progress", "completed"],
+                                description: "Item status. Only ONE item should be in_progress at any time.",
                             },
-                            required: ["id", "subject", "status"],
                         },
+                        required: ["id", "subject", "status"],
                     },
                 },
-                required: ["todos"],
-            }),
-            execute: async (input) => {
-                const todos = Array.isArray(input?.todos)
-                    ? input.todos
-                    : [];
-                const counts = { completed: 0, inProgress: 0, pending: 0, total: todos.length };
-                for (const t of todos) {
-                    if (t.status === "completed")
-                        counts.completed++;
-                    else if (t.status === "in_progress")
-                        counts.inProgress++;
-                    else
-                        counts.pending++;
-                }
-                return `Tracking ${counts.total} todo${counts.total !== 1 ? "s" : ""}: ${counts.completed} done · ${counts.inProgress} in progress · ${counts.pending} queued.`;
             },
-        });
-    }
+            required: ["todos"],
+        }),
+        execute: async (input) => {
+            const todos = Array.isArray(input?.todos)
+                ? input.todos
+                : [];
+            const counts = { completed: 0, inProgress: 0, pending: 0, total: todos.length };
+            for (const t of todos) {
+                if (t.status === "completed")
+                    counts.completed++;
+                else if (t.status === "in_progress")
+                    counts.inProgress++;
+                else
+                    counts.pending++;
+            }
+            return `Tracking ${counts.total} todo${counts.total !== 1 ? "s" : ""}: ${counts.completed} done · ${counts.inProgress} in progress · ${counts.pending} queued.`;
+        },
+    });
     // Vision-tool gate: drop the 3 vision-proxy tools on turns with no plausible
     // image involvement. Built then deleted (closures are cheap) to avoid
     // re-indenting the tool definitions above. todo_write + core tools untouched.

package/dist/src/ui/app.js

@@ -58,6 +58,7 @@ import { usePairQuoteBuffer } from "./components/use-pair-quote-buffer.js";
 import { useAgentEditor } from "./hooks/use-agent-editor.js";
 import { useMcpEditor } from "./hooks/use-mcp-editor.js";
 import { useModelPicker } from "./hooks/use-model-picker.js";
+import { useSessionPicker } from "./hooks/use-session-picker.js";
 import { useTypeahead } from "./hooks/useTypeahead.js";
 import { Markdown } from "./markdown.js";
 import { buildMcpBrowseRows, McpBrowserModal, McpEditorModal } from "./mcp-modal.js";
@@ -66,6 +67,7 @@ import { ApiKeyModal } from "./modals/api-key-modal.js";
 import { ConnectModal, TelegramPairModal, TelegramTokenModal } from "./modals/connect-modal.js";
 import { ModelPickerModal } from "./modals/model-picker-modal.js";
 import { SandboxPickerModal } from "./modals/sandbox-picker-modal.js";
+import { SessionPickerModal } from "./modals/session-picker-modal.js";
 import { UpdateModal } from "./modals/update-modal.js";
 import { PaymentApprovalPanel, WalletPickerModal } from "./modals/wallet-picker-modal.js";
 import { resolvePickerProviders } from "./picker-providers.js";
@@ -77,6 +79,7 @@ import { StatusBar } from "./status-bar/index.js";
 import { statusBarStore, wireStatusBar } from "./status-bar/store.js";
 import { getCompactTuiSelectionText } from "./terminal-selection-text.js";
 import { dark } from "./theme.js";
+import { relaunchWithSession } from "./utils/relaunch.js";
 import "./slash/route.js";
 import "./slash/optimize.js";
 import "./slash/discuss.js";
@@ -565,6 +568,7 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
     const dismissToast = useCallback(() => setActiveToast(null), []);
     // ─── /Phase 21 toast subscriber ────────────────────────────────────────────
     const { model, setModel, showModelPicker, setShowModelPicker, modelPickerIndex, setModelPickerIndex, modelSearchQuery, setModelSearchQuery, configuredProviders, setConfiguredProviders, disabledProviders, setDisabledProvidersState, defaultProvider, setDefaultProviderState, disabledModels, setDisabledModelsState, modelPickerFocus, setModelPickerFocus, providerChipIndex, setProviderChipIndex, reasoningEffortByModel, setReasoningEffortByModel, } = useModelPicker(agent.getModel());
+    const { showSessionPicker, setShowSessionPicker, sessionPickerIndex, setSessionPickerIndex, sessions: sessionPickerList, setSessions: setSessionPickerList, } = useSessionPicker();
     const modelRef = useRef(model);
     const [providersWithKey, setProvidersWithKey] = useState(() => new Set());
     const refreshProvidersWithKey = useCallback(async () => {
@@ -3051,6 +3055,27 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
             openSandboxPicker();
             return true;
         }
+        if (c === "/sessions" || c === "/session") {
+            try {
+                const { SessionStore } = require("../storage/sessions.js");
+                const list = new SessionStore(agent.getCwd()).listRecentSessions(20);
+                setSessionPickerList(list);
+                setSessionPickerIndex(0);
+                setShowSessionPicker(true);
+            }
+            catch (err) {
+                console.error(`[session-picker] list failed: ${err?.message ?? err}`);
+                setMessages((p) => [
+                    ...p,
+                    {
+                        type: "assistant",
+                        content: `Failed to list sessions: ${err instanceof Error ? err.message : String(err)}`,
+                        timestamp: new Date(),
+                    },
+                ]);
+            }
+            return true;
+        }
         if (c === "/wallet") {
             openWalletPicker();
             return true;
@@ -3747,6 +3772,9 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
         model,
         messages.length,
         messages,
+        setSessionPickerList,
+        setSessionPickerIndex,
+        setShowSessionPicker,
     ]);
     const handleSlashMenuSelect = useCallback((item) => {
         setShowSlashMenuSync(false);
@@ -3921,34 +3949,27 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
                 ]);
                 break;
             case "sessions": {
-                // List recent sessions in this workspace so the user can pick one
-                // to resume on next launch (`muonroi-cli --session <id>`).
-                let body = "No prior sessions found in this workspace.";
+                // Open the picker (delegates to the same path as typing `/sessions`)
+                // so the user can pick a session and resume it directly instead of
+                // having to remember the id + relaunch by hand.
                 try {
                     const { SessionStore } = require("../storage/sessions.js");
-                    const store = new SessionStore(agent.getCwd());
-                    const sessions = store.listRecentSessions(15);
-                    if (sessions.length > 0) {
-                        const lines = sessions.map((s, idx) => {
-                            const ts = new Date(s.updatedAt).toLocaleString();
-                            const title = s.title?.trim() || "(untitled)";
-                            const truncTitle = title.length > 80 ? `${title.slice(0, 77)}...` : title;
-                            return `${String(idx + 1).padStart(2)}. [${s.id}] ${ts}  ${s.model}\n    ${truncTitle}`;
-                        });
-                        body = [
-                            "Recent sessions in this workspace:",
-                            "",
-                            ...lines,
-                            "",
-                            "Resume on next launch:  muonroi-cli --session <id>",
-                            "Or:                     muonroi-cli --session latest",
-                        ].join("\n");
-                    }
+                    const list = new SessionStore(agent.getCwd()).listRecentSessions(20);
+                    setSessionPickerList(list);
+                    setSessionPickerIndex(0);
+                    setShowSessionPicker(true);
                 }
                 catch (err) {
-                    body = `Failed to list sessions: ${err instanceof Error ? err.message : String(err)}`;
+                    console.error(`[session-picker] list failed: ${err?.message ?? err}`);
+                    setMessages((p) => [
+                        ...p,
+                        {
+                            type: "assistant",
+                            content: `Failed to list sessions: ${err instanceof Error ? err.message : String(err)}`,
+                            timestamp: new Date(),
+                        },
+                    ]);
                 }
-                setMessages((p) => [...p, { type: "assistant", content: body, timestamp: new Date() }]);
                 break;
             }
             default: {
@@ -4076,12 +4097,16 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
         setModelPickerIndex,
         setModelSearchQuery,
         setShowModelPicker,
+        setSessionPickerList,
+        setSessionPickerIndex,
+        setShowSessionPicker,
     ]);
     const blockPrompt = showConnectModal ||
         showTelegramTokenModal ||
         showTelegramPairModal ||
         showMcpModal ||
         showSandboxPicker ||
+        showSessionPicker ||
         showWalletPicker ||
         !!pendingPaymentApproval ||
         showScheduleModal ||
@@ -5182,6 +5207,43 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
             }
             return;
         }
+        if (showSessionPicker) {
+            if (isEscapeKey(key)) {
+                setShowSessionPicker(false);
+                return;
+            }
+            if (key.name === "up") {
+                setSessionPickerIndex((i) => Math.max(0, i - 1));
+                return;
+            }
+            if (key.name === "down") {
+                setSessionPickerIndex((i) => Math.min(Math.max(0, sessionPickerList.length - 1), i + 1));
+                return;
+            }
+            if (key.name === "return") {
+                const picked = sessionPickerList[sessionPickerIndex];
+                if (!picked) {
+                    setShowSessionPicker(false);
+                    return;
+                }
+                // 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.
+                setTimeout(() => {
+                    try {
+                        relaunchWithSession(picked.id);
+                    }
+                    catch (err) {
+                        console.error(`[session-picker] relaunch failed: ${err?.message ?? err}`);
+                        pushToast("error", `Resume failed: ${err?.message ?? err}`);
+                    }
+                }, 50);
+                return;
+            }
+            return;
+        }
         if (showModelPicker) {
             // Sub-modal: BW sync (password + provider picker phases).
             if (bwSync) {
@@ -5806,6 +5868,11 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
         setShowModelPicker,
         setModelPickerIndex,
         setModel,
+        showSessionPicker,
+        sessionPickerList,
+        sessionPickerIndex,
+        setShowSessionPicker,
+        setSessionPickerIndex,
     ]);
     useKeyboard(handleKey);
     const handlePaste = useCallback((event) => {
@@ -6040,7 +6107,7 @@ export function App({ agent, startupConfig, initialMessage, onExit }) {
                                                         : `💭 Thought for ${(lastReasoningElapsedMs / 1000).toFixed(1)}s` }) })), streamContent && (_jsx("box", { paddingLeft: 3, marginTop: 1, flexShrink: 0, children: _jsx(Markdown, { content: streamContent, t: t }) })), isProcessing && !streamContent && activeToolCalls.length === 0 && (_jsx(ShimmerText, { t: t, text: "Planning next moves" })), showPlanPanel && _jsx(PlanQuestionsPanel, { t: t, questions: planQuestions, state: pqs }), pendingPaymentApproval && _jsx(PaymentApprovalPanel, { t: t, payment: pendingPaymentApproval }), activeHaltCard && (_jsx(HaltRecoveryCard, { halt: activeHaltCard, selectedIndex: haltSelectedIndex, terminalCols: width, theme: t })), initNewForm && _jsx(InitNewFormCard, { state: initNewForm, terminalCols: width, theme: t }), pointToExistingForm && (_jsx(PointToExistingFormCard, { state: pointToExistingForm, terminalCols: width, theme: t })), councilProgress && (_jsx(Semantic, { id: "continue-as-council-progress", role: "log", name: "Council brainstorm", children: _jsx("box", { flexDirection: "column", borderStyle: "single", borderColor: councilProgress.status === "error" ? t.initFormError : t.text, padding: 1, marginTop: 1, children: _jsxs("text", { fg: t.text, children: [councilProgress.status === "running" && "Council brainstorming — writing spec.md...", councilProgress.status === "done" &&
                                                                 `Council brainstorm complete: ${councilProgress.specPath}${councilProgress.hasContent ? "" : " (no content — production council wiring deferred)"}`, councilProgress.status === "error" && `Council brainstorm failed: ${councilProgress.error}`] }) }) }))] }) }), btwState && _jsx(BtwOverlay, { state: btwState, theme: t }), _jsx("box", { flexShrink: 0, children: _jsx(PromptBox, { t: t, inputRef: inputRef, isProcessing: isProcessing, showModelPicker: showModelPicker, showSandboxPicker: showSandboxPicker, showWalletPicker: showWalletPicker, showSlashMenu: showSlashMenu, showPlanQuestions: showPlanPanel, showApiKeyModal: showApiKeyModal, blockPrompt: blockPrompt, onSubmit: handleSubmit, onPaste: handlePaste, pasteBlocks: pasteBlocks, modeInfo: modeInfo, model: model, modelInfo: modelInfo, contextStats: contextStats, queuedCount: queuedMessages.length, queuedMessages: queuedMessages, typeahead: typeahead, slashItems: filteredSlashItems, slashSelectedIndex: slashMenuIndex, slashInputIsMatched: slashInputIsMatched, composerValue: showSlashMenu ? `/${slashSearchQuery}` : undefined }) })] }), _jsx("box", { paddingLeft: 2, paddingRight: 2, flexShrink: 0, children: _jsx(StatusBar, {}) }), _jsxs("box", { paddingLeft: 2, paddingRight: 2, paddingBottom: 1, flexDirection: "row", flexShrink: 0, children: [_jsx("text", { fg: t.textDim, children: agent.getCwd().replace(os.homedir(), "~") }), sandboxMode === "shuru" ? _jsx("text", { fg: "#f97316", children: " · sandbox" }) : null, _jsx("box", { flexGrow: 1 })] })] })) : (
                 /* ── Home ───────────────────────────────────────── */
-                _jsxs(_Fragment, { children: [_jsxs("box", { flexGrow: 1, alignItems: "center", paddingLeft: 2, paddingRight: 2, children: [_jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { flexShrink: 0, alignItems: "center", children: _jsx(HeroLogo, { t: t }) }), _jsx("box", { height: 1, minHeight: 0, flexShrink: 1 }), _jsx("box", { width: "100%", maxWidth: 75, flexShrink: 0, children: _jsx(PromptBox, { t: t, inputRef: inputRef, isProcessing: isProcessing, showModelPicker: showModelPicker, showSandboxPicker: showSandboxPicker, showWalletPicker: showWalletPicker, showSlashMenu: showSlashMenu, showPlanQuestions: showPlanPanel, showApiKeyModal: showApiKeyModal, blockPrompt: blockPrompt, onSubmit: handleSubmit, onPaste: handlePaste, pasteBlocks: pasteBlocks, modeInfo: modeInfo, model: model, modelInfo: modelInfo, contextStats: contextStats, placeholder: "What are we building?", typeahead: typeahead, slashItems: filteredSlashItems, slashSelectedIndex: slashMenuIndex, slashInputIsMatched: slashInputIsMatched, composerValue: showSlashMenu ? `/${slashSearchQuery}` : undefined }) }), _jsx("box", { height: 2, minHeight: 0, flexShrink: 1 }), _jsx("box", { flexGrow: 1, minHeight: 0 })] }), updateInfo?.hasUpdate && (_jsx("box", { paddingLeft: 2, paddingRight: 2, flexDirection: "row", flexShrink: 0, children: _jsxs("text", { fg: "#f59e0b", children: ["┃ Update available: v", startupConfig.version, " → v", updateInfo.latestVersion, " — run /update to install"] }) })), isUpdating && (_jsx("box", { paddingLeft: 2, paddingRight: 2, flexDirection: "row", flexShrink: 0, children: _jsx("text", { fg: "#f59e0b", children: "┃ Updating..." }) })), updateOutput && !isUpdating && (_jsx("box", { paddingLeft: 2, paddingRight: 2, flexDirection: "row", flexShrink: 0, children: _jsxs("text", { fg: updateOutput.startsWith("Update complete") ? "#22c55e" : "#ef4444", children: ["┃ ", updateOutput] }) })), _jsx("box", { paddingLeft: 2, paddingRight: 2, flexShrink: 0, children: _jsx(StatusBar, {}) }), _jsxs("box", { paddingLeft: 2, paddingRight: 2, paddingBottom: 1, flexDirection: "row", flexShrink: 0, children: [_jsx("text", { fg: t.textDim, children: agent.getCwd().replace(os.homedir(), "~") }), sandboxMode === "shuru" ? _jsx("text", { fg: "#f97316", children: " · sandbox" }) : null, _jsx("box", { flexGrow: 1 }), _jsx("text", { fg: t.textDim, children: `v${startupConfig.version}` })] })] })), showApiKeyModal && (_jsx(ApiKeyModal, { t: t, width: width, height: height, inputRef: apiKeyInputRef, error: apiKeyError, onSubmit: submitApiKey })), showUpdateModal && updateInfo && (_jsx(UpdateModal, { t: t, width: width, height: height, currentVersion: startupConfig.version, latestVersion: updateInfo.latestVersion })), showMcpModal && !showMcpEditor && (_jsx(McpBrowserModal, { t: t, width: width, height: height, selectedIndex: mcpModalIndex, searchQuery: mcpSearchQuery, rows: mcpRows })), showMcpEditor && (_jsx(McpEditorModal, { t: t, width: width, height: height, draft: mcpEditorDraft, focusedField: mcpEditorField, syncKey: mcpEditorSyncKey, error: mcpEditorError, title: editingMcpId ? "Edit MCP Server" : "Add MCP Server", labelRef: mcpLabelRef, urlRef: mcpUrlRef, headersRef: mcpHeadersRef, commandRef: mcpCommandRef, argsRef: mcpArgsRef, cwdRef: mcpCwdRef, envRef: mcpEnvRef, onSubmit: submitMcpEditor })), showScheduleModal && (_jsx(ScheduleBrowserModal, { t: t, width: width, height: height, selectedIndex: scheduleModalIndex, searchQuery: scheduleSearchQuery, rows: scheduleRows })), showAgentsModal && !showAgentsEditor && (_jsx(SubagentsBrowserModal, { t: t, width: width, height: height, selectedIndex: agentsModalIndex, searchQuery: agentsSearchQuery, rows: agentRows })), showAgentsEditor && (_jsx(SubagentEditorModal, { t: t, width: width, height: height, draft: agentsEditorDraft, focusedField: agentsEditorField, modelIndex: agentsEditorModelIndex, error: agentsEditorError, title: editingSubagent ? `Edit sub-agent: ${formatSubagentName(editingSubagent.name)}` : "Add sub-agent", nameRef: subagentNameRef, instructionRef: subagentInstructionRef, onSubmit: submitSubagentEditor, showRemoveHint: !!editingSubagent }, `subagent-editor-${agentsEditorSyncKey}`)), showModelPicker && (_jsx(ModelPickerModal, { t: t, currentModel: model, selectedIndex: modelPickerIndex, width: width, height: height, searchQuery: modelSearchQuery, filteredModels: filteredModels, reasoningEffortByModel: reasoningEffortByModel, configuredProviders: configuredProviders, disabledProviders: disabledProviders, disabledModels: disabledModels, defaultProvider: defaultProvider, focus: modelPickerFocus, providerChipIndex: providerChipIndex, providersWithKey: providersWithKey, apiKeyPrompt: apiKeyPrompt, bwSync: bwSync })), showWalletPicker && (_jsx(WalletPickerModal, { t: t, settings: walletSettings, walletInfo: walletDisplayInfo, focusIndex: walletFocusIndex, width: width, height: height })), showSandboxPicker && (_jsx(SandboxPickerModal, { t: t, currentMode: sandboxMode, settings: sandboxSettings, focusIndex: sandboxSettingsFocusIndex, editing: sandboxSettingsEditing, editBuffer: sandboxSettingsEditBuffer, width: width, height: height })), showConnectModal && (_jsx(ConnectModal, { t: t, width: width, height: height, selectedIndex: connectModalIndex, channels: CONNECT_CHANNELS })), showTelegramTokenModal && (_jsx(TelegramTokenModal, { t: t, width: width, height: height, inputRef: telegramTokenInputRef, error: telegramTokenError, onSubmit: submitTelegramToken })), showTelegramPairModal && (_jsx(TelegramPairModal, { t: t, width: width, height: height, inputRef: telegramPairInputRef, error: telegramPairError, onSubmit: () => void submitTelegramPair() }))] }) }));
+                _jsxs(_Fragment, { children: [_jsxs("box", { flexGrow: 1, alignItems: "center", paddingLeft: 2, paddingRight: 2, children: [_jsx("box", { flexGrow: 1, minHeight: 0 }), _jsx("box", { flexShrink: 0, alignItems: "center", children: _jsx(HeroLogo, { t: t }) }), _jsx("box", { height: 1, minHeight: 0, flexShrink: 1 }), _jsx("box", { width: "100%", maxWidth: 75, flexShrink: 0, children: _jsx(PromptBox, { t: t, inputRef: inputRef, isProcessing: isProcessing, showModelPicker: showModelPicker, showSandboxPicker: showSandboxPicker, showWalletPicker: showWalletPicker, showSlashMenu: showSlashMenu, showPlanQuestions: showPlanPanel, showApiKeyModal: showApiKeyModal, blockPrompt: blockPrompt, onSubmit: handleSubmit, onPaste: handlePaste, pasteBlocks: pasteBlocks, modeInfo: modeInfo, model: model, modelInfo: modelInfo, contextStats: contextStats, placeholder: "What are we building?", typeahead: typeahead, slashItems: filteredSlashItems, slashSelectedIndex: slashMenuIndex, slashInputIsMatched: slashInputIsMatched, composerValue: showSlashMenu ? `/${slashSearchQuery}` : undefined }) }), _jsx("box", { height: 2, minHeight: 0, flexShrink: 1 }), _jsx("box", { flexGrow: 1, minHeight: 0 })] }), updateInfo?.hasUpdate && (_jsx("box", { paddingLeft: 2, paddingRight: 2, flexDirection: "row", flexShrink: 0, children: _jsxs("text", { fg: "#f59e0b", children: ["┃ Update available: v", startupConfig.version, " → v", updateInfo.latestVersion, " — run /update to install"] }) })), isUpdating && (_jsx("box", { paddingLeft: 2, paddingRight: 2, flexDirection: "row", flexShrink: 0, children: _jsx("text", { fg: "#f59e0b", children: "┃ Updating..." }) })), updateOutput && !isUpdating && (_jsx("box", { paddingLeft: 2, paddingRight: 2, flexDirection: "row", flexShrink: 0, children: _jsxs("text", { fg: updateOutput.startsWith("Update complete") ? "#22c55e" : "#ef4444", children: ["┃ ", updateOutput] }) })), _jsx("box", { paddingLeft: 2, paddingRight: 2, flexShrink: 0, children: _jsx(StatusBar, {}) }), _jsxs("box", { paddingLeft: 2, paddingRight: 2, paddingBottom: 1, flexDirection: "row", flexShrink: 0, children: [_jsx("text", { fg: t.textDim, children: agent.getCwd().replace(os.homedir(), "~") }), sandboxMode === "shuru" ? _jsx("text", { fg: "#f97316", children: " · sandbox" }) : null, _jsx("box", { flexGrow: 1 }), _jsx("text", { fg: t.textDim, children: `v${startupConfig.version}` })] })] })), showApiKeyModal && (_jsx(ApiKeyModal, { t: t, width: width, height: height, inputRef: apiKeyInputRef, error: apiKeyError, onSubmit: submitApiKey })), showUpdateModal && updateInfo && (_jsx(UpdateModal, { t: t, width: width, height: height, currentVersion: startupConfig.version, latestVersion: updateInfo.latestVersion })), showMcpModal && !showMcpEditor && (_jsx(McpBrowserModal, { t: t, width: width, height: height, selectedIndex: mcpModalIndex, searchQuery: mcpSearchQuery, rows: mcpRows })), showMcpEditor && (_jsx(McpEditorModal, { t: t, width: width, height: height, draft: mcpEditorDraft, focusedField: mcpEditorField, syncKey: mcpEditorSyncKey, error: mcpEditorError, title: editingMcpId ? "Edit MCP Server" : "Add MCP Server", labelRef: mcpLabelRef, urlRef: mcpUrlRef, headersRef: mcpHeadersRef, commandRef: mcpCommandRef, argsRef: mcpArgsRef, cwdRef: mcpCwdRef, envRef: mcpEnvRef, onSubmit: submitMcpEditor })), showScheduleModal && (_jsx(ScheduleBrowserModal, { t: t, width: width, height: height, selectedIndex: scheduleModalIndex, searchQuery: scheduleSearchQuery, rows: scheduleRows })), showAgentsModal && !showAgentsEditor && (_jsx(SubagentsBrowserModal, { t: t, width: width, height: height, selectedIndex: agentsModalIndex, searchQuery: agentsSearchQuery, rows: agentRows })), showAgentsEditor && (_jsx(SubagentEditorModal, { t: t, width: width, height: height, draft: agentsEditorDraft, focusedField: agentsEditorField, modelIndex: agentsEditorModelIndex, error: agentsEditorError, title: editingSubagent ? `Edit sub-agent: ${formatSubagentName(editingSubagent.name)}` : "Add sub-agent", nameRef: subagentNameRef, instructionRef: subagentInstructionRef, onSubmit: submitSubagentEditor, showRemoveHint: !!editingSubagent }, `subagent-editor-${agentsEditorSyncKey}`)), showModelPicker && (_jsx(ModelPickerModal, { t: t, currentModel: model, selectedIndex: modelPickerIndex, width: width, height: height, searchQuery: modelSearchQuery, filteredModels: filteredModels, reasoningEffortByModel: reasoningEffortByModel, configuredProviders: configuredProviders, disabledProviders: disabledProviders, disabledModels: disabledModels, defaultProvider: defaultProvider, focus: modelPickerFocus, providerChipIndex: providerChipIndex, providersWithKey: providersWithKey, apiKeyPrompt: apiKeyPrompt, bwSync: bwSync })), showSessionPicker && (_jsx(SessionPickerModal, { t: t, sessions: sessionPickerList, focusIndex: sessionPickerIndex, width: width, height: height })), showWalletPicker && (_jsx(WalletPickerModal, { t: t, settings: walletSettings, walletInfo: walletDisplayInfo, focusIndex: walletFocusIndex, width: width, height: height })), showSandboxPicker && (_jsx(SandboxPickerModal, { t: t, currentMode: sandboxMode, settings: sandboxSettings, focusIndex: sandboxSettingsFocusIndex, editing: sandboxSettingsEditing, editBuffer: sandboxSettingsEditBuffer, width: width, height: height })), showConnectModal && (_jsx(ConnectModal, { t: t, width: width, height: height, selectedIndex: connectModalIndex, channels: CONNECT_CHANNELS })), showTelegramTokenModal && (_jsx(TelegramTokenModal, { t: t, width: width, height: height, inputRef: telegramTokenInputRef, error: telegramTokenError, onSubmit: submitTelegramToken })), showTelegramPairModal && (_jsx(TelegramPairModal, { t: t, width: width, height: height, inputRef: telegramPairInputRef, error: telegramPairError, onSubmit: () => void submitTelegramPair() }))] }) }));
 }
 export { computeMcpRunInfo } from "./components/message-view.js";
 /* ── Slash Menu ──────────────────────────────────────────────── */

package/dist/src/ui/hooks/use-session-picker.d.ts

@@ -0,0 +1,14 @@
+import type { SessionInfo } from "../../types/index.js";
+/**
+ * State for the /sessions picker modal. Sessions are loaded lazily when the
+ * picker is opened (the SQLite query is cheap — ORDER BY updated_at LIMIT 20
+ * on an indexed column) so we do not pay for it on cold boot.
+ */
+export declare function useSessionPicker(): {
+    showSessionPicker: boolean;
+    setShowSessionPicker: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    sessionPickerIndex: number;
+    setSessionPickerIndex: import("react").Dispatch<import("react").SetStateAction<number>>;
+    sessions: SessionInfo[];
+    setSessions: import("react").Dispatch<import("react").SetStateAction<SessionInfo[]>>;
+};

package/dist/src/ui/hooks/use-session-picker.js

@@ -0,0 +1,20 @@
+import { useState } from "react";
+/**
+ * State for the /sessions picker modal. Sessions are loaded lazily when the
+ * picker is opened (the SQLite query is cheap — ORDER BY updated_at LIMIT 20
+ * on an indexed column) so we do not pay for it on cold boot.
+ */
+export function useSessionPicker() {
+    const [showSessionPicker, setShowSessionPicker] = useState(false);
+    const [sessionPickerIndex, setSessionPickerIndex] = useState(0);
+    const [sessions, setSessions] = useState([]);
+    return {
+        showSessionPicker,
+        setShowSessionPicker,
+        sessionPickerIndex,
+        setSessionPickerIndex,
+        sessions,
+        setSessions,
+    };
+}
+//# sourceMappingURL=use-session-picker.js.map