Preserve provider instance fallback ids

Author: lintowe

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -13,6 +13,7 @@ import * as DesktopClientSettings from "./DesktopClientSettings.ts";
 
 const clientSettings: ClientSettings = {
   autoOpenPlanSidebar: false,
+  codexUsageIndicatorMode: "five-hour",
   confirmThreadArchive: true,
   confirmThreadDelete: false,
   dismissedProviderUpdateNotificationKeys: [],

apps/web/src/components/ChatView.tsx

@@ -1294,6 +1294,10 @@ export default function ChatView(props: ChatViewProps) {
       selectedProvider,
       lockedProvider,
       lockedContinuationGroupKey,
+      fallbackInstanceIds: [
+        activeThread?.modelSelection.instanceId,
+        activeProject?.defaultModelSelection?.instanceId,
+      ],
     });
     const selectedEntry = providerInstanceEntries.find(
       (entry) => entry.instanceId === selectedInstanceId,

apps/web/src/components/chat/ChatComposer.tsx

@@ -635,6 +635,10 @@ export const ChatComposer = memo(
         selectedProvider,
         lockedProvider,
         lockedContinuationGroupKey,
+        fallbackInstanceIds: [
+          activeThreadModelSelection?.instanceId,
+          activeProjectDefaultModelSelection?.instanceId,
+        ],
       });
     }, [
       activeProjectDefaultModelSelection?.instanceId,

apps/web/src/providerInstances.test.ts

@@ -149,4 +149,54 @@ describe("resolveSelectedProviderInstanceId", () => {
       }),
     ).toBe("codex");
   });
+
+  it("keeps persisted model selections as the last fallback before codex", () => {
+    const persistedInstanceId = ProviderInstanceId.make("codex_saved");
+
+    expect(
+      resolveSelectedProviderInstanceId({
+        entries: [],
+        candidates: [null],
+        selectedProvider: ProviderDriverKind.make("codex"),
+        fallbackInstanceIds: [persistedInstanceId],
+      }),
+    ).toBe(persistedInstanceId);
+  });
+
+  it("falls back instead of returning a disabled explicit selection", () => {
+    const providers = [
+      provider({
+        provider: ProviderDriverKind.make("codex"),
+        instanceId: "codex_disabled",
+        enabled: false,
+      }),
+      provider({ provider: ProviderDriverKind.make("codex"), instanceId: "codex" }),
+    ];
+    const entries = deriveProviderInstanceEntries(providers);
+
+    expect(
+      resolveSelectedProviderInstanceId({
+        entries,
+        candidates: [ProviderInstanceId.make("codex_disabled")],
+        selectedProvider: ProviderDriverKind.make("codex"),
+      }),
+    ).toBe("codex");
+  });
+
+  it("falls back instead of returning an explicit selection outside a lock", () => {
+    const providers = [
+      provider({ provider: ProviderDriverKind.make("claudeAgent"), instanceId: "claudeAgent" }),
+      provider({ provider: ProviderDriverKind.make("codex"), instanceId: "codex" }),
+    ];
+    const entries = deriveProviderInstanceEntries(providers);
+
+    expect(
+      resolveSelectedProviderInstanceId({
+        entries,
+        candidates: [ProviderInstanceId.make("claudeAgent")],
+        selectedProvider: ProviderDriverKind.make("claudeAgent"),
+        lockedProvider: ProviderDriverKind.make("codex"),
+      }),
+    ).toBe("codex");
+  });
 });

apps/web/src/providerInstances.ts

@@ -190,10 +190,10 @@ export function resolveSelectedProviderInstanceId(input: {
   selectedProvider: ProviderDriverKind;
   lockedProvider?: ProviderDriverKind | null | undefined;
   lockedContinuationGroupKey?: string | null | undefined;
+  fallbackInstanceIds?: ReadonlyArray<ProviderInstanceId | null | undefined>;
 }): ProviderInstanceId {
   const lockedProvider = input.lockedProvider ?? null;
   const lockedContinuationGroupKey = input.lockedContinuationGroupKey ?? null;
-  const explicitSelection = input.candidates.find((candidate) => candidate != null);
 
   for (const candidate of input.candidates) {
     if (!candidate) continue;
@@ -206,10 +206,6 @@ export function resolveSelectedProviderInstanceId(input: {
     return match.instanceId;
   }
 
-  if (explicitSelection) {
-    return ProviderInstanceId.make(explicitSelection);
-  }
-
   const fallbackProvider = lockedProvider ?? input.selectedProvider;
   const byKind = input.entries.find(
     (entry) =>
@@ -220,7 +216,14 @@ export function resolveSelectedProviderInstanceId(input: {
   if (byKind) return byKind.instanceId;
 
   const anyEnabled = input.entries.find((entry) => entry.enabled);
-  return anyEnabled?.instanceId ?? input.entries[0]?.instanceId ?? ProviderInstanceId.make("codex");
+  const fallbackSelection = input.fallbackInstanceIds?.find((instanceId) => instanceId != null);
+  return (
+    anyEnabled?.instanceId ??
+    input.entries[0]?.instanceId ??
+    (fallbackSelection
+      ? ProviderInstanceId.make(fallbackSelection)
+      : ProviderInstanceId.make("codex"))
+  );
 }
 
 /**