zidane 7.0.28 → 7.0.30

package/dist/tui.js

@@ -1,6 +1,7 @@
-import { C as estimateRebilledCostUsd } from "./openai-compat-cIeLSED_.js";
+import { C as estimateRebilledCostUsd } from "./openai-compat-Dy56weK8.js";
+import { n as THINKING_LEVELS } from "./types-CWgENVLY.js";
 import { t as buildContextSegments } from "./context-segments-BrEsRhA0.js";
-import { $ as installExtensionFromSpec, A as selectFilesFromSession, C as resolveLegacySessionDir, Cn as createDebugLog, D as resolveTasksDir, Dn as coerceExtensionConfigInput, Dt as isSpawnTool, E as resolveSessionDir, Fn as createExtensionBus, Ft as tailTruncate, G as summaryToTurn, Gn as renderArtifactRow, Jt as artifacts_default, Lt as looksBinary, M as compactConversation, Mn as sanitizeExtensionConfigActionPatch, O as buildPostCompactAttachments, Rn as artifactKindLabel, S as resolveLegacyPersistDir, Sn as scanExtensionDirectories, T as resolvePersistDir, Wn as refreshArtifact, X as createExtensionPromptBridge, Xn as effectiveContextWindow, Yn as OUTPUT_RESERVE_TOKENS, Z as ExtensionInstallError, an as matchesBinding, at as createExtensionHud, dt as filterExtensionRegistry, en as KEYBINDING_KEY_COL_WIDTH, f as applyCompactSummaryCutoff, ft as filterRegistryPlugins, gt as createExtensionHostRuntimeBridge, hn as registerExtensionHostModules, in as keybindingsPath, it as updateInstalledExtension, jn as resolveExtensionConfigValue, lt as composeExtensionPreset, mt as partitionExtensionCatalog, nn as formatBindingForDisplay, ot as discoverAndBuildExtensionRegistry, rn as groupBindings, rt as removeInstalledExtension, t as createAgent, tn as ensureKeybindingsFile, un as resolveExtensionKeybindings, ut as disposeExtensionRegistry, v as cleanupPersistedSession, vt as composePresets, w as resolveMcpWarningsDir, wn as setDebugLogSink, x as rehomePersistedStubs, xn as parseExtensionScanPathEnv, xt as basic_default, yn as inlineLoadedExtension, zt as createModelSearchTool } from "./agent-DLgyw1n5.js";
+import { $ as installExtensionFromSpec, A as selectFilesFromSession, C as resolveLegacySessionDir, Cn as createDebugLog, D as resolveTasksDir, Dn as coerceExtensionConfigInput, Dt as isSpawnTool, E as resolveSessionDir, Fn as createExtensionBus, Ft as tailTruncate, G as summaryToTurn, Gn as renderArtifactRow, Jt as artifacts_default, Lt as looksBinary, M as compactConversation, Mn as sanitizeExtensionConfigActionPatch, O as buildPostCompactAttachments, Rn as artifactKindLabel, S as resolveLegacyPersistDir, Sn as scanExtensionDirectories, T as resolvePersistDir, Wn as refreshArtifact, X as createExtensionPromptBridge, Xn as effectiveContextWindow, Yn as OUTPUT_RESERVE_TOKENS, Z as ExtensionInstallError, an as matchesBinding, at as createExtensionHud, dt as filterExtensionRegistry, en as KEYBINDING_KEY_COL_WIDTH, f as applyCompactSummaryCutoff, ft as filterRegistryPlugins, gt as createExtensionHostRuntimeBridge, hn as registerExtensionHostModules, in as keybindingsPath, it as updateInstalledExtension, jn as resolveExtensionConfigValue, lt as composeExtensionPreset, mt as partitionExtensionCatalog, nn as formatBindingForDisplay, ot as discoverAndBuildExtensionRegistry, rn as groupBindings, rt as removeInstalledExtension, t as createAgent, tn as ensureKeybindingsFile, un as resolveExtensionKeybindings, ut as disposeExtensionRegistry, v as cleanupPersistedSession, vt as composePresets, w as resolveMcpWarningsDir, wn as setDebugLogSink, x as rehomePersistedStubs, xn as parseExtensionScanPathEnv, xt as basic_default, yn as inlineLoadedExtension, zt as createModelSearchTool } from "./agent-BipX4BBj.js";
 import { D as shouldAutoGenerateTitle, E as generateSessionTitle, F as parseCommandInvocation, M as commandBlocksToContent, P as executeCommand, S as resolveInlineSuggestion, a as loginMcpServer, b as createPathAutocompleteProvider, c as SKILL_EDIT_METADATA_KEY, g as readSkillEditMarker, h as extensionScaffold, j as commandBlockToEvent, l as ZIDANE_EXTENSION_SKILL_NAME, m as extensionDirForCwd, p as editSessionMetadata, u as ZIDANE_SKILL_EDIT_SKILL_NAME, v as withZidaneExtensionSkill, w as generateStructuredData, x as patchInlineGhost, y as withZidaneSkillEditSkill } from "./src-DzzhE2YO.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { n as appendCapped } from "./output-cap-C9zukcCj.js";
