@bastani/atomic 0.9.10 → 0.9.11-alpha.10

package/dist/modes/interactive-engine/isolated-auth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isolated-auth.js","sourceRoot":"","sources":["../../../src/modes/interactive-engine/isolated-auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAkC,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,6GAA6G;AAC7G,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC/C,OAAqB,EACrB,MAAiB,EACjB,OAA2B,EAC3B,QAAgB,EAChB,SAAoC;IAEpC,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC/E,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,wBAAwB,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5G,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC7B,4EAA4E;IAC5E,yEAAyE;IACzE,MAAM,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7E,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC","sourcesContent":["import type { AgentSession } from \"../../core/agent-session.ts\";\nimport { type AtomicOAuthLoginCallbacks, normalizeOAuthLoginError } from \"../../core/oauth-login.ts\";\nimport type { RpcClient } from \"../rpc/rpc-client.ts\";\nimport { loginRpcOAuthProvider } from \"../rpc/rpc-oauth-client.ts\";\nimport type { RemoteModelCatalog } from \"./remote-model-catalog.ts\";\n\nexport type { AtomicOAuthLoginCallbacks } from \"../../core/oauth-login.ts\";\n\n/** Acquire and persist OAuth entirely in the engine, transporting only UI callbacks and catalog metadata. */\nexport async function loginIsolatedOAuthProvider(\n\tsession: AgentSession,\n\tclient: RpcClient,\n\tcatalog: RemoteModelCatalog,\n\tprovider: string,\n\tcallbacks: AtomicOAuthLoginCallbacks,\n): Promise<{ modelsRefreshed: true }> {\n\tconst remoteCatalog = await loginRpcOAuthProvider(client, provider, callbacks);\n\tif (remoteCatalog.cancelled) {\n\t\tthrow normalizeOAuthLoginError(callbacks.signal?.reason ?? new Error(\"Login cancelled\"), callbacks.signal);\n\t}\n\tcatalog.apply(remoteCatalog);\n\t// The engine owns persistence. Refresh the frontend snapshot only after its\n\t// credential transaction and catalog refresh both complete successfully.\n\tawait session.modelRuntime.reloadCredentials({ refreshAvailability: false });\n\treturn { modelsRefreshed: true };\n}\n"]}

package/dist/modes/interactive-engine/isolated-runtime.d.ts

@@ -1,9 +1,12 @@
 import type { AgentSession } from "../../core/agent-session.ts";
 import { AgentSessionRuntime, type CreateAgentSessionRuntimeFactory } from "../../core/agent-session-runtime.ts";
+import type { ResourceOverlap } from "../../core/diagnostics.ts";
 import type { RpcClient } from "../rpc/rpc-client.ts";
-import type { RpcExtensionUIRequest, RpcExtensionUIResponse } from "../rpc/rpc-types.ts";
-import type { RpcSlashCommand } from "../rpc/rpc-types.ts";
+import type { RpcAutocompleteItem, RpcExtensionUIRequest, RpcExtensionUIResponse, RpcSlashCommand } from "../rpc/rpc-types.ts";
 import type { ActivityWatchdogDiagnostic } from "./activity-watchdog.ts";
