@code-yeongyu/senpi 2026.8.27 → 2026.8.28-2

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

@@ -224,6 +224,19 @@ function isDeadTerminalError(error) {
     }
     return false;
 }
+function storageWriteCrashMessage(error) {
+    if (!error || typeof error !== "object" || !("code" in error)) {
+        return undefined;
+    }
+    const code = error.code;
+    if (code === "EDQUOT") {
+        return "Disk quota exceeded (EDQUOT). Free space or quota on the filesystem, then retry.";
+    }
+    if (code === "ENOSPC") {
+        return "Disk full (ENOSPC). Free space on the filesystem, then retry.";
+    }
+    return undefined;
+}
 const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth is active. Third-party harness usage draws from extra usage and is billed per token, not your Claude plan limits. Manage extra usage at https://claude.ai/settings/usage. Disable this warning in /settings.";
 function isAnthropicSubscriptionAuthKey(apiKey) {
     return typeof apiKey === "string" && apiKey.startsWith("sk-ant-oat");
@@ -490,6 +503,8 @@ export class InteractiveMode {
         this.ui.setMaxRenderFps(fps);
     }
     // Convenience accessors
+    // The session may be the local AgentSession or the shared-host RPC proxy; the
+    // four reads widened on InteractiveSession must be awaited at every call site.
     get session() {
         return this.runtimeHost.session;
     }
@@ -2985,7 +3000,7 @@ export class InteractiveMode {
                             this.showTreeSelector();
                         }
                         else {
-                            this.showUserMessageSelector();
+                            void this.showUserMessageSelector().catch((error) => this.showError(error instanceof Error ? error.message : String(error)));
                         }
                         this.lastEscapeTime = 0;
                     }
@@ -2999,7 +3014,9 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.clear", () => this.handleCtrlC());
         this.defaultEditor.onCtrlD = () => this.handleCtrlD();
         this.defaultEditor.onAction("app.suspend", () => this.handleCtrlZ());
-        this.defaultEditor.onAction("app.thinking.cycle", () => this.cycleThinkingLevel());
+        this.defaultEditor.onAction("app.thinking.cycle", () => {
+            void this.cycleThinkingLevel().catch((error) => this.showError(error instanceof Error ? error.message : String(error)));
+        });
         this.defaultEditor.onAction("app.model.cycleForward", () => this.cycleModel("forward"));
         this.defaultEditor.onAction("app.model.cycleBackward", () => this.cycleModel("backward"));
         // Global debug handler on TUI (works regardless of focus)
@@ -3021,7 +3038,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
         this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
         this.defaultEditor.onAction("app.session.tree", () => this.showTreeSelector());
