@golba98/codexa 1.0.4 → 1.0.6

package/README.md

@@ -577,7 +577,7 @@ npm install -g @golba98/codexa@latest
 
 ### Update notice does not appear
 
-Codexa checks for updates on startup and caches the result for 6 hours (stored in `~/.codexa-update-check.json`). The update notice only appears when the npm registry `latest` version is newer than the running version.
+Codexa checks npm for updates on every interactive startup. The local cache at `~/.codexa-update-check.json` is only used as a best-effort fallback if npm is temporarily unavailable. The update notice appears when the npm registry `latest` version is newer than the running version.
 
 Published npm versions are immutable. Versions before the fixed update checker may not show update notices even when a newer package exists. If in doubt, update directly:
 
@@ -588,9 +588,8 @@ npm install -g @golba98/codexa@latest
 If you expect a notice but don't see one:
 
 1. Check the current registry state: `npm view @golba98/codexa dist-tags --json`
-2. Clear the cache to force a fresh check: delete `~/.codexa-update-check.json`, then restart Codexa
-3. Force an explicit check in-app: `/update check`
-4. Update checks are disabled for local dev builds (`codexa-dev` / `cxd`)
+2. Force an explicit check in-app: `/update check`
+3. Update checks are disabled for local dev builds (`codexa-dev` / `cxd`)
 
 | Symptom | Fix |
 |---------|-----|
@@ -606,11 +605,8 @@ If you expect a notice but don't see one:
 
 See [CHANGELOG.md](CHANGELOG.md) for the full release history.
 
-**Current release: v1.0.4**
+**Current release: v1.0.6**
 
-v1.0.4 is an update-notice reliability fix:
-- Older installed versions can detect when npm `latest` is newer
-- `/update check` bypasses stale cache and reports a useful status
-- Failed registry lookups do not get cached as “up to date”
+v1.0.6 checks npm on every interactive startup and shows an update prompt as soon as Codexa is idle. The prompt offers the correct update command for the package manager that installed Codexa.
 
