Merge pull request #2 from ScriptedAlchemy/codex/provider-reliability-root-causes

fix(providers): recover update failures and preserve PR watches

Author: ScriptedAlchemy

apps/mobile/src/features/threads/ThreadSettingsSheet.tsx

@@ -55,8 +55,9 @@ import { ProviderIcon } from "../../components/ProviderIcon";
 import { ThemedSwitch } from "../../components/ui/ThemedSwitch";
 import { cn } from "../../lib/cn";
 import {
+  buildProviderUpdateRequiredGroups,
   buildModelOptions,
-  groupByProvider,
+  groupModelOptionsWithProviderNotices,
   type ModelOption,
   type ProviderGroup,
 } from "../../lib/modelOptions";
@@ -95,11 +96,10 @@ import {
 } from "./thread-settings-options";
 import {
   canCommitPendingModel,
-  favoritesFirst,
   modelFavoriteKey,
-  modelMatchesCatalogQuery,
   pendingModelAfterPress,
   providerSectionIsCollapsed,
+  visibleModelsForCatalog,
 } from "./thread-settings-sheet-state";
 import { formatProviderUpdateRequiredNotice } from "@t3tools/client-runtime/providerUpdateRequiredModels";
 
@@ -358,19 +358,26 @@ function ThreadSettingsSessionProvider(
     new Map<string, { favorite: boolean; settings: ServerSettings; pending: boolean }>(),
   );
   const [pendingHiddenKeys, setPendingHiddenKeys] = useState<ReadonlySet<string>>(() => new Set());
-  const providerGroups =
+  const modelOptions =
     manageHidden && config
