zidane 7.0.20 → 7.0.23

package/dist/tui.js

@@ -20,9 +20,9 @@ import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
 import { n as JsonRpcRemoteError, t as JsonRpcConnectionClosedError } from "./json-rpc-rSWMUh9b.js";
 import { $ as reorderKeyed, $t as formatTokenCount, A as chunkMarkdownForRender, B as streamingLabel, C as usageTone, Ct as retagUserPromptEvents, Dt as streamEventSearchText, E as filterModelCatalog, Et as selectionAfterTurnRemoval, F as stripHtmlCommentsOutsideCode, G as chainPositionOf, Gt as shortSessionId, H as DAEMON_HEALTH_STYLE, Ht as sessionEventExcerpt, I as cacheBreakChip, It as isMainSession, J as filterChainFallbacks, Jt as fitRunReceiptCells, K as chainsEqual, Kt as truncateTitle, L as compactingLabel, M as codeTokenHasClosingFence, Mt as SESSION_EVENT_STATUS_STYLE, N as normalizeMarkdownCodeFences, O as parseCustomModelQuery, Ot as turnSelectionOwnership, P as splitMarkdownCodeBlocks, Q as providerKeySetChanged, Qt as formatRunReceiptLine, R as liveSessionCost, S as resetLabel, Sn as summarizeOutcomes, T as buildModelCatalog, Tn as createChatsCompletionProvider, Tt as selectableTurnIds, U as buildRunModel, Vt as sessionDirLabel, Wt as sessionEventMeta, Y as pickChainPrimary, Yt as formatCostUsd, Zt as formatRunReceiptCells, _ as turnContextSize, _n as mergeApprovalAndBodyOutcomes, _t as isTurnHighlighted, a as TOOL_DISPLAY, an as buildUnifiedDiff, at as createSkillsCompletionProvider, b as formatUsagePercent, bn as rewriteMultiEditHeader, bt as isVisibleDuringSearch, ct as createFilesCompletionProvider, d as finalizeStreamingMarkdown, dn as previewEditPayload, dt as createCommandsCompletionProvider, et as restoreChainFallbacks, f as finalizeStreamingMarkdownForOwner, ft as blendHsl, g as revealEarlierTranscriptEvents, gt as isEditErrorResult, h as replaceTranscriptTurnEvents, hn as buildEditOutcomesAnnotation, ht as EDIT_TOOL_NAMES, i as turnAsText, in as buildContextualDiff, j as closeDanglingCodeFence, ln as extractEditPayload, mt as BASH_CALL_ID_PREFIX, n as deleteTurnSafely, nn as runReceiptFromRun, nt as toggleChainEntry, o as displayNameFor, on as clipDiffForRender, ot as uniqueSkillNamesFromReferences, p as hiddenEarlierTranscriptCount, pn as summarizeEditPayload, pt as buildLinearRamp, r as truncateTurnsAt, s as formatToolCall, tn as hasRunReceipt, u as capTranscriptEvents, un as filetypeFromPath, v as formatBalance, vn as parseEditOutcomesFromResult, vt as isUserBashEvent, w as splitPromptSegments, wt as retagUserPromptEventsFromRefs, x as mostConstrainedWindow, xn as stripEditOutcomesAnnotation, xt as promptHistoryFromEvents, yn as resolveApprovalForPayload, yt as isVisible } from "./turn-operations-BgqpLlOG.js";
 import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
