diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts index 7980de15e11..544ebfd3b4b 100644 --- a/packages/app/e2e/regression/composer.spec.ts +++ b/packages/app/e2e/regression/composer.spec.ts @@ -4,6 +4,89 @@ import { openDraft, openSession } from "../utils/workspace" test.use({ permissions: ["clipboard-read", "clipboard-write"] }) +test("a catalog refresh cannot replace an existing session's model", async ({ page }) => { + const alpha = { id: "alpha", name: "Alpha", variants: { high: {} } } + const beta = { id: "beta", name: "Beta" } + const catalog = { current: provider(alpha, beta) } + const switches: unknown[] = [] + const prompts: unknown[] = [] + const sessionID = "ses_catalog_selection" + page.on("request", (request) => { + if (request.method() === "POST" && new URL(request.url()).pathname === `/api/session/${sessionID}/model`) + switches.push(request.postDataJSON()) + }) + + const view = await openSession(page, { + name: "CatalogSelection", + sessions: [{ id: sessionID, agent: "build", model: { id: "alpha", providerID: "opencode", variant: "high" } }], + provider: () => catalog.current, + onPrompt: (input) => void prompts.push(input.body), + seed: { storage: { "opencode.global.dat:model": { recent: [{ providerID: "opencode", modelID: "beta" }] } } }, + }) + + const control = page.locator('[data-action="composer-model"]') + await expect(control).toHaveText("Alpha") + await view.editor.fill("Keep my selected model") + + catalog.current = provider(beta) + await view.push([ + { + id: "evt_catalog_missing", + created: T0 + 1, + type: "model.updated", + location: { directory: view.directory }, + data: {}, + }, + ]) + await expect(control).toHaveText("Select model") + await view.editor.press("Enter") + await expect(page.getByText("Select an agent and model", { exact: true })).toBeVisible() + await expect(view.editor).toHaveText("Keep my selected model") + expect(switches).toEqual([]) + expect(prompts).toEqual([]) + + catalog.current = provider(alpha, beta) + await view.push([ + { + id: "evt_catalog_restored", + created: T0 + 2, + type: "model.updated", + location: { directory: view.directory }, + data: {}, + }, + ]) + await expect(control).toHaveText("Alpha") + await expect(page.getByRole("button", { name: "Choose model variant", exact: true })).toHaveText("high") + await view.editor.press("Enter") + await expect.poll(() => prompts.length).toBe(1) + expect(switches).toEqual([{ model: { id: "alpha", providerID: "opencode", variant: "high" } }]) + + catalog.current = provider(beta) + await view.push([ + { + id: "evt_catalog_removed", + created: T0 + 3, + type: "model.updated", + location: { directory: view.directory }, + data: {}, + }, + ]) + await expect(control).toHaveText("Select model") + await control.click() + await page + .getByRole("dialog", { name: "Select model" }) + .getByRole("button", { name: "Beta Free", exact: true }) + .click() + await expect(control).toHaveText("Beta") + await view.editor.fill("Use the replacement I chose") + await view.editor.press("Enter") + await expect.poll(() => prompts.length).toBe(2) + expect(switches).toEqual([ + { model: { id: "alpha", providerID: "opencode", variant: "high" } }, + { model: { id: "beta", providerID: "opencode" } }, + ]) +}) + async function draft(page: Page) { const { editor } = await openDraft(page, { name: "ComposerDraft", provider: NO_PROVIDER }) await editor.click() diff --git a/packages/app/e2e/utils/mock-server.ts b/packages/app/e2e/utils/mock-server.ts index 5e91f66c64c..1d776408c7d 100644 --- a/packages/app/e2e/utils/mock-server.ts +++ b/packages/app/e2e/utils/mock-server.ts @@ -1477,7 +1477,7 @@ export function currentSession(session: MockSession, fallbackDirectory?: string) parentID: session.parentID, projectID: session.projectID ?? "project", agent: session.agent ?? "build", - model: session.model ?? { id: "mock-model", providerID: "mock-provider" }, + model: session.model, cost: session.cost ?? 0, tokens: session.tokens ?? { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } }, ...decodeSessionOutcome(session), diff --git a/packages/app/src/providers/models/selection.tsx b/packages/app/src/providers/models/selection.tsx index 4b82b05c44a..c6308de0e7f 100644 --- a/packages/app/src/providers/models/selection.tsx +++ b/packages/app/src/providers/models/selection.tsx @@ -269,19 +269,15 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ const current = createMemo(() => { if (!configuredModel.ready()) return - const item = firstModel( - () => scope()?.model, - () => { - const session = durable() + const session = durable() - if (session?.agent && session.agent !== agent.current()?.name) return - const model = session?.model - - return model && { providerID: model.providerID, modelID: model.id } - }, - () => agent.current()?.model, - fallback, - ) + // Catalog availability must not replace a user's choice with a default on the next submission. + const item = + scope()?.model ?? + (session?.model && (!session.agent || session.agent === agent.current()?.name) + ? { providerID: session.model.providerID, modelID: session.model.id } + : undefined) ?? + firstModel(() => agent.current()?.model, fallback) if (!item) return diff --git a/packages/app/test-browser/fixtures/model-selection.ts b/packages/app/test-browser/fixtures/model-selection.ts index bac5b21f36d..3be282494b3 100644 --- a/packages/app/test-browser/fixtures/model-selection.ts +++ b/packages/app/test-browser/fixtures/model-selection.ts @@ -100,14 +100,15 @@ afterEach(() => function fixture(input: { session?: Commit; agents?: Agent[]; config?: ConfigModel; preferred?: string } = {}) { const directory = `/selection-test/${crypto.randomUUID()}` + // SAFETY: fixture transitions clear the route as well as selecting session IDs. const [state, set] = createStore({ visible: true, configLoaded: true, connection: "connected", route: { id: "ses_a" as string | undefined }, agents: input.agents ?? [agent("build"), agent("plan")], - config: input.config as ConfigModel | undefined, - sessions: { ses_a: input.session } as Record, + config: input.config, + sessions: Object.fromEntries([["ses_a", input.session]]), providers: [{ id: "provider", name: "Provider", package: "@ai-sdk/test", activation: "enabled" }], models: ["a", "b", "c"].map((id) => ({ id, @@ -126,6 +127,7 @@ function fixture(input: { session?: Commit; agents?: Agent[]; config?: ConfigMod })), }) + // SAFETY: empty collections are valid preferences; tests later populate them with the declared model keys and variants. const [preferences, setPreferences] = createStore({ user: [] as Array, recent: [] as ModelKey[], @@ -350,9 +352,8 @@ test("uses historical message selection only when durable and local selection ar expect(selection(local)).toEqual({ agent: "plan", model: "b", variant: "high" }) }) -test("invalid durable models fall through agent, global, recent, and connected defaults", () => { +test("sessions without a selection fall through agent, global, recent, and connected defaults", () => { const f = fixture({ - session: durable("removed", "high"), agents: [agent("build", key("b"), "low")], config: "provider/c", })