[rdself]

Summary

• Separate automatic model discovery from user-managed custom model imports.
• Keep auto-sync results in the synced available-model cache instead of mirroring them into custom models.
• Preserve manual and explicitly imported models while cleaning legacy auto-sync entries from custom models.
• Fall back to in-process model discovery when the internal /models self-fetch fails, covering local/Electron port mismatch cases.

Root Cause

The sync path used the same imported-model write path for automatic discovery and manual imports, so remote /models results were stored in both Available Models and Custom Models. The manual import route also depended on a server-side HTTP request back to the local app, which can fail when the app is running on a different local origin or packaged desktop port.

Validation

• node --import tsx/esm --test tests/unit/model-sync-route.test.ts
• node --import tsx/esm --test tests/unit/provider-models-route.test.ts tests/unit/db-models-crud.test.ts
• npm run typecheck:core
• npm run lint
• pre-push hook: npm run test:unit

[gemini-code-assist]

Code Review

This pull request refactors the model synchronization process by introducing a fallback mechanism for internal model fetching and improving the distinction between 'sync' and 'merge' modes. Key changes include the addition of fetchProviderModelsForSync in the API route to handle in-process discovery if the self-fetch fails, and updates to importManagedModels for more accurate tracking of synced available models and aliases. Unit tests were also updated to validate the new fallback logic and reporting. I have no feedback to provide.

[Copilot]

Pull request overview

This PR fixes model sync/import behavior by separating automatic model discovery (stored in the per-connection “synced available models” cache) from user-managed custom models, while also improving resilience when the sync route can’t self-fetch /models due to local origin/port mismatches (e.g., Electron).

Changes:

• Stop mirroring auto-discovered /models results into custom models; keep them in syncedAvailableModels and clean legacy sync entries out of custom models.
• Standardize “synced/imported” source handling by normalizing historical values (api-sync/auto-sync) to imported across DB normalization + UI labeling/search.
• Add a fallback path in /sync-models to call the provider models route in-process when the internal self-fetch fails.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
tests/unit/provider-models-route.test.ts	Updates expectations for cached discovery source (imported).
tests/unit/models-catalog-route.test.ts	Updates catalog fixtures to use imported source.
tests/unit/model-sync-route.test.ts	Aligns sync behavior/response expectations with new storage model; adds in-process fallback test.
tests/unit/model-catalog-source.test.ts	Updates source normalization + labels to “Imported”.
tests/unit/model-catalog-search.test.ts	Updates search normalization/labels for the new imported source.
tests/unit/db-models-crud.test.ts	Adjusts synced-available-model CRUD tests for imported source.
src/shared/utils/modelCatalogSearch.ts	Replaces api-sync with imported in source normalization and user-facing label.
src/shared/components/ModelSelectModal.tsx	Uses normalized source to label custom vs imported entries consistently.
src/lib/providerModels/modelDiscovery.ts	Stores discovered models with source: "imported".
src/lib/providerModels/managedModelImport.ts	Moves discovery into synced-available cache, removes upstream-discovered rows from custom models, preserves compat overrides.
src/lib/db/models.ts	Normalizes synced-available-model rows on read/write; updates SyncedAvailableModel.source to imported.
src/lib/combos/builderOptions.ts	Updates model source priority/normalization to prefer imported.
src/app/api/v1beta/models/route.ts	Adds non-Gemini synced-available models into the Gemini-compatible /v1beta/models response.
src/app/api/providers/[id]/sync-models/route.ts	Adds in-process fallback for internal /models fetch; logs changes for available + custom model cleanup.
src/app/api/pricing/models/route.ts	Includes synced-available models as a catalog source alongside manual custom models.
src/app/(dashboard)/dashboard/providers/[id]/page.tsx	Updates UI source labeling/styling and reload behavior based on combined change counts.

Comments suppressed due to low confidence (1)

src/app/api/providers/[id]/sync-models/route.ts:208

• modelsRes.json() is awaited before checking modelsRes.ok, and without a fallback for non-JSON error bodies. If the internal /models self-fetch (or the in-process fallback) returns a non-JSON response (e.g. HTML error page, proxy error, empty body), this will throw and the handler will fall into the generic 500 path, losing the upstream status/details. Consider guarding JSON parsing (e.g., try JSON then fall back to text()), and still returning/logging modelsRes.status when the HTTP request itself succeeded but the body is invalid.

    const modelsRes = await fetchProviderModelsForSync(request, id);

    const duration = Date.now() - start;
    const modelsData = await modelsRes.json();

[Copilot]

This handler dedupes synced models via existingNames, but custom models added later in the function don't consult the same set. That can produce duplicate models/<provider>/<id> entries when a user adds a custom model that matches an existing built-in/synced model. Consider reusing existingNames when appending custom models (skip if already present) to keep returned models[].name unique.