+import type { InteractiveEngineGenerationEndedListener } from "./engine-generation.ts";
+import { type EngineDiagnosticListener } from "./engine-health.ts";
+import { type AtomicOAuthLoginCallbacks } from "./isolated-auth.ts";
 import type { EngineKeybindingState, InteractiveEngineCommand, InteractiveEngineMessage } from "./protocol.ts";
 import { type RemoteCommandsListener } from "./remote-command-catalog.ts";
 export declare class IsolatedInteractiveRuntime extends AgentSessionRuntime {
@@ -11,35 +14,52 @@ export declare class IsolatedInteractiveRuntime extends AgentSessionRuntime {
     private readonly patchedSessions;
     private streaming;
     private compacting;
-    private bashRunning;
+    private readonly activeBashRequestIds;
     private steeringMessages;
     private followUpMessages;
     private engineCallbackActive;
-    private readonly diagnosticListeners;
-    private remoteModels;
-    private remoteScopedModels;
-    private pendingDiagnostics;
-    private lastDiagnostic;
+    private readonly queuePause;
     private autoCompactionEnabled;
     private autoRetryEnabled;
     private remoteSessionName;
     private remoteSessionFile;
-    private restartPromise;
+    private readonly health;
     private readonly remoteCommands;
+    private readonly remoteModelCatalog;
+    private resourceOverlaps;
     constructor(localRuntime: AgentSessionRuntime, createRuntime: CreateAgentSessionRuntimeFactory, client: RpcClient);
     get session(): AgentSession;
     initializeFromEngine(): Promise<void>;
-    onDiagnostic(listener: (diagnostic: ActivityWatchdogDiagnostic) => void): () => void;
+    loginOAuthProvider(provider: string, callbacks: AtomicOAuthLoginCallbacks): Promise<{
+        modelsRefreshed: true;
+    }>;
+    logoutProvider(provider: string): Promise<import("../rpc/rpc-types.ts").RpcLogoutProviderResult>;
+    onDiagnostic(listener: EngineDiagnosticListener): () => void;
     onEngineMessage(listener: (message: InteractiveEngineMessage) => void): () => void;
     onKeybindingState(listener: (state: EngineKeybindingState) => void): () => void;
     sendEngineCommand(command: InteractiveEngineCommand): void;
     getRemoteCommands(): readonly RpcSlashCommand[];
     onRemoteCommandsChanged(listener: RemoteCommandsListener): () => void;
+    getRemoteCommandCompletions(commandName: string, argumentPrefix: string): Promise<RpcAutocompleteItem[] | null>;
     invokeRemoteShortcut(key: string): Promise<void>;
     waitUntilBound(): Promise<void>;
     getEnginePid(): number | undefined;
     getEngineGeneration(): number;
     isRecovering(): boolean;
+    /** Subscribe to host-local engine generation death (see engine-generation.ts). */
+    onGenerationEnded(listener: InteractiveEngineGenerationEndedListener): () => void;
+    /**
+     * A heartbeat proves the child's event loop is turning again, so a stall the
+     * watchdog already reported must stop arming the Ctrl+C escape hatch. Fed by a
+     * dedicated client callback rather than a generic engine-message subscriber,
+     * which would consume buffered startup custom-UI messages.
+     */
+    noteEngineHeartbeat(): void;
+    /** True only when the engine is provably not answering (see EngineHealthController). */
+    needsExplicitTermination(): boolean;
+    /** Explicit user-driven engine termination and recovery (Ctrl+C escape hatch). */
+    terminateAndRecover(): Promise<void>;
+    getResourceOverlaps(): readonly ResourceOverlap[];
     synchronize(): Promise<void>;
     setEngineCallbackActive(active: boolean): void;
     interruptBlockedCallback(): boolean;
@@ -62,14 +82,27 @@ export declare class IsolatedInteractiveRuntime extends AgentSessionRuntime {
         cancelled: boolean;
         selectedText?: string;
     }>;
+    /**
+     * The child engine already settled (and persisted) its own turn before it
+     * reported the replacement, and the host facade's `abort()` is `abortAndRecover()`
+     * — an unbounded cooperative round trip. Re-entering it during teardown would
+     * hang session replacement on an unresponsive or dead engine, which is exactly
+     * what engine recovery exists to survive.
+     */
+    protected settleActiveResponseBeforeTeardown(): Promise<void>;
     dispose(): Promise<void>;
     private patchSession;
+    /**
+     * Cooperative interrupt. Requests the engine's own abort and waits for it —
+     * no timeout, no termination, no restart. A genuinely wedged engine is the
+     * user's call to terminate with Ctrl+C (see terminateAndRecover), never an
+     * automatic consequence of pressing Escape.
+     */
     private abortAndRecover;
     private dispatchBestEffort;
     private resetUnpersistedSessionView;
     private patchSessionManager;
     private refreshSessionView;
-    private patchModelCatalog;
     private observeEvent;
 }
 //# sourceMappingURL=isolated-runtime.d.ts.map

package/dist/modes/interactive-engine/isolated-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isolated-runtime.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/isolated-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"isolated-runtime.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive-engine/isolated-runtime.ts"],"names":[],"mappings":"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"}