-import { $ as supportsOAuth, $n as tryOpenBrowser, A as useSafeModeQueue, An as createDiscoverySlot, At as makeRequestInteraction, Ci as sumRunCosts, Ct as InteractionsProvider, Di as updateToolEventOutcomes, Dr as accentColor, Dt as createInteractionTools, Ei as toolResultText, Et as createAutomaticInteractionResponse, Fn as useConfig, G as usageChecksOptedOut, Gn as mcpsWritePath, Gr as setTodosForRun, H as fetchAllProviderUsage, Hn as countClaudeSessionFiles, Hr as pruneTodosByRun, In as resolveConfig, Ir as applyTodosSnapshot, J as fetchOAuthRedirect, Jn as buildMcpServers, Jt as buildPluginContributions, Kn as removeMcpServer, Kr as todoProgressLabel, Ln as resolveStoragePaths, M as addToSafelist, Mn as useDiscovery, N as getSafelist, Nn as useDiscoveryOptional, Nt as useInteractionsActions, O as SafeModeProvider, Oi as usageByModel, On as parseEditorCommand, P as isOnSafelist, Pn as ConfigProvider, Pr as TODO_STATUS_GLYPHS, Pt as useInteractionsQueue, Q as runOAuthLogin, R as suggestSafelistEntries, Si as stripSpawnTokensLine, St as HOST_INTERACTION_ID_PREFIX, Ti as toolCallPreview, Tt as buildResumedToolResultsTurn, U as fetchProviderUsage, Un as hasClaudeCodeSetup, Ut as createBuiltinCommands, V as clearProviderUsageCache, Vn as useCompletion, Vr as pickActiveRunId, W as providerUsageSupported, Wn as importFromClaudeCode, Wr as selectActiveTodos, Wt as createMainSession, X as redirectUriFromAuthUrl, Xt as parsePluginScanPathEnv, Yn as dedupMcpServersByName, Yt as discoverProjectPlugins, Z as oauthUsesManualCodePaste, Zn as discoverProjectMcps, Zt as attachMcpWarnLog, _ as buildSpawnEndEvent, _i as loadState, _r as groupArtifacts, _t as useMcpAuthState, ai as buildPlanSystem, at as subscribeMcpToolsCache, b as defaultSkillScanPaths, bn as resolveTheme, bt as ASK_USER_TOOL, c as useSelectStyle, ci as createChatTurnsReadTool, cn as DEFAULT_SETTINGS, d as useTheme, dn as SETTINGS_INPUTS, dt as parentServerName, en as EMPTY_HINTS, er as tryRevealPath, f as discoverSystemMd, fi as deriveSessionTitle, fn as SETTINGS_TOGGLES, ft as createFileMcpCredentialStore, g as useStreamBuffer, gi as listSessionMeta, gn as useSettings, gr as chatAutoCompactBehavior, gt as useMcpAuthDispatch, h as userSystemMdPath, hi as lastContextSizeFromTurns, ht as McpAuthProvider, ii as buildBuildSystem, in as buildHints, ir as useUpdateCheck, jn as DiscoveryProvider, jt as pendingInteractionsFromTurns, k as useSafeModeActions, kn as quoteForShell, kt as isModelInteraction, l as useSurfaces, ln as SETTINGS_CATEGORIES, lt as buildVisibleMcpRows, m as userScopeOverridesLoad, mi as getSessionMeta, mn as clampFps, nn as hintsLength, nr as bootTick, nt as mcpToolsCachePath, o as ThemeProvider, oi as envSection, on as listProjectFiles, p as renderSystemMdSeed, pi as eventsFromTurns, pn as SettingsProvider, q as formatPathForCwd, qn as upsertMcpServer, qr as useActiveTodos, qt as runEndNotice, r as computeTurnAnchors, rn as truncateTrailing, rr as buildUpdateHint, rt as refreshMcpToolsCatalog, s as useColors, si as chatReferenceTokensForPrompt, sn as useEnabledToggleSet, st as useMcpToolToggleMap, tn as clipHintsToWidth, tt as loadMcpToolsCache, ui as compactSummaryEvent, un as SETTINGS_CHOICES, ut as indexOfServerRow, v as buildSpawnStartEvent, vi as marginTopFor, vt as getMcpAuthStatus, w as writeSessionExport, wt as PRESENT_PLAN_TOOL, x as discoverProjectSkills, xi as serverToolResultSummary, y as buildSkillsConfig, yi as noticeTurnContent, yn as resolveChipColor, yr as discoverAgentsMd, zn as createArtifactsCompletionProvider } from "./approvals-CzrFKdu-.js";
-import { E as renderDefaultCallbackPage, T as restoreModelOptions, b as modelSupportsReasoning, c as setPreferredCredential, g as getContextWindow, h as enabledModelOptions, l as setProviderCredential, n as applyApiKeyEnv, t as detectAuth, w as piIdOf, y as modelOptionsFor } from "./auth-DD4KYv1w.js";
-import { a as connectIpcClient, d as defaultSocketPath, m as selfDaemonSpawnCommand, o as connectOrSpawnDaemon, p as probeSocket } from "./server-C3FOQvIu.js";
+import { $ as supportsOAuth, $n as tryOpenBrowser, A as useSafeModeQueue, An as createDiscoverySlot, At as makeRequestInteraction, Ci as sumRunCosts, Ct as InteractionsProvider, Di as updateToolEventOutcomes, Dr as accentColor, Dt as createInteractionTools, Ei as toolResultText, Et as createAutomaticInteractionResponse, Fn as useConfig, G as usageChecksOptedOut, Gn as mcpsWritePath, Gr as setTodosForRun, H as fetchAllProviderUsage, Hn as countClaudeSessionFiles, Hr as pruneTodosByRun, In as resolveConfig, Ir as applyTodosSnapshot, J as fetchOAuthRedirect, Jn as buildMcpServers, Jt as buildPluginContributions, Kn as removeMcpServer, Kr as todoProgressLabel, Ln as resolveStoragePaths, M as addToSafelist, Mn as useDiscovery, N as getSafelist, Nn as useDiscoveryOptional, Nt as useInteractionsActions, O as SafeModeProvider, Oi as usageByModel, On as parseEditorCommand, P as isOnSafelist, Pn as ConfigProvider, Pr as TODO_STATUS_GLYPHS, Pt as useInteractionsQueue, Q as runOAuthLogin, R as suggestSafelistEntries, Si as stripSpawnTokensLine, St as HOST_INTERACTION_ID_PREFIX, Ti as toolCallPreview, Tt as buildResumedToolResultsTurn, U as fetchProviderUsage, Un as hasClaudeCodeSetup, Ut as createBuiltinCommands, V as clearProviderUsageCache, Vn as useCompletion, Vr as pickActiveRunId, W as providerUsageSupported, Wn as importFromClaudeCode, Wr as selectActiveTodos, Wt as createMainSession, X as redirectUriFromAuthUrl, Xt as parsePluginScanPathEnv, Yn as dedupMcpServersByName, Yt as discoverProjectPlugins, Z as oauthUsesManualCodePaste, Zn as discoverProjectMcps, Zt as attachMcpWarnLog, _ as buildSpawnEndEvent, _i as loadState, _r as groupArtifacts, _t as useMcpAuthState, ai as buildPlanSystem, at as subscribeMcpToolsCache, b as defaultSkillScanPaths, bn as resolveTheme, bt as ASK_USER_TOOL, c as useSelectStyle, ci as createChatTurnsReadTool, cn as DEFAULT_SETTINGS, d as useTheme, dn as SETTINGS_INPUTS, dt as parentServerName, en as EMPTY_HINTS, er as tryRevealPath, f as discoverSystemMd, fi as deriveSessionTitle, fn as SETTINGS_TOGGLES, ft as createFileMcpCredentialStore, g as useStreamBuffer, gi as listSessionMeta, gn as useSettings, gr as chatAutoCompactBehavior, gt as useMcpAuthDispatch, h as userSystemMdPath, hi as lastContextSizeFromTurns, ht as McpAuthProvider, ii as buildBuildSystem, in as buildHints, ir as useUpdateCheck, jn as DiscoveryProvider, jt as pendingInteractionsFromTurns, k as useSafeModeActions, kn as quoteForShell, kt as isModelInteraction, l as useSurfaces, ln as SETTINGS_CATEGORIES, lt as buildVisibleMcpRows, m as userScopeOverridesLoad, mi as getSessionMeta, mn as clampFps, nn as hintsLength, nr as bootTick, nt as mcpToolsCachePath, o as ThemeProvider, oi as envSection, on as listProjectFiles, p as renderSystemMdSeed, pi as eventsFromTurns, pn as SettingsProvider, q as formatPathForCwd, qn as upsertMcpServer, qr as useActiveTodos, qt as runEndNotice, r as computeTurnAnchors, rn as truncateTrailing, rr as buildUpdateHint, rt as refreshMcpToolsCatalog, s as useColors, si as chatReferenceTokensForPrompt, sn as useEnabledToggleSet, st as useMcpToolToggleMap, tn as clipHintsToWidth, tt as loadMcpToolsCache, ui as compactSummaryEvent, un as SETTINGS_CHOICES, ut as indexOfServerRow, v as buildSpawnStartEvent, vi as marginTopFor, vt as getMcpAuthStatus, w as writeSessionExport, wt as PRESENT_PLAN_TOOL, x as discoverProjectSkills, xi as serverToolResultSummary, y as buildSkillsConfig, yi as noticeTurnContent, yn as resolveChipColor, yr as discoverAgentsMd, zn as createArtifactsCompletionProvider } from "./approvals-Deg8JhMI.js";
+import { E as renderDefaultCallbackPage, T as restoreModelOptions, b as modelSupportsReasoning, c as setPreferredCredential, g as getContextWindow, h as enabledModelOptions, l as setProviderCredential, n as applyApiKeyEnv, t as detectAuth, w as piIdOf, y as modelOptionsFor } from "./auth-Nq-tSMb9.js";
+import { a as connectIpcClient, d as defaultSocketPath, m as selfDaemonSpawnCommand, o as connectOrSpawnDaemon, p as probeSocket } from "./server-DW-sKF3g.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { _ as buildVisibleAuthRows, a as editTodo, b as parentProviderKey, c as NOTICE_GLYPH, f as validateMcpForm, g as instructionPreviewLines, h as instructionOriginBadge, i as cycleTodoStatus, l as MCP_TRANSPORTS, m as buildVisibleInstructionRows, n as buildTodoRetryMessage, r as clearTodos, s as removeTodo, t as addTodo, v as indexOfProviderRow, x as selectableSources } from "./todo-edits-Dw2oO2ON.js";
@@ -7659,7 +7659,7 @@ function OptionRow({ option, isEnabled, isFocused, highlightBg }) {
 * away from. Without it such an entry is invisible and re-persists forever.
 */
 /** Visible rows in the windowed list. Keeps the modal a stable size on long catalogs. */
-const VISIBLE_ROWS = 10;
+const VISIBLE_ROWS = 14;
 /**
 * Promote selected entries in SELECTION order, then append every unselected
 * row in its original catalog order. Pure/non-mutating and collision-safe:
@@ -7835,7 +7835,7 @@ function ModelPickerModal({ providers, modelsFor, current, onPick, chain, onAppl
 	if (providers.length === 0) return /* @__PURE__ */ jsx$1(EmptyProvidersState, {});
 	return /* @__PURE__ */ jsxs(Modal, {
 		title: chainMode ? "select models · order is fallback priority" : "select model",
-		maxWidth: 100,
+		maxWidth: 140,
 		onClose: handleClose,
 		children: [
 			/* @__PURE__ */ jsx$1("box", {
@@ -8210,12 +8210,12 @@ const METHOD_NOT_FOUND = -32601;
 * Version-skewed daemons exist by construction (a daemon process is frozen
 * at spawn time while windows come from newer builds mid-development).
 */
-async function optional(call) {
+async function optional(call, allowClosed = true) {
 	try {
 		return await call();
 	} catch (err) {
 		if (err instanceof JsonRpcRemoteError && err.code === METHOD_NOT_FOUND) return null;
-		if (err instanceof JsonRpcConnectionClosedError) return null;
+		if (allowClosed && err instanceof JsonRpcConnectionClosedError) return null;
 		throw err;
 	}
 }
@@ -8227,12 +8227,15 @@ async function connectDaemonSession(options) {
 		spawnCommand: options.spawnCommand ?? selfDaemonSpawnCommand(),
 		...options.appVersion ? { appVersion: options.appVersion } : {},
 		onClose: () => {
-			if (!disposed) callbacks.onDisconnect?.();
+			if (!disposed) {
+				disposed = true;
+				callbacks.onDisconnect?.();
+			}
 		}
 	});
 	let running = false;
-	/** A `run:start` observed via signal wins over the initial RPC probe. */
-	let sawRunStart = false;
+	/** Either live run-state signal wins over the initial RPC probe. */
+	let sawRunState = false;
 	/** Sequence for `suggest.resolve` — see `resolveSuggestion`. */
 	let suggestSeq = 0;
 	/**
@@ -8275,6 +8278,7 @@ async function connectDaemonSession(options) {
 		});
 	};
 	const unsubscribe = client.onSignal((signal) => {
+		if (disposed) return;
 		switch (signal.kind) {
 			case "approval:request":
 				surfaceApproval(signal.request);
@@ -8341,10 +8345,11 @@ async function connectDaemonSession(options) {
 				break;
 			case "run:start":
 				running = true;
-				sawRunStart = true;
+				sawRunState = true;
 				callbacks.onRunState(true);
 				break;
 			case "run:end":
+				sawRunState = true;
 				running = false;
 				callbacks.onRunState(false, {
 					ok: signal.ok,
@@ -8439,25 +8444,34 @@ async function connectDaemonSession(options) {
 			default: break;
 		}
 	});
+	const bootstrapRequest = async (method, params) => {
+		if (disposed) throw new JsonRpcConnectionClosedError();
+		const result = await client.request(method, params);
+		if (disposed) throw new JsonRpcConnectionClosedError();
+		return result;
+	};
 	try {
-		const initialEvents = await client.request("sessions.loadEvents", { sessionId });
+		const initialEvents = await bootstrapRequest("sessions.loadEvents", { sessionId });
 		callbacks.onInitialTranscript(initialEvents);
 		transcriptReady = true;
 		for (const event of bufferedEvents.splice(0)) callbacks.onStreamEvent(event);
-		if (!sawRunStart) {
-			running = await client.request("chat.isRunning", { sessionId });
-			if (running) callbacks.onRunState(true);
+		if (!sawRunState) {
+			const snapshot = await bootstrapRequest("chat.isRunning", { sessionId });
+			if (!sawRunState) {
+				running = snapshot;
+				callbacks.onRunState(running);
+			}
 		}
-		for (const request of await client.request("approvals.listPending", {})) surfaceApproval(request);
-		await client.request("interactions.rehydrate", { sessionId });
-		for (const pending of await client.request("interactions.list", { sessionId })) surfaceInteraction(pending.request);
+		for (const request of await bootstrapRequest("approvals.listPending", {})) surfaceApproval(request);
+		await bootstrapRequest("interactions.rehydrate", { sessionId });
+		for (const pending of await bootstrapRequest("interactions.list", { sessionId })) surfaceInteraction(pending.request);
 		client.notify("presence.watch", { sessionId });
 		const [presence, queued, draft, systemMd, todos] = await Promise.all([
-			optional(() => client.request("presence.list", {})),
-			optional(() => client.request("queue.list", { sessionId })),
-			optional(() => client.request("drafts.get", { sessionId })),
-			optional(() => client.request("sessions.systemMd", { sessionId })),
-			optional(() => client.request("todos.get", { sessionId }))
+			optional(() => bootstrapRequest("presence.list", {}), false),
+			optional(() => bootstrapRequest("queue.list", { sessionId }), false),
+			optional(() => bootstrapRequest("drafts.get", { sessionId }), false),
+			optional(() => bootstrapRequest("sessions.systemMd", { sessionId }), false),
+			optional(() => bootstrapRequest("todos.get", { sessionId }), false)
 		]);
 		if (presence) callbacks.onPresenceChanged?.(presence);
 		if (queued && queued.length > 0) callbacks.onQueueChanged?.(queued);
@@ -8470,6 +8484,7 @@ async function connectDaemonSession(options) {
 		callbacks.onSystemMd(systemMd?.file ?? null, systemMd?.shadowed ?? []);
 		if (todos) callbacks.onTodosChanged?.(todos);
 	} catch (err) {
+		disposed = true;
 		unsubscribe();
 		client.close();
 		throw err;
@@ -8649,6 +8664,89 @@ async function connectDaemonSession(options) {
 	};
 }
 //#endregion
+//#region src/tui/runtime/session-connection.ts
+function guardConnectionCallbacks(attempt, callbacks) {
+	const guarded = { ...callbacks };
+	for (const key of Object.keys(callbacks)) guarded[key] = attempt.guard(callbacks[key]);
+	return guarded;
+}
+/** Owns one activation and its transport attempts; absence of a controller is never local mode. */
+var SessionConnection = class {
+	schedule;
+	generation = 0;
+	cancelRetry;
+	controller;
+	canSend = false;
+	constructor(schedule = (run, delay) => {
+		const timer = setTimeout(run, delay);
+		return () => clearTimeout(timer);
+	}) {
+		this.schedule = schedule;
+	}
+	dispose() {
+		this.generation++;
+		this.canSend = false;
+		this.cancelRetry?.();
+		this.cancelRetry = void 0;
+		const controller = this.controller;
+		this.controller = void 0;
+		controller?.dispose();
+	}
+	begin() {
+		this.dispose();
+		const generation = this.generation;
+		const isCurrent = () => generation === this.generation;
+		return {
+			isCurrent,
+			localReady: () => {
+				if (isCurrent()) this.canSend = true;
+			},
+			connect: async (options) => {
+				let failures = 0;
+				const run = async () => {
+					if (!isCurrent()) return;
+					let live = true;
+					const current = () => isCurrent() && live;
+					const disconnect = (error) => {
+						if (!current()) return;
+						live = false;
+						this.canSend = false;
+						const controller = this.controller;
+						this.controller = void 0;
+						controller?.dispose();
+						options.cleanup?.();
+						options.unavailable(error);
+						this.cancelRetry = this.schedule(() => {
+							this.cancelRetry = void 0;
+							run();
+						}, Math.min(1500 * 2 ** Math.min(failures++, 3), 12e3));
+					};
+					try {
+						const controller = await options.open({
+							isCurrent: current,
+							guard: (callback) => (...args) => {
+								if (current()) callback(...args);
+							},
+							disconnect
+						});
+						if (!current()) {
+							controller.dispose();
+							return;
+						}
+						this.controller = controller;
+						failures = 0;
+						options.ready(controller);
+						this.canSend = true;
+					} catch (error) {
+						disconnect(error);
+					}
+				};
+				await run();
+			}
+		};
+	}
+};
+//#endregion
 //#region src/chat/external-editor.ts
 /**
 * External-editor handoff — open a piece of text in the user's `$EDITOR`,
@@ -22504,6 +22602,7 @@ function AppShell() {
 	*/
 	const activateSessionRef = useRef(async () => {});
 	const activationGenerationRef = useRef(0);
+	const connectionRef = useRef(new SessionConnection());
 	useEffect(() => {
 		const daemon = daemonRef.current;
 		if (!daemon || !picked) return;
@@ -24303,14 +24402,14 @@ function AppShell() {
 	refreshSessionsRef.current = refreshSessions;
 	refreshSessionsForArtifactsRef.current = refreshSessions;
 	const teardown = useCallback(async () => {
+		const teardownGeneration = ++activationGenerationRef.current;
 		try {
-			daemonRef.current?.dispose();
+			connectionRef.current.dispose();
 		} catch (err) {
 			debugLog("teardown: daemon dispose failed", err);
 		}
 		daemonRef.current = null;
 		setDaemonConnected(false);
-		activationGenerationRef.current += 1;
 		setRemoteDraft(null);
 		setRemoteDraftAttachments(null);
 		setRemoteSuggest(null);
@@ -24348,10 +24447,12 @@ function AppShell() {
 		transcriptRevealHoldRef.current = false;
 		stream.reset();
 		await agentRef.current?.destroy().catch((err) => debugLog("agent.destroy failed", err));
+		if (activationGenerationRef.current !== teardownGeneration) return;
 		agentRef.current = null;
 		sessionRef.current = null;
 		if (warnLogRef.current) {
 			await warnLogRef.current.close().catch((err) => debugLog("teardown: warnLog.close failed", err));
+			if (activationGenerationRef.current !== teardownGeneration) return;
 			warnLogRef.current = null;
 		}
 		setCompacting(false);
@@ -24477,10 +24578,12 @@ function AppShell() {
 		}
 	}, [stream, autoCompactBehaviorFor]);
 	const activateSession = useCallback(async (id, key, opts) => {
-		await teardown();
-		activationGenerationRef.current += 1;
-		const activationGeneration = activationGenerationRef.current;
+		const cleanup = teardown();
+		const activation = connectionRef.current.begin();
+		await cleanup;
+		if (!activation.isCurrent()) return;
 		const loaded = id ? await loadSession(store, id) : null;
+		if (!activation.isCurrent()) return;
 		const freshProfile = loaded ? null : defaultAgentProfile();
 		const session = loaded ?? await createSession({
 			store,
@@ -24489,6 +24592,7 @@ function AppShell() {
 			...id ? { id } : {},
 			...opts?.metadata ? { metadata: opts.metadata } : {}
 		});
+		if (!activation.isCurrent()) return;
 		if (freshProfile && freshProfile.id !== pickedAgentRef.current.id) {
 			pickedAgentRef.current = freshProfile;
 			setPickedAgent(freshProfile);
@@ -24506,370 +24610,372 @@ function AppShell() {
 				stampedLegacyAgent = true;
 			}
 		}
-		if (settingsRef.current.useDaemon && !isDaemonDisabledByEnv()) try {
-			agentRef.current = null;
-			if (!loaded && typeof session.metadata.cwd !== "string") {
-				session.setMeta("cwd", cwdRef.current ?? process.cwd());
-				await session.save();
-			}
-			const activePick = pickedRef.current;
-			let seedModelViaRpc = false;
-			if (activePick) {
-				if (typeof session.metadata.providerKey !== "string") if (loaded) seedModelViaRpc = true;
-				else {
-					session.setMeta("providerKey", activePick.provider.key);
-					session.setMeta("modelId", activePick.model);
-					if (activePick.effort) session.setMeta("effort", activePick.effort);
-					if (activePick.modelOptions) session.setMeta("modelOptions", activePick.modelOptions);
-					await session.save();
-				}
-				lastPushedModelRef.current = JSON.stringify([
-					activePick.provider.key,
-					activePick.model,
-					activePick.effort ?? null,
-					activePick.modelOptions ?? null
-				]);
-			} else lastPushedModelRef.current = null;
-			const sessionId = session.id;
-			const refreshHeaderFromStore = () => {
-				store.load(sessionId).then((data) => {
-					if (!data || sessionRef.current?.id !== sessionId) return;
-					setCurrentSession({
-						id: data.id,
-						title: deriveSessionTitle(data.turns, data.metadata),
-						turnCount: data.turns.length,
-						userMessageCount: data.turns.reduce((n, t) => t.role === "user" ? n + 1 : n, 0),
-						runCount: data.runs.length,
-						updatedAt: data.updatedAt,
-						...data.projectRoot ? { projectRoot: data.projectRoot } : {}
-					});
-				}).catch(() => void 0);
-			};
-			let controllerHandle = null;
-			const reflectRemoteModel = () => {
-				store.load(sessionId).then((data) => {
-					if (!data || sessionRef.current?.id !== sessionId) return;
-					const providerKey = data.metadata.providerKey;
-					const modelId = data.metadata.modelId;
-					if (typeof providerKey !== "string" || typeof modelId !== "string") return;
-					const auth = availableProvidersRef.current.find((p) => p.key === providerKey);
-					if (!auth) return;
-					const next = makePicked(auth, modelId);
-					if (!next) return;
-					const effort = data.metadata.effort;
-					const modelOptions = data.metadata.modelOptions;
-					const merged = {
-						...next,
-						...typeof effort === "string" ? { effort } : {},
-						...modelOptions && typeof modelOptions === "object" ? { modelOptions } : {}
-					};
-					const tuple = JSON.stringify([
-						merged.provider.key,
-						merged.model,
-						merged.effort ?? null,
-						merged.modelOptions ?? null
-					]);
-					if (lastPushedModelRef.current === tuple) return;
-					lastPushedModelRef.current = tuple;
-					setPicked(merged);
-				}).catch(() => void 0);
-			};
-			const reflectRemoteAgent = () => {
-				(store.getMeta ? store.getMeta(sessionId) : store.load(sessionId)).then((meta) => {
-					if (!meta || sessionRef.current?.id !== sessionId) return;
-					const remote = meta.agentId;
-					if (!remote || remote === pickedAgentRef.current.id) return;
-					sessionRef.current.setAgentId(remote);
-					const profile = liveAgentRegistryRef.current[remote];
-					if (!profile) return;
-					pickedAgentRef.current = profile;
-					setPickedAgent(profile);
-				}).catch(() => void 0);
-			};
-			const resyncTranscript = () => {
-				controllerHandle?.fetchTranscript().then(async (canonical) => {
-					if (!canonical || sessionRef.current?.id !== sessionId || runningRef.current) return;
-					await streamRef.current?.whenDrained();
-					if (sessionRef.current?.id !== sessionId || runningRef.current) return;
-					streamRef.current?.reset();
-					setEvents(capTranscriptEvents(canonical));
-				}).catch(() => void 0);
-			};
-			const controller = await connectDaemonSession({
-				sessionId,
-				appVersion: "tui",
-				callbacks: {
-					onRetry: ({ attempt, max, source }) => setRetryInfo({
-						attempt,
-						max,
-						source
-					}),
-					onRetryCleared: (source) => clearRetryInfo(source),
-					onPromptTurns: (refs) => {
-						stream.flushAndUpdate((events) => retagUserPromptEventsFromRefs(events, refs));
-					},
-					onCompactionProgress: (tokens) => setCompactionTokens(tokens),
-					onStreamProgress: (progress) => setStreamProgress(progress),
-					onModelFallback: (from, to) => {
-						setActiveFallback({
-							provider: to.provider,
-							model: to.model
-						});
-						stream.appendImmediate({
-							kind: "info",
-							text: `model fallback: ${from.provider}/${from.model} failed, continuing on ${to.provider}/${to.model}`
-						});
-					},
-					onCacheBreak: (info) => {
-						const providerKey = pickedRef.current?.provider.key;
-						const apply = (costUsd) => {
-							setActiveCacheBreak(costUsd !== void 0 ? {
-								...info,
-								costUsd
-							} : info);
-						};
-						if (!providerKey) {
-							apply(void 0);
-							return;
-						}
-						estimateRebilledCostUsd(providerKey, info.model, info.rebilledTokens).then(apply).catch(() => apply(void 0));
-					},
-					onSystemMd: (file) => {
-						sessionSystemFileRef.current = file;
-						announceProjectSystemOverride();
-					},
-					onSettingsChanged: (remote) => {
-						const local = settingsRef.current;
-						const entries = Object.entries(remote).filter(([key, value]) => key in DEFAULT_SETTINGS && JSON.stringify(local[key]) !== JSON.stringify(value));
-						if (entries.length === 0) return;
-						suppressSettingsPublishRef.current = true;
-						for (const [key, value] of entries) setSetting(key, value);
-					},
-					onSessionsChanged: (op, changedId) => {
-						if (op === "update" && changedId === sessionId) {
-							refreshHeaderFromStore();
-							resyncTranscript();
-							reflectRemoteModel();
-							reflectRemoteAgent();
-						}
-					},
-					onDraftChanged: (text, shell) => {
-						draftSeqRef.current += 1;
-						setRemoteDraft({
-							seq: draftSeqRef.current,
-							text,
-							...shell ? { shell: true } : {}
-						});
-					},
-					onSuggestChanged: ({ basis, caret, suggestion, candidates }) => {
-						remoteSuggestSeqRef.current += 1;
-						setRemoteSuggest({
-							seq: remoteSuggestSeqRef.current,
-							basis,
-							caret,
-							suggestion,
-							...candidates ? { candidates } : {}
-						});
-					},
-					onSearchChanged: ({ active, query }) => {
-						setTranscriptSearchMode(active);
-						setTranscriptSearchQuery(query);
-						if (!active) setSelectedTurnId(null);
-						remoteSearchSeqRef.current += 1;
-						setRemoteSearchQuery(active ? {
-							seq: remoteSearchSeqRef.current,
-							query
-						} : null);
-					},
-					onDraftAttachmentsChanged: (attachments) => {
-						draftAttachmentsSeqRef.current += 1;
-						setRemoteDraftAttachments({
-							seq: draftAttachmentsSeqRef.current,
-							attachments: attachments.map((att) => ({
-								name: att.name ?? "attachment",
-								mediaType: att.mediaType,
-								content: Buffer.from(att.data, "base64")
-							}))
-						});
-					},
-					onSkillsChanged: (active) => {
-						setActiveSkillNames(new Set(active));
-					},
-					onMcpAuth: ({ name, reason }) => {
-						dispatchAuthRef.current({
-							type: "auth-required",
-							name,
-							reason: reason === "auto-promoted" ? "auto-promoted" : "no-tokens"
-						});
-					},
-					onHudState: (state) => {
-						setRemoteHudState(state);
-					},
-					onHudNotify: (n) => {
-						const allow = enabledExtensionsRef.current;
-						if (allow !== void 0 && !allow.includes(n.extension)) return;
-						stream.appendImmediate({
-							kind: n.tone === "error" ? "error" : "info",
-							text: `${n.extension}: ${n.tone === "warn" ? "⚠ " : ""}${n.text}`
-						});
-					},
-					onExtensionSignal: (envelope) => {
-						getTuiBus()?.deliver(envelope);
-					},
-					onTurnEnd: ({ usage, childId }) => {
-						if (childId === void 0) setStreamProgress(null);
-						if (childId !== void 0) stream.flushAndUpdate((prev) => finalizeStreamingMarkdownForOwner(prev, childId));
-						if (!usage) return;
-						if (childId === void 0) {
-							lastFinishReasonRef.current = usage.finishReason;
-							const tokens = turnContextSize(usage);
-							if (tokens > 0) {
-								setLastInputTokens(tokens);
-								lastInputTokensRef.current = tokens;
-							}
-						}
-						const turnCost = usage.cost ?? 0;
-						if (turnCost > 0) setSessionCost((prev) => prev + turnCost);
-					},
-					onArtifactRecorded: () => notifyArtifactsChanged(),
-					onArtifactChanged: () => notifyArtifactsChanged(),
-					onTodosChanged: (snapshot) => {
-						todosApplySeqRef.current += 1;
-						const seq = todosApplySeqRef.current;
-						const open = sessionRef.current;
-						if (open?.id === sessionId && pickActiveRunId(open) === snapshot.runId) {
-							applyTodosSnapshot(open, snapshot);
-							notifyTodosChanged();
-							return;
+		const useDaemon = settingsRef.current.useDaemon && !isDaemonDisabledByEnv();
+		if (useDaemon) {
+			setDaemonHealth("connecting");
+			await activation.connect({
+				open: async (attempt) => {
+					agentRef.current = null;
+					if (!loaded && typeof session.metadata.cwd !== "string") {
+						session.setMeta("cwd", cwdRef.current ?? process.cwd());
+						await session.save();
+						if (!attempt.isCurrent()) throw new Error("activation superseded");
+					}
+					const activePick = pickedRef.current;
+					let seedModelViaRpc = false;
+					if (activePick) {
+						if (typeof session.metadata.providerKey !== "string") if (loaded) seedModelViaRpc = true;
+						else {
+							session.setMeta("providerKey", activePick.provider.key);
+							session.setMeta("modelId", activePick.model);
+							if (activePick.effort) session.setMeta("effort", activePick.effort);
+							if (activePick.modelOptions) session.setMeta("modelOptions", activePick.modelOptions);
+							await session.save();
+							if (!attempt.isCurrent()) throw new Error("activation superseded");
 						}
-						loadSession(store, sessionId).then((fresh) => {
-							if (!fresh || sessionRef.current?.id !== sessionId) return;
-							if (seq !== todosApplySeqRef.current) return;
-							applyTodosSnapshot(fresh, snapshot);
-							sessionRef.current = fresh;
-							refreshHeaderFromStore();
-							notifyTodosChanged();
+						lastPushedModelRef.current = JSON.stringify([
+							activePick.provider.key,
+							activePick.model,
+							activePick.effort ?? null,
+							activePick.modelOptions ?? null
+						]);
+					} else lastPushedModelRef.current = null;
+					if (!attempt.isCurrent()) throw new Error("activation superseded");
+					const sessionId = session.id;
+					const refreshHeaderFromStore = () => {
+						store.load(sessionId).then((data) => {
+							if (!attempt.isCurrent() || !data || sessionRef.current?.id !== sessionId) return;
+							setCurrentSession({
+								id: data.id,
+								title: deriveSessionTitle(data.turns, data.metadata),
+								turnCount: data.turns.length,
+								userMessageCount: data.turns.reduce((n, t) => t.role === "user" ? n + 1 : n, 0),
+								runCount: data.runs.length,
+								updatedAt: data.updatedAt,
+								...data.projectRoot ? { projectRoot: data.projectRoot } : {}
+							});
 						}).catch(() => void 0);
-					},
-					onWorkChanged: (items) => {
-						const mapped = items.map((item) => ({
-							kind: item.kind,
-							callId: item.id,
-							tool: item.label,
-							startedAt: item.startedAt
-						}));
-						setInFlightTools(mapped.filter((m) => m.kind === "tool"));
-						setBackgroundTasks(mapped.filter((m) => m.kind === "task"));
-					},
-					onQueueChanged: (items) => {
-						daemonQueueIdsRef.current = items.map((item) => item.id);
-						const mirrored = items.map((item) => ({
-							prompt: item.text,
-							references: [],
-							attachments: []
-						}));
-						messageQueueRef.current = mirrored;
-						setMessageQueue(mirrored);
-						setQueueSelectionIndex((prev) => prev == null ? prev : mirrored.length === 0 ? null : Math.min(prev, mirrored.length - 1));
-					},
-					onInitialTranscript: (initial) => {
-						setEvents(capTranscriptEvents(initial));
-					},
-					onStreamEvent: (event) => {
-						const source = {
-							...event.turnId ? { turnId: event.turnId } : {},
-							...event.childId ? { childId: event.childId } : {},
-							...typeof event.depth === "number" ? { depth: event.depth } : {}
-						};
-						if (event.kind === "markdown" && event.streaming) stream.queueStreamDelta("markdown", event.text, source);
-						else if (event.kind === "thinking") stream.queueStreamDelta("thinking", event.text, source);
-						else stream.appendImmediate(event);
-					},
-					onRunState: (running, info) => {
-						runningRef.current = running;
-						setBusy(running);
-						if (running) return;
-						stream.flushAndUpdate(finalizeStreamingMarkdown);
-						if (info && !info.ok && info.error) stream.appendImmediate({
-							kind: "error",
-							text: info.error
-						});
-						refreshHeaderFromStore();
-						resyncTranscript();
-					},
-					onApproval: (request, resolve) => {
-						requestApproval(request.tool, request.input, request.originator, request.id).then(resolve);
-					},
-					onApprovalResolved: (requestId) => {
-						dropApprovalByCorrelation(requestId);
-					},
-					onInteraction: (request, actions) => {
-						interactions.enqueue({
-							request,
-							resolve: actions.respond,
-							cancel: () => actions.cancel()
-						});
-					},
-					onInteractionResolved: (requestId) => {
-						interactions.dropById(requestId);
-					},
-					onCompacting: (active, info) => {
-						setCompacting(active);
-						if (!active && info?.ok && info.effectiveTokens !== void 0) {
-							setLastInputTokens(info.effectiveTokens);
-							lastInputTokensRef.current = info.effectiveTokens;
-						}
-					},
-					onDisconnect: () => {
-						runningRef.current = false;
-						setBusy(false);
-						setDaemonHealth("connecting");
-						stream.appendImmediate({
-							kind: "info",
-							text: "daemon connection lost, reconnecting"
-						});
-						setTimeout(() => {
-							if (sessionRef.current?.id === sessionId && settingsRef.current.useDaemon && daemonRef.current === controllerHandle) activateSessionRef.current(sessionId, pickedRef.current?.provider.key ?? "anthropic").catch(() => {
+					};
+					let controllerHandle = null;
+					const reflectRemoteModel = () => {
+						store.load(sessionId).then((data) => {
+							if (!attempt.isCurrent() || !data || sessionRef.current?.id !== sessionId) return;
+							const providerKey = data.metadata.providerKey;
+							const modelId = data.metadata.modelId;
+							if (typeof providerKey !== "string" || typeof modelId !== "string") return;
+							const auth = availableProvidersRef.current.find((p) => p.key === providerKey);
+							if (!auth) return;
+							const next = makePicked(auth, modelId);
+							if (!next) return;
+							const effort = data.metadata.effort;
+							const modelOptions = data.metadata.modelOptions;
+							const merged = {
+								...next,
+								...typeof effort === "string" ? { effort } : {},
+								...modelOptions && typeof modelOptions === "object" ? { modelOptions } : {}
+							};
+							const tuple = JSON.stringify([
+								merged.provider.key,
+								merged.model,
+								merged.effort ?? null,
+								merged.modelOptions ?? null
+							]);
+							if (lastPushedModelRef.current === tuple) return;
+							lastPushedModelRef.current = tuple;
+							setPicked(merged);
+						}).catch(() => void 0);
+					};
+					const reflectRemoteAgent = () => {
+						(store.getMeta ? store.getMeta(sessionId) : store.load(sessionId)).then((meta) => {
+							if (!attempt.isCurrent() || !meta || sessionRef.current?.id !== sessionId) return;
+							const remote = meta.agentId;
+							if (!remote || remote === pickedAgentRef.current.id) return;
+							sessionRef.current.setAgentId(remote);
+							const profile = liveAgentRegistryRef.current[remote];
+							if (!profile) return;
+							pickedAgentRef.current = profile;
+							setPickedAgent(profile);
+						}).catch(() => void 0);
+					};
+					const resyncTranscript = () => {
+						controllerHandle?.fetchTranscript().then(async (canonical) => {
+							if (!attempt.isCurrent() || !canonical || sessionRef.current?.id !== sessionId || runningRef.current) return;
+							await streamRef.current?.whenDrained();
+							if (!attempt.isCurrent() || sessionRef.current?.id !== sessionId || runningRef.current) return;
+							streamRef.current?.reset();
+							setEvents(capTranscriptEvents(canonical));
+						}).catch(() => void 0);
+					};
+					const controller = await connectDaemonSession({
+						sessionId,
+						appVersion: "tui",
+						callbacks: guardConnectionCallbacks(attempt, {
+							onRetry: ({ attempt, max, source }) => setRetryInfo({
+								attempt,
+								max,
+								source
+							}),
+							onRetryCleared: (source) => clearRetryInfo(source),
+							onPromptTurns: (refs) => {
+								stream.flushAndUpdate((events) => retagUserPromptEventsFromRefs(events, refs));
+							},
+							onCompactionProgress: (tokens) => setCompactionTokens(tokens),
+							onStreamProgress: (progress) => setStreamProgress(progress),
+							onModelFallback: (from, to) => {
+								setActiveFallback({
+									provider: to.provider,
+									model: to.model
+								});
 								stream.appendImmediate({
+									kind: "info",
+									text: `model fallback: ${from.provider}/${from.model} failed, continuing on ${to.provider}/${to.model}`
+								});
+							},
+							onCacheBreak: (info) => {
+								const providerKey = pickedRef.current?.provider.key;
+								const apply = (costUsd) => {
+									if (!attempt.isCurrent()) return;
+									setActiveCacheBreak(costUsd !== void 0 ? {
+										...info,
+										costUsd
+									} : info);
+								};
+								if (!providerKey) {
+									apply(void 0);
+									return;
+								}
+								estimateRebilledCostUsd(providerKey, info.model, info.rebilledTokens).then(apply).catch(() => apply(void 0));
+							},
+							onSystemMd: (file) => {
+								sessionSystemFileRef.current = file;
+								announceProjectSystemOverride();
+							},
+							onSettingsChanged: (remote) => {
+								const local = settingsRef.current;
+								const entries = Object.entries(remote).filter(([key, value]) => key in DEFAULT_SETTINGS && JSON.stringify(local[key]) !== JSON.stringify(value));
+								if (entries.length === 0) return;
+								suppressSettingsPublishRef.current = true;
+								for (const [key, value] of entries) setSetting(key, value);
+							},
+							onSessionsChanged: (op, changedId) => {
+								if (op === "update" && changedId === sessionId) {
+									refreshHeaderFromStore();
+									resyncTranscript();
+									reflectRemoteModel();
+									reflectRemoteAgent();
+								}
+							},
+							onDraftChanged: (text, shell) => {
+								draftSeqRef.current += 1;
+								setRemoteDraft({
+									seq: draftSeqRef.current,
+									text,
+									...shell ? { shell: true } : {}
+								});
+							},
+							onSuggestChanged: ({ basis, caret, suggestion, candidates }) => {
+								remoteSuggestSeqRef.current += 1;
+								setRemoteSuggest({
+									seq: remoteSuggestSeqRef.current,
+									basis,
+									caret,
+									suggestion,
+									...candidates ? { candidates } : {}
+								});
+							},
+							onSearchChanged: ({ active, query }) => {
+								setTranscriptSearchMode(active);
+								setTranscriptSearchQuery(query);
+								if (!active) setSelectedTurnId(null);
+								remoteSearchSeqRef.current += 1;
+								setRemoteSearchQuery(active ? {
+									seq: remoteSearchSeqRef.current,
+									query
+								} : null);
+							},
+							onDraftAttachmentsChanged: (attachments) => {
+								draftAttachmentsSeqRef.current += 1;
+								setRemoteDraftAttachments({
+									seq: draftAttachmentsSeqRef.current,
+									attachments: attachments.map((att) => ({
+										name: att.name ?? "attachment",
+										mediaType: att.mediaType,
+										content: Buffer.from(att.data, "base64")
+									}))
+								});
+							},
+							onSkillsChanged: (active) => {
+								setActiveSkillNames(new Set(active));
+							},
+							onMcpAuth: ({ name, reason }) => {
+								dispatchAuthRef.current({
+									type: "auth-required",
+									name,
+									reason: reason === "auto-promoted" ? "auto-promoted" : "no-tokens"
+								});
+							},
+							onHudState: (state) => {
+								setRemoteHudState(state);
+							},
+							onHudNotify: (n) => {
+								const allow = enabledExtensionsRef.current;
+								if (allow !== void 0 && !allow.includes(n.extension)) return;
+								stream.appendImmediate({
+									kind: n.tone === "error" ? "error" : "info",
+									text: `${n.extension}: ${n.tone === "warn" ? "⚠ " : ""}${n.text}`
+								});
+							},
+							onExtensionSignal: (envelope) => {
+								getTuiBus()?.deliver(envelope);
+							},
+							onTurnEnd: ({ usage, childId }) => {
+								if (childId === void 0) setStreamProgress(null);
+								if (childId !== void 0) stream.flushAndUpdate((prev) => finalizeStreamingMarkdownForOwner(prev, childId));
+								if (!usage) return;
+								if (childId === void 0) {
+									lastFinishReasonRef.current = usage.finishReason;
+									const tokens = turnContextSize(usage);
+									if (tokens > 0) {
+										setLastInputTokens(tokens);
+										lastInputTokensRef.current = tokens;
+									}
+								}
+								const turnCost = usage.cost ?? 0;
+								if (turnCost > 0) setSessionCost((prev) => prev + turnCost);
+							},
+							onArtifactRecorded: () => notifyArtifactsChanged(),
+							onArtifactChanged: () => notifyArtifactsChanged(),
+							onTodosChanged: (snapshot) => {
+								todosApplySeqRef.current += 1;
+								const seq = todosApplySeqRef.current;
+								const open = sessionRef.current;
+								if (open?.id === sessionId && pickActiveRunId(open) === snapshot.runId) {
+									applyTodosSnapshot(open, snapshot);
+									notifyTodosChanged();
+									return;
+								}
+								loadSession(store, sessionId).then((fresh) => {
+									if (!attempt.isCurrent() || !fresh || sessionRef.current?.id !== sessionId) return;
+									if (seq !== todosApplySeqRef.current) return;
+									applyTodosSnapshot(fresh, snapshot);
+									sessionRef.current = fresh;
+									refreshHeaderFromStore();
+									notifyTodosChanged();
+								}).catch(() => void 0);
+							},
+							onWorkChanged: (items) => {
+								const mapped = items.map((item) => ({
+									kind: item.kind,
+									callId: item.id,
+									tool: item.label,
+									startedAt: item.startedAt
+								}));
+								setInFlightTools(mapped.filter((m) => m.kind === "tool"));
+								setBackgroundTasks(mapped.filter((m) => m.kind === "task"));
+							},
+							onQueueChanged: (items) => {
+								daemonQueueIdsRef.current = items.map((item) => item.id);
+								const mirrored = items.map((item) => ({
+									prompt: item.text,
+									references: [],
+									attachments: []
+								}));
+								messageQueueRef.current = mirrored;
+								setMessageQueue(mirrored);
+								setQueueSelectionIndex((prev) => prev == null ? prev : mirrored.length === 0 ? null : Math.min(prev, mirrored.length - 1));
+							},
+							onInitialTranscript: (initial) => {
+								setEvents(capTranscriptEvents(initial));
+							},
+							onStreamEvent: (event) => {
+								const source = {
+									...event.turnId ? { turnId: event.turnId } : {},
+									...event.childId ? { childId: event.childId } : {},
+									...typeof event.depth === "number" ? { depth: event.depth } : {}
+								};
+								if (event.kind === "markdown" && event.streaming) stream.queueStreamDelta("markdown", event.text, source);
+								else if (event.kind === "thinking") stream.queueStreamDelta("thinking", event.text, source);
+								else stream.appendImmediate(event);
+							},
+							onRunState: (running, info) => {
+								runningRef.current = running;
+								setBusy(running);
+								if (running) return;
+								stream.flushAndUpdate(finalizeStreamingMarkdown);
+								if (info && !info.ok && info.error) stream.appendImmediate({
 									kind: "error",
-									text: "reconnect failed. ctrl+r or reopen the session to retry"
+									text: info.error
 								});
-							});
-						}, 1500);
-					}
+								refreshHeaderFromStore();
+								resyncTranscript();
+							},
+							onApproval: (request, resolve) => {
+								requestApproval(request.tool, request.input, request.originator, request.id).then(attempt.guard(resolve));
+							},
+							onApprovalResolved: (requestId) => {
+								dropApprovalByCorrelation(requestId);
+							},
+							onInteraction: (request, actions) => {
+								interactions.enqueue({
+									request,
+									resolve: attempt.guard(actions.respond),
+									cancel: attempt.guard(() => actions.cancel())
+								});
+							},
+							onInteractionResolved: (requestId) => {
+								interactions.dropById(requestId);
+							},
+							onCompacting: (active, info) => {
+								setCompacting(active);
+								if (!active && info?.ok && info.effectiveTokens !== void 0) {
+									setLastInputTokens(info.effectiveTokens);
+									lastInputTokensRef.current = info.effectiveTokens;
+								}
+							},
+							onDisconnect: attempt.disconnect
+						})
+					});
+					if (!attempt.isCurrent()) return controller;
+					controllerHandle = controller;
+					daemonRef.current = controller;
+					setDaemonConnected(true);
+					if (stampedLegacyAgent) controller.setAgentId(pickedAgentRef.current.id);
+					if (seedModelViaRpc && activePick) controller.applyModel({
+						providerKey: activePick.provider.key,
+						modelId: activePick.model,
+						...activePick.effort ? { effort: activePick.effort } : {},
+						...activePick.modelOptions ? { modelOptions: activePick.modelOptions } : {}
+					});
+					return controller;
+				},
+				ready: () => {},
+				cleanup: () => {
+					denyAll();
+					interactions.cancelAll("daemon disconnected");
+				},
+				unavailable: (err) => {
+					debugLog("daemon unavailable — retrying attachment", err);
+					daemonRef.current = null;
+					runningRef.current = false;
+					setBusy(false);
+					setDaemonHealth("connecting");
+					stream.appendImmediate({
+						kind: "info",
+						text: "daemon unavailable, reconnecting; sends disabled until reattached. Disable “Use daemon runtime” explicitly to run locally."
+					});
 				}
 			});
-			if (activationGenerationRef.current !== activationGeneration) {
-				controller.dispose();
-				return;
-			}
-			controllerHandle = controller;
-			daemonRef.current = controller;
-			setDaemonConnected(true);
-			if (stampedLegacyAgent) controller.setAgentId(pickedAgentRef.current.id);
-			if (seedModelViaRpc && activePick) controller.applyModel({
-				providerKey: activePick.provider.key,
-				modelId: activePick.model,
-				...activePick.effort ? { effort: activePick.effort } : {},
-				...activePick.modelOptions ? { modelOptions: activePick.modelOptions } : {}
-			});
-		} catch (err) {
-			debugLog("daemon activation failed — falling back to in-process runtime", err);
-			daemonRef.current = null;
-			setDaemonConnected(false);
+		} else {
 			agentRef.current = buildAgent(session, key);
-			stream.appendImmediate({
-				kind: "info",
-				text: `daemon unavailable (${errorMessage(err)}), running this session in-process. Turn off “Use daemon runtime” to silence this.`
-			});
+			activation.localReady();
 		}
-		else agentRef.current = buildAgent(session, key);
+		if (!activation.isCurrent()) return;
 		if (extensionRegistrySwapKeyRef.current === null || extensionRegistrySwapKeyRef.current === extensionRegistry) pendingAgentRebuildRef.current = false;
 		announcedSystemOverrideRef.current = null;
 		announceProjectSystemOverride();
 		const persistedPins = readPinnedSkills(session.metadata["zidane.activeSkills"]);
 		setActiveSkillNames(persistedPins);
-		if (!daemonRef.current) setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
+		if (!useDaemon) setEvents(capTranscriptEvents(eventsFromTurns(session.turns, session.runs)));
 		setActiveFallback(null);
 		const replayedTokens = lastContextSizeFromTurns(session.turns, session.runs);
 		setLastInputTokens(replayedTokens);
@@ -24891,7 +24997,7 @@ function AppShell() {
 			lastProvider: key,
 			lastSessionId: session.id
 		});
-		const pending = daemonRef.current ? [] : pendingInteractionsFromTurns(session.turns);
+		const pending = useDaemon ? [] : pendingInteractionsFromTurns(session.turns);
 		if (pending.length > 0) {
 			const collected = /* @__PURE__ */ new Map();
 			const automatic = interactionModeRef.current === "skip";
@@ -25407,6 +25513,7 @@ function AppShell() {
 		});
 	}, []);
 	const dropSelectedQueuedMessage = useCallback(() => {
+		if (!connectionRef.current.canSend) return;
 		const idx = queueSelectionIndexRef.current;
 		if (idx == null) return;
 		const queue = messageQueueRef.current;
@@ -25438,6 +25545,7 @@ function AppShell() {
 	* it up as a regular prompt, so the message is never silently dropped.
 	*/
 	const pushSelectedQueuedMessage = useCallback(() => {
+		if (!connectionRef.current.canSend) return;
 		const idx = queueSelectionIndexRef.current;
 		if (idx == null) return;
 		if (daemonRef.current) {
@@ -25848,6 +25956,7 @@ function AppShell() {
 	* `agent.run` so the single-flight agent is never re-entered.
 	*/
 	const runCommand = useCallback(async (invocation, attachments = []) => {
+		if (!connectionRef.current.canSend) return;
 		const session = sessionRef.current;
 		const agent = agentRef.current;
 		if (!session) return;
@@ -26227,6 +26336,7 @@ function AppShell() {
 	* path as `/` commands (`commandAbortRef`).
 	*/
 	const runBashCommand = useCallback(async (command) => {
+		if (!connectionRef.current.canSend) return;
 		const session = sessionRef.current;
 		if (!session) return;
 		const controller = new AbortController();
@@ -26321,6 +26431,7 @@ function AppShell() {
 	}, [stream, cwd]);
 	/** Route a submitted prompt to the command executor when it's a `/cmd`, otherwise to the model. */
 	const runPromptOrCommand = useCallback(async (prompt, references, attachments, opts) => {
+		if (!connectionRef.current.canSend) return;
 		if (!opts?.wake) {
 			const invocation = parseCommandInvocation(prompt, commandsRef.current);
 			if (invocation) {
@@ -26384,6 +26495,20 @@ function AppShell() {
 		}
 	}, [runSingleMessage, runPromptOrCommand]);
 	const onSubmitPrompt = useCallback((prompt, references, attachments) => {
+		if (!connectionRef.current.canSend) {
+			const shell = parseBashInvocation(prompt);
+			setRemoteDraft({
+				seq: ++draftSeqRef.current,
+				text: shell ?? prompt,
+				...shell !== null ? { shell: true } : {}
+			});
+			setRemoteDraftAttachments({
+				seq: ++draftAttachmentsSeqRef.current,
+				attachments: [...attachments]
+			});
+			return;
+		}
+		const submitGeneration = activationGenerationRef.current;
 		if (!prompt.trim() && attachments.length === 0) return;
 		const agent = agentRef.current;
 		const daemon = daemonRef.current;
@@ -26397,6 +26522,7 @@ function AppShell() {
 			let effectivePrompt = prompt;
 			if (parseCommandInvocation(prompt, commandsRef.current) === null && parseBashInvocation(prompt) === null) for (const contribution of extensionRegistry.promptTransforms) try {
 				const out = await contribution.value(effectivePrompt);
+				if (submitGeneration !== activationGenerationRef.current || !connectionRef.current.canSend || daemon !== daemonRef.current) return;
 				if (out === void 0) continue;
 				if (typeof out === "string") {
 					effectivePrompt = out;
@@ -26413,6 +26539,7 @@ function AppShell() {
 				debugLog(`prompt transform (${contribution.extensionName}) threw`, err);
 			}
 			const resolvedReferences = await resolveCompletionSubmit(effectivePrompt, completionProviders, { cursor: effectivePrompt.length }).catch(() => references);
+			if (submitGeneration !== activationGenerationRef.current || !connectionRef.current.canSend || daemon !== daemonRef.current) return;
 			if (daemon) {
 				if (!wasRunning) runningRef.current = false;
 				const commandInvocation = parseCommandInvocation(effectivePrompt, commandsRef.current);