@@ -12,7 +13,7 @@ import { a as createRingBufferSink, c as logFileTimestamp, i as createLoggingHoo
 import { i as sniffImageMediaType } from "./media-sniff-UKijEaiQ.js";
 import { _ as hasAuthorizationHeader, h as McpOAuthProvider, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-BIWa57eY.js";
 import { replaceDynamicSection, splitSystemPrompt } from "./prompt.js";
-import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-23Stp71-.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-CVy-2mAy.js";
 import { t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { s as withTimeout } from "./timeout-CjOG2mea.js";
 import { i as installCacheBreakLogger } from "./cache-telemetry-ehVdWsg2.js";
@@ -20,9 +21,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, A as useSafeModeQueue, An as quoteForShell, At as makeRequestInteraction, Bn as createArtifactsCompletionProvider, Ci as stripSpawnTokensLine, Ct as InteractionsProvider, Di as toolResultText, Dt as createInteractionTools, Ei as toolCallPreview, Et as createAutomaticInteractionResponse, Fn as ConfigProvider, Fr as TODO_STATUS_GLYPHS, G as usageChecksOptedOut, Gn as importFromClaudeCode, Gr as selectActiveTodos, Gt as createMainSession, H as fetchAllProviderUsage, Hn as useCompletion, Hr as pickActiveRunId, In as useConfig, J as fetchOAuthRedirect, Jn as upsertMcpServer, Jr as useActiveTodos, Jt as runEndNotice, Kn as mcpsWritePath, Kr as setTodosForRun, Ln as resolveConfig, Lr as applyTodosSnapshot, M as addToSafelist, Mn as DiscoveryProvider, N as getSafelist, Nn as useDiscovery, Nt as useInteractionsActions, O as SafeModeProvider, Oi as updateToolEventOutcomes, Or as accentColor, P as isOnSafelist, Pn as useDiscoveryOptional, Pt as useInteractionsQueue, Q as runOAuthLogin, Qn as discoverProjectMcps, Qt as attachMcpWarnLog, R as suggestSafelistEntries, Rn as resolveStoragePaths, Rt as installProviderDiagnosticHook, Si as serverToolResultSummary, St as HOST_INTERACTION_ID_PREFIX, Tt as buildResumedToolResultsTurn, U as fetchProviderUsage, Un as countClaudeSessionFiles, Ur as pruneTodosByRun, V as clearProviderUsageCache, W as providerUsageSupported, Wn as hasClaudeCodeSetup, Wt as createBuiltinCommands, X as redirectUriFromAuthUrl, Xn as dedupMcpServersByName, Xt as discoverProjectPlugins, Yn as buildMcpServers, Yt as buildPluginContributions, Z as oauthUsesManualCodePaste, Zt as parsePluginScanPathEnv, _ as buildSpawnEndEvent, _i as listSessionMeta, _n as useSettings, _r as chatAutoCompactBehavior, _t as useMcpAuthState, ai as buildBuildSystem, an as buildHints, ar as useUpdateCheck, at as subscribeMcpToolsCache, b as defaultSkillScanPaths, bi as noticeTurnContent, bn as resolveChipColor, br as discoverAgentsMd, bt as ASK_USER_TOOL, c as useSelectStyle, ci as chatReferenceTokensForPrompt, cn as useEnabledToggleSet, d as useTheme, di as compactSummaryEvent, dn as SETTINGS_CHOICES, dt as parentServerName, er as tryOpenBrowser, f as discoverSystemMd, fn as SETTINGS_INPUTS, ft as createFileMcpCredentialStore, g as useStreamBuffer, gi as lastContextSizeFromTurns, gt as useMcpAuthDispatch, h as userSystemMdPath, hi as getSessionMeta, hn as clampFps, ht as McpAuthProvider, in as truncateTrailing, ir as buildUpdateHint, jn as createDiscoverySlot, jt as pendingInteractionsFromTurns, k as useSafeModeActions, ki as usageByModel, kn as parseEditorCommand, kt as isModelInteraction, l as useSurfaces, li as createChatTurnsReadTool, ln as DEFAULT_SETTINGS, lt as buildVisibleMcpRows, m as userScopeOverridesLoad, mi as eventsFromTurns, mn as SettingsProvider, nn as clipHintsToWidth, nt as mcpToolsCachePath, o as ThemeProvider, oi as buildPlanSystem, p as renderSystemMdSeed, pi as deriveSessionTitle, pn as SETTINGS_TOGGLES, q as formatPathForCwd, qn as removeMcpServer, qr as todoProgressLabel, r as computeTurnAnchors, rn as hintsLength, rr as bootTick, rt as refreshMcpToolsCatalog, s as useColors, si as envSection, sn as listProjectFiles, st as useMcpToolToggleMap, tn as EMPTY_HINTS, tr as tryRevealPath, tt as loadMcpToolsCache, un as SETTINGS_CATEGORIES, ut as indexOfServerRow, v as buildSpawnStartEvent, vi as loadState, vr as groupArtifacts, vt as getMcpAuthStatus, w as writeSessionExport, wi as sumRunCosts, wt as PRESENT_PLAN_TOOL, x as discoverProjectSkills, xn as resolveTheme, y as buildSkillsConfig, yi as marginTopFor } from "./approvals-YO3zmQ-s.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-DXJ9hJmU.js";
-import { a as connectIpcClient, d as defaultSocketPath, f as ensureDaemonRunning, m as selfDaemonSpawnCommand, o as connectOrSpawnDaemon } from "./server-Dnc3BRS4.js";
+import { $ as supportsOAuth, A as useSafeModeQueue, An as quoteForShell, At as makeRequestInteraction, Bn as createArtifactsCompletionProvider, Ci as stripSpawnTokensLine, Ct as InteractionsProvider, Di as toolResultText, Dt as createInteractionTools, Ei as toolCallPreview, Et as createAutomaticInteractionResponse, Fn as ConfigProvider, Fr as TODO_STATUS_GLYPHS, G as usageChecksOptedOut, Gn as importFromClaudeCode, Gr as selectActiveTodos, Gt as createMainSession, H as fetchAllProviderUsage, Hn as useCompletion, Hr as pickActiveRunId, In as useConfig, J as fetchOAuthRedirect, Jn as upsertMcpServer, Jr as useActiveTodos, Jt as runEndNotice, Kn as mcpsWritePath, Kr as setTodosForRun, Kt as modelChainMetadata, Ln as resolveConfig, Lr as applyTodosSnapshot, M as addToSafelist, Mn as DiscoveryProvider, N as getSafelist, Nn as useDiscovery, Nt as useInteractionsActions, O as SafeModeProvider, Oi as updateToolEventOutcomes, Or as accentColor, P as isOnSafelist, Pn as useDiscoveryOptional, Pt as useInteractionsQueue, Q as runOAuthLogin, Qn as discoverProjectMcps, Qt as attachMcpWarnLog, R as suggestSafelistEntries, Rn as resolveStoragePaths, Rt as installProviderDiagnosticHook, Si as serverToolResultSummary, St as HOST_INTERACTION_ID_PREFIX, Tt as buildResumedToolResultsTurn, U as fetchProviderUsage, Un as countClaudeSessionFiles, Ur as pruneTodosByRun, V as clearProviderUsageCache, W as providerUsageSupported, Wn as hasClaudeCodeSetup, Wt as createBuiltinCommands, X as redirectUriFromAuthUrl, Xn as dedupMcpServersByName, Xt as discoverProjectPlugins, Yn as buildMcpServers, Yt as buildPluginContributions, Z as oauthUsesManualCodePaste, Zt as parsePluginScanPathEnv, _ as buildSpawnEndEvent, _i as listSessionMeta, _n as useSettings, _r as chatAutoCompactBehavior, _t as useMcpAuthState, ai as buildBuildSystem, an as buildHints, ar as useUpdateCheck, at as subscribeMcpToolsCache, b as defaultSkillScanPaths, bi as noticeTurnContent, bn as resolveChipColor, br as discoverAgentsMd, bt as ASK_USER_TOOL, c as useSelectStyle, ci as chatReferenceTokensForPrompt, cn as useEnabledToggleSet, d as useTheme, di as compactSummaryEvent, dn as SETTINGS_CHOICES, dt as parentServerName, er as tryOpenBrowser, f as discoverSystemMd, fn as SETTINGS_INPUTS, ft as createFileMcpCredentialStore, g as useStreamBuffer, gi as lastContextSizeFromTurns, gt as useMcpAuthDispatch, h as userSystemMdPath, hi as getSessionMeta, hn as clampFps, ht as McpAuthProvider, in as truncateTrailing, ir as buildUpdateHint, jn as createDiscoverySlot, jt as pendingInteractionsFromTurns, k as useSafeModeActions, ki as usageByModel, kn as parseEditorCommand, kt as isModelInteraction, l as useSurfaces, li as createChatTurnsReadTool, ln as DEFAULT_SETTINGS, lt as buildVisibleMcpRows, m as userScopeOverridesLoad, mi as eventsFromTurns, mn as SettingsProvider, nn as clipHintsToWidth, nt as mcpToolsCachePath, o as ThemeProvider, oi as buildPlanSystem, p as renderSystemMdSeed, pi as deriveSessionTitle, pn as SETTINGS_TOGGLES, q as formatPathForCwd, qn as removeMcpServer, qr as todoProgressLabel, r as computeTurnAnchors, rn as hintsLength, rr as bootTick, rt as refreshMcpToolsCatalog, s as useColors, si as envSection, sn as listProjectFiles, st as useMcpToolToggleMap, tn as EMPTY_HINTS, tr as tryRevealPath, tt as loadMcpToolsCache, un as SETTINGS_CATEGORIES, ut as indexOfServerRow, v as buildSpawnStartEvent, vi as loadState, vr as groupArtifacts, vt as getMcpAuthStatus, w as writeSessionExport, wi as sumRunCosts, wt as PRESENT_PLAN_TOOL, x as discoverProjectSkills, xn as resolveTheme, y as buildSkillsConfig, yi as marginTopFor } from "./approvals-staFZZ5o.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-D4MpTfvF.js";
+import { a as connectIpcClient, d as defaultSocketPath, f as ensureDaemonRunning, m as selfDaemonSpawnCommand, o as connectOrSpawnDaemon } from "./server-GJ2gNRt_.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";
@@ -7638,6 +7639,86 @@ function OptionRow({ option, isEnabled, isFocused, highlightBg }) {
 	});
 }
 //#endregion