package/dist/modes/interactive-engine/isolated-runtime.js

@@ -1,26 +1,42 @@
-import { AgentSessionRuntime, } from "../../core/agent-session-runtime.js";
+import { AgentSessionRuntime } from "../../core/agent-session-runtime.js";
 import { SessionManager } from "../../core/session-manager.js";
+import { EngineHealthController } from "./engine-health.js";
+import { loginIsolatedOAuthProvider } from "./isolated-auth.js";
 import { RemoteCommandCatalog } from "./remote-command-catalog.js";
-import { sleep } from "../../utils/sleep.js";
+import { RemoteModelCatalog } from "./remote-model-catalog.js";
+import { RemoteQueuePause } from "./remote-queue-pause.js";
 export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
     constructor(localRuntime, createRuntime, client) {
-        super(localRuntime.session, localRuntime.services, createRuntime, [...localRuntime.diagnostics], localRuntime.modelFallbackMessage);
+        super(localRuntime.session, localRuntime.services, createRuntime, [...localRuntime.diagnostics], localRuntime.modelFallbackMessage, localRuntime.modelFallbackReason);
         this.patchedSessions = new WeakSet();
         this.streaming = false;
         this.compacting = false;
-        this.bashRunning = false;
+        this.activeBashRequestIds = new Map();
         this.steeringMessages = [];
         this.followUpMessages = [];
         this.engineCallbackActive = false;
-        this.diagnosticListeners = new Set();
-        this.remoteModels = [];
-        this.remoteScopedModels = [];
-        this.pendingDiagnostics = [];
         this.autoCompactionEnabled = true;
         this.autoRetryEnabled = true;
+        this.resourceOverlaps = [];
         this.client = client;
         this.remoteCommands = new RemoteCommandCatalog(client);
+        this.remoteModelCatalog = new RemoteModelCatalog(client);
+        this.queuePause = new RemoteQueuePause(client);
+        this.health = new EngineHealthController({
+            stop: () => this.client.stop(),
+            restart: async () => {
+                await this.client.restart(this.remoteSessionFile);
+                await this.initializeFromEngine();
+            },
+            clearActivity: () => {
+                this.streaming = false;
+                this.compacting = false;
+                this.engineCallbackActive = false;
+                this.health.markCooperativeAbortSettled();
+            },
+        });
         this.client.onEvent((event) => this.observeEvent(event));
+        this.client.onGenerationEnded((event) => this.health.handleGenerationEnded(event));
     }
     get session() {
         const session = super.session;
@@ -29,34 +45,46 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
     }
     async initializeFromEngine() {
         const state = await this.client.getState();
-        const session = super.session;
         const catalog = await this.client.requestInternal({ type: "get_available_models" });
-        this.remoteModels = catalog.models;
-        this.remoteScopedModels = catalog.scopedModels ?? [];
-        this.patchModelCatalog(session);
-        if (state.model)
-            session.agent.state.model = state.model;
+        if (state.sessionFile && super.session.sessionManager.getSessionFile() !== state.sessionFile) {
+            await super.switchSession(state.sessionFile);
+        }
+        const session = super.session;
+        this.remoteModelCatalog.apply(catalog);
+        this.remoteModelCatalog.patch(session);
+        session.agent.state.model = state.model;
         session.agent.state.thinkingLevel = state.thinkingLevel;
         session.agent.steeringMode = state.steeringMode;
         session.agent.followUpMode = state.followUpMode;
         this.autoCompactionEnabled = state.autoCompactionEnabled;
+        this.resourceOverlaps = state.resourceOverlaps ?? [];
         this.remoteSessionName = state.sessionName;
         this.remoteSessionFile = state.sessionFile;
         this.streaming = state.isStreaming;
         this.compacting = state.isCompacting;
-        if (state.sessionFile && session.sessionFile !== state.sessionFile)
-            await super.switchSession(state.sessionFile);
+        this.queuePause.synchronize(state.queuedMessagesPaused === true);
+        this.replaceModelFallback(state.modelFallbackMessage, state.modelFallbackReason);
         this.refreshSessionView();
         this.engineCallbackActive = false;
+        this.health.clearUnresponsive();
+        this.health.markCooperativeAbortSettled();
         // Non-blocking refresh so isolated autocomplete lists engine-only extension
         // commands after bind/restart/reload/new/resume/fork. See RemoteCommandCatalog.
         this.remoteCommands.refresh();
     }