-        this.defaultEditor.onAction("app.session.fork", () => this.showUserMessageSelector());
+        this.defaultEditor.onAction("app.session.fork", () => void this.showUserMessageSelector().catch((error) => this.showError(error instanceof Error ? error.message : String(error))));
         this.defaultEditor.onAction("app.session.resume", () => this.showSessionSelector());
         this.defaultEditor.onChange = (text) => {
             const wasBashMode = this.isBashMode;
@@ -3177,197 +3194,158 @@ export class InteractiveMode {
     }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
-            // Capture-then-clear BEFORE any branch: handleFollowUp's non-streaming
-            // path pre-resolves images and hands off here, but slash / extension /
-            // bash submissions return before the consuming branches below. Clearing
-            // only after use would leak a stale array into a later ordinary
-            // submission whose text never references it.
-            const preResolvedImages = this.preResolvedSubmissionImages;
-            this.preResolvedSubmissionImages = undefined;
-            this.hideShortcutOverlay();
-            this.lastEditorText = "";
-            text = text.trim();
-            if (!text)
-                return;
-            // Handle commands
-            if (text === "/settings") {
-                this.showSettingsSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/favorite-models") {
-                this.editor.setText("");
-                await this.showFavoriteModelsSelector();
-                return;
-            }
-            if (text === "/scoped-models") {
-                this.editor.setText("");
-                this.showScopedModelsSelector();
-                return;
-            }
-            if (text === "/model" || text.startsWith("/model ")) {
-                const searchTerm = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
-                this.editor.setText("");
-                await this.handleModelCommand(searchTerm);
-                return;
-            }
-            if (text === "/export" || text.startsWith("/export ")) {
-                await this.handleExportCommand(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/import" || text.startsWith("/import ")) {
-                await this.handleImportCommand(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/share") {
-                await this.handleShareCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/copy") {
-                await this.handleCopyCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/name" || text.startsWith("/name ")) {
-                this.handleNameCommand(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/session") {
-                this.handleSessionCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/changelog") {
-                this.handleChangelogCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/keybindings") {
-                this.editor.setText("");
-                await this.handleKeybindingsCommand();
-                return;
-            }
-            if (text === "/hotkeys") {
-                this.handleHotkeysCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/fork") {
-                this.showUserMessageSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/clone") {
-                this.editor.setText("");
-                await this.handleCloneCommand();
-                return;
-            }
-            if (text === "/tree") {
-                this.showTreeSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/trust") {
-                this.showTrustSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/login" || text.startsWith("/login ")) {
-                const providerRef = text.startsWith("/login ") ? text.slice(7).trim() : undefined;
-                this.editor.setText("");
-                await this.handleLoginCommand(providerRef);
-                return;
-            }
-            if (text === "/logout") {
-                this.showOAuthSelector("logout");
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/new") {
-                this.editor.setText("");
-                await this.handleClearCommand();
-                return;
-            }
-            if (text === "/compact" || text.startsWith("/compact ")) {
-                const customInstructions = text.startsWith("/compact ") ? text.slice(9).trim() : undefined;
-                this.editor.setText("");
-                await this.handleCompactCommand(customInstructions);
-                return;
-            }
-            if (text === "/reload") {
-                this.editor.setText("");
-                await this.handleReloadCommand();
-                return;
-            }
-            if (text === "/debug") {
-                this.handleDebugCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/arminsayshi") {
-                this.handleArminSaysHi();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/dementedelves") {
-                this.handleDementedDelves();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/resume") {
-                this.showSessionSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/quit" || text === "/exit") {
-                this.editor.setText("");
-                await this.shutdown();
-                return;
-            }
-            if (this.isExtensionCommand(text)) {
-                this.editor.addToHistory?.(text);
-                this.editor.setText("");
-                const pendingEchoId = this.optimisticUserEchoes.begin(text);
-                try {
-                    await this.session.prompt(text, this.optimisticUserEchoes.promptOptions(pendingEchoId));
+            try {
+                // Capture-then-clear BEFORE any branch: handleFollowUp's non-streaming
+                // path pre-resolves images and hands off here, but slash / extension /
+                // bash submissions return before the consuming branches below. Clearing
+                // only after use would leak a stale array into a later ordinary
+                // submission whose text never references it.
+                const preResolvedImages = this.preResolvedSubmissionImages;
+                this.preResolvedSubmissionImages = undefined;
+                this.hideShortcutOverlay();
+                this.lastEditorText = "";
+                text = text.trim();
+                if (!text)
+                    return;
+                // Handle commands
+                if (text === "/settings") {
+                    await this.showSettingsSelector();
+                    this.editor.setText("");
+                    return;
                 }
-                catch (error) {
-                    this.optimisticUserEchoes.reject(pendingEchoId);
-                    throw error;
+                if (text === "/favorite-models") {
+                    this.editor.setText("");
+                    await this.showFavoriteModelsSelector();
+                    return;
                 }
-                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.session.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();
+                if (text === "/scoped-models") {
+                    this.editor.setText("");
+                    this.showScopedModelsSelector();
+                    return;
+                }
+                if (text === "/model" || text.startsWith("/model ")) {
+                    const searchTerm = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
+                    this.editor.setText("");
+                    await this.handleModelCommand(searchTerm);
+                    return;
+                }
+                if (text === "/export" || text.startsWith("/export ")) {
+                    await this.handleExportCommand(text);
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/import" || text.startsWith("/import ")) {
+                    await this.handleImportCommand(text);
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/share") {
+                    await this.handleShareCommand();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/copy") {
+                    await this.handleCopyCommand();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/name" || text.startsWith("/name ")) {
+                    await this.handleNameCommand(text);
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/session") {
+                    await this.handleSessionCommand();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/changelog") {
+                    this.handleChangelogCommand();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/keybindings") {
+                    this.editor.setText("");
+                    await this.handleKeybindingsCommand();
+                    return;
+                }
+                if (text === "/hotkeys") {
+                    this.handleHotkeysCommand();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/fork") {
+                    await this.showUserMessageSelector();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/clone") {
+                    this.editor.setText("");
+                    await this.handleCloneCommand();
+                    return;
+                }
+                if (text === "/tree") {
+                    this.showTreeSelector();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/trust") {
+                    this.showTrustSelector();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/login" || text.startsWith("/login ")) {
+                    const providerRef = text.startsWith("/login ") ? text.slice(7).trim() : undefined;
+                    this.editor.setText("");
+                    await this.handleLoginCommand(providerRef);
+                    return;
+                }
+                if (text === "/logout") {
+                    this.showOAuthSelector("logout");
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/new") {
+                    this.editor.setText("");
+                    await this.handleClearCommand();
+                    return;
+                }
+                if (text === "/compact" || text.startsWith("/compact ")) {
+                    const customInstructions = text.startsWith("/compact ") ? text.slice(9).trim() : undefined;
+                    this.editor.setText("");
+                    await this.handleCompactCommand(customInstructions);
+                    return;
+                }
+                if (text === "/reload") {
+                    this.editor.setText("");
+                    await this.handleReloadCommand();
+                    return;
+                }
+                if (text === "/debug") {
+                    this.handleDebugCommand();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/arminsayshi") {
+                    this.handleArminSaysHi();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/dementedelves") {
+                    this.handleDementedDelves();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/resume") {
+                    this.showSessionSelector();
+                    this.editor.setText("");
+                    return;
+                }
+                if (text === "/quit" || text === "/exit") {
+                    this.editor.setText("");
+                    await this.shutdown();
                     return;
                 }
-            }
-            // Queue non-command input during compaction.
-            // Extension commands short-circuit at the isExtensionCommand branch above and
-            // dispatch immediately inside AgentSession.prompt(), so the only text that
-            // reaches this compaction branch is non-command user input, which is queued
-            // for delivery after compaction settles.
-            //
-            // Note: the isExtensionCommand re-check below is already unreachable today
-            // (the branch above returns first) and stays harmless after the
-            // immediate-dispatch hoist in prompt().
-            if (this.session.isCompacting) {
                 if (this.isExtensionCommand(text)) {
                     this.editor.addToHistory?.(text);
                     this.editor.setText("");
@@ -3379,52 +3357,96 @@ export class InteractiveMode {
                         this.optimisticUserEchoes.reject(pendingEchoId);
                         throw error;
                     }
+                    return;
                 }
-                else {
-                    this.queueCompactionSubmission(text, "steer");
+                // 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.session.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;
+                    }
                 }
-                return;
-            }
-            // If streaming, use prompt() with steer behavior.
-            // Extension commands are dispatched immediately by AgentSession.prompt()
-            // (short-circuited at the isExtensionCommand branch above); the steer
-            // behavior here applies only to ordinary text, prompt template expansion,
-            // and queueing.
-            if (this.session.isStreaming) {
-                // Resolve BEFORE setText(""): the editor's prune chain fires
-                // onImageMarkersChanged([]) and destroys pendingImages.
+                // Queue non-command input during compaction.
+                // Extension commands short-circuit at the isExtensionCommand branch above and
+                // dispatch immediately inside AgentSession.prompt(), so the only text that
+                // reaches this compaction branch is non-command user input, which is queued
+                // for delivery after compaction settles.
+                //
+                // Note: the isExtensionCommand re-check below is already unreachable today
+                // (the branch above returns first) and stays harmless after the
+                // immediate-dispatch hoist in prompt().
+                if (this.session.isCompacting) {
+                    if (this.isExtensionCommand(text)) {
+                        this.editor.addToHistory?.(text);
+                        this.editor.setText("");
+                        const pendingEchoId = this.optimisticUserEchoes.begin(text);
+                        try {
+                            await this.session.prompt(text, this.optimisticUserEchoes.promptOptions(pendingEchoId));
+                        }
+                        catch (error) {
+                            this.optimisticUserEchoes.reject(pendingEchoId);
+                            throw error;
+                        }
+                    }
+                    else {
+                        this.queueCompactionSubmission(text, "steer");
+                    }
+                    return;
+                }
+                // If streaming, use prompt() with steer behavior.
+                // Extension commands are dispatched immediately by AgentSession.prompt()
+                // (short-circuited at the isExtensionCommand branch above); the steer
+                // behavior here applies only to ordinary text, prompt template expansion,
+                // and queueing.
+                if (this.session.isStreaming) {
+                    // Resolve BEFORE setText(""): the editor's prune chain fires
+                    // onImageMarkersChanged([]) and destroys pendingImages.
+                    const images = preResolvedImages ?? this.takeSubmissionImages(text);
+                    this.editor.addToHistory?.(text);
+                    this.editor.setText("");
+                    const pendingEchoId = this.optimisticUserEchoes.begin(text);
+                    try {
+                        await this.session.prompt(text, {
+                            streamingBehavior: "steer",
+                            ...(images.length > 0 ? { images } : {}),
+                            ...this.optimisticUserEchoes.promptOptions(pendingEchoId),
+                        });
+                    }
+                    catch (error) {
+                        this.optimisticUserEchoes.reject(pendingEchoId);
+                        throw error;
+                    }
+                    this.updatePendingMessagesDisplay();
+                    this.ui.requestRender();
+                    return;
+                }
+                // Normal message submission
+                // First, move any pending bash components to chat
+                this.flushPendingBashComponents();
                 const images = preResolvedImages ?? this.takeSubmissionImages(text);
-                this.editor.addToHistory?.(text);
-                this.editor.setText("");
                 const pendingEchoId = this.optimisticUserEchoes.begin(text);
-                try {
-                    await this.session.prompt(text, {
-                        streamingBehavior: "steer",
-                        ...(images.length > 0 ? { images } : {}),
-                        ...this.optimisticUserEchoes.promptOptions(pendingEchoId),
-                    });
+                const submission = images.length > 0 ? { text, images, pendingEchoId } : { text, pendingEchoId };
+                if (this.onInputCallback) {
+                    this.onInputCallback(submission);
                 }
-                catch (error) {
-                    this.optimisticUserEchoes.reject(pendingEchoId);
-                    throw error;
+                else {
+                    this.pendingUserInputs.push(submission);
                 }
-                this.updatePendingMessagesDisplay();
-                this.ui.requestRender();
-                return;
-            }
-            // Normal message submission
-            // First, move any pending bash components to chat
-            this.flushPendingBashComponents();
-            const images = preResolvedImages ?? this.takeSubmissionImages(text);
-            const pendingEchoId = this.optimisticUserEchoes.begin(text);
-            const submission = images.length > 0 ? { text, images, pendingEchoId } : { text, pendingEchoId };
-            if (this.onInputCallback) {
-                this.onInputCallback(submission);
+                this.editor.addToHistory?.(text);
             }
-            else {
-                this.pendingUserInputs.push(submission);
+            catch (error) {
+                this.showError(error instanceof Error ? error.message : String(error));
             }
-            this.editor.addToHistory?.(text);
         };
     }
     subscribeToAgent() {
@@ -3485,6 +3507,7 @@ export class InteractiveMode {
             case "thinking_level_changed":
                 this.footer.invalidate();
                 this.updateEditorBorderColor();
+                this.showStatus(`Thinking level: ${event.level}`);
                 break;
             case "high_reasoning_warning":
                 this.showHighReasoningWarning(event);
@@ -3735,15 +3758,24 @@ export class InteractiveMode {
                     // Keep the structural fallback for focused handler consumers while using
                     // the session-owned manager on the real TUI path.
                     const sessionManager = this.session.sessionManager ?? this.sessionManager;
-                    const entries = sessionManager.buildContextEntries();
+                    let entries = sessionManager?.buildContextEntries?.() ?? [];
                     if (entries[0]?.type !== "compaction") {
-                        throw new Error("Completed compaction is missing from the session context");
+                        try {
+                            sessionManager?.reloadFromDisk?.();
+                            entries = sessionManager?.buildContextEntries?.() ?? entries;
+                        }
+                        catch {
+                            // Retain existing entries on reload error
+                        }
                     }
                     this.chatContainer.clear();
                     const summaryMessage = createCompactionSummaryMessage(sanitizeTerminalLabel(event.result.summary), event.result.tokensBefore, new Date().toISOString(), event.result.details);
                     if (typeof this.renderSessionEntries === "function") {
                         // The latest compaction is prepended for model context; append it below at its chronological position.
-                        this.renderSessionEntries(entries.slice(1));
+                        const entriesToRender = entries[0]?.type === "compaction"
+                            ? entries.slice(1)
+                            : entries.filter((e) => e.type !== "compaction");
+                        this.renderSessionEntries(entriesToRender);
                         this.addMessageToChat(summaryMessage);
                         if (event.result.usage) {
                             this.addCompactionCostNotice({
@@ -4438,6 +4470,12 @@ export class InteractiveMode {
         };
     }
     rebuildChatFromMessages() {
+        try {
+            this.sessionManager?.reloadFromDisk?.();
+        }
+        catch {
+            // Keep in-memory entries if file reload is unavailable
+        }
         this.chatContainer.clear();
         this.renderSessionEntries(this.sessionManager.buildContextEntries());
     }
@@ -4558,6 +4596,10 @@ export class InteractiveMode {
         }
         catch { }
         restoreInteractiveStderr();
+        const storageMessage = storageWriteCrashMessage(error);
+        if (storageMessage !== undefined) {
+            console.error(storageMessage);
+        }
         console.error(`${APP_NAME} exiting due to uncaughtException:`);
         console.error(error);
         process.exit(1);
@@ -4738,16 +4780,15 @@ export class InteractiveMode {
         }
         this.ui.requestRender();
     }
-    cycleThinkingLevel() {
-        const newLevel = this.session.cycleThinkingLevel();
+    async cycleThinkingLevel() {
+        // The shared-host proxy answers this over RPC. The level itself is rendered
+        // from the thinking_level_changed event (single path for local and remote,
+        // and for changes made by OTHER attached clients); the awaited value only
+        // distinguishes "model does not support thinking".
+        const newLevel = await this.session.cycleThinkingLevel();
         if (newLevel === undefined) {
             this.showStatus("Current model does not support thinking");
         }
-        else {
-            this.footer.invalidate();
-            this.updateEditorBorderColor();
-            this.showStatus(`Thinking level: ${newLevel}`);
-        }
     }
     async cycleModel(direction) {
         try {
@@ -5229,7 +5270,9 @@ export class InteractiveMode {
         this.ui.setFocus(created.focus);
         this.ui.requestRender();
     }
-    showSettingsSelector() {
+    async showSettingsSelector() {
+        // Awaited at the boundary: the shared-host proxy answers this over RPC.
+        const availableThinkingLevels = await this.session.getAvailableThinkingLevels();
         this.showSelector((done) => {
             let selector;
             selector = new SettingsSelectorComponent({
@@ -5244,7 +5287,7 @@ export class InteractiveMode {
                 transport: this.settingsManager.getTransport(),
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
                 thinkingLevel: this.session.thinkingLevel,
-                availableThinkingLevels: this.session.getAvailableThinkingLevels(),
+                availableThinkingLevels,
                 currentTheme: this.themeController.getThemeSelection() || "dark",
                 terminalTheme: this.themeController.getTerminalTheme(),
                 availableThemes: getAvailableThemes(),
@@ -5832,8 +5875,9 @@ export class InteractiveMode {
             };
         });
     }
-    showUserMessageSelector() {
-        const userMessages = this.session.getUserMessagesForForking();
+    async showUserMessageSelector() {
+        // Awaited at the boundary: the shared-host proxy answers this over RPC.
+        const userMessages = await this.session.getUserMessagesForForking();
         if (userMessages.length === 0) {
             this.showStatus("No messages to fork from");
             return;
@@ -6612,7 +6656,7 @@ export class InteractiveMode {
         const outputPath = this.getPathCommandArgument(text, "/export");
         try {
             if (outputPath?.endsWith(".jsonl")) {
-                const filePath = this.session.exportToJsonl(outputPath);
+                const filePath = await this.session.exportToJsonl(outputPath);
                 this.showStatus(`Session exported to: ${filePath}`);
             }
             else {
@@ -6801,7 +6845,7 @@ export class InteractiveMode {
             this.showError(error instanceof Error ? error.message : String(error));
         }
     }
-    handleNameCommand(text) {
+    async handleNameCommand(text) {
         const name = text.replace(/^\/name\s*/, "").trim();
         if (!name) {
             const currentName = this.sessionManager.getSessionName();
@@ -6815,8 +6859,8 @@ export class InteractiveMode {
             this.ui.requestRender();
             return;
         }
-        this.session.setSessionName(name);
-        const sessionName = this.sessionManager.getSessionName();
+        await this.session.setSessionName(name);
+        const sessionName = this.session.sessionName;
         if (sessionName !== name) {
             this.showWarning(`Session name was normalized from ${JSON.stringify(name)} to ${JSON.stringify(sessionName)}`);
         }
@@ -6824,9 +6868,10 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${sessionName ?? name}`), 1, 0));
         this.ui.requestRender();
     }
-    handleSessionCommand() {
-        const stats = this.session.getSessionStats();
-        const sessionName = this.sessionManager.getSessionName();
+    async handleSessionCommand() {
+        // Awaited at the boundary: the shared-host proxy answers this over RPC.
+        const stats = await this.session.getSessionStats();
+        const sessionName = this.session.sessionName;
         const entries = this.sessionManager.getEntries();
         const cacheWaste = computeCacheWaste(entries, this.session.modelRuntime);
         // Cost/token totals per provider/model actually used (e.g. OpenRouter `auto`
@@ -7108,7 +7153,7 @@ export class InteractiveMode {
             }
             this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
             // Record the result in session
-            this.session.recordBashResult(command, result, { excludeFromContext });
+            void this.session.recordBashResult(command, result, { excludeFromContext });
             this.bashComponent = undefined;
             this.ui.requestRender();
             return;