-> Versions before the fixed update checker may not show update notices. Update directly with `npm install -g @golba98/codexa@latest`.
+> Versions before v1.0.6 can wait for a cached result before discovering a new npm release. Update directly with `npm install -g @golba98/codexa@latest` if needed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@golba98/codexa",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Terminal UI for Codexa — TypeScript + Bun + Ink",
   "type": "module",
   "bin": {

package/src/app.tsx

@@ -15,12 +15,13 @@ function normalizeRuntimeAvailability(value: unknown): RuntimeAvailability {
   return "unknown";
 }
 
-function formatRuntimeProviderLabel(providerId: ProviderId): string {
-  if (providerId === "local") return "Local";
-  if (providerId === "google") return "Google";
-  if (providerId === "anthropic") return "Anthropic";
-  if (providerId === "antigravity") return "Antigravity";
-  return "OpenAI";
+function formatRuntimeProviderLabel(providerId: ProviderId): string {
+  if (providerId === "local") return "Local";
+  if (providerId === "google") return "Google";
+  if (providerId === "anthropic") return "Anthropic";
+  if (providerId === "mistral") return "Mistral Vibe CLI";
+  if (providerId === "antigravity") return "Antigravity";
+  return "OpenAI";
 }
 
 function readDiagnosticString(
@@ -131,6 +132,7 @@ import {
   normalizeReasoningForModelCapabilities,
   type CodexModelCapabilities,
 } from "./core/models/codexModelCapabilities.js";
+import { loadSeededCodexCapabilities } from "./core/models/codexModelsCacheSeed.js";
 import {
   buildDevLaunchNotice,
   buildWorkspaceCommandContext,
@@ -171,11 +173,18 @@ import {
   getProviderRuntime,
   isProviderRouteConfigured,
   isProviderRoutableInCodexa,
+  persistProviderDiscovery,
   resolveActiveProviderRoute,
   validateProviderRouteActivation,
 } from "./core/providerRuntime/registry.js";
 import { hasGeminiApiKey, runGeminiDiagnostics } from "./core/providerRuntime/gemini.js";
 import { checkLocalProvider, runLocalDiagnostics, setLocalProviderConfig } from "./core/providerRuntime/local.js";
+import {
+  detectVibeActiveModel,
+  launchMistralVibeCli,
+  resetMistralVibeSession,
+  resolveVibeExecutable,
+} from "./core/providerRuntime/mistralVibe.js";
 import { validateAnthropicRoute, ANTHROPIC_ROUTE_SETUP_MESSAGE } from "./core/providerRuntime/anthropic.js";
 import { providerModelsToCodexCapabilities } from "./core/providerRuntime/models.js";
 import {
@@ -229,25 +238,25 @@ import {
   submitPlanFeedback,
   type PlanFlowState,
 } from "./session/planFlow.js";
-import { AuthPanel } from "./ui/AuthPanel.js";
-import { BackendPicker } from "./ui/BackendPicker.js";
-import { measureBottomComposerRows, MemoizedBottomComposer } from "./ui/BottomComposer.js";
+import { AuthPanel } from "./ui/panels/AuthPanel.js";
+import { BackendPicker } from "./ui/panels/BackendPicker.js";
+import { measureBottomComposerRows, MemoizedBottomComposer } from "./ui/chrome/BottomComposer.js";
 import { resolveStartupHeaderMode, useTerminalViewport } from "./ui/layout.js";
-import { ModelPickerScreen } from "./ui/ModelPickerScreen.js";
-import { ModePicker } from "./ui/ModePicker.js";
-import { PlanActionPicker, type PlanActionValue, measurePlanActionPickerRows } from "./ui/PlanActionPicker.js";
-import { PermissionsPanel, type PermissionsPanelAction } from "./ui/PermissionsPanel.js";
-import { ProviderPicker } from "./ui/ProviderPicker.js";
-import { ReasoningPicker } from "./ui/ReasoningPicker.js";
-import { AttachmentImportPanel, type PendingImportFile } from "./ui/AttachmentImportPanel.js";
-import { SelectionPanel } from "./ui/SelectionPanel.js";
-import { SettingsPanel } from "./ui/SettingsPanel.js";
-import { UpdatePromptPanel } from "./ui/UpdatePromptPanel.js";
-import { measureTextEntryPanelRows, TextEntryPanel } from "./ui/TextEntryPanel.js";
-import { ThemePicker } from "./ui/ThemePicker.js";
-import { getFocusTargetForScreen, FOCUS_IDS } from "./ui/focus.js";
+import { ModelPickerScreen } from "./ui/panels/ModelPickerScreen.js";
+import { ModePicker } from "./ui/panels/ModePicker.js";
+import { PlanActionPicker, type PlanActionValue, measurePlanActionPickerRows } from "./ui/panels/PlanActionPicker.js";
+import { PermissionsPanel, type PermissionsPanelAction } from "./ui/panels/PermissionsPanel.js";
+import { ProviderPicker } from "./ui/panels/ProviderPicker.js";
+import { ReasoningPicker } from "./ui/panels/ReasoningPicker.js";
+import { AttachmentImportPanel, type PendingImportFile } from "./ui/panels/AttachmentImportPanel.js";
+import { SelectionPanel } from "./ui/panels/SelectionPanel.js";
+import { SettingsPanel } from "./ui/panels/SettingsPanel.js";
+import { UpdatePromptPanel } from "./ui/panels/UpdatePromptPanel.js";
+import { measureTextEntryPanelRows, TextEntryPanel } from "./ui/panels/TextEntryPanel.js";
+import { ThemePicker } from "./ui/panels/ThemePicker.js";
+import { getFocusTargetForScreen, FOCUS_IDS } from "./ui/input/focus.js";
 import { ThemeProvider, THEMES } from "./ui/theme.js";
-import { buildActiveRuntimeDisplay, runtimeDisplayToSummary } from "./ui/runtimeDisplay.js";
+import { buildActiveRuntimeDisplay, runtimeDisplayToSummary } from "./ui/render/runtimeDisplay.js";
 import {
   cancelThemeSelection,
   commitThemeSelection,
@@ -257,13 +266,14 @@ import {
   type ThemeSelectionState,
 } from "./ui/themeFlow.js";
 import { isBusy as isUiBusy } from "./session/types.js";
-import { AppShell } from "./ui/AppShell.js";
-import { TranscriptShell } from "./ui/TranscriptShell.js";
-import type { RuntimeAvailability } from "./ui/RuntimeStatusBar.js";
+import { AppShell } from "./ui/chrome/AppShell.js";
+import { TranscriptShell } from "./ui/timeline/TranscriptShell.js";
+import type { RuntimeAvailability } from "./ui/chrome/RuntimeStatusBar.js";
 import { checkForUpdates, formatLocalDevUpdateStatus, formatUpdateInstructions, shouldRunStartupUpdateCheck, type UpdateCheckResult } from "./core/version/updateCheck.js";
+import { detectGlobalPackageManager, getUpdateCommand } from "./core/version/packageManager.js";
 import { isLocalDevChannel } from "./core/version/channel.js";
 import {
-  isCacheValid,
+  isCacheForRunningVersion,
   loadUpdateCheckCache,
   saveUpdateCheckCache,
 } from "./config/updateCheckCache.js";
@@ -319,7 +329,7 @@ function createProviderMigrationNoticeEvent(
     createdAt: Date.now(),
     title: sanitizeTerminalOutput("Provider migrated"),
     content: sanitizeTerminalOutput(
-      `${formatRuntimeProviderLabel(notice.deprecatedProviderId as ProviderId)} provider is no longer supported. Reverted to ${resolvedProviderLabel}.`,
+      `${formatRuntimeProviderLabel(notice.deprecatedProviderId as ProviderId)} provider is no longer supported. Reverted to ${resolvedProviderLabel}.`,
       { preserveTabs: false, tabSize: 2 },
     ),
   };
@@ -385,9 +395,6 @@ export function App({ launchArgs }: AppProps) {
     ? projectInstructionsLoad.instructions
     : null;
   const initialSettings = useRef(loadSettings());
-  const skippedUpdateVersionRef = useRef<string | null>(
-    initialSettings.current.updateCheck.skippedUpdateVersion ?? null,
-  );
   const initialProviderWorkspaceConfig = useRef<ProviderWorkspaceConfig>(loadProviderWorkspaceConfig(workspaceRoot));
   const initialLayeredConfig = useRef<LayeredConfigResult | null>(null);
   if (initialLayeredConfig.current === null) {
@@ -483,8 +490,14 @@ export function App({ launchArgs }: AppProps) {
   const [authStatusBusy, setAuthStatusBusy] = useState(false);
   // Running character total across the conversation — used to estimate token usage
   const [conversationChars, setConversationChars] = useState(0);
-  const [modelCapabilities, setModelCapabilities] = useState<CodexModelCapabilities | null>(null);
+  // Seeded synchronously from local caches (codex's models_cache.json or the
+  // persisted last-good discovery) so the model picker opens instantly with
+  // real models; live discovery replaces this in the background.
+  const [modelCapabilities, setModelCapabilities] = useState<CodexModelCapabilities | null>(() => loadSeededCodexCapabilities());
   const [modelCapabilitiesBusy, setModelCapabilitiesBusy] = useState(false);
+  // True while a provider route switch is validating (subprocess probes);
+  // drives the model picker's loading state for non-openai providers.
+  const [routeSwitchBusy, setRouteSwitchBusy] = useState(false);
   const [activeContextMetadata, setActiveContextMetadata] = useState<ModelContextMetadata | null>(null);
   const { stdout } = useStdout();
   const { stdin } = useStdin();
@@ -535,6 +548,9 @@ export function App({ launchArgs }: AppProps) {
   const [planFlow, setPlanFlow] = useState<PlanFlowState>(createInitialPlanFlowState);
   const [initialRevisionText, setInitialRevisionText] = useState("");
   const [updateCheckResult, setUpdateCheckResult] = useState<UpdateCheckResult | null>(null);
+  const [startupUpdateDismissed, setStartupUpdateDismissed] = useState(false);
+  // Launcher path is fixed for the process lifetime, so detect once.
+  const globalPackageManager = useMemo(() => detectGlobalPackageManager(), []);
   // Transcript mode leaves mouse reporting off so wheel/trackpad input scrolls
   // the terminal emulator's native scrollback instead of an in-app viewport.
   const mouseCapture = (mouseOverride ?? (terminalMouseMode === "wheel")) && !isMouseIdle;
@@ -658,6 +674,7 @@ export function App({ launchArgs }: AppProps) {
       setLocalProviderConfig(providerWorkspaceConfig.providers?.local);
       return buildProviderRegistry({
         activeModel: model,
+        workspaceRoot,
         workspaceConfig: providerWorkspaceConfig,
         diagnostics: providerDiagnosticsRef.current,
         routeErrors: providerRouteErrorsRef.current,
@@ -667,7 +684,7 @@ export function App({ launchArgs }: AppProps) {
     // updates mutate providerDiagnosticsRef/providerRouteErrorsRef (refs, not state)
     // and then increment the nonce to trigger a re-read of those refs.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [model, providerWorkspaceConfig, registryNonce],
+    [model, providerWorkspaceConfig, registryNonce, workspaceRoot],
   );
   const workspaceDefaultProvider = useMemo(
     () => providerRegistry.find((provider) => provider.isDefault) ?? providerRegistry[0] ?? null,
@@ -717,7 +734,10 @@ export function App({ launchArgs }: AppProps) {
   const modelPickerDiscovery = useMemo(() => {
     if (modelPickerProviderId === "openai") return null;
     return discoverProviderModels(modelPickerProviderId);
-  }, [modelPickerProviderId]);
+    // registryNonce is intentionally included: route validation discovers models
+    // as a side effect and bumps the nonce so an open picker re-reads them.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [modelPickerProviderId, registryNonce]);
   const providerModelCapabilities = useMemo(() => {
     if (!modelPickerDiscovery) return null;
     return providerModelsToCodexCapabilities(modelPickerDiscovery.models, activeProviderRoute.modelId);
@@ -1568,6 +1588,9 @@ export function App({ launchArgs }: AppProps) {
           providerRouteErrorsRef.current["anthropic"] = result.message ?? ANTHROPIC_ROUTE_SETUP_MESSAGE;
         } else {
           delete providerRouteErrorsRef.current["anthropic"];
+          // Persist the freshly discovered catalog so newly released Claude
+          // models replace the stale on-disk cache without a manual refresh.
+          persistProviderDiscovery(discoverProviderModels("anthropic"));
         }
       } catch {
         // Best-effort probe — failures are surfaced only when the user activates the route.
@@ -1603,54 +1626,53 @@ export function App({ launchArgs }: AppProps) {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [workspaceRoot]);
 
-  // Non-blocking background update check — runs once at startup.
+  // Non-blocking background update check — fetches npm on every interactive startup.
   useEffect(() => {
     const ucSettings = initialSettings.current.updateCheck ?? DEFAULT_UPDATE_CHECK_SETTINGS;
     if (!shouldRunStartupUpdateCheck(process.env, ucSettings.enabled)) return;
 
-    const timer = setTimeout(() => {
-      void (async () => {
-        try {
-          const cache = loadUpdateCheckCache();
-          if (cache && isCacheValid(cache, ucSettings.intervalHours, APP_VERSION)) {
-            if (cache.updateAvailable && cache.latestVersion) {
-              setUpdateCheckResult({
-                status: "update-available",
-                currentVersion: cache.currentVersion,
-                latestVersion: cache.latestVersion,
-                checkedAt: cache.lastChecked,
-              });
-              if (cache.latestVersion !== skippedUpdateVersionRef.current) {
-                setScreen("update-prompt");
-              }
-            }
-            return;
-          }
-          const result = await checkForUpdates({ enabled: true });
-          if (result.status !== "error") {
-            setUpdateCheckResult(result);
-            saveUpdateCheckCache({
-              lastChecked: result.checkedAt,
-              currentVersion: result.currentVersion,
-              latestVersion: result.latestVersion,
-              updateAvailable: result.status === "update-available",
-            });
-            if (result.status === "update-available" && result.latestVersion) {
-              if (result.latestVersion !== skippedUpdateVersionRef.current) {
-                setScreen("update-prompt");
-              }
-            }
-          }
-        } catch {
-          // Never crash the TUI on a failed update check.
-        }
-      })();
-    }, 2000);
-
-    return () => clearTimeout(timer);
+    void (async () => {
+      const cache = loadUpdateCheckCache();
+      try {
+        const result = await checkForUpdates({ enabled: true });
+        if (result.status === "error") {
+          // A previously confirmed update is still useful when npm is briefly
+          // unreachable, but it must never suppress the next fresh startup check.
+          if (cache?.updateAvailable && cache.latestVersion && isCacheForRunningVersion(cache, APP_VERSION)) {
+            setUpdateCheckResult({
+              status: "update-available",
+              currentVersion: cache.currentVersion,
+              latestVersion: cache.latestVersion,
+              checkedAt: cache.lastChecked,
+              source: "cache",
+            });
+          }
+          return;
+        }
+
+        setUpdateCheckResult(result);
+        saveUpdateCheckCache({
+          lastChecked: result.checkedAt,
+          currentVersion: result.currentVersion,
+          latestVersion: result.latestVersion,
+          updateAvailable: result.status === "update-available",
+        });
+      } catch {
+        // Never crash the TUI on a failed update check.
+      }
+    })();
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  // A startup update prompt must not interrupt an active run or another panel.
+  // Keep the result until the user returns to the idle main screen instead.
+  useEffect(() => {
+    if (startupUpdateDismissed || busy || screen !== "main") return;
+    if (updateCheckResult?.status === "update-available" && updateCheckResult.latestVersion) {
+      setScreen("update-prompt");
+    }
+  }, [busy, screen, startupUpdateDismissed, updateCheckResult]);
+
   // Track clear epoch to suppress stale command result events
   useEffect(() => {
     clearEpochRef.current = sessionState.clearEpoch;
@@ -1993,6 +2015,12 @@ export function App({ launchArgs }: AppProps) {
     }
 
     modelSelectionInFlightRef.current = true;
+    // Reflect the target provider in the model picker immediately: route
+    // validation below can take seconds (subprocess probes), and until it
+    // persists the new active route, modelPickerProviderId would otherwise
+    // keep resolving to the stale route.
+    setPendingRouteProviderId(providerId);
+    setRouteSwitchBusy(true);
     traceInputDebug("model_selection_app_start", getInputDebugSnapshot({
       handler: "setModelAndReasoningWithNotice",
       model: nextModel,
@@ -2062,6 +2090,10 @@ export function App({ launchArgs }: AppProps) {
         model: nextModel,
         reasoningLevel: normalizedReasoning,
       }));
+      if (providerId === "mistral" && activeProviderRoute.providerId !== "mistral") {
+        // Switching to Vibe starts a fresh CLI conversation instead of resuming a stale one.
+        resetMistralVibeSession(workspaceRoot);
+      }
       persistActiveRoute(providerId, nextModel, normalizedReasoning, validation.backendKind, geminiSelection);
       setPendingRouteProviderId(null);
       traceInputDebug("model_selection_app_success", getInputDebugSnapshot({
@@ -2079,8 +2111,10 @@ export function App({ launchArgs }: AppProps) {
         reasoning: nextReasoning,
         error: message,
       }));
+      setPendingRouteProviderId(null);
       appendErrorEvent("Model selection failed", message);
     } finally {
+      setRouteSwitchBusy(false);
       modelSelectionInFlightRef.current = false;
       returnToChatMode("selection");
     }
@@ -2126,32 +2160,10 @@ export function App({ launchArgs }: AppProps) {
   }, [applyWorkspaceDisplayMode, showBusyLoader, terminalMouseMode, terminalTitleMode, workspaceDisplayMode]);
 
   const handleSkipUpdateForSession = useCallback(() => {
+    setStartupUpdateDismissed(true);
     setScreen("main");
   }, []);
 
-  const handleSkipUpdateVersion = useCallback((version: string) => {
-    initialSettings.current.updateCheck = {
-      ...initialSettings.current.updateCheck,
-      skippedUpdateVersion: version,
-    };
-    saveSettings({
-      ui: {
-        layoutStyle: initialSettings.current.ui.layoutStyle,
-        theme: themeSelection.committedTheme,
-        workspaceDisplayMode,
-        terminalTitleMode,
-        showBusyLoader,
-        terminalMouseMode,
-        customTheme,
-      },
-      auth: { preference: authPreference },
-      header: headerConfig,
-      updateCheck: initialSettings.current.updateCheck,
-    });
-    skippedUpdateVersionRef.current = version;
-    setScreen("main");
-  }, [authPreference, customTheme, headerConfig, showBusyLoader, terminalMouseMode, terminalTitleMode, themeSelection.committedTheme, workspaceDisplayMode]);
-
   const setApprovalPolicyWithNotice = useCallback((nextValue: RuntimeApprovalPolicy) => {
     const gate = guardConfigMutation("mode", busy);
     if (!gate.allowed) {
@@ -2269,7 +2281,11 @@ export function App({ launchArgs }: AppProps) {
   }, [appendSystemEvent, busy]);
 
   const openProviderPicker = useCallback(() => {
-    setPendingRouteProviderId(null);
+    // Mid route switch, keep the pending id so initialProviderId highlights
+    // the provider being activated instead of the stale route.
+    if (!modelSelectionInFlightRef.current) {
+      setPendingRouteProviderId(null);
+    }
     const gate = guardConfigMutation("backend", busy);
     if (!gate.allowed) {
       appendSystemEvent("Busy", gate.message ?? "Finish the current run before opening providers.");
@@ -2277,6 +2293,31 @@ export function App({ launchArgs }: AppProps) {
     }
 
     setScreen("provider-picker");
+    providerDiagnosticsRef.current.mistral = {
+      ...providerDiagnosticsRef.current.mistral,
+      selectedModel: detectVibeActiveModel({ cwd: workspaceRoot }).modelId,
+      availabilityStatus: "checking",
+    };
+    void resolveVibeExecutable({ cwd: workspaceRoot }).then((resolvedCommand) => {
+      if (!isMountedRef.current) return;
+      const modelDetection = detectVibeActiveModel({ cwd: workspaceRoot });
+      providerDiagnosticsRef.current.mistral = {
+        resolvedCommand,
+        selectedModel: modelDetection.modelId,
+        modelSource: modelDetection.source,
+        configPath: modelDetection.configPath,
+        availabilityStatus: resolvedCommand ? "available" : "unavailable",
+      };
+      setRegistryNonce((n) => n + 1);
+    }).catch(() => {
+      if (!isMountedRef.current) return;
+      providerDiagnosticsRef.current.mistral = {
+        selectedModel: detectVibeActiveModel({ cwd: workspaceRoot }).modelId,
+        resolvedCommand: null,
+        availabilityStatus: "unavailable",
+      };
+      setRegistryNonce((n) => n + 1);
+    });
     markProviderAvailability("local", "checking", "provider-picker-open");
     void checkLocalProvider({ override: providerWorkspaceConfig.providers?.local }).then((result) => {
       if (!isMountedRef.current) return;
@@ -2290,7 +2331,7 @@ export function App({ launchArgs }: AppProps) {
       }
       setRegistryNonce((n) => n + 1);
     }).catch(() => undefined);
-  }, [appendSystemEvent, busy, markProviderAvailability, providerWorkspaceConfig.providers]);
+  }, [appendSystemEvent, busy, markProviderAvailability, providerWorkspaceConfig.providers, workspaceRoot]);
 
   const setWorkspaceDefaultProviderWithNotice = useCallback((providerId: ProviderId) => {
     const provider = findProvider(providerRegistry, providerId);
@@ -2307,7 +2348,9 @@ export function App({ launchArgs }: AppProps) {
       const routeConfigured = isProviderRouteConfigured(providerId);
       appendSystemEvent(
         "Provider default updated",
-        provider.routeMode === "in-codexa" && routeConfigured
+        provider.routeMode === "launch-only"
+          ? `${provider.displayName} is now the workspace default external CLI. Active chat route remains ${activeRouteProvider?.displayName ?? "OpenAI"} / ${model}.`
+          : provider.routeMode === "in-codexa" && routeConfigured
           ? `${provider.displayName} is now the workspace default provider. Active chat route remains ${activeRouteProvider?.displayName ?? "OpenAI"} / ${model}.`
           : `${provider.displayName} is set as the workspace default, but in-Codexa routing is not configured yet. Active chat route remains ${activeRouteProvider?.displayName ?? "OpenAI"} / ${model}.`,
       );
@@ -2466,6 +2509,7 @@ export function App({ launchArgs }: AppProps) {
             cwd: workspaceRoot,
             localConfig: providerId === "local" ? providerWorkspaceConfig.providers?.local : undefined,
           }).then((discovery) => {
+            persistProviderDiscovery(discovery);
             if (discovery.diagnostics) {
               providerDiagnosticsRef.current[providerId] = discovery.diagnostics as Record<string, string | number | boolean | null>;
             }
@@ -2557,10 +2601,10 @@ export function App({ launchArgs }: AppProps) {
     setScreen("main");
     appendSystemEvent(
       "Provider launch",
-      `Suspending Codexa and launching ${provider.displayName}. Codexa will resume when the external CLI exits.`,
+      `Suspending Codexa and launching ${provider.displayName}${providerId === "mistral" ? ` / ${provider.currentModel}` : ""}. Codexa will resume when the external CLI exits.`,
     );
 
-    void launchProviderCli(provider, {
+    const launchOptions = {
       cwd: workspaceRoot,
       stdin,
       beforeLaunch: () => {
@@ -2570,9 +2614,18 @@ export function App({ launchArgs }: AppProps) {
       afterLaunch: () => {
         terminalControl.setMouseReporting(effectiveMouseCapture, "src/app.tsx:providerLaunch.restoreMouse");
       },
-    }).then((result) => {
+    };
+    const launchPromise = providerId === "mistral"
+      ? launchMistralVibeCli(provider, launchOptions)
+      : launchProviderCli(provider, launchOptions);
+
+    void launchPromise.then((result) => {
       if (!isMountedRef.current) return;
-      appendSystemEvent("Provider launch", result.message);
+      if (providerId === "mistral" && (result.status === "missing-command" || result.status === "spawn-error")) {
+        appendErrorEvent("Mistral Vibe launch failed", result.message);
+      } else {
+        appendSystemEvent("Provider launch", result.message);
+      }
     }).catch((error) => {
       if (!isMountedRef.current) return;
       const message = error instanceof Error ? error.message : "Provider launch failed.";
@@ -2599,7 +2652,11 @@ export function App({ launchArgs }: AppProps) {
   ]);
 
   const openModelPicker = useCallback(() => {
-    setPendingRouteProviderId(null);
+    // While a route switch is validating, keep the pending id so the picker
+    // shows the target provider instead of snapping back to the stale route.
+    if (!modelSelectionInFlightRef.current) {
+      setPendingRouteProviderId(null);
+    }
     traceInputDebug("model_picker_open_request", getInputDebugSnapshot({
       handler: "openModelPicker",
       currentScreen: screen,
@@ -3121,6 +3178,7 @@ export function App({ launchArgs }: AppProps) {
     activeTurnIdRef.current = null;
     activeRunLifecycleRef.current = null;
     activeRunTimingRef.current = null;
+    resetMistralVibeSession(workspaceRoot);
     setPlanFlow(resetPlanFlow());
     renderDebug.traceEvent("terminal", "clearReactStateRequested", {
       clearGeneration,
@@ -3139,7 +3197,7 @@ export function App({ launchArgs }: AppProps) {
         liveInkInstanceResolved: Boolean(inkInstance),
       });
     }
-  }, [cancelActiveRun, clearFrameBoundaryController, inkInstance, launchContext, providerWorkspaceConfig, resetToHomeScreen, sessionState.clearEpoch, stdout.columns, terminalControl]);
+  }, [cancelActiveRun, clearFrameBoundaryController, inkInstance, launchContext, providerWorkspaceConfig, resetToHomeScreen, sessionState.clearEpoch, stdout.columns, terminalControl, workspaceRoot]);
 
   const handleShellExecute = useCallback((command: string) => {
     const safeCommand = sanitizeTerminalInput(command).trim();
@@ -4174,13 +4232,13 @@ export function App({ launchArgs }: AppProps) {
         case "diagnose_providers": {
           const lines: string[] = ["Provider CLI diagnostics:"];
           const diags = providerDiagnosticsRef.current;
-          const providerIds = ["openai", "anthropic", "local", "antigravity"] as const;
-          const labels: Record<string, string> = {
-            openai: "OpenAI/Codex",
-            anthropic: "Anthropic/Claude",
-            local: "Local OpenAI-compatible",
-            antigravity: "Antigravity CLI",
-          };
+          const providerIds = ["openai", "anthropic", "local", "antigravity"] as const;
+          const labels: Record<string, string> = {
+            openai: "OpenAI/Codex",
+            anthropic: "Anthropic/Claude",
+            local: "Local OpenAI-compatible",
+            antigravity: "Antigravity CLI",
+          };
           for (const id of providerIds) {
             const diag = diags[id];
             lines.push(`\n  ${labels[id] ?? id}:`);
@@ -4355,7 +4413,10 @@ export function App({ launchArgs }: AppProps) {
             if (freshResult?.status === "update-available" && freshResult.latestVersion) {
               setScreen("update-prompt");
             } else {
-              appendSystemEvent("Update", formatUpdateInstructions(freshResult));
+              appendSystemEvent(
+                "Update",
+                formatUpdateInstructions(freshResult, getUpdateCommand(globalPackageManager).displayCommand),
+              );
             }
           })();
           return;
@@ -4447,6 +4508,7 @@ export function App({ launchArgs }: AppProps) {
     dispatchSession,
     findUserPromptForTurn,
     focusManager,
+    globalPackageManager,
     handleCopy,
     handleClear,
     handleQuit,
@@ -4671,8 +4733,12 @@ export function App({ launchArgs }: AppProps) {
           clearCount={sessionState.clearCount}
           headerConfig={effectiveHeaderConfig}
           updateAvailable={
-            updateCheckResult?.status === "update-available" && updateCheckResult.latestVersion
-              ? { latestVersion: updateCheckResult.latestVersion, currentVersion: updateCheckResult.currentVersion }
+            screen !== "update-prompt" && updateCheckResult?.status === "update-available" && updateCheckResult.latestVersion
+              ? {
+                latestVersion: updateCheckResult.latestVersion,
+                currentVersion: updateCheckResult.currentVersion,
+                updateCommand: getUpdateCommand(globalPackageManager).displayCommand,
+              }
               : null
           }
           panel={
@@ -4705,7 +4771,8 @@ export function App({ launchArgs }: AppProps) {
                 currentModel={modelPickerCurrentModel}
                 currentReasoning={modelPickerCurrentReasoning}
                 activeProviderLabel={modelPickerProviderLabel}
-                isLoading={modelPickerProviderId === "openai" && modelCapabilitiesBusy && modelPickerModels.length === 0}
+                isLoading={modelPickerModels.length === 0
+                  && ((modelPickerProviderId === "openai" && modelCapabilitiesBusy) || routeSwitchBusy)}
                 emptyMessage={modelPickerEmptyMessage}
                 onSelect={(m, r, geminiSelection) => {
                   if (pendingRouteProviderId && pendingRouteProviderId !== activeProviderRoute.providerId) {
@@ -4929,9 +4996,9 @@ export function App({ launchArgs }: AppProps) {
                 focusId={FOCUS_IDS.updatePrompt}
                 currentVersion={updateCheckResult.currentVersion}
                 latestVersion={updateCheckResult.latestVersion}
-                onSkip={handleSkipUpdateForSession}
-                onSkipUntilNextVersion={handleSkipUpdateVersion}
-              />
+                packageManager={globalPackageManager}
+                onSkip={handleSkipUpdateForSession}
+              />
             )}
             </>
           }