+//#region src/tui/model-pick.ts
+/**
+* Change-detector key for the daemon push — covers EVERYTHING
+* `applyModel` sends (chain included), so a chain-only edit is a change and
+* a re-pick of the identical tuple is not.
+*/
+function modelPickTuple(p) {
+	return JSON.stringify([
+		p.provider.key,
+		p.model,
+		(p.fallbacks ?? []).map((f) => [f.provider, f.model]),
+		p.effort ?? null,
+		p.modelOptions ?? null
+	]);
+}
+/** The wire shape of a pick for `DaemonSession.applyModel` / `sessions.setModel`. */
+function modelPickPayload(p) {
+	return {
+		providerKey: p.provider.key,
+		modelId: p.model,
+		fallbacks: (p.fallbacks ?? []).map((f) => ({
+			providerKey: f.provider,
+			modelId: f.model
+		})),
+		...p.effort ? { effort: p.effort } : {},
+		...p.modelOptions && Object.keys(p.modelOptions).length > 0 ? { modelOptions: p.modelOptions } : {}
+	};
+}
+/**
+* The session-metadata image of a pick — the same keys `ChatHost.setSessionModel`
+* writes, so a session stamped by the TUI reads back identically in the GUI
+* and the daemon. `undefined` values clear (per-model knobs never leak).
+*/
+function sessionModelMetadata(p) {
+	const payload = modelPickPayload(p);
+	return {
+		providerKey: payload.providerKey,
+		modelId: payload.modelId,
+		modelChain: modelChainMetadata(payload.providerKey, payload.modelId, payload.fallbacks),
+		effort: payload.effort,
+		modelOptions: payload.modelOptions
+	};
+}
+/** Whether the session has a persisted model at all (regardless of whether THIS window can serve it). */
+function hasSessionModel(metadata) {
+	return typeof metadata.providerKey === "string" && typeof metadata.modelId === "string";
+}
+/**
+* Rebuild a `Picked` from a session's persisted model metadata. `null`
+* when the session has no model (see `hasSessionModel`) OR names a provider
+* this window has no credentials/descriptor for — callers must tell the two
+* apart before seeding: only a model-less session may be seeded from the
+* window's pick; an unrepresentable one is left alone. Chain entries whose
+* provider isn't available here drop; effort applies only to models with a
+* reasoning knob (defaulting to `DEFAULT_EFFORT` when absent); options are
+* filtered to the ones the model declares.
+*/
+function pickedFromSessionMetadata(metadata, availableProviders, providerRegistry) {
+	const providerKey = metadata.providerKey;
+	const modelId = metadata.modelId;
+	if (typeof providerKey !== "string" || typeof modelId !== "string") return null;
+	const auth = availableProviders.find((p) => p.key === providerKey);
+	const descriptor = providerRegistry[providerKey];
+	if (!auth || !descriptor) return null;
+	const persistedEffort = typeof metadata.effort === "string" && THINKING_LEVELS.includes(metadata.effort) ? metadata.effort : void 0;
+	const effort = modelSupportsReasoning(descriptor, modelId) ? persistedEffort ?? "medium" : void 0;
+	const modelOptions = restoreModelOptions(descriptor, modelId, { [modelId]: enabledModelOptions(metadata.modelOptions) });
+	const fallbacks = restoreChainFallbacks(metadata.modelChain, {
+		provider: providerKey,
+		model: modelId
+	}, (k) => availableProviders.some((p) => p.key === k) && providerRegistry[k] !== void 0);
+	return {
+		provider: auth,
+		model: modelId,
+		...fallbacks.length > 0 ? { fallbacks } : {},
+		...effort ? { effort } : {},
+		...modelOptions ? { modelOptions } : {}
+	};
+}
+//#endregion
 //#region src/tui/model-picker.tsx
 /**
 * Cross-provider, searchable model picker.
@@ -8651,15 +8732,10 @@ async function connectDaemonSession(options) {
 			await optional(() => client.request("sessions.setModel", {
 				sessionId,
 				providerKey: options.providerKey,
-				modelId: options.modelId
-			}));
-			if (options.effort !== void 0) await optional(() => client.request("sessions.setEffort", {
-				sessionId,
-				effort: options.effort
-			}));
-			if (options.modelOptions !== void 0) await optional(() => client.request("sessions.setModelOptions", {
-				sessionId,
-				options: options.modelOptions
+				modelId: options.modelId,
+				fallbacks: [...options.fallbacks],
+				...options.effort !== void 0 ? { effort: options.effort } : {},
+				...options.modelOptions !== void 0 ? { modelOptions: options.modelOptions } : {}
 			}));
 		},
 		async setAgentId(agentId) {
@@ -22639,10 +22715,12 @@ function AppShell() {
 		};
 	}, [settings.useDaemon]);
 	/**
-	* Model-pick → session-metadata cabling (daemon mode). Seeded at
-	* activation with the CURRENT pick so the push effect only fires on a
-	* genuine user change — pushing at mount would dispose a possibly-live
-	* daemon agent for nothing.
+	* Model-pick → session-metadata cabling (both runtimes). Primed at
+	* activation with the SESSION's pick (adopted or freshly stamped) so the
+	* push effect only fires on a genuine user change — pushing at mount would
+	* dispose a possibly-live daemon agent for nothing, and priming from the
+	* window's pick instead of the session's is what let footer and execution
+	* disagree.
 	*/
 	const lastPushedModelRef = useRef(null);
 	/**
@@ -22653,24 +22731,6 @@ function AppShell() {
 	const activateSessionRef = useRef(async () => {});
 	const activationGenerationRef = useRef(0);
 	const connectionRef = useRef(new SessionConnection());
-	useEffect(() => {
-		const daemon = daemonRef.current;
-		if (!daemon || !picked) return;
-		const tuple = JSON.stringify([
-			picked.provider.key,
-			picked.model,
-			picked.effort ?? null,
-			picked.modelOptions ?? null
-		]);
-		if (lastPushedModelRef.current === tuple) return;
-		lastPushedModelRef.current = tuple;
-		daemon.applyModel({
-			providerKey: picked.provider.key,
-			modelId: picked.model,
-			...picked.effort ? { effort: picked.effort } : {},
-			...picked.modelOptions ? { modelOptions: picked.modelOptions } : {}
-		});
-	}, [picked]);
 	/** Remote search-query mirror for the PromptBlock input (seq-keyed apply). */
 	const [remoteSearchQuery, setRemoteSearchQuery] = useState(null);
 	const remoteSearchSeqRef = useRef(0);
