Skip to content

Commit aa8ce27

Browse files
committed
fix(copilot): resolve context tiers without catalog variants
1 parent 2bbfa5c commit aa8ce27

23 files changed

Lines changed: 491 additions & 129 deletions

File tree

‎packages/app/src/composer/selection.ts‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { useModels } from "@/providers/models/models"
1010
import { cycleModelVariant, getConfiguredAgentVariant, resolveModelVariant } from "@/providers/models/variant"
1111
import { useComposerState } from "./persistence"
1212
import { useConfiguredModel } from "@/providers/models/configured"
13+
import { selectModelVariant } from "@opencode/util/model-variant"
1314

1415
export function createComposerControls(input: { model?: ModelSelection } = {}) {
1516
const local = useLocal()
@@ -42,6 +43,7 @@ export function createComposerModelSelection(input: {
4243
agent: () => { name: string; model?: ModelKey; variant?: string } | undefined
4344
}) {
4445
const sdk = useWorkspaceLocation()
46+
const data = useData()
4547
const models = useModels()
4648
const local = useLocal()
4749
const prompt = useComposerState()
@@ -162,6 +164,7 @@ export function createComposerModelSelection(input: {
162164

163165
return resolveModelVariant({
164166
variants: this.list(),
167+
context: hasContext(),
165168
selected: this.selected(),
166169
configured: this.configured(),
167170
preferred: model ? models.variant.get({ providerID: model.provider.id, modelID: model.id }) : undefined,
@@ -175,8 +178,11 @@ export function createComposerModelSelection(input: {
175178
const model = current()
176179

177180
if (!model) return
178-
prompt.model.set({ providerID: model.provider.id, modelID: model.id, variant: value ?? null })
179-
models.variant.set({ providerID: model.provider.id, modelID: model.id }, value)
181+
182+
const variant = selectModelVariant(this.current(), value, this.list(), hasContext())
183+
184+
prompt.model.set({ providerID: model.provider.id, modelID: model.id, variant: variant ?? null })
185+
models.variant.set({ providerID: model.provider.id, modelID: model.id }, variant)
180186
})
181187
},
182188
cycle() {
@@ -186,6 +192,7 @@ export function createComposerModelSelection(input: {
186192
this.set(
187193
cycleModelVariant({
188194
variants,
195+
context: hasContext(),
189196
selected: this.current() ?? null,
190197
configured: undefined,
191198
}),
@@ -194,5 +201,13 @@ export function createComposerModelSelection(input: {
194201
},
195202
}
196203

204+
function hasContext() {
205+
const model = current()
206+
207+
return !!data.location.model
208+
.list({ directory: sdk().directory })
209+
?.find((item) => item.providerID === model?.provider.id && item.id === model?.id)?.context
210+
}
211+
197212
return selection satisfies ModelSelection
198213
}

‎packages/app/src/providers/models/selection.tsx‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createSimpleContext } from "@opencode/ui/context"
22
import { base64Encode } from "@opencode/util/encode"
3+
import { selectModelVariant } from "@opencode/util/model-variant"
34
import { useParams } from "@solidjs/router"
45
import { batch, createEffect, createMemo, onCleanup } from "solid-js"
56
import { createStore } from "solid-js/store"
@@ -448,6 +449,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
448449

449450
return resolveModelVariant({
450451
variants: this.list(),
452+
context: hasContext(),
451453
selected: this.selected(),
452454
configured: this.configured(),
453455
preferred: model ? models.variant.get({ providerID: model.provider.id, modelID: model.id }) : undefined,
@@ -465,8 +467,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
465467
const model = current()
466468

467469
if (!model) return
468-
write({ model: { providerID: model.provider.id, modelID: model.id }, variant: value ?? null })
469-
models.variant.set({ providerID: model.provider.id, modelID: model.id }, value)
470+
471+
const variant = selectModelVariant(this.current(), value, this.list(), hasContext())
472+
473+
write({ model: { providerID: model.provider.id, modelID: model.id }, variant: variant ?? null })
474+
models.variant.set({ providerID: model.provider.id, modelID: model.id }, variant)
470475
})
471476
},
472477
cycle() {
@@ -476,6 +481,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
476481
this.set(
477482
cycleModelVariant({
478483
variants: items,
484+
context: hasContext(),
479485
selected: this.current() ?? null,
480486
configured: undefined,
481487
}),
@@ -484,6 +490,14 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
484490
},
485491
}
486492

493+
function hasContext() {
494+
const model = current()
495+
496+
return !!data.location.model
497+
.list({ directory: sdk().directory })
498+
?.find((item) => item.providerID === model?.provider.id && item.id === model?.id)?.context
499+
}
500+
487501
const result = {
488502
slug: createMemo(() => base64Encode(sdk().directory)),
489503
model,

‎packages/app/src/providers/models/variant.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@ import { cycleModelVariant, getConfiguredAgentVariant, resolveModelVariant } fro
44
const variants = ["low", "high", "xhigh"]
55

66
describe("model variant", () => {
7+
test("preserves combined saved selections and context while cycling a reasoning-only catalog", () => {
8+
const input = { variants: ["low", "high", "custom@v2"], selected: undefined, configured: undefined, context: true }
9+
expect(resolveModelVariant({ ...input, preferred: "custom@v2@long" })).toBe("custom@v2@long")
10+
expect(resolveModelVariant({ ...input, selected: "default@long" })).toBe("default@long")
11+
expect(resolveModelVariant({ ...input, preferred: "unknown@long" })).toBeUndefined()
12+
expect(resolveModelVariant({ ...input, preferred: "high@long", context: false })).toBeUndefined()
13+
expect(cycleModelVariant({ ...input, selected: "high@long" })).toBe("custom@v2@long")
14+
expect(cycleModelVariant({ ...input, selected: "custom@v2@long" })).toBe("default@long")
15+
expect(cycleModelVariant({ ...input, selected: "default@long" })).toBe("low@long")
16+
expect(cycleModelVariant({ ...input, variants: ["high", "explicit@long"], selected: "high@default" })).toBe(
17+
"explicit@long@default",
18+
)
19+
expect(
20+
resolveModelVariant({ ...input, variants: ["high", "explicit@long"], selected: "explicit@long@default" }),
21+
).toBe("explicit@long@default")
22+
expect(
23+
cycleModelVariant({ ...input, variants: ["high", "explicit@long"], selected: "explicit@long@default" }),
24+
).toBe("default@default")
25+
})
726
test.each([
827
{ name: "applies when the model matches", providerID: "openai", modelID: "gpt-5.2", expected: "xhigh" },
928
{ name: "is ignored for another model", providerID: "anthropic", modelID: "claude-sonnet-4", expected: undefined },

‎packages/app/src/providers/models/variant.ts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { contextSelection, isModelVariantAvailable } from "@opencode/util/model-variant"
2+
13
type AgentModel = {
24
providerID: string
35
modelID: string
@@ -17,6 +19,7 @@ type VariantInput = {
1719
selected: string | null | undefined
1820
configured: string | undefined
1921
preferred?: string
22+
context?: boolean
2023
}
2124

2225
export function getConfiguredAgentVariant(input: { agent: Agent | undefined; model: Model | undefined }) {
@@ -37,11 +40,21 @@ export function resolveModelVariant(input: VariantInput) {
3740
if (input.selected === null) return undefined
3841
const value = input.selected ?? input.preferred ?? input.configured
3942

40-
return value && value !== "default" && input.variants.includes(value) ? value : undefined
43+
return value && value !== "default" && isModelVariantAvailable(value, input.variants, input.context)
44+
? value
45+
: undefined
4146
}
4247

4348
export function cycleModelVariant(input: VariantInput) {
4449
const current = resolveModelVariant(input)
4550

51+
if (input.context) {
52+
const selection = contextSelection(current, input.variants)
53+
const effort = selection.effort
54+
const next = input.variants[effort ? input.variants.indexOf(effort) + 1 : 0]
55+
56+
return `${next ?? "default"}@${selection.tier}`
57+
}
58+
4659
return input.variants[current ? input.variants.indexOf(current) + 1 : 0]
4760
}

‎packages/core/src/config/plugin/provider.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,9 @@ export const Plugin = define({
147147
}
148148
if (config.disabled !== undefined) model.enabled = !config.disabled
149149
if (config.limit !== undefined) model.limit = { ...model.limit, ...config.limit }
150-
if (model.context) {
151-
for (const effort of [
152-
"default",
153-
...model.variants
154-
.filter((variant) => !/@(default|long)$/.test(variant.id))
155-
.map((variant) => variant.id),
156-
]) {
157-
for (const tier of ["default", "long"]) {
158-
const id = Model.VariantID.make(`${effort}@${tier}`)
159-
if (!model.variants.some((variant) => variant.id === id)) model.variants.push({ id })
160-
}
161-
}
162-
}
163150
})
164151
if (config.variants === undefined && !source?.base)
165152
models.update(providerID, id, (model) => {
166-
if (model.context) return
167153
model.variants = [
168154
...Variant.resolve({
169155
...model,

‎packages/core/src/github-copilot/models.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ function build(id: Model.ID, remote: UsableModel, baseURL: string, previous?: Mo
161161
? remote.version.slice(remote.id.length + 1)
162162
: remote.version
163163
const released = previous?.time.released || Date.parse(version)
164-
const reasoning = variants(remote, messages)
165164

166165
return Model.Info.make({
167166
...Model.Info.default(Provider.ID.githubCopilot, id),
@@ -182,16 +181,7 @@ function build(id: Model.ID, remote: UsableModel, baseURL: string, previous?: Mo
182181
input,
183182
output: ["text"],
184183
},
185-
variants: [
186-
...reasoning,
187-
...(context
188-
? ["default", "long"].flatMap((tier) =>
189-
["default", ...reasoning.map((variant) => variant.id)].map((effort) => ({
190-
id: Model.VariantID.make(`${effort}@${tier}`),
191-
})),
192-
)
193-
: []),
194-
],
184+
variants: variants(remote, messages),
195185
time: { released: Number.isFinite(released) ? released : 0 },
196186
cost: [
197187
{

‎packages/core/src/model-resolver.ts‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { Integration } from "./integration.js"
1010
import { Capabilities, ID, Info, Model, Ref, VariantID } from "./model.js"
1111
import type { RuntimeInfo } from "./model.js"
1212
import { Npm } from "@opencode/util/npm"
13+
import { contextSelection, isModelVariantAvailable } from "@opencode/util/model-variant"
1314
import { Provider } from "./provider.js"
1415

1516
export class VariantUnavailableError extends Schema.TaggedError<VariantUnavailableError>()(
@@ -140,20 +141,41 @@ export const withVariant = (
140141
): Effect.Effect<Info, VariantUnavailableError> => {
141142
const id = variantID === "default" ? undefined : variantID
142143
const variant = model.variants?.find((item) => item.id === id)
143-
if (!variant && id !== undefined)
144+
if (
145+
id !== undefined &&
146+
!isModelVariantAvailable(
147+
id,
148+
model.variants.map((item) => item.id),
149+
!!model.context,
150+
)
151+
)
144152
return Effect.fail(
145153
new VariantUnavailableError({
146154
providerID: model.providerID,
147155
modelID: model.id,
148156
variant: id,
149157
}),
150158
)
151-
const effort = model.context && id && /@(default|long)$/.test(id) ? id.slice(0, id.lastIndexOf("@")) : undefined
159+
const selection = contextSelection(id)
160+
const effort = model.context && id && /@(default|long)$/.test(id) ? selection.effort : undefined
152161
const base = effort ? model.variants.find((item) => item.id === effort) : undefined
153-
const budget = model.context?.[id?.endsWith("@long") ? "long" : "default"]
162+
const budget = model.context?.[selection.tier]
154163
const input = budget === undefined ? undefined : Math.min(budget, model.limit.input ?? budget)
164+
if (base && /@(default|long)$/.test(base.id))
165+
return withVariant(model, base.id).pipe(
166+
Effect.map((resolved) => ({
167+
...resolved,
168+
limit:
169+
input === undefined
170+
? model.limit
171+
: { ...model.limit, input, context: Math.min(model.limit.context, input + model.limit.output) },
172+
settings: Provider.mergeOverlay(resolved.settings, Provider.modelSettings(variant?.settings)),
173+
headers: Provider.mergeHeaders(resolved.headers, variant?.headers),
174+
body: Provider.mergeOverlay(resolved.body, variant?.body),
175+
})),
176+
)
155177
return Effect.succeed(
156-
variant
178+
variant || base
157179
? {
158180
...model,
159181
...(input === undefined
@@ -163,10 +185,10 @@ export const withVariant = (
163185
}),
164186
settings: Provider.mergeOverlay(
165187
Provider.mergeOverlay(model.settings, Provider.modelSettings(base?.settings)),
166-
Provider.modelSettings(variant.settings),
188+
Provider.modelSettings(variant?.settings),
167189
),
168-
headers: Provider.mergeHeaders(Provider.mergeHeaders(model.headers, base?.headers), variant.headers),
169-
body: Provider.mergeOverlay(Provider.mergeOverlay(model.body, base?.body), variant.body),
190+
headers: Provider.mergeHeaders(Provider.mergeHeaders(model.headers, base?.headers), variant?.headers),
191+
body: Provider.mergeOverlay(Provider.mergeOverlay(model.body, base?.body), variant?.body),
170192
}
171193
: input === undefined
172194
? model

‎packages/core/src/tool/plugin/subagent.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { ToolFailure } from "@opencode/ai"
44
import type { Context } from "@opencode/plugin/effect/plugin"
55
import type { SessionHooks } from "@opencode/plugin/effect/session"
66
import { Effect, Predicate, Schema } from "effect"
7+
import { isModelVariantAvailable } from "@opencode/util/model-variant"
78
import { Agent } from "../../agent.js"
89
import { Config } from "../../config.js"
910
import { Job } from "../../job.js"
@@ -87,7 +88,13 @@ export const Plugin = {
8788
return yield* new ToolFailure({
8889
message: `Model "${ref.providerID}/${ref.id}" is not available. Use the models tool to see what is available.`,
8990
})
90-
if (ref.variant !== undefined && !model.variants.some((variant) => variant.id === ref.variant))
91+
if (
92+
!isModelVariantAvailable(
93+
ref.variant,
94+
model.variants.map((variant) => variant.id),
95+
!!model.context,
96+
)
97+
)
9198
return yield* new ToolFailure({
9299
message:
93100
model.variants.length === 0

‎packages/core/test/config/provider.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function required<T>(value: T | undefined): T {
3434
const decode = Schema.decodeUnknownSync(Info)
3535

3636
describe("ConfigProviderPlugin.Plugin", () => {
37-
it.effect("combines configured reasoning variants with context and preserves input caps", () =>
37+
it.effect("resolves configured reasoning with context without listing combinations and preserves input caps", () =>
3838
Effect.gen(function* () {
3939
const models = yield* Model.Service
4040
const providers = yield* Provider.Service
@@ -65,8 +65,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
6565
}),
6666
])
6767
const model = required(yield* models.get(providerID, modelID))
68-
expect(model.variants.map((variant) => variant.id)).toContain(Model.VariantID.make("custom@v2@default"))
69-
expect(model.variants.map((variant) => variant.id)).toContain(Model.VariantID.make("custom@v2@long"))
68+
expect(model.variants.map((variant) => String(variant.id))).toEqual(["medium", "custom@v2"])
7069
for (const variant of [undefined, "custom@v2", "custom@v2@default", "custom@v2@long"]) {
7170
const resolved = yield* ModelResolver.withVariant(
7271
model,

‎packages/core/test/github-copilot/models.test.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,17 @@ test("discovers context tiers, resolves independent reasoning, and prices actual
208208
if (!model) throw new Error("Model missing")
209209
expect(catalog.size).toBe(1)
210210
expect(model.context).toEqual({ default: 272_000, long: 922_000 })
211+
expect(model.variants.map((variant) => String(variant.id))).toEqual(["medium", "high"])
211212
const resolve = (variant?: string) =>
212213
Effect.runPromise(
213214
ModelResolver.withVariant(model, variant === undefined ? undefined : Model.VariantID.make(variant)),
214215
)
215216
expect((await resolve()).limit).toEqual({ context: 400_000, input: 272_000, output: 128_000 })
217+
expect((await resolve("high")).limit).toEqual({ context: 400_000, input: 272_000, output: 128_000 })
218+
expect((await resolve("default@default")).limit).toEqual({ context: 400_000, input: 272_000, output: 128_000 })
219+
for (const variant of ["unknown", "unknown@long", "@long", "high@unknown"]) {
220+
await expect(resolve(variant)).rejects.toMatchObject({ _tag: "SessionRunnerModel.VariantUnavailableError" })
221+
}
216222
expect((await resolve("medium@default")).settings?.reasoningEffort).toBe("medium")
217223
expect((await resolve("high@long")).limit.context).toBe(1_050_000)
218224
expect((await resolve("high@long")).settings?.reasoningEffort).toBe("high")

0 commit comments

Comments
 (0)