+    async loginOAuthProvider(provider, callbacks) {
+        return loginIsolatedOAuthProvider(super.session, this.client, this.remoteModelCatalog, provider, callbacks);
+    }
+    async logoutProvider(provider) {
+        const result = await this.client.logoutProvider(provider);
+        this.remoteModelCatalog.applyModels({ models: result.models, scopedModels: result.scopedModels ?? [] });
+        await super.session.modelRuntime.reloadCredentials({ refreshAvailability: false });
+        super.session.modelRuntime.applyExternalProviderAuthStatus(provider, result.authStatus);
+        super.session.refreshCurrentModelFromRegistry();
+        return result;
+    }
     onDiagnostic(listener) {
-        for (const diagnostic of this.pendingDiagnostics.splice(0))
-            listener(diagnostic);
-        this.diagnosticListeners.add(listener);
-        return () => this.diagnosticListeners.delete(listener);
+        return this.health.onDiagnostic(listener);
     }
     onEngineMessage(listener) {
         return this.client.onInteractiveEngineMessage(listener);
@@ -67,21 +95,63 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
     sendEngineCommand(command) {
         this.client.sendInteractiveEngineCommand(command);
     }
-    getRemoteCommands() { return this.remoteCommands.getCommands(); }
-    onRemoteCommandsChanged(listener) { return this.remoteCommands.onChange(listener); }
+    getRemoteCommands() {
+        return this.remoteCommands.getCommands();
+    }
+    onRemoteCommandsChanged(listener) {
+        return this.remoteCommands.onChange(listener);
+    }
+    getRemoteCommandCompletions(commandName, argumentPrefix) {
+        return this.client.getCommandCompletions(commandName, argumentPrefix);
+    }
     async invokeRemoteShortcut(key) {
         await this.client.requestInternal({ type: "invoke_shortcut", key });
     }
-    waitUntilBound() { return this.client.waitForInteractiveEngineBound(); }
-    getEnginePid() { return this.client.getEnginePid(); }
-    getEngineGeneration() { return this.client.getGeneration(); }
-    isRecovering() { return this.restartPromise !== undefined; }
+    waitUntilBound() {
+        return this.client.waitForInteractiveEngineBound();
+    }
+    getEnginePid() {
+        return this.client.getEnginePid();
+    }
+    getEngineGeneration() {
+        return this.client.getGeneration();
+    }
+    isRecovering() {
+        return this.health.isRecovering();
+    }
+    /** Subscribe to host-local engine generation death (see engine-generation.ts). */
+    onGenerationEnded(listener) {
+        return this.client.onGenerationEnded(listener);
+    }
+    /**
+     * A heartbeat proves the child's event loop is turning again, so a stall the
+     * watchdog already reported must stop arming the Ctrl+C escape hatch. Fed by a
+     * dedicated client callback rather than a generic engine-message subscriber,
+     * which would consume buffered startup custom-UI messages.
+     */
+    noteEngineHeartbeat() {
+        this.health.clearUnresponsive();
+    }
+    /** True only when the engine is provably not answering (see EngineHealthController). */
+    needsExplicitTermination() {
+        return this.health.needsExplicitTermination();
+    }
+    /** Explicit user-driven engine termination and recovery (Ctrl+C escape hatch). */
+    terminateAndRecover() {
+        return this.health.terminate();
+    }
+    getResourceOverlaps() {
+        return this.resourceOverlaps;
+    }
     async synchronize() {
         const state = await this.client.getState();
         this.remoteSessionFile = state.sessionFile;
         this.remoteSessionName = state.sessionName;
+        this.resourceOverlaps = state.resourceOverlaps ?? [];
+    }
+    setEngineCallbackActive(active) {
+        this.engineCallbackActive = active;
     }
-    setEngineCallbackActive(active) { this.engineCallbackActive = active; }
     interruptBlockedCallback() {
         if (!this.engineCallbackActive)
             return false;
@@ -90,10 +160,12 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
     }
     setExtensionUIHandler(handler) {
         return this.client.onExtensionUIRequest((request) => {
-            void handler(request).then(async (response) => {
+            void handler(request)
+                .then(async (response) => {
                 if (response)
                     await this.client.respondExtensionUI(response);
-            }).catch((error) => {
+            })
+                .catch((error) => {
                 this.emitDiagnostic({
                     activity: undefined,
                     elapsedMs: 0,
@@ -104,12 +176,8 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
         });
     }
     emitDiagnostic(diagnostic) {
-        this.lastDiagnostic = diagnostic;
         this.engineCallbackActive = true;
-        if (this.diagnosticListeners.size === 0)
-            this.pendingDiagnostics.push(diagnostic);
-        for (const listener of this.diagnosticListeners)
-            listener(diagnostic);
+        this.health.publish(diagnostic);
     }
     async switchSession(sessionPath) {
         const result = await this.client.switchSession(sessionPath);
@@ -133,7 +201,9 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
     }
     async importFromJsonl(inputPath, cwdOverride) {
         const result = await this.client.requestInternal({
-            type: "import_session", inputPath, cwdOverride,
+            type: "import_session",
+            inputPath,
+            cwdOverride,
         });
         if (result.cancelled)
             return result;
@@ -162,7 +232,18 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
         await this.initializeFromEngine();
         return { cancelled: false, selectedText };
     }
+    /**
+     * The child engine already settled (and persisted) its own turn before it
+     * reported the replacement, and the host facade's `abort()` is `abortAndRecover()`
+     * — an unbounded cooperative round trip. Re-entering it during teardown would
+     * hang session replacement on an unresponsive or dead engine, which is exactly
+     * what engine recovery exists to survive.
+     */
+    async settleActiveResponseBeforeTeardown() { }
     async dispose() {
+        // Joins any in-flight replacement: shutdown voids the client's restart
+        // permit and waits for the attempt, so nothing spawns after this returns.
+        await this.health.shutdown();
         await this.client.stop();
         await super.dispose();
     }
@@ -174,11 +255,12 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
         Object.defineProperties(session, {
             isStreaming: { configurable: true, get: () => this.streaming },
             isCompacting: { configurable: true, get: () => this.compacting },
-            isBashRunning: { configurable: true, get: () => this.bashRunning },
+            isBashRunning: { configurable: true, get: () => this.activeBashRequestIds.size > 0 },
             sessionName: { configurable: true, get: () => this.remoteSessionName },
             sessionFile: { configurable: true, get: () => this.remoteSessionFile },
             autoCompactionEnabled: { configurable: true, get: () => this.autoCompactionEnabled },
             autoRetryEnabled: { configurable: true, get: () => this.autoRetryEnabled },
+            queuedMessagesPaused: { configurable: true, get: () => this.queuePause.isPaused },
             subscribe: {
                 configurable: true,
                 value: (listener) => this.client.onEvent(listener),
@@ -196,29 +278,46 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
             executeBash: {
                 configurable: true,
                 value: async (command, onChunk, options) => {
-                    this.bashRunning = true;
+                    const key = options?.id ?? Symbol("isolated-bash-request");
                     try {
-                        const result = await this.client.requestInternal({
-                            type: "user_bash", command, excludeFromContext: options?.excludeFromContext,
+                        return await this.client.userBashWithUpdates(command, (delta, channel) => onChunk?.(delta, channel), {
+                            excludeFromContext: options?.excludeFromContext,
+                            onRequestId: (requestId) => this.activeBashRequestIds.set(key, requestId),
                         });
-                        if (result.output)
-                            onChunk?.(result.output);
-                        return result;
                     }
                     finally {
-                        this.bashRunning = false;
+                        this.activeBashRequestIds.delete(key);
                     }
                 },
             },
             recordBashResult: { configurable: true, value: () => { } },
-            abortBash: { configurable: true, value: () => this.dispatchBestEffort("abort bash", this.client.abortBash()) },
+            abortBash: {
+                configurable: true,
+                value: (id) => {
+                    if (id === undefined)
+                        this.dispatchBestEffort("abort bash", this.client.abortBash());
+                    else {
+                        const requestId = this.activeBashRequestIds.get(id);
+                        if (requestId)
+                            this.dispatchBestEffort("abort bash", this.client.abortBash(requestId));
+                    }
+                },
+            },
             compact: { configurable: true, value: () => this.client.compact() },
-            abortCompaction: { configurable: true, value: () => this.dispatchBestEffort("abort compaction", this.client.requestInternal({ type: "abort_compaction" })) },
-            abortRetry: { configurable: true, value: () => this.dispatchBestEffort("abort retry", this.client.abortRetry()) },
+            abortCompaction: {
+                configurable: true,
+                value: () => this.dispatchBestEffort("abort compaction", this.client.requestInternal({ type: "abort_compaction" })),
+            },
+            abortRetry: {
+                configurable: true,
+                value: () => this.dispatchBestEffort("abort retry", this.client.abortRetry()),
+            },
             navigateTree: {
                 configurable: true,
                 value: async (targetId, options) => this.client.requestInternal({
-                    type: "navigate_tree", targetId, options,
+                    type: "navigate_tree",
+                    targetId,
+                    options,
                 }),
             },
             reload: {
@@ -247,11 +346,17 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
                     return queued;
                 },
             },
+            pauseQueuedMessages: { configurable: true, value: () => this.queuePause.pause() },
+            resumeQueuedMessages: {
+                configurable: true,
+                value: (beforeRelease) => this.queuePause.resume(beforeRelease),
+            },
             setModel: {
                 configurable: true,
                 value: async (model) => {
                     const selected = await this.client.setModel(model.provider, model.id);
-                    session.agent.state.model = session.modelRegistry.find(selected.provider, selected.id) ?? model;
+                    session.agent.state.model = session.modelRuntime.getModel(selected.provider, selected.id) ?? model;
+                    this.resolveModelFallback();
                 },
             },
             setThinkingLevel: {
@@ -264,12 +369,14 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
             cycleModel: {
                 configurable: true,
                 value: async (direction) => {
+                    const previousModel = session.model;
                     const result = await this.client.cycleModel(direction);
                     if (!result)
                         return undefined;
-                    const model = session.modelRegistry.find(result.model.provider, result.model.id) ?? result.model;
+                    const model = session.modelRuntime.getModel(result.model.provider, result.model.id) ?? result.model;
                     session.agent.state.model = model;
                     session.agent.state.thinkingLevel = result.thinkingLevel;
+                    this.resolveModelFallbackAfterExplicitModelSelection(previousModel, model);
                     return { ...result, model };
                 },
             },
@@ -286,14 +393,6 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
                     return level;
                 },
             },
-            setContextWindow: {
-                configurable: true,
-                value: (tokens) => {
-                    if (session.agent.state.model)
-                        session.agent.state.model = { ...session.agent.state.model, contextWindow: tokens };
-                    this.dispatchBestEffort("set context window", this.client.setContextWindow(tokens));
-                },
-            },
             setSteeringMode: {
                 configurable: true,
                 value: (mode) => {
@@ -324,38 +423,26 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
             },
         });
     }
+    /**
+     * Cooperative interrupt. Requests the engine's own abort and waits for it —
+     * no timeout, no termination, no restart. A genuinely wedged engine is the
+     * user's call to terminate with Ctrl+C (see terminateAndRecover), never an
+     * automatic consequence of pressing Escape.
+     */
     async abortAndRecover() {
-        if (this.restartPromise)
-            return this.restartPromise;
-        const cooperativeAbort = this.client.abort().then(() => true, () => false);
-        if (await Promise.race([cooperativeAbort, sleep(250).then(() => false)])) {
+        await this.queuePause.settleBeforeAbort();
+        this.health.markCooperativeAbortStarted();
+        try {
+            await this.client.abort();
+        }
+        finally {
+            this.health.markCooperativeAbortSettled();
             this.engineCallbackActive = false;
-            return;
         }
-        const activity = this.lastDiagnostic?.activity;
-        const label = activity ? `${activity.kind} ${activity.name}` : "engine callback";
-        const diagnostic = {
-            activity,
-            elapsedMs: this.lastDiagnostic?.elapsedMs ?? 0,
-            level: "unresponsive",
-            message: `Engine terminated; ${label} result unknown; inspect side effects before retrying`,
-        };
-        this.streaming = false;
-        this.compacting = false;
-        this.engineCallbackActive = false;
-        for (const listener of this.diagnosticListeners)
-            listener(diagnostic);
-        this.restartPromise = (async () => {
-            await this.client.restart(this.remoteSessionFile);
-            await this.initializeFromEngine();
-        })().catch((error) => {
-            this.emitDiagnostic({ ...diagnostic, message: `${diagnostic.message}; engine restart failed: ${error.message}` });
-        }).finally(() => { this.restartPromise = undefined; });
-        await this.restartPromise;
     }
     dispatchBestEffort(label, operation) {
         void operation.catch((error) => {
-            if (this.restartPromise)
+            if (this.health.isRecovering())
                 return;
             this.emitDiagnostic({
                 activity: undefined,
@@ -376,7 +463,9 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
         Object.defineProperty(manager, "appendLabelChange", {
             configurable: true,
             value: (entryId, label) => {
-                this.dispatchBestEffort("set label", this.client.requestInternal({ type: "set_label", entryId, label }).then(() => this.refreshSessionView()));
+                this.dispatchBestEffort("set label", this.client
+                    .requestInternal({ type: "set_label", entryId, label })
+                    .then(() => this.refreshSessionView()));
             },
         });
     }
@@ -391,24 +480,6 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
         this.patchSessionManager(refreshed);
         session.agent.state.messages = refreshed.buildSessionContext().messages;
     }
-    patchModelCatalog(session) {
-        const registry = session.modelRegistry;
-        Object.defineProperties(registry, {
-            getAvailable: { configurable: true, value: () => [...this.remoteModels] },
-            find: {
-                configurable: true,
-                value: (provider, modelId) => this.remoteModels.find((model) => model.provider === provider && model.id === modelId),
-            },
-            hasConfiguredAuth: {
-                configurable: true,
-                value: (model) => this.remoteModels.some((candidate) => candidate.provider === model.provider && candidate.id === model.id),
-            },
-        });
-        Object.defineProperty(session, "scopedModels", {
-            configurable: true,
-            get: () => this.remoteScopedModels,
-        });
-    }
     observeEvent(event) {
         const session = super.session;
         switch (event.type) {
@@ -435,10 +506,6 @@ export class IsolatedInteractiveRuntime extends AgentSessionRuntime {
             case "thinking_level_changed":
                 session.agent.state.thinkingLevel = event.level;
                 break;
-            case "context_window_changed":
-                if (session.agent.state.model)
-                    session.agent.state.model = { ...session.agent.state.model, contextWindow: event.contextWindow };
-                break;
             case "session_info_changed":
                 this.remoteSessionName = event.name;
                 break;