@@ -22710,6 +22770,23 @@ function AppShell() {
 		if (Object.keys(patch).length > 0) daemonRef.current?.publishSettings(patch);
 	}, [settings]);
 	const sessionRef = useRef(null);
+	useEffect(() => {
+		if (!picked || screen !== "chat") return;
+		const tuple = modelPickTuple(picked);
+		if (lastPushedModelRef.current === tuple) return;
+		if (settingsRef.current.useDaemon && !isDaemonDisabledByEnv()) {
+			const daemon = daemonRef.current;
+			if (!daemon) return;
+			lastPushedModelRef.current = tuple;
+			daemon.applyModel(modelPickPayload(picked));
+			return;
+		}
+		const session = sessionRef.current;
+		if (!session) return;
+		lastPushedModelRef.current = tuple;
+		for (const [k, v] of Object.entries(sessionModelMetadata(picked))) session.setMeta(k, v);
+		session.save().catch((err) => debugLog("model pick: session save failed", err));
+	}, [picked, screen]);
 	/**
 	* Todo-change listeners, notified by BOTH runtimes.
 	*
@@ -23269,6 +23346,18 @@ function AppShell() {
 			...opts ? { modelOptions: opts } : {}
 		};
 	}, [providerRegistry, initialState]);
+	/**
+	* Rebuild a `Picked` from a session's persisted model metadata — the
+	* daemon's source of truth. This is what the footer must show in daemon
+	* mode: the session's model, never this window's remembered pick.
+	*
+	* Resume-on-launch activates BEFORE the auth-detection effect has
+	* populated `availableProviders`; an empty list would read every session
+	* as "unrepresentable", so detect synchronously in that window.
+	*/
+	const pickedFromSessionMetadata$1 = useCallback((metadata) => {
+		return pickedFromSessionMetadata(metadata, availableProvidersRef.current.length > 0 ? availableProvidersRef.current : detectAuth(config.paths.userDir, providerRegistry).filter((p) => p.available), providerRegistry);
+	}, [config.paths.userDir, providerRegistry]);
 	const cancelRunOnDenial = useCallback((reason) => {
 		denyAll();
 		interactions.cancelAll(reason);
@@ -24681,25 +24770,23 @@ function AppShell() {
 						await session.save();
 						if (!attempt.isCurrent()) throw new Error("activation superseded");
 					}
-					const activePick = pickedRef.current;
+					let 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");
-						}
-						lastPushedModelRef.current = JSON.stringify([
-							activePick.provider.key,
-							activePick.model,
-							activePick.effort ?? null,
-							activePick.modelOptions ?? null
-						]);
-					} else lastPushedModelRef.current = null;
+					if (loaded) {
+						const sessionPick = pickedFromSessionMetadata$1(session.metadata);
+						if (sessionPick) {
+							activePick = sessionPick;
+							pickedRef.current = sessionPick;
+							setPicked(sessionPick);
+							if (sessionPick.effort && typeof session.metadata.effort !== "string") seedModelViaRpc = true;
+						} else if (!hasSessionModel(session.metadata) && activePick) seedModelViaRpc = true;
+						else activePick = null;
+					} else if (activePick) {
+						for (const [k, v] of Object.entries(sessionModelMetadata(activePick))) session.setMeta(k, v);
+						await session.save();
+						if (!attempt.isCurrent()) throw new Error("activation superseded");
+					}
+					lastPushedModelRef.current = activePick ? modelPickTuple(activePick) : null;
 					if (!attempt.isCurrent()) throw new Error("activation superseded");
 					const sessionId = session.id;
 					const refreshHeaderFromStore = () => {
@@ -24720,29 +24807,13 @@ function AppShell() {
 					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);
+							const next = pickedFromSessionMetadata$1(data.metadata);
 							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
-							]);
+							const tuple = modelPickTuple(next);
 							if (lastPushedModelRef.current === tuple) return;
 							lastPushedModelRef.current = tuple;
