@ashx-j/lunr 0.2.26 → 0.2.28

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

@@ -1,3 +1,4 @@
+import { collectUsageRequests, usageTokens } from "../../core/usage-accounting.js";
 /**
  * Interactive mode for the coding agent.
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
@@ -8,7 +9,6 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { getSupportedThinkingLevels, } from "@ashx-j/lunr-ai/compat";
 import { CombinedAutocompleteProvider, Container, collectImageMarkerIds, formatImageMarker, fuzzyFilter, isFocusable, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@ashx-j/lunr-tui";
-import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, appendDebugLog, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
@@ -30,10 +30,9 @@ import { refreshModelCandidatesForInit } from "../../core/model-runtime.js";
 import { getModelTiersBridge } from "../../core/model-tiers.js";
 import { registerPermissionModeBridge } from "../../core/permission-mode.js";
 import { nextModeForGoal, registerPermissionModeControlBridge } from "../../core/permission-mode-control.js";
-import { AUTO_MODE_ADDENDUM, getPermissionMode, nextPermissionMode, registerApprovalHandler, resetPermissions, restorePermissionModeAfterPlan, setPermissionMode, } from "../../core/permissions.js";
-import { READ_ONLY_MODE_ADDENDUM } from "../../core/plan-mode.js";
+import { nextPermissionMode, registerApprovalHandler, restorePermissionModeAfterPlan, } from "../../core/permissions.js";
 import * as processRegistry from "../../core/process-registry.js";
-import { captureTreeChanges, clearRollback, disableRollbackForSession, enableRollbackForSession, initRollback, isRollbackEnabled, isRollbackSessionForceEnabled, migrateRollbackSession, peekRollbackTurnsConsumed, beginTurn as rollbackBeginTurn, rollbackLastTurn, setRollbackWarningHandler, } from "../../core/rollback.js";
+import { captureTreeChanges, clearRollback, commitRollbackTurn, disableRollbackForSession, enableRollbackForSession, getRollbackRecoveryBlockReason, getRollbackTargetUserId, initRollback, isRollbackEnabled, isRollbackSessionForceEnabled, migrateRollbackSession, peekRollbackTurnsConsumed, beginTurn as rollbackBeginTurn, rollbackLastTurn, setRollbackWarningHandler, } from "../../core/rollback.js";
 import { getSearchCuratorSetting, setSearchCuratorSetting } from "../../core/search-curator.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { cancelSessionHandoff, markSessionHandoff, recordTuiActivity, registerTransferHandler, requestSessionTransfer, } from "../../core/session-handoff.js";
@@ -66,7 +65,6 @@ import { CustomEntryComponent } from "./components/custom-entry.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
 import { DaxnutsComponent } from "./components/daxnuts.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
-import { buildExitCard, computeExitCardStats } from "./components/exit-card.js";
 import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
@@ -143,27 +141,6 @@ function isAnthropicSubscriptionAuthKey(apiKey) {
 function isUnknownModel(model) {
     return !!model && model.provider === "unknown" && model.id === "unknown" && model.api === "unknown";
 }
-function quoteIfNeeded(value) {
-    if (value.length > 0 && !/[^a-zA-Z0-9_\-./~:@]/.test(value)) {
-        return value;
-    }
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-export function formatResumeCommand(sessionManager) {
-    if (!process.stdout.isTTY)
-        return undefined;
-    if (!sessionManager.isPersisted())
-        return undefined;
-    const sessionFile = sessionManager.getSessionFile();
-    if (!sessionFile || !fs.existsSync(sessionFile))
-        return undefined;
-    const args = [APP_NAME];
-    if (!sessionManager.usesDefaultSessionDir()) {
-        args.push("--session-dir", quoteIfNeeded(sessionManager.getSessionDir()));
-    }
-    args.push("--session", sessionManager.getSessionId());
-    return args.join(" ");
-}
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
@@ -345,11 +322,11 @@ export class InteractiveMode {
         this.options = options;
         this.autoTrustOnReloadCwd = options.autoTrustOnReloadCwd;
         this.runtimeHost.setBeforeSessionInvalidate((reason) => {
+            this.stopPlanUsagePolling();
             this.resetExtensionUI();
-            // lunr: reset permission mode to configured default + clear session approvals
+            // Reset UI mode history before binding the replacement session.
             this.previousPermissionMode = undefined;
             this.preGoalPermissionMode = undefined;
-            resetPermissions(this.settingsManager.getDefaultPermissionMode());
             // lunr: clear process registry and rollback state
             processRegistry.clearRegistry();
             // lunr: on fork (/rollback, tree navigation) the snapshots SURVIVE —
@@ -361,22 +338,21 @@ export class InteractiveMode {
         });
         this.runtimeHost.setRebindSession(async () => {
             await this.rebindCurrentSession({ renderBeforeBind: true });
+            this.startPlanUsagePolling();
             // lunr: re-init rollback for the new session id + re-apply auto force-enable.
             initRollback(this.settingsManager, this.sessionManager.getSessionId());
-            const mode = this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode();
-            resetPermissions(mode);
+            const mode = this.session.permissionMode;
             this.syncPermissionModeEffects(mode);
         });
         this.version = VERSION;
         this.ui = options.startupView?.ui ?? new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         // lunr: register the permission-mode footer bridge (provider-side: InteractiveMode owns the state).
-        registerPermissionModeBridge(() => getPermissionMode());
+        registerPermissionModeBridge(() => this.session.permissionMode);
         registerPermissionModeControlBridge({
             enterGoalAuto: () => this.enterGoalAuto(),
             leaveGoalAuto: () => this.leaveGoalAuto(),
         });
-        resetPermissions(this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode());
         this.headerContainer = new Container();
         if (options.startupView) {
             this.headerContainer.addChild(new Spacer(1));
@@ -630,7 +606,7 @@ export class InteractiveMode {
         // lunr: initialize rollback service for this session.
         initRollback(this.settingsManager, this.sessionManager.getSessionId());
         setRollbackWarningHandler((msg) => this.showStatus(msg));
-        this.syncPermissionModeEffects(this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode());
+        this.syncPermissionModeEffects(this.session.permissionMode);
         await this.themeController.applyFromSettings();
         this.headerContainer.clear();
         // Add boot screen header (unless silenced)
@@ -716,10 +692,13 @@ export class InteractiveMode {
         }
     }
     planUsageTimer;
+    planUsageBridge;
     startPlanUsagePolling() {
-        const bridge = getUsageServiceBridge();
+        this.stopPlanUsagePolling();
+        const bridge = getUsageServiceBridge(this.session.modelRuntime);
         if (!bridge)
             return;
+        this.planUsageBridge = bridge;
         bridge.setOnUpdate(() => this.ui.requestRender());
         const tick = () => {
             const provider = this.session.model?.provider;
@@ -730,6 +709,14 @@ export class InteractiveMode {
         this.planUsageTimer = setInterval(tick, 60_000);
         this.planUsageTimer.unref?.();
     }
+    stopPlanUsagePolling() {
+        if (this.planUsageTimer) {
+            clearInterval(this.planUsageTimer);
+            this.planUsageTimer = undefined;
+        }
+        this.planUsageBridge?.setOnUpdate(undefined);
+        this.planUsageBridge = undefined;
+    }
     /** Background npm version check. Never blocks first paint. Workspace installs skip. */
     async maybeNotifyCliUpdate() {
         try {
@@ -858,7 +845,7 @@ export class InteractiveMode {
             return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
         }
         if (extendedKeysFormat === "xterm") {
-            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+            return "tmux extended-keys-format is xterm. lunR works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
         }
         return undefined;
     }
@@ -3051,9 +3038,7 @@ export class InteractiveMode {
             }
             case "agent_end":
                 this.session.refreshModelFromRegistry();
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(false);
-                }
+                this.ui.terminal.setProgress(false);
                 this.clearStatusIndicator("working");
                 this.stopSmoothStreaming();
                 if (this.streamingComponent) {
@@ -3090,9 +3075,7 @@ export class InteractiveMode {
                 break;
             }
             case "compaction_end": {
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(false);
-                }
+                this.ui.terminal.setProgress(false);
                 if (this.autoCompactionEscapeHandler) {
                     this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
                     this.autoCompactionEscapeHandler = undefined;
@@ -3403,7 +3386,7 @@ export class InteractiveMode {
     }
     /**
      * Show a transcript notice when a completed assistant message paid for a
-     * significant cache miss. Only states observable facts: the miss itself,
+     * significant cache miss. The overlap estimate cannot establish identical prompt content. It also shows
      * a model switch, or an idle gap past the cache TTL.
      */
     maybeShowCacheMissNotice(message) {
@@ -3418,10 +3401,10 @@ export class InteractiveMode {
         if (miss.missedTokens < 20_000 && miss.missedCost < 0.1)
             return;
         const cost = miss.missedCost >= 0.01 ? ` (~$${miss.missedCost.toFixed(2)})` : "";
-        const reBilled = `${formatTokens(miss.missedTokens)} tokens re-billed${cost}`;
-        let label = "Cache miss";
+        const reBilled = `~${formatTokens(miss.missedTokens)} tokens may have missed cache${cost}`;
+        let label = "Estimated cache miss";
         if (miss.modelChanged) {
-            label = "Cache miss after model switch";
+            label = "Estimated cache miss after model switch";
         }
         else if (miss.idleMs >= CACHE_TTL_MS) {
             label = `Cache miss after ${Math.round(miss.idleMs / 60_000)}m idle`;
@@ -3497,13 +3480,10 @@ export class InteractiveMode {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
+        this.session.stopAdmission();
         this.unregisterSessionTransfer?.();
         this.stopSmoothStreaming();
-        if (this.planUsageTimer) {
-            clearInterval(this.planUsageTimer);
-            this.planUsageTimer = undefined;
-        }
-        getUsageServiceBridge()?.setOnUpdate(undefined);
+        this.stopPlanUsagePolling();
         // Keep signal handlers registered until terminal cleanup has completed.
         // `signal-exit` checks the listener list during the same SIGTERM/SIGHUP
         // dispatch and re-sends the signal if only its own listeners remain.
@@ -3542,21 +3522,6 @@ export class InteractiveMode {
         }
         this.stop();
         await this.runtimeHost.dispose();
-        // lunr: exit summary card — print a closing card for non-empty sessions,
-        // before the resume line. Fires on all interactive exits reaching shutdown
-        // (/quit, double ctrl+c, ctrl+d). Skipped for empty sessions (0 user msgs).
-        const entries = this.sessionManager?.getEntries?.();
-        const exitStats = entries ? computeExitCardStats(entries) : { turns: 0, tokens: 0, filesChanged: 0 };
-        const cardLines = buildExitCard(exitStats);
-        if (cardLines.length > 0) {
-            process.stdout.write(`${chalk.dim(cardLines.join("\n"))}\n`);
-        }
-        const resumeCommand = this.sessionManager && typeof this.sessionManager.isPersisted === "function"
-            ? formatResumeCommand(this.sessionManager)
-            : undefined;
-        if (resumeCommand) {
-            process.stdout.write(`${chalk.dim("To resume this session:")} ${resumeCommand}\n`);
-        }
         process.exit(0);
     }
     emergencyTerminalExit() {
@@ -3756,7 +3721,7 @@ export class InteractiveMode {
         }
     }
     cyclePermissionMode() {
-        this.applyPermissionMode(nextPermissionMode(getPermissionMode()), { silent: true });
+        this.applyPermissionMode(nextPermissionMode(this.session.permissionMode), { silent: true });
     }
     async cycleModel(direction) {
         if (this.runtimeHost.isDetached || this.transferInProgress)
@@ -3876,7 +3841,7 @@ export class InteractiveMode {
             this.ui.stop();
             // Split by space to support editor arguments (e.g., "code --wait")
             const [editor, ...editorArgs] = editorCmd.split(" ");
-            process.stdout.write(`Launching external editor: ${editorCmd}\nPi will resume when the editor exits.\n`);
+            process.stdout.write(`Launching external editor: ${editorCmd}\nlunR will resume when the editor exits.\n`);
             // Do not use spawnSync here. On Windows, synchronous child_process calls can keep
             // Node/libuv's console input read active after ui.stop() pauses stdin, racing
             // vim/nvim for the console input buffer until Ctrl+C cancels the pending read.
@@ -4351,6 +4316,8 @@ export class InteractiveMode {
                 },
                 onShowTerminalProgressChange: (enabled) => {
                     this.settingsManager.setShowTerminalProgress(enabled);
+                    if (!enabled)
+                        this.ui.terminal.setProgress(false);
                 },
                 onModelTiersEnabledChange: (enabled) => {
                     this.settingsManager.setModelTiersEnabled(enabled);
@@ -4573,7 +4540,16 @@ export class InteractiveMode {
         const cloudRefresh = globalThis[Symbol.for("@lunr/ollama-cloud-refresh")];
         if (cloudRefresh && allowNetwork) {
             try {
-                await cloudRefresh({ ui: runner.createCommandContext().ui });
+                const resolution = await runtime.getAuth("ollama-cloud");
+                await cloudRefresh({
+                    ui: runner.createCommandContext().ui,
+                    auth: resolution
+                        ? {
+                            apiKey: resolution.auth.apiKey,
+                            headers: Object.fromEntries(Object.entries(resolution.auth.headers ?? {}).filter((entry) => entry[1] !== null)),
+                        }
+                        : undefined,
+                });
             }
             catch (error) {
                 ollama = `ollama-cloud refresh failed: ${error instanceof Error ? error.message : String(error)}`;
@@ -6304,9 +6280,24 @@ export class InteractiveMode {
             const prompt = "Generate a title of at most 6 words summarizing this request. " +
                 "Reply with the title only — no quotes, no trailing punctuation, no prefix.\n\n" +
                 `Request:\n${firstUserText.slice(0, 2000)}`;
+            const requestSessionId = this.sessionManager.getSessionId();
+            const requestSessionFile = this.sessionManager.getSessionFile();
             const response = await this.session.modelRuntime.complete(model, {
                 messages: [{ role: "user", content: [{ type: "text", text: prompt }], timestamp: Date.now() }],
             });
+            if (this.sessionManager.getSessionId() !== requestSessionId) {
+                if (requestSessionFile) {
+                    const target = SessionManager.open(requestSessionFile);
+                    try {
+                        target.appendRequestUsage("title", response);
+                    }
+                    finally {
+                        target.dispose();
+                    }
+                }
+                return;
+            }
+            this.sessionManager.appendRequestUsage("title", response);
             let title = response.content
                 .filter((c) => c.type === "text")
                 .map((c) => c.text)
@@ -6332,19 +6323,12 @@ export class InteractiveMode {
         // Cost/token totals per provider/model actually used (e.g. OpenRouter `auto`
         // resolves to a concrete responseModel), sorted by cost descending.
         const perModelMap = new Map();
-        for (const entry of entries) {
-            if (entry.type !== "message" || entry.message.role !== "assistant")
-                continue;
-            const message = entry.message;
-            const usage = message.usage;
-            const key = `${message.provider}/${message.responseModel ?? message.model}`;
-            let bucket = perModelMap.get(key);
-            if (!bucket) {
-                bucket = { key, cost: 0, tokens: 0 };
-                perModelMap.set(key, bucket);
-            }
-            bucket.cost += usage.cost.total;
-            bucket.tokens += usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+        for (const request of collectUsageRequests(entries)) {
+            const key = `${request.provider}/${request.model}`;
+            const bucket = perModelMap.get(key) ?? { key, cost: 0, tokens: 0 };
+            bucket.cost += request.usage.cost.total;
+            bucket.tokens += usageTokens(request.usage);
+            perModelMap.set(key, bucket);
         }
         const perModel = Array.from(perModelMap.values()).sort((a, b) => b.cost - a.cost);
         let info = `${theme.bold("Session Info")}\n\n`;
@@ -6358,7 +6342,7 @@ export class InteractiveMode {
         info += `${theme.fg("dim", "User:")} ${stats.userMessages}\n`;
         info += `${theme.fg("dim", "Assistant:")} ${stats.assistantMessages}\n`;
         info += `${theme.fg("dim", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results\n\n`;
-        info += `${theme.bold("Tokens")}\n`;
+        info += `${theme.bold("Parent tokens including auxiliary requests")}\n`;
         // "Input" is the full prompt volume. With cache activity, split it into
         // cached (served from cache) vs uncached (everything else) - the only
         // provider-independent split. Cache writes, where reported, are a detail
@@ -6374,6 +6358,17 @@ export class InteractiveMode {
         }
         info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}\n`;
         info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
+        if (stats.childUsage?.total) {
+            info += `Children: ${stats.childUsage.total.toLocaleString()} tokens, $${stats.childUsage.cost.toFixed(3)}\n`;
+            info += `Combined: ${stats.combinedUsage?.total.toLocaleString()} tokens, $${stats.combinedUsage?.cost.toFixed(3)}\n`;
+        }
+        if (stats.parentUsage?.unknownRequests)
+            info += `Usage unavailable for ${stats.parentUsage.unknownRequests} request(s).\n`;
+        if (stats.parentUsage?.partialRequests)
+            info += `Usage incomplete for ${stats.parentUsage.partialRequests} request(s).\n`;
+        if (stats.parentUsage?.unknownCosts)
+            info += `Pricing unavailable for ${stats.parentUsage.unknownCosts} request(s).\n`;
+        info += "Costs use catalog estimates unless the provider reports its account charge.\n";
         if (stats.cost > 0 || cacheWaste.missedTokens > 0) {
             info += `\n${theme.bold("Cost")}\n`;
             info += `${theme.fg("dim", "Total:")} $${stats.cost.toFixed(3)}`;
@@ -6387,8 +6382,8 @@ export class InteractiveMode {
                 const detail = `${cacheWaste.missedTokens.toLocaleString()} tokens, ${missLabel}`;
                 info +=
                     cacheWaste.missedCost >= 0.0001
-                        ? `\n${theme.fg("dim", "Cache Re-billed:")} $${cacheWaste.missedCost.toFixed(3)} ${theme.fg("dim", `(${detail})`)}`
-                        : `\n${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
+                        ? `\n${theme.fg("dim", "Estimated cache misses:")} $${cacheWaste.missedCost.toFixed(3)} ${theme.fg("dim", `(${detail})`)}`
+                        : `\n${theme.fg("dim", "Estimated cache misses:")} ${detail}`;
             }
         }
         this.chatContainer.addChild(new Spacer(1));
@@ -6436,20 +6431,33 @@ export class InteractiveMode {
     // context-window bar, and subscription plan usage.
     async handleUsageCommand() {
         const stats = this.session.getSessionStats();
-        const sessionTotals = stats.tokens.total > 0
+        const sessionTotals = stats.tokens.total > 0 ||
+            stats.parentUsage?.requests ||
+            stats.parentUsage?.unknownRequests ||
+            stats.parentUsage?.partialRequests
             ? {
                 input: stats.tokens.input,
                 output: stats.tokens.output,
                 cacheRead: stats.tokens.cacheRead,
                 cacheWrite: stats.tokens.cacheWrite,
                 total: stats.tokens.total,
+                requests: stats.parentUsage?.requests,
+                unknownRequests: stats.parentUsage?.unknownRequests,
+                partialRequests: stats.parentUsage?.partialRequests,
             }
             : undefined;
         const context = this.session.getContextUsage();
         const provider = this.session.model?.provider;
         const planResult = await getAllPlanUsageResults(provider, this.session.modelRuntime);
         const breakdown = this.collectUsageBreakdown();
-        const lines = renderUsageBox({ sessionTotals, context, plan: planResult.usages, breakdown }, this.ui.terminal.columns);
+        const lines = renderUsageBox({
+            sessionTotals,
+            childTotals: stats.childUsage,
+            combinedTotals: stats.combinedUsage,
+            context,
+            plan: planResult.usages,
+            breakdown,
+        }, this.ui.terminal.columns);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(lines.join("\n"), 1, 0));
         if (planResult.errors.length > 0)
@@ -6480,9 +6488,11 @@ export class InteractiveMode {
     // /plan is a shortcut into read-only mode for planning.
     async handlePlanCommand(args) {
         const sub = args.toLowerCase();
-        const inReadOnly = getPermissionMode() === "read-only";
+        const inReadOnly = this.session.permissionMode === "read-only";
         if (sub === "status") {
-            this.showStatus(inReadOnly ? "Read mode is active. /plan off to leave it." : `Permission mode: ${getPermissionMode()}.`);
+            this.showStatus(inReadOnly
+                ? "Read mode is active. /plan off to leave it."
+                : `Permission mode: ${this.session.permissionMode}.`);
             return;
         }
         if (sub !== "" && sub !== "on" && sub !== "off") {
@@ -6501,7 +6511,7 @@ export class InteractiveMode {
     handleModeCommand(args) {
         const sub = args.toLowerCase();
         if (sub === "status") {
-            this.showStatus(`Permission mode: ${getPermissionMode() === "read-only" ? "read" : getPermissionMode()}`);
+            this.showStatus(`Permission mode: ${this.session.permissionMode === "read-only" ? "read" : this.session.permissionMode}`);
             return;
         }
         if (sub === "yolo" || sub === "auto" || sub === "read-only" || sub === "read") {
@@ -6536,53 +6546,35 @@ export class InteractiveMode {
     syncPermissionModeEffects(mode) {
         if (this.runtimeHost.isDetached || this.transferInProgress)
             return;
-        this.sessionManager.setPermissionMode(mode);
-        if (mode === "read-only") {
-            this.session.setSystemPromptAppend(READ_ONLY_MODE_ADDENDUM);
-        }
-        else if (mode === "auto") {
-            this.session.setSystemPromptAppend(AUTO_MODE_ADDENDUM);
+        this.session.setPermissionMode(mode);
+        if (mode === "auto")
             enableRollbackForSession(this.sessionManager.getSessionId());
-        }
-        else {
-            this.session.setSystemPromptAppend(undefined);
-        }
     }
     // lunr: `/goal` forces session auto without writing settings.
     enterGoalAuto() {
-        const next = nextModeForGoal(getPermissionMode(), "enter", this.preGoalPermissionMode);
+        const next = nextModeForGoal(this.session.permissionMode, "enter", this.preGoalPermissionMode);
         this.preGoalPermissionMode = next.saved;
-        if (next.mode !== getPermissionMode()) {
+        if (next.mode !== this.session.permissionMode) {
             this.applyPermissionMode(next.mode, { silent: true });
         }
     }
     leaveGoalAuto() {
-        const next = nextModeForGoal(getPermissionMode(), "leave", this.preGoalPermissionMode);
+        const next = nextModeForGoal(this.session.permissionMode, "leave", this.preGoalPermissionMode);
         this.preGoalPermissionMode = next.saved;
-        if (next.mode !== getPermissionMode()) {
+        if (next.mode !== this.session.permissionMode) {
             this.applyPermissionMode(next.mode, { silent: true });
         }
     }
     applyPermissionMode(mode, opts) {
         if (this.runtimeHost.isDetached || this.transferInProgress)
             return;
-        this.sessionManager.setPermissionMode(mode);
         recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
-        const prev = getPermissionMode();
+        const prev = this.session.permissionMode;
         if (mode === "read-only" && prev !== "read-only") {
             this.previousPermissionMode = prev;
         }
-        setPermissionMode(mode);
+        this.session.setPermissionMode(mode);
         this.ui.requestRender();
-        if (mode === "read-only") {
-            this.session.setSystemPromptAppend(READ_ONLY_MODE_ADDENDUM);
-        }
-        else if (mode === "auto") {
-            this.session.setSystemPromptAppend(AUTO_MODE_ADDENDUM);
-        }
-        else {
-            this.session.setSystemPromptAppend(undefined);
-        }
         if (mode === "auto" && prev !== "auto") {
             enableRollbackForSession(this.sessionManager.getSessionId());
         }
@@ -6682,10 +6674,15 @@ export class InteractiveMode {
             this.showWarning("Wait for the current response to finish before running /rollback.");
             return;
         }
-        if (!isRollbackEnabled()) {
+        if (!isRollbackEnabled(this.sessionManager.getSessionId())) {
             this.showStatus("Rollback is disabled — enable it in /settings → Rollback");
             return;
         }
+        const recoveryBlocked = getRollbackRecoveryBlockReason(this.sessionManager.getSessionId());
+        if (recoveryBlocked) {
+            this.showWarning(recoveryBlocked);
+            return;
+        }
         // lunr: how many turns the rollback will consume — the newest non-empty turn
         // plus any empty (chat-only) turns on top of it. The conversation must rewind
         // past the same number of user messages or files and messages desync.
@@ -6695,43 +6692,68 @@ export class InteractiveMode {
         // the current branch) BEFORE mutating anything — forking to it is what makes
         // the rewind persistent.
         const branch = this.sessionManager.getBranch();
-        let targetUserId;
+        let targetUserId = getRollbackTargetUserId(this.sessionManager.getSessionId());
+        if (targetUserId && !branch.some((entry) => entry.id === targetUserId)) {
+            this.showWarning("Rollback recovery belongs to another chat branch. Return to that branch to retry.");
+            return;
+        }
         let userMessagesSeen = 0;
-        for (let i = branch.length - 1; i >= 0; i--) {
+        let fallbackUserId;
+        for (let i = branch.length - 1; !targetUserId && i >= 0; i--) {
             const entry = branch[i];
             if (entry.type === "message" && entry.message.role === "user") {
                 userMessagesSeen++;
-                targetUserId = entry.id;
+                fallbackUserId = entry.id;
                 if (userMessagesSeen >= turnsToConsume)
                     break;
             }
         }
+        targetUserId ??= fallbackUserId;
         if (!targetUserId) {
             this.showStatus("Nothing to roll back");
             return;
         }
         let result;
         try {
-            // lunr: fork FIRST. If the fork throws or is cancelled by an extension veto,
-            // no snapshot has been popped yet, so files and conversation stay consistent
-            // and /rollback can simply be retried. Fork teardown skips the rollback wipe
-            // (reason === "fork"); the snapshots are then migrated to the forked session id.
+            result = rollbackLastTurn(this.sessionManager.getSessionId(), { deferCommit: true, targetUserId });
+        }
+        catch (error) {
+            this.showError(`Rollback could not prepare recovery: ${error instanceof Error ? error.message : String(error)}`);
+            return;
+        }
+        if (!result.complete) {
+            const failures = result.failed
+                .slice(0, 3)
+                .map(({ path: file, error }) => `${path.basename(file)}: ${error}`)
+                .join("; ");
+            this.showWarning(`Rollback incomplete. ${result.restored.length} file(s) restored, ${result.deleted.length} deleted, ${result.failed.length} failed. ${failures}. Chat unchanged. /rollback retries this turn's unfinished recovery.`);
+            return;
+        }
+        let chatRewound = false;
+        try {
+            // Restore first, but keep snapshots and completed-path receipts until
+            // the fork succeeds. A veto or exception retries only this chat rewind.
             const oldSid = this.sessionManager.getSessionId();
             const forkResult = await this.runtimeHost.fork(targetUserId, { position: "before" });
             if (forkResult.cancelled) {
-                this.showStatus("Rollback cancelled");
+                this.showWarning("File recovery complete. Chat rewind cancelled. /rollback retries the same turn without restoring completed files again.");
                 return;
             }
+            chatRewound = true;
             migrateRollbackSession(oldSid, this.sessionManager.getSessionId());
-            result = rollbackLastTurn(this.sessionManager.getSessionId());
-            // /redo cannot redo across a fork — the branched session has new entry ids.
+            if (result.turnIndex !== undefined)
+                commitRollbackTurn(this.sessionManager.getSessionId(), result.turnIndex);
+            // /redo cannot cross a fork because the branched session has new entry ids.
             this.redoStack.length = 0;
             if (forkResult.selectedText && !this.editor.getText().trim()) {
                 this.editor.setText(forkResult.selectedText);
             }
         }
         catch (error) {
-            this.showError(error instanceof Error ? error.message : String(error));
+            const message = error instanceof Error ? error.message : String(error);
+            this.showError(chatRewound
+                ? `Chat rewound, but finishing rollback failed: ${message}`
+                : `File recovery complete; chat rewind failed: ${message}. /rollback retries the same turn.`);
             return;
         }
         const names = (paths) => {
@@ -6747,7 +6769,7 @@ export class InteractiveMode {
         if (result.deleted.length > 0)
             parts.push(`${result.deleted.length} file(s) deleted (${names(result.deleted)})`);
         if (parts.length === 0)
-            parts.push("no file changes to restore");
+            parts.push(result.turnIndex === undefined ? "no file changes to restore" : "file recovery complete");
         this.showStatus(`Rollback complete — ${parts.join("; ")}.`);
     }
     /**
@@ -7023,9 +7045,7 @@ ${toggleThinking ? `| \`${toggleThinking}\` | Toggle thinking block visibility |
         this.setThinkingAnimation(false);
         this.stopCatalogRefresh?.();
         this.stopCatalogRefresh = undefined;
-        if (this.settingsManager.getShowTerminalProgress()) {
-            this.ui.terminal.setProgress(false);
-        }
+        this.ui.terminal.setProgress(false);
         this.clearStatusIndicator();
         this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();