-      ? groupByProvider(
-          buildModelOptions(
-            config,
-            props.selectedModel,
-            props.lockedProviderInstanceId,
-            props.projectId,
-            "composer",
-            true,
-          ),
+      ? buildModelOptions(
+          config,
+          props.selectedModel,
+          props.lockedProviderInstanceId,
+          props.projectId,
+          "composer",
+          true,
         )
-      : props.providerGroups;
+      : props.providerGroups.flatMap((group) => group.models);
+  const providerGroups = groupModelOptionsWithProviderNotices(
+    modelOptions,
+    buildProviderUpdateRequiredGroups(
+      config,
+      props.lockedProviderInstanceId,
+      props.projectId,
+      "composer",
+    ),
+  );
   const legacyFavorites = AsyncResult.isSuccess(preferences)
     ? (preferences.value.modelFavorites ?? EMPTY_MODEL_FAVORITES)
     : EMPTY_MODEL_FAVORITES;
@@ -762,29 +769,18 @@ function buildThreadSettingsCatalogItems(
     ) {
       return [];
     }
-    const driver = group.models[0]?.providerDriver ?? group.providerKey;
-    const catalogModels =
-      session.manageHidden ||
-      session.showLegacy ||
-      session.providerFilter === FAVORITES_PROVIDER_FILTER
-        ? group.models
-        : group.models.filter(
-            (model) =>
-              !model.isLegacy || session.isDisplayed(model) || session.favoriteKeys.has(model.key),
-          );
-    const visibleModels = favoritesFirst(
-      catalogModels.filter(
-        (model) =>
-          (session.providerFilter !== FAVORITES_PROVIDER_FILTER ||
-            session.favoriteKeys.has(model.key)) &&
-          modelMatchesCatalogQuery({
-            model,
-            providerLabel: group.providerLabel,
-            query: session.searchQuery,
-          }),
-      ),
-      session.favoriteKeys,
-    );
+    const driver =
+      group.models[0]?.providerDriver ?? group.updateRequired?.driver ?? group.providerKey;
+    const visibleModels = visibleModelsForCatalog({
+      models: group.models,
+      providerLabel: group.providerLabel,
+      query: session.searchQuery,
+      manageHidden: session.manageHidden,
+      showLegacy: session.showLegacy,
+      favoritesOnly: session.providerFilter === FAVORITES_PROVIDER_FILTER,
+      favoriteKeys: session.favoriteKeys,
+      isDisplayed: session.isDisplayed,
+    });
     const updateRequiredNotice =
       group.updateRequired && session.providerFilter !== FAVORITES_PROVIDER_FILTER
         ? formatProviderUpdateRequiredNotice(group.updateRequired, session.searchQuery)
@@ -797,7 +793,10 @@ function buildThreadSettingsCatalogItems(
     const isNarrowed = session.providerFilter !== null || session.searchQuery.trim().length > 0;
     const collapsible = !isNarrowed;
     const collapsed = providerSectionIsCollapsed({
-      defaultExpanded: isPrimary || containsAppliedSelection,
+      defaultExpanded:
+        isPrimary ||
+        containsAppliedSelection ||
+        (visibleModels.length === 0 && updateRequiredNotice !== null),
       hasExpansionOverride: session.providerExpansionOverrides.has(group.providerKey),
       isNarrowed,
     });

apps/mobile/src/features/threads/thread-settings-sheet-state.test.ts

@@ -11,7 +11,11 @@ import {
   rememberModelOptions,
   withRememberedModelOptions,
 } from "../../state/use-model-option-memory";
-import { canCommitPendingModel, pendingModelAfterPress } from "./thread-settings-sheet-state";
+import {
+  canCommitPendingModel,
+  pendingModelAfterPress,
+  visibleModelsForCatalog,
+} from "./thread-settings-sheet-state";
 
 function modelOption(
   model: string,
@@ -69,6 +73,23 @@ afterEach(() => {
 });
 
 describe("thread settings sheet state", () => {
+  it("includes a matching legacy model in search while legacy models are hidden", () => {
+    const legacyModel = { ...modelOption("gpt-5.4"), isLegacy: true };
+
+    expect(
+      visibleModelsForCatalog({
+        models: [legacyModel],
+        providerLabel: "Codex",
+        query: "gpt-5.4",
+        manageHidden: false,
+        showLegacy: false,
+        favoritesOnly: false,
+        favoriteKeys: new Set(),
+        isDisplayed: () => false,
+      }),
+    ).toEqual([legacyModel]);
+  });
+
   it("preserves in-progress edits when the staged model is pressed again", () => {
     rememberModelOptions("codex", "gpt-next", [{ id: "effort", value: "medium" }]);
     const pending = modelOption("gpt-next", [{ id: "effort", value: "high" }]);

apps/mobile/src/features/threads/thread-settings-sheet-state.ts

@@ -35,6 +35,38 @@ export function modelMatchesCatalogQuery(input: {
   ].some((value) => value.toLocaleLowerCase().includes(query));
 }
 
+export function visibleModelsForCatalog(input: {
+  readonly models: ReadonlyArray<ModelOption>;
+  readonly providerLabel: string;
+  readonly query: string;
+  readonly manageHidden: boolean;
+  readonly showLegacy: boolean;
+  readonly favoritesOnly: boolean;
+  readonly favoriteKeys: ReadonlySet<string>;
+  readonly isDisplayed: (model: ModelOption) => boolean;
+}): ReadonlyArray<ModelOption> {
+  const catalogModels =
+    input.manageHidden || input.showLegacy || input.favoritesOnly || input.query.trim().length > 0
+      ? input.models
+      : input.models.filter(
+          (model) =>
+            !model.isLegacy || input.isDisplayed(model) || input.favoriteKeys.has(model.key),
+        );
+
+  return favoritesFirst(
+    catalogModels.filter(
+      (model) =>
+        (!input.favoritesOnly || input.favoriteKeys.has(model.key)) &&
+        modelMatchesCatalogQuery({
+          model,
+          providerLabel: input.providerLabel,
+          query: input.query,
+        }),
+    ),
+    input.favoriteKeys,
+  );
+}
+
 export function pendingModelAfterPress(input: {
   readonly current: ModelOption | null;
   readonly pressed: ModelOption;

apps/mobile/src/lib/modelOptions.test.ts

@@ -11,9 +11,11 @@ import {
 } from "@t3tools/contracts";
 
 import {
+  buildProviderUpdateRequiredGroups,
   buildModelOptions,
   describeUnavailableModelSelection,
   groupByProvider,
+  groupModelOptionsWithProviderNotices,
   isModelSelectionUnavailable,
   resolveDefaultableModelSelection,
   resolveNewTaskModelSelection,
@@ -22,6 +24,45 @@ import {
 } from "./modelOptions";
 
 describe("mobile model options", () => {
+  it("keeps provider update notices when no model rows are visible", () => {
+    const updateRequiredModels = [
+      {
+        slug: "claude-next",
+        name: "Claude Next",
+        minVersion: "2.0.0",
+      },
+    ];
+    const config = {
+      providers: [
+        {
+          instanceId: "claudeAgent_work",
+          driver: "claudeAgent",
+          displayName: "Claude Work",
+          enabled: true,
+          installed: true,
+          auth: { status: "authenticated" },
+          models: [],
+          updateRequiredModels,
+        },
+      ],
+    } as unknown as ServerConfig;
+    const options = buildModelOptions(config, null, undefined, null, "composer");
+    const providerNotices = buildProviderUpdateRequiredGroups(config, undefined, null, "composer");
+
+    expect(options).toEqual([]);
+    expect(groupModelOptionsWithProviderNotices(options, providerNotices)).toEqual([
+      {
+        providerKey: "claudeAgent_work",
+        providerLabel: "Claude Work",
+        models: [],
+        updateRequired: {
+          driver: "claudeAgent",
+          updateRequiredModels,
+        },
+      },
+    ]);
+  });
+
   it("distinguishes same-name OpenCode models without changing their routing", () => {
     const sources = [
       { id: "anthropic", label: "Anthropic" },