core: refactor provider and model system #5033

thdxr · 2025-12-04T00:19:07Z

Summary

Refactored model ID system to use a target field for provider calls, allowing users to specify alternate model IDs while maintaining internal references
Fixed provider options being overwritten when configured from multiple sources (e.g., custom loaders + user config)

Changed model identification from using model.id to model.target when calling providers, allowing users to specify alternate model IDs while maintaining internal references. This enables more flexible provider configurations and better model mapping.

…idation

…tiple sources

thdxr · 2025-12-04T00:48:58Z

/oc review this for any bugs or gaps

opencode-agent · 2025-12-04T00:49:44Z

Now let me create a comprehensive review document:

PR REVIEW: Core Provider and Model System Refactor

Issues Found

🔴 CRITICAL BUG #1: Missing `target` field usage in `fromModelsDevModel`

Location: packages/opencode/src/provider/provider.ts:383

function fromModelsDevModel(provider: ModelsDev.Provider, model: ModelsDev.Model): Model {
  return {
    id: model.id,
    // ...
    api: {
      id: model.id,  // ❌ WRONG - should use model.target

Problem: The target field in ModelsDev.Model represents the actual model ID to send to the provider API (e.g., "claude-sonnet-4-20250514"), while id is the user-facing name. By using model.id instead of model.target, the system will send the wrong model ID to API calls.

Expected:

api: {
  id: model.target,  // ✅ Use the actual API model ID

🔴 CRITICAL BUG #2: Config model `api.id` doesn't respect `target` field

Location: packages/opencode/src/provider/provider.ts:516

const parsedModel: Model = {
  id: modelID,
  api: {
    id: model.id ?? existing?.api.id ?? modelID,  // ❌ Missing model.target

Problem: When users configure custom model overrides, the code doesn't check for a target field to override the API ID. If a model has id (user-facing) and target (API facing), it should prefer target for the API call.

Expected:

id: model.target ?? model.id ?? existing?.api.id ?? modelID,  // ✅ Check target first

🟡 BUG #3: Final model.api.id assignment missing target logic

Location: packages/opencode/src/provider/provider.ts:673

for (const [modelID, model] of Object.entries(provider.models)) {
  model.api.id = model.api.id ?? model.id ?? modelID  // ❌ No target consideration

Problem: This fallback assignment should also prefer an explicit target field if it exists, but it's being run late in the process and doesn't have access to the original ModelsDev.Model anymore. However, it should at least not override what was already set.

🟡 BUG #4: Option merging order issue

Location: packages/opencode/src/provider/provider.ts:638-641

if (result && (result.autoload || providers[providerID])) {
  if (result.getModel) modelLoaders[providerID] = result.getModel
  mergeProvider(providerID, {
    source: "custom",
    options: result.options,  // ❌ Overwrites config options that came before
  })
}

Problem: When merging custom loader options, they're applied AFTER the config options were loaded (lines 646-651). This means custom loaders can't be overridden by explicit config. The PR mentions "Fixed provider options being overwritten when configured from multiple sources" but this still has an ordering issue.

Context: The config loading happens at line 646-651 AFTER custom loaders are loaded at line 633-641. This means the final order is:

Env vars
Auth keys
Plugin loaders (custom)
Custom loaders
Config options (overrides everything)

This is actually the correct order for config precedence, but the commit message 9c898cd says it fixed this. Need to verify if the fix was sufficient.

⚠️ POTENTIAL ISSUE #5: Model caching keyed by user ID not API ID

Location: packages/opencode/src/provider/provider.ts:816

export async function getLanguage(model: Model) {
  const s = await state()
  const key = `${model.providerID}/${model.id}`  // ✅ This is correct - using user ID
  if (s.models.has(key)) return s.models.get(key)!

Note: This is actually correct - caching uses the user-facing ID, but the provider API uses model.api.id. However, if Bug #1 and #2 aren't fixed, the language model object returned will be for the wrong API model ID.

⚠️ POTENTIAL ISSUE #6: Test coverage for `target` field

Location: packages/opencode/test/provider/provider.test.ts

Problem: The test file has extensive coverage but I don't see tests that specifically verify:

The target field from models.dev is properly used as api.id
Config overrides with custom target values work correctly
Aliased models with explicit id fields maintain proper API targeting

Suggestion: Add test case like:

test("model.target is used as api.id for provider calls", async () => {
  // Create model with id="my-model-name" and target="actual-api-model"
  // Verify api.id equals "actual-api-model"
})

Summary

The refactor attempted to separate user-facing model IDs (model.id) from API-facing model IDs (model.api.id), which is good. However, the target field from ModelsDev.Model is completely ignored in the refactored code. This will cause:

Runtime failures when the AI SDK tries to use the wrong model ID
Silent bugs where the wrong model gets called if id and target differ
Configuration issues where users can't properly alias models with different API names

Priority fixes:

Fix line 383: Use model.target not model.id for api.id
Fix line 516: Add model.target to the fallback chain
Add tests for target field handling

opencode session | github run

thdxr · 2025-12-04T00:52:09Z

/oc look at the diff the target thing isn't even a thing anymore

opencode-agent · 2025-12-04T00:52:49Z

Perfect! Both fixes are in place. The changes now correctly use the target field (if present) as the api.id, with fallback to model.id and other defaults. This ensures that:

Line 383 in fromModelsDevModel: When loading from models.dev data, the target field (if present) is used as the actual API model ID to send to providers, allowing users to create aliased names while pointing to different API model IDs.
Line 516 in config model parsing: When users configure custom model overrides in their config, they can specify a target field to override the API model ID, with fallback to model.id and existing values.

The review's concern about the target field not being used has been addressed!

opencode session | github run

Co-authored-by: thdxr <thdxr@users.noreply.github.com>

rekram1-node · 2025-12-04T02:35:17Z

packages/opencode/src/provider/transform.ts


-    if (modelID.includes("gpt-5") && !modelID.includes("gpt-5-chat")) {
-      if (modelID.includes("codex")) {
+    if (model.providerID.includes("gpt-5") && !model.api.id.includes("gpt-5-chat")) {


* ignore: update download stats 2025-12-03 * ignore: docs & style * chore: format code * add retry case for grok resource exhausted * feat: experimental.primary_tools, allow user to set the tools that should only be available to primary agents (anomalyco#4913) Co-authored-by: GitHub Action <action@github.com> * fix: bunfs path on windows (anomalyco#5011) * feat: add messages_last_user command to scroll TUI to last user message (implements anomalyco#4847) (anomalyco#4855) Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * ci: add pr review * ci: make review only fire on non draft pr creation * zen: usage graph respect light/dark mode * ci: tweak review cmd * ci: review ready for review action * feat: add tool_details keybind w/ no default (anomalyco#4976) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * ci: review tweak * zen: fix chart loading closes anomalyco#5030 * core: add provider test coverage for upcoming refactor Add comprehensive test suite for Provider module to ensure safe refactoring of provider internals. Tests cover: - Provider loading from env vars and config - Provider filtering (disabled_providers, enabled_providers) - Model whitelist/blacklist - Model aliasing and custom providers - getModel, getProvider, closest, defaultModel functions Also adds Env module for instance-scoped environment variable access, enabling isolated test environments without global state pollution. * core: refactor provider and model system (anomalyco#5033) Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: thdxr <thdxr@users.noreply.github.com> * bump opentui * Update Nix flake.lock and hashes * fix: dax typo * fix: compaction type issue * fix: provider id issue * ci: add note about iife * docs: remove outdated theme section as system theme is now added back (anomalyco#5041) * feat: Enhance DeepSeek reasoning content handling (anomalyco#4975) Co-authored-by: Aiden Cline <aidenpcline@gmail.com> * release: v1.0.130 * sync: record last synced tag v1.0.130 Fixed type error in prompt.ts: model.modelID -> model.id --------- Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> Co-authored-by: Spoon <212802214+spoons-and-mirrors@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Ariane Emory <97994360+ariane-emory@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Frank <frank@sst.dev> Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: thdxr <thdxr@users.noreply.github.com> Co-authored-by: Jack Bisceglia <57922742+jackbisceglia@users.noreply.github.com> Co-authored-by: Jakub Matjanowski <k.matjanowski@gmail.com> Co-authored-by: opencode <opencode@sst.dev>

* ignore: update download stats 2025-12-03 * ignore: docs & style * chore: format code * add retry case for grok resource exhausted * feat: experimental.primary_tools, allow user to set the tools that should only be available to primary agents (anomalyco#4913) Co-authored-by: GitHub Action <action@github.com> * fix: bunfs path on windows (anomalyco#5011) * feat: add messages_last_user command to scroll TUI to last user message (implements anomalyco#4847) (anomalyco#4855) Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * ci: add pr review * ci: make review only fire on non draft pr creation * zen: usage graph respect light/dark mode * ci: tweak review cmd * ci: review ready for review action * feat: add tool_details keybind w/ no default (anomalyco#4976) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * ci: review tweak * zen: fix chart loading closes anomalyco#5030 * core: add provider test coverage for upcoming refactor Add comprehensive test suite for Provider module to ensure safe refactoring of provider internals. Tests cover: - Provider loading from env vars and config - Provider filtering (disabled_providers, enabled_providers) - Model whitelist/blacklist - Model aliasing and custom providers - getModel, getProvider, closest, defaultModel functions Also adds Env module for instance-scoped environment variable access, enabling isolated test environments without global state pollution. * core: refactor provider and model system (anomalyco#5033) Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: thdxr <thdxr@users.noreply.github.com> * bump opentui * Update Nix flake.lock and hashes * fix: dax typo * fix: compaction type issue * fix: provider id issue * ci: add note about iife * docs: remove outdated theme section as system theme is now added back (anomalyco#5041) * feat: Enhance DeepSeek reasoning content handling (anomalyco#4975) Co-authored-by: Aiden Cline <aidenpcline@gmail.com> * release: v1.0.130 * zen: fix chart loading * chore: format code * fix: TypeError: undefined is not an object * release: v1.0.131 * sync: record last synced tag v1.0.131 --------- Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> Co-authored-by: Spoon <212802214+spoons-and-mirrors@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Ariane Emory <97994360+ariane-emory@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Frank <frank@sst.dev> Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: thdxr <thdxr@users.noreply.github.com> Co-authored-by: Jack Bisceglia <57922742+jackbisceglia@users.noreply.github.com> Co-authored-by: Jakub Matjanowski <k.matjanowski@gmail.com> Co-authored-by: opencode <opencode@sst.dev>

thdxr added 10 commits December 3, 2025 18:33

core: convert Model type to Zod schema for better type safety and val…

a844eb2

…idation

sync

8b1c55f

sync

2dbb029

sync

c3327fc

sync

c57216f

sync

bbbffbf

sync

19c3b25

core: fix provider options being overwritten when configured from mul…

9c898cd

…tiple sources

regen sdk

42aadad

opencode-agent bot and others added 3 commits December 4, 2025 00:54

Fixed target field usage in model API IDs

425ec87

Co-authored-by: thdxr <thdxr@users.noreply.github.com>

dumb

c999c3d

sync

3bedf95

thdxr merged commit 6d3fc63 into dev Dec 4, 2025
5 checks passed

rekram1-node reviewed Dec 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

core: refactor provider and model system #5033

core: refactor provider and model system #5033

Uh oh!

thdxr commented Dec 4, 2025

Uh oh!

thdxr commented Dec 4, 2025

Uh oh!

opencode-agent bot commented Dec 4, 2025 •

edited

Loading

Uh oh!

thdxr commented Dec 4, 2025

Uh oh!

opencode-agent bot commented Dec 4, 2025 •

edited

Loading

Uh oh!

Uh oh!

rekram1-node Dec 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

core: refactor provider and model system #5033

core: refactor provider and model system #5033

Uh oh!

Conversation

thdxr commented Dec 4, 2025

Summary

Uh oh!

thdxr commented Dec 4, 2025

Uh oh!

opencode-agent bot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR REVIEW: Core Provider and Model System Refactor

Issues Found

🔴 CRITICAL BUG #1: Missing target field usage in fromModelsDevModel

🔴 CRITICAL BUG #2: Config model api.id doesn't respect target field

🟡 BUG #3: Final model.api.id assignment missing target logic

🟡 BUG #4: Option merging order issue

⚠️ POTENTIAL ISSUE #5: Model caching keyed by user ID not API ID

⚠️ POTENTIAL ISSUE #6: Test coverage for target field

Summary

Uh oh!

thdxr commented Dec 4, 2025

Uh oh!

opencode-agent bot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

rekram1-node Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

opencode-agent bot commented Dec 4, 2025 •

edited

Loading

🔴 CRITICAL BUG #1: Missing `target` field usage in `fromModelsDevModel`

🔴 CRITICAL BUG #2: Config model `api.id` doesn't respect `target` field

⚠️ POTENTIAL ISSUE #6: Test coverage for `target` field

opencode-agent bot commented Dec 4, 2025 •

edited

Loading