-							setPicked(merged);
+							pickedRef.current = next;
+							setPicked(next);
 						}).catch(() => void 0);
 					};
 					const reflectRemoteAgent = () => {
@@ -25000,12 +25071,7 @@ function AppShell() {
 					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 } : {}
-					});
+					if (seedModelViaRpc && activePick) controller.applyModel(modelPickPayload(activePick));
 					return controller;
 				},
 				ready: () => {},
@@ -25026,6 +25092,23 @@ function AppShell() {
 				}
 			});
 		} else {
+			const sessionPick = loaded ? pickedFromSessionMetadata$1(session.metadata) : null;
+			let primed = pickedRef.current;
+			if (sessionPick) {
+				pickedRef.current = sessionPick;
+				setPicked(sessionPick);
+				key = sessionPick.provider.key;
+				primed = sessionPick;
+				for (const [k, v] of Object.entries(sessionModelMetadata(sessionPick))) session.setMeta(k, v);
+			} else if (loaded && hasSessionModel(session.metadata)) primed = null;
+			else if (pickedRef.current) {
+				for (const [k, v] of Object.entries(sessionModelMetadata(pickedRef.current))) session.setMeta(k, v);
+				if (!loaded) {
+					await session.save();
+					if (!activation.isCurrent()) return;
+				}
+			}
+			lastPushedModelRef.current = primed ? modelPickTuple(primed) : null;
 			agentRef.current = buildAgent(session, key);
 			activation.localReady();
 		}
