mixdog 0.9.69 → 0.9.71

package/src/session-runtime/channel-config-api.mjs

@@ -17,13 +17,24 @@ import { runScheduleSession } from '../runtime/shared/schedule-session-run.mjs';
 // API object; the mutating admin helpers are imported directly here and the
 // runtime injects only the closure-owned callbacks (backend flush, channel
 // worker handle, soft reload).
-export function createChannelConfigApi({ flushBackendSave, channels, reloadChannelsSoon, ensureAutomationRuntime = () => {} }) {
+export function createChannelConfigApi({
+  flushBackendSave,
+  channels,
+  reloadChannelsSoon,
+  ensureAutomationRuntime = () => {},
+  awaitKeychainPrewarm = async () => {},
+}) {
   return {
     async getChannelSetup() {
       // Flush a pending debounced backend switch first so setup readers
       // (Settings → Channel Setting, remote toggles) never observe the
       // previous backend during the 150ms debounce window.
       try { await flushBackendSave(); } catch {}
+      // Bot tokens live in the OS keychain. Reading them before the batch
+      // prewarm lands costs one SYNCHRONOUS PowerShell DPAPI decrypt each
+      // (measured 971ms + 579ms on a cold desktop boot, blocking the whole
+      // event loop); waiting for the prewarm serves both from its cache.
+      try { await awaitKeychainPrewarm(); } catch {}
       return channelSetup();
     },
     getChannelWorkerStatus() {

package/src/session-runtime/lifecycle-api.mjs

@@ -52,6 +52,15 @@ export function createLifecycleApi(deps) {
     pushTranscriptRebind,
     notificationListeners, remoteStateListeners, desktopSession,
   } = deps;
+  const closeSurfaceSession = (session, reason, options) => {
+    if (!session?.id) return false;
+    // A remote-attached session is only a viewer handle owned by this surface.
+    // Closing it through the shared manager bumps the durable generation and
+    // invalidates the real owner's in-flight turn. Viewer exits therefore
+    // detach locally; only the process that owns the runtime may close it.
+    if (session.remoteAttached === true) return true;
+    return mgr.closeSession(session.id, reason, options);
+  };
   const listLeadSessions = (options = {}) => {
     const heartbeatMtimes = listSessionHeartbeatMtimes();
     return mgr.listSessions({
@@ -245,7 +254,7 @@ export function createLifecycleApi(deps) {
         // first-turn exit could still burn a real session.
         const tombstone = !hasUserConversationMessage(session.messages)
           && !hasUserConversationMessage(session.liveTurnMessages);
-        ok = mgr.closeSession(session.id, reason, { tombstone });
+        ok = closeSurfaceSession(session, reason, { tombstone });
         setSession(null);
       }
       invalidateContextStatusCache();
@@ -345,7 +354,7 @@ export function createLifecycleApi(deps) {
         statusRoutes?.clearGatewaySessionRoute?.(session.id);
         const tombstone = !hasUserConversationMessage(session.messages)
           && !hasUserConversationMessage(session.liveTurnMessages);
-        mgr.closeSession(session.id, cleanupReason, { tombstone });
+        closeSurfaceSession(session, cleanupReason, { tombstone });
         setSession(null);
       }
       setDesktopSession(nextDesktopSession && typeof nextDesktopSession === 'object'
@@ -376,7 +385,7 @@ export function createLifecycleApi(deps) {
         void ingestSessionIntoMemory(session);
         const tombstone = !hasUserConversationMessage(session.messages)
           && !hasUserConversationMessage(session.liveTurnMessages);
-        mgr.closeSession(session.id, 'cli-new', { tombstone });
+        closeSurfaceSession(session, 'cli-new', { tombstone });
         setSession(null);
       }
       invalidateContextStatusCache();
@@ -411,7 +420,7 @@ export function createLifecycleApi(deps) {
         void ingestSessionIntoMemory(prev);
         const tombstone = !hasUserConversationMessage(previousMessages)
           && !hasUserConversationMessage(previousLive);
-        mgr.closeSession(previousId, 'cli-resume', { tombstone });
+        closeSurfaceSession(prev, 'cli-resume', { tombstone });
       }
       setSession(resumed);
       applyResolvedCwd(resolveResumeCwd(resumed, getCurrentCwd()), { markRefresh: false });

package/src/session-runtime/media-api.mjs

@@ -0,0 +1,50 @@
+/**
+ * Media studio API (image / video generation) exposed on the session runtime.
+ *
+ * The media graph (lane catalog, adapters, asset store) is imported on first
+ * use: a session that never opens the Studio must not pay for it at boot.
+ */
+let mediaModule = null;
+
+async function media() {
+  mediaModule ??= await import('../runtime/media/index.mjs');
+  return mediaModule;
+}
+
+export function createMediaApi() {
+  return {
+    async listMediaLanes() {
+      return (await media()).listMediaLanes();
+    },
+    async startMediaJob(input) {
+      return (await media()).startMediaJob(input || {});
+    },
+    async getMediaJob(id) {
+      return (await media()).getMediaJob(id);
+    },
+    async listMediaJobs() {
+      return (await media()).listMediaJobs();
+    },
+    async cancelMediaJob(id) {
+      return (await media()).cancelMediaJob(id);
+    },
+    async listMediaAssets(options) {
+      return (await media()).listMediaAssets(options || {});
+    },
+    async readMediaAsset(id, options) {
+      return (await media()).readMediaAsset(id, options || {});
+    },
+    async resolveMediaFile(id, options) {
+      return (await media()).resolveMediaFile(id, options || {});
+    },
+    async deleteMediaAsset(id) {
+      return (await media()).deleteMediaAsset(id);
+    },
+    async openMediaAsset(id) {
+      return (await media()).openMediaAsset(id);
+    },
+    async openMediaFolder() {
+      return (await media()).openMediaFolder();
+    },
+  };
+}

package/src/session-runtime/model-route-api.mjs

@@ -96,6 +96,10 @@ export function createModelRouteApi(deps) {
       if (!searchCapableFor(selectedRoute.provider, modelMeta)) {
         throw new Error(`model "${selectedRoute.model}" is not marked as web-search capable`);
       }
+      // Route-scope isolation: the search route stores its own effort/fast in
+      // config.searchRoute. The shared config.modelSettings[provider/model]
+      // bucket belongs to the MAIN route alone, so a search-model pick that
+      // happens to match Main must not rewrite Main's saved effort/fast.
       const fastCapable = fastCapableFor(selectedRoute.provider, modelMeta);
       const effort = coerceEffortFor(selectedRoute.provider, modelMeta, selectedRoute.effort);
       selectedRoute = {
@@ -103,7 +107,6 @@ export function createModelRouteApi(deps) {
         ...(effort ? { effort } : {}),
         fast: fastCapable ? selectedRoute.fast === true : false,
       };
-      adoptConfig(saveModelSettings(cfgMod, selectedRoute, { fastCapable, baseConfig: getConfig() }), { hasSecrets: getConfigHasSecrets() });
       const routeToSave = normalizeSearchRouteConfig(selectedRoute);
       const nextConfig = { ...getConfig() };
       nextConfig.searchRoute = routeToSave;

package/src/session-runtime/runtime-core.mjs

@@ -230,6 +230,7 @@ import { createProviderUsage } from './provider-usage.mjs';
 import { envFlag } from './env.mjs';
 import { bootProfile, profiledImport } from './boot-profile.mjs';
 import { createChannelConfigApi } from './channel-config-api.mjs';
+import { createMediaApi } from './media-api.mjs';
 import { createProviderAuthApi } from './provider-auth-api.mjs';
 import { createContextStatus } from './context-status.mjs';
 import { createLifecycleApi } from './lifecycle-api.mjs';
@@ -588,6 +589,9 @@ export async function createMixdogSessionRuntime({
   };
   const providerInitPromises = new Map();
   let startupProviderCatalogRefreshStarted = false;
+  // True while the boot-time provider-catalog refresh is in flight: warming a
+  // model cache it is about to invalidate only burns the load twice.
+  let startupProviderCatalogRefreshPending = false;
   let lastProjectMcpKey = null;
   // MCP connect state, owned here so teardown/reconnect paths still observe it;
   // the mcp-glue factory mutates this object in place (see createMcpGlue).
@@ -1011,20 +1015,28 @@ export async function createMixdogSessionRuntime({
     }
     if (!startupProviderCatalogRefreshStarted && !closeRequested) {
       startupProviderCatalogRefreshStarted = true;
+      startupProviderCatalogRefreshPending = true;
       try {
         void Promise.resolve(reg.refreshProviderCatalogsOnStartup())
           .then(() => {
             // Fresh catalog rows invalidate model-derived caches, but the
             // already initialized provider registry remains valid.
             invalidateProviderCaches({ preserveProviderInit: true });
-            warmProviderModelCache();
+            startupProviderCatalogRefreshPending = false;
+            // Secrets-aware: a no-secrets rewarm bumps the load sequence and
+            // is never adopted, so it discarded the in-flight authoritative
+            // load and left the picker cache empty — every later consumer then
+            // paid a full catalog load (measured ~560ms each).
+            warmProviderModelCache({ loadSecrets: true });
             bootProfile('provider-catalogs:refresh-ready');
           })
           .catch((error) => {
+            startupProviderCatalogRefreshPending = false;
             bootProfile('provider-catalogs:refresh-failed', { error: error?.message || String(error) });
           });
         bootProfile('provider-catalogs:refresh-started');
       } catch (error) {
+        startupProviderCatalogRefreshPending = false;
         bootProfile('provider-catalogs:refresh-failed', { error: error?.message || String(error) });
       }
     }
@@ -1355,6 +1367,7 @@ export async function createMixdogSessionRuntime({
     cachedProviderSetup,
     warmCatalogsInBackground,
     isFirstTurnCompleted: () => firstTurnCompleted,
+    isCatalogRefreshPending: () => startupProviderCatalogRefreshPending,
     envFlag,
     delays: {
       providerWarmupDelayMs,
@@ -1631,6 +1644,7 @@ export async function createMixdogSessionRuntime({
     // Automation saved mid-session boots the worker (claim-if-vacant) even
     // though the boot-time autostart window has already passed.
     ensureAutomationRuntime: () => scheduleChannelStart(0),
+    awaitKeychainPrewarm,
   });
   const providerAuthApi = createProviderAuthApi({
     cfgMod,
@@ -1648,6 +1662,7 @@ export async function createMixdogSessionRuntime({
     getUsageDashboard,
     collectProviderModels,
   });
+  const mediaApi = createMediaApi();
   const lifecycleApi = createLifecycleApi({
     getSession: () => session,
     setSession: (v) => { session = v; },
@@ -1830,6 +1845,7 @@ export async function createMixdogSessionRuntime({
     ...settingsApi,
     ...channelConfigApi,
     ...providerAuthApi,
+    ...mediaApi,
     // Turn-scoped worktree diff (shadow snapshot): everything changed since
     // the current turn's base tree, regardless of which agent/process wrote it.
     getTurnReviewDiff: () => getTurnSnapshotReviewDiff(currentCwd, session?.id),

package/src/session-runtime/session-text.mjs

@@ -44,7 +44,6 @@ const SYNTHETIC_SESSION_TEXT_PATTERNS = Object.freeze([
   // "Re-attached after compaction…" rows in Recent (user report). Skipping
   // them titles the session from its first REAL user message instead.
   /^re-attached after compaction\b/i,
-  /^reference files:\s/i,
   /^the async (?:agent|shell) task\b/i,
 ]);
 

package/src/session-runtime/tool-catalog.mjs

@@ -131,6 +131,32 @@ function toolSearchNativePayload(catalog, names, provider = '') {
   };
 }
 
+// Schemas for tools that are ALREADY active. They are deliberately NOT added
+// to toolReferences/openaiTools: re-announcing them would rewrite the request
+// tools array and break the cached prefix. The caller only ever sees names
+// otherwise, so the parameter contract (enums, limits) rides in the RESULT.
+function activeToolSchemas(catalog, session, names) {
+  const wanted = new Set((names || []).map(clean).filter(Boolean));
+  if (!wanted.size) return [];
+  const seen = new Set();
+  const specs = [];
+  for (const pool of [Array.isArray(session?.tools) ? session.tools : [], catalog || []]) {
+    for (const tool of pool) {
+      const name = clean(tool?.name);
+      if (!name || !wanted.has(name) || seen.has(name)) continue;
+      seen.add(name);
+      specs.push({
+        name,
+        description: clean(tool?.description),
+        parameters: tool?.inputSchema && typeof tool.inputSchema === 'object'
+          ? tool.inputSchema
+          : { type: 'object', properties: {} },
+      });
+    }
+  }
+  return specs;
+}
+
 // Plain case-insensitive substring filter over name + description. No scores,
 // no aliases, no auto-selection: tool_search only lists and (via select)
 // loads. Empty query matches every row.
@@ -734,9 +760,14 @@ export function renderToolSearch(args = {}, session, mode = 'full', options = {}
         summary: '',
       })
     : null;
+  const alreadyActiveSchemas = activeToolSchemas(catalog, session, alreadyActive);
   const nativeSummary = [
     ...(loaded.length ? [`Loaded deferred tools: ${loaded.join(', ')}`] : []),
     ...(alreadyActive.length ? [`Already active: ${alreadyActive.join(', ')}`] : []),
+    // The native path replaces the whole JSON result with this summary
+    // (tool-batch), so an already-active tool's schema has to travel here or
+    // the caller keeps guessing its parameters.
+    ...(alreadyActiveSchemas.length ? [`Already-active schemas: ${JSON.stringify(alreadyActiveSchemas)}`] : []),
   ].join('\n');
   const nativeToolSearch = nativeToolSearchBase
     ? { ...nativeToolSearchBase, summary: nativeSummary || nativeToolSearchBase.summary }
@@ -754,6 +785,7 @@ export function renderToolSearch(args = {}, session, mode = 'full', options = {}
     ...(nativeToolSearch ? { nativeToolSearch } : {}),
     loaded,
     alreadyActive,
+    ...(alreadyActiveSchemas.length ? { alreadyActiveSchemas } : {}),
     missing,
     ...(blocked.length ? { blocked } : {}),
     ...mcpFields,

package/src/session-runtime/warmup-schedulers.mjs

@@ -26,6 +26,7 @@ export function createWarmupSchedulers({
   cachedProviderSetup,
   warmCatalogsInBackground,
   isFirstTurnCompleted,
+  isCatalogRefreshPending = () => false,
   envFlag,
   delays,
   flags,
@@ -104,9 +105,21 @@ export function createWarmupSchedulers({
         scheduleProviderModelWarmup(backgroundBusyRetryMs);
         return;
       }
+      // The startup catalog refresh invalidates every model-derived cache when
+      // it lands, so warming before it finishes throws the whole load away.
+      if (isCatalogRefreshPending()) {
+        bootProfile('provider-models:warm-deferred', { reason: 'catalog-refresh-pending' });
+        scheduleProviderModelWarmup(backgroundBusyRetryMs);
+        return;
+      }
       if (!isFirstTurnCompleted() && !envFlag('MIXDOG_PROVIDER_WARMUP_BEFORE_FIRST_TURN')) {
         bootProfile('provider-models:warm-deferred', { reason: 'first-turn-pending' });
-        warmProviderModelCache();
+        // Secrets-aware even before the first turn: the no-secrets variant is
+        // never adopted as the picker cache, so every consumer immediately
+        // reloaded the whole catalog (measured ~900ms of duplicate provider
+        // I/O on a desktop boot). This runs on a background timer and the
+        // keychain prewarm is already in flight, so nothing user-facing waits.
+        warmProviderModelCache({ loadSecrets: true });
         scheduleProviderModelWarmup(backgroundBusyRetryMs);
         return;
       }

package/src/session-runtime/workflow-agents-api.mjs

@@ -23,7 +23,7 @@ import {
 import { ONBOARDING_VERSION } from './quick-search-models.mjs';
 import { findOutputStyle } from './output-styles.mjs';
 import { ensureProviderEnabled } from './config-helpers.mjs';
-import { fastCapableFor, saveModelSettings } from './model-capabilities.mjs';
+import { fastCapableFor } from './model-capabilities.mjs';
 
 // Onboarding + agents/workflows/output-style selection surface. Extracted
 // verbatim from the runtime API object; stateless helpers are imported directly
@@ -31,7 +31,7 @@ import { fastCapableFor, saveModelSettings } from './model-capabilities.mjs';
 // session locals plus the closure callbacks.
 export function createWorkflowAgentsApi(deps) {
   const {
-    getConfig, getRoute, setRouteState, getSession, setSession, getConfigHasSecrets,
+    getConfig, getRoute, setRouteState, getSession, setSession,
     cfgMod, reg, mgr, STANDALONE_DATA_DIR,
     resolveRoute, lookupModelMeta, adoptConfig, saveConfigAndAdopt, displayConfig, ensureProvidersReady,
     agentRouteFromConfig, loadAgentDefinition, activeWorkflowId, listWorkflowPacks,
@@ -406,12 +406,37 @@ export function createWorkflowAgentsApi(deps) {
       const id = normalizeAgentId(agentId) || normalizeWorkflowId(agentId);
       if (!id) throw new Error(`unknown agent "${agentId}"`);
       if (isHiddenAgent(id)) throw new Error(`agent "${id}" is internal and has no configurable route`);
-      let selectedRoute = resolveRoute(getConfig(), { ...(next || {}) });
+      // Route-scope isolation: an agent route owns its model AND its
+      // effort/fast, stored in config.agents[<id>]. The shared
+      // config.modelSettings[provider/model] bucket belongs to the MAIN route
+      // alone (setRoute/setFast/setEffort) — resolveRoute reads it with
+      // priority over the lead preset, so an agent that reused it silently
+      // rewrote Main's effort/fast for the next session. Read the agent's own
+      // stored route as the fallback instead, and never write the bucket here.
+      const requested = { ...(next || {}) };
+      const routeDataDir = cfgMod.getPluginData?.() || STANDALONE_DATA_DIR;
+      const stored = agentRouteFromConfig(getConfig(), id, routeDataDir) || {};
+      // A request with neither provider nor model is the "seed from the current
+      // default" path (new custom agent) and inherits Main verbatim.
+      const inheritsDefault = !clean(requested.provider) && !clean(requested.model);
+      let selectedRoute = resolveRoute(getConfig(), requested);
+      if (!inheritsDefault) {
+        const sameModel = clean(selectedRoute.provider) === clean(stored.provider)
+          && clean(selectedRoute.model) === clean(stored.model);
+        selectedRoute = {
+          ...selectedRoute,
+          effort: requested.effort !== undefined
+            ? selectedRoute.effort
+            : (sameModel ? (stored.effort || null) : null),
+          fast: requested.fast !== undefined
+            ? selectedRoute.fast === true
+            : (sameModel && stored.fast === true),
+        };
+      }
       await ensureProvidersReady(ensureProviderEnabled(getConfig(), selectedRoute.provider));
       const modelMeta = await lookupModelMeta(selectedRoute.provider, selectedRoute.model);
       const fastCapable = fastCapableFor(selectedRoute.provider, modelMeta);
       selectedRoute = { ...selectedRoute, fast: fastCapable ? selectedRoute.fast === true : false };
-      adoptConfig(saveModelSettings(cfgMod, selectedRoute, { fastCapable, baseConfig: getConfig() }), { hasSecrets: getConfigHasSecrets() });
 
       const routeToSave = normalizeWorkflowRoute(selectedRoute);
       if (!routeToSave) throw new Error('agent route requires provider and model');

package/src/tui/dist/index.mjs

@@ -23945,7 +23945,6 @@ var SYNTHETIC_SESSION_TEXT_PATTERNS = Object.freeze([
   // "Re-attached after compaction…" rows in Recent (user report). Skipping
   // them titles the session from its first REAL user message instead.
   /^re-attached after compaction\b/i,
-  /^reference files:\s/i,
   /^the async (?:agent|shell) task\b/i
 ]);
 var LATE_TOOL_ANNOUNCEMENT_SENTINEL = "connected after this session started";
@@ -28402,6 +28401,21 @@ function createEngineApiB(bag) {
       pushNotice("channel saved", "info");
       return result;
     },
+    // Media studio (image/video generation). Reads stay quiet; only the
+    // generation start posts a notice so the TUI shows background work.
+    listMediaLanes: () => runtime.listMediaLanes?.(),
+    listMediaAssets: (options) => runtime.listMediaAssets?.(options),
+    readMediaAsset: (id, options) => runtime.readMediaAsset?.(id, options),
+    resolveMediaFile: (id, options) => runtime.resolveMediaFile?.(id, options),
+    getMediaJob: (id) => runtime.getMediaJob?.(id),
+    listMediaJobs: () => runtime.listMediaJobs?.(),
+    // No notice on start: the Studio surfaces progress on its own pending tile,
+    // and a toast for a user-initiated generation is pure noise.
+    startMediaJob: (input) => runtime.startMediaJob(input),
+    cancelMediaJob: (id) => runtime.cancelMediaJob?.(id),
+    deleteMediaAsset: (id) => runtime.deleteMediaAsset?.(id),
+    openMediaAsset: (id) => runtime.openMediaAsset?.(id),
+    openMediaFolder: () => runtime.openMediaFolder?.(),
     setWebhookConfig: async (patch) => {
       const result = await runtime.setWebhookConfig(patch);
       pushNotice("webhook config updated", "info");
@@ -30532,6 +30546,11 @@ function createEngineItemMutators({
 
 // src/tui/engine.mjs
 var SESSION_RUNTIME_MODULE = import.meta.url.replace(/\\/g, "/").includes("/tui/dist/") ? "../../mixdog-session-runtime.mjs" : "../mixdog-session-runtime.mjs";
+var sessionRuntimeModulePromise = null;
+function importSessionRuntimeModule() {
+  sessionRuntimeModulePromise ??= import(SESSION_RUNTIME_MODULE);
+  return sessionRuntimeModulePromise;
+}
 var TOOL_APPROVAL_TIMEOUT_MS = (() => {
   const value = Number(process.env.MIXDOG_TOOL_APPROVAL_TIMEOUT_MS);
   return Number.isFinite(value) && value > 0 ? Math.max(1e3, Math.round(value)) : 12e4;
@@ -30556,7 +30575,7 @@ async function createEngineSession({
   process.env.MIXDOG_QUIET_MEMORY_LOG = "1";
   process.env.MIXDOG_PATCH_NATIVE_PREWARM ??= "0";
   const importStartedAt = performance3.now();
-  const { createMixdogSessionRuntime } = await import(SESSION_RUNTIME_MODULE);
+  const { createMixdogSessionRuntime } = await importSessionRuntimeModule();
   bootProfile("session-runtime:imported", { ms: (performance3.now() - importStartedAt).toFixed(1) });
   const runtime = await createMixdogSessionRuntime({
     provider: providerName,

package/src/tui/engine/session-api-ext.mjs

@@ -673,6 +673,21 @@ export function createEngineApiB(bag) {
       pushNotice('channel saved', 'info');
       return result;
     },
+    // Media studio (image/video generation). Reads stay quiet; only the
+    // generation start posts a notice so the TUI shows background work.
+    listMediaLanes: () => runtime.listMediaLanes?.(),
+    listMediaAssets: (options) => runtime.listMediaAssets?.(options),
+    readMediaAsset: (id, options) => runtime.readMediaAsset?.(id, options),
+    resolveMediaFile: (id, options) => runtime.resolveMediaFile?.(id, options),
+    getMediaJob: (id) => runtime.getMediaJob?.(id),
+    listMediaJobs: () => runtime.listMediaJobs?.(),
+    // No notice on start: the Studio surfaces progress on its own pending tile,
+    // and a toast for a user-initiated generation is pure noise.
+    startMediaJob: (input) => runtime.startMediaJob(input),
+    cancelMediaJob: (id) => runtime.cancelMediaJob?.(id),
+    deleteMediaAsset: (id) => runtime.deleteMediaAsset?.(id),
+    openMediaAsset: (id) => runtime.openMediaAsset?.(id),
+    openMediaFolder: () => runtime.openMediaFolder?.(),
     setWebhookConfig: async (patch) => {
       const result = await runtime.setWebhookConfig(patch);
       pushNotice('webhook config updated', 'info');

package/src/tui/engine.mjs

@@ -119,6 +119,44 @@ const SESSION_RUNTIME_MODULE = import.meta.url.replace(/\\/g, '/').includes('/tu
   ? '../../mixdog-session-runtime.mjs'
   : '../mixdog-session-runtime.mjs';
 
+// The runtime graph is imported lazily, but that import (measured ~250ms) used
+// to land inside the FIRST engine creation, which desktop performs while it
+// holds its transition lock — so the user's first navigation paid for it. Hosts
+// can start it during their own idle startup instead; the promise is shared, so
+// the create path either awaits an in-flight preload or does the import itself.
+let sessionRuntimeModulePromise = null;
+function importSessionRuntimeModule() {
+  sessionRuntimeModulePromise ??= import(SESSION_RUNTIME_MODULE);
+  return sessionRuntimeModulePromise;
+}
+
+export function preloadSessionRuntimeModule() {
+  void importSessionRuntimeModule().catch(() => {
+    // A real load failure surfaces on the authoritative create path.
+    sessionRuntimeModulePromise = null;
+  });
+}
+
+// Windows keychain reads go through a DPAPI PowerShell host whose cold start
+// dominates a packaged boot (measured ~1.5s). The runtime batches every secret
+// into one call, but it only starts that batch when the runtime is created —
+// late enough that the first context switch waits on it. Hosts can start the
+// same batch while their window is still coming up.
+export function preloadKeychainSecrets() {
+  void (async () => {
+    try {
+      const { createRequire } = await import('node:module');
+      const require = createRequire(import.meta.url);
+      const keychain = require(import.meta.url.replace(/\\/g, '/').includes('/tui/dist/')
+        ? '../../lib/keychain-cjs.cjs'
+        : '../lib/keychain-cjs.cjs');
+      await keychain.prewarmSecrets?.();
+    } catch {
+      // Prewarm is opportunistic; the runtime still warms on its own path.
+    }
+  })();
+}
+
 const TOOL_APPROVAL_TIMEOUT_MS = (() => {
   const value = Number(process.env.MIXDOG_TOOL_APPROVAL_TIMEOUT_MS);
   return Number.isFinite(value) && value > 0 ? Math.max(1000, Math.round(value)) : 120_000;
@@ -161,7 +199,7 @@ export async function createEngineSession({
   process.env.MIXDOG_PATCH_NATIVE_PREWARM ??= '0';
 
   const importStartedAt = performance.now();
-  const { createMixdogSessionRuntime } = await import(SESSION_RUNTIME_MODULE);
+  const { createMixdogSessionRuntime } = await importSessionRuntimeModule();
   bootProfile('session-runtime:imported', { ms: (performance.now() - importStartedAt).toFixed(1) });
   const runtime = await createMixdogSessionRuntime({
     provider: providerName,