@@ -25088,7 +25171,8 @@ function AppShell() {
 		continueResumedInteractions,
 		persistResumedInteractions,
 		extensionRegistry,
-		defaultAgentProfile
+		defaultAgentProfile,
+		pickedFromSessionMetadata$1
 	]);
 	/** Ref mirror — same rationale as `refreshSessionsRef` above. */
 	activateSessionRef.current = activateSession;
@@ -25693,10 +25777,13 @@ function AppShell() {
 		setActiveFallback(null);
 		pickedRef.current = updated;
 		modal.close();
-		if ((providerChanged || providerKeySetChanged(prevChain, [{
+		if (daemonRef.current) return;
+		if (!(providerChanged || providerKeySetChanged(prevChain, [{
 			provider: primary.provider,
 			model: primary.model
-		}, ...fallbacks])) && currentSession && !busy && !pendingApproval) await activateSession(currentSession.id, nextProvider.key);
+		}, ...fallbacks])) || !currentSession) return;
+		if (busy || pendingApproval) pendingAgentRebuildRef.current = true;
+		else await rebuildActiveAgentRef.current?.();
 	}, [
 		availableProviders,
 		providerRegistry,
@@ -25705,8 +25792,7 @@ function AppShell() {
 		picked,
 		currentSession,
 		busy,
-		pendingApproval,
-		activateSession
+		pendingApproval
 	]);
 	/**
 	* Open the cross-provider model picker for the COMPACTION model