Skip to content

Commit 950111f

Browse files
authored
feat(app): simplify composer model labels (#59735)
1 parent d6867f2 commit 950111f

10 files changed

Lines changed: 453 additions & 77 deletions

File tree

‎packages/app/e2e/regression/composer.spec.ts‎

Lines changed: 113 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
282282
})
283283

284284
const control = page.locator('[data-action="composer-model"]')
285-
await expect(control).toHaveText("OpenCode / Alpha")
285+
await expect(control).toHaveText("Alpha")
286286
await view.editor.fill("Keep my selected model")
287287

288288
catalog.current = provider(beta)
@@ -295,7 +295,7 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
295295
data: {},
296296
},
297297
])
298-
await expect(control).toHaveText("OpenCode / alpha (unavailable)")
298+
await expect(control).toHaveText("alpha (unavailable)")
299299
await view.editor.press("Enter")
300300
await expect(page.getByText("Select an agent and model", { exact: true })).toBeVisible()
301301
await expect(view.editor).toHaveText("Keep my selected model")
@@ -312,7 +312,7 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
312312
data: {},
313313
},
314314
])
315-
await expect(control).toHaveText("OpenCode / Alpha")
315+
await expect(control).toHaveText("Alpha")
316316
await expect(page.getByRole("button", { name: "Choose model variant", exact: true })).toHaveText("high")
317317
await view.editor.press("Enter")
318318
await expect.poll(() => prompts.length).toBe(1)
@@ -329,13 +329,13 @@ test("a catalog refresh cannot replace an existing session's model", async ({ pa
329329
data: {},
330330
},
331331
])
332-
await expect(control).toHaveText("OpenCode / alpha (unavailable)")
332+
await expect(control).toHaveText("alpha (unavailable)")
333333
await control.click()
334334
await page
335335
.getByRole("dialog", { name: "Select model" })
336336
.getByRole("button", { name: "Beta Free", exact: true })
337337
.click()
338-
await expect(control).toHaveText("OpenCode / Beta")
338+
await expect(control).toHaveText("Beta")
339339
await view.editor.fill("Use the replacement I chose")
340340
await view.editor.press("Enter")
341341
await expect.poll(() => prompts.length).toBe(2)
@@ -387,8 +387,8 @@ test("an existing session's model never shows a fallback while its agent loads",
387387
const agentLoaded = page.waitForResponse((response) => new URL(response.url()).pathname === "/api/agent")
388388
agents.resolve()
389389
await agentLoaded
390-
await expect(control).toHaveText("OpenCode / Alpha")
391-
expect(await page.evaluate(() => [...(window.__chipTexts ?? [])])).toEqual(["OpenCode / Alpha"])
390+
await expect(control).toHaveText("Alpha")
391+
expect(await page.evaluate(() => [...(window.__chipTexts ?? [])])).toEqual(["Alpha"])
392392
})
393393

394394
test("a send pressed while the Location's plugins activate waits, Esc cancels it, and it sends once catalogs load", async ({
@@ -459,7 +459,7 @@ test("an opened session in another Location names its model from a loaded catalo
459459

460460
const control = page.locator('[data-action="composer-model"]')
461461
await page.goto(sessionHref("ses_warm_here"))
462-
await expect(control).toHaveText("OpenCode / Alpha")
462+
await expect(control).toHaveText("Alpha")
463463

464464
const held = await holdRoute(
465465
page,
@@ -470,7 +470,7 @@ test("an opened session in another Location names its model from a loaded catalo
470470
try {
471471
await page.locator(`[data-slot="vertical-tabs"] a[href="${sessionHref("ses_warm_there", SERVER)}"]`).click()
472472
await held.arrived
473-
await expect(control).toHaveText("OpenCode / Beta")
473+
await expect(control).toHaveText("Beta")
474474
await expect(page.getByRole("button", { name: "Choose model variant" })).toHaveText("high")
475475
const painted = await control.elementHandle()
476476

@@ -488,7 +488,7 @@ test("an opened session in another Location names its model from a loaded catalo
488488
await Promise.all(loaded)
489489
await expect(page.getByRole("dialog")).toBeVisible()
490490
// The loaded selection keeps the same chip instead of replacing it.
491-
await expect(control).toHaveText("OpenCode / Beta")
491+
await expect(control).toHaveText("Beta")
492492
expect(await painted?.evaluate((element) => element.isConnected)).toBe(true)
493493
} finally {
494494
held.release()
@@ -501,33 +501,120 @@ declare global {
501501
}
502502
}
503503

504-
test("names a Console-managed provider without its workspace unless a direct connection shares it", async ({
504+
test("a managed composer label follows direct connections, not picker filtering or model identity", async ({
505505
page,
506506
}) => {
507-
const sessions = [
508-
{ id: "ses_managed_root", model: { id: "alpha", providerID: "opencode" } },
509-
{ id: "ses_managed_openai", model: { id: "gpt", providerID: "console-openai" } },
510-
]
507+
const sessionID = "ses_managed_provider"
508+
const connected = { direct: false }
509+
const switches: unknown[] = []
510+
const prompts: Parameters<NonNullable<MockServerConfig["onPrompt"]>>[0]["body"][] = []
511+
page.on("request", (request) => {
512+
if (request.method() === "POST" && new URL(request.url()).pathname === `/api/session/${sessionID}/model`)
513+
switches.push(request.postDataJSON())
514+
})
511515

512-
const managed = { integrationID: "opencode" }
513-
await openSession(page, {
516+
const view = await openSession(page, {
514517
name: "ManagedProvider",
515-
sessions: sessions.map((session) => ({ ...session, agent: "build" })),
516-
provider: {
518+
sessions: [{ id: sessionID, agent: "build", model: { id: "gpt", providerID: "console-openai" } }],
519+
provider: () => ({
517520
all: [
518-
{ ...managed, id: "opencode", name: "Anomaly / OpenCode", models: { alpha: { id: "alpha", name: "Alpha" } } },
519-
{ ...managed, id: "console-openai", name: "Anomaly / OpenAI", models: { gpt: { id: "gpt", name: "GPT" } } },
520-
{ id: "openai", name: "OpenAI", models: { gpt: { id: "gpt", name: "GPT" } } },
521+
{
522+
id: "opencode",
523+
integrationID: "opencode",
524+
name: "Anomaly / OpenCode",
525+
models: {},
526+
},
527+
{
528+
id: "console-openai",
529+
canonical: "openai",
530+
integrationID: "opencode",
531+
name: "Anomaly / OpenAI",
532+
models: { gpt: { id: "gpt", name: "GPT" } },
533+
},
534+
...(connected.direct
535+
? [
536+
{
537+
id: "openai",
538+
name: "OpenAI",
539+
models: { "direct-model": { id: "direct-model", name: "Direct Model" } },
540+
},
541+
]
542+
: []),
521543
],
522-
connected: ["opencode", "console-openai", "openai"],
544+
connected: ["opencode", "console-openai", ...(connected.direct ? ["openai"] : [])],
523545
default: {},
546+
}),
547+
onPrompt: (input) => void prompts.push(input.body),
548+
seed: {
549+
storage: {
550+
"opencode.global.dat:model": {
551+
user: [
552+
{ providerID: "console-openai", modelID: "gpt", visibility: "show" },
553+
{ providerID: "openai", modelID: "direct-model", visibility: "show" },
554+
],
555+
},
556+
},
524557
},
525558
})
526559

527560
const control = page.locator('[data-action="composer-model"]')
528-
await expect(control).toHaveText("OpenCode / Alpha")
529-
await page.goto(sessionHref(sessions[1]!.id))
530-
await expect(control).toHaveText("Anomaly / OpenAI / GPT")
561+
const picker = page.getByRole("dialog", { name: "Select model", exact: true })
562+
const selected = picker.locator('[data-option-key="console-openai:gpt"]')
563+
await expect(control).toHaveText("OpenAI / GPT")
564+
565+
connected.direct = true
566+
await view.push([
567+
{
568+
id: "evt_direct_connected",
569+
created: T0 + 1,
570+
type: "provider.updated",
571+
location: { directory: view.directory },
572+
data: {},
573+
},
574+
{
575+
id: "evt_direct_models_connected",
576+
created: T0 + 2,
577+
type: "model.updated",
578+
location: { directory: view.directory },
579+
data: {},
580+
},
581+
])
582+
await expect(control).toHaveText("OpenCode / OpenAI / GPT")
583+
await expect(control).toHaveAccessibleName("OpenCode / OpenAI / GPT")
584+
await control.click()
585+
const search = picker.getByRole("combobox", { name: "Search models", exact: true })
586+
await expect(picker.locator('[data-option-key="openai:direct-model"]')).toBeVisible()
587+
await search.fill("GPT")
588+
await expect(picker.locator('[data-option-key="openai:direct-model"]')).toHaveCount(0)
589+
await expect(selected).toHaveAttribute("aria-current", "true")
590+
await expect(control).toHaveText("OpenCode / OpenAI / GPT")
591+
await search.press("Escape")
592+
await expect(picker).toBeHidden()
593+
594+
connected.direct = false
595+
await view.push([
596+
{
597+
id: "evt_direct_disconnected",
598+
created: T0 + 3,
599+
type: "provider.updated",
600+
location: { directory: view.directory },
601+
data: {},
602+
},
603+
{
604+
id: "evt_direct_models_disconnected",
605+
created: T0 + 4,
606+
type: "model.updated",
607+
location: { directory: view.directory },
608+
data: {},
609+
},
610+
])
611+
await expect(control).toHaveText("OpenAI / GPT")
612+
613+
await view.editor.fill("Keep the managed provider selected")
614+
await view.editor.press("Enter")
615+
await expect.poll(() => prompts.length).toBe(1)
616+
expect(prompts[0]).toMatchObject({ text: "Keep the managed provider selected" })
617+
expect(switches).toEqual([])
531618
})
532619

533620
async function draft(page: Page) {

‎packages/app/e2e/regression/mobile-model-pickers.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ for (const direction of ["ltr", "rtl"] as const) {
3535
await expect(variant).toBeFocused()
3636

3737
const model = composer.locator('[data-action="composer-model"]')
38-
await expect(model).toHaveText("OpenCode / Mobile Model A")
38+
await expect(model).toHaveText("Mobile Model A")
3939
await expect(model).toHaveAttribute("data-control-type", "drawer")
4040
await model.click()
4141
const models = page.getByRole("dialog", { name: "Select model", exact: true })
@@ -88,7 +88,7 @@ for (const direction of ["ltr", "rtl"] as const) {
8888
await expect(models.getByRole("button", { name: /Mobile Model A/ })).toHaveCount(0)
8989
await search.press("Enter")
9090
await expect(models).toBeHidden()
91-
await expect(model).toHaveText("OpenCode / Mobile Model B")
91+
await expect(model).toHaveText("Mobile Model B")
9292
await expect(composer.getByRole("textbox", { name: "Prompt", exact: true })).toBeFocused()
9393

9494
await model.click()
@@ -133,7 +133,7 @@ for (const direction of ["ltr", "rtl"] as const) {
133133
await expect(page.getByRole("menu")).toHaveCount(0)
134134
await dialog.locator('[data-option-key="opencode:mobile-b"]').click()
135135
await expect(dialog).toBeHidden()
136-
await expect(model).toHaveText("OpenCode / Mobile Model B")
136+
await expect(model).toHaveText("Mobile Model B")
137137
await expect(page.locator('[data-slot="mobile-drawer-content"]')).toHaveCount(0)
138138
await expect(composer.getByRole("textbox", { name: "Prompt", exact: true })).toBeFocused()
139139
})
@@ -152,7 +152,7 @@ for (const direction of ["ltr", "rtl"] as const) {
152152
await expect(flyout.getByText("Text, Image, PDF, Tools", { exact: true })).toBeVisible()
153153
await flyout.getByRole("menuitemradio", { name: "max", exact: true }).click()
154154
await expect(dialog).toBeHidden()
155-
await expect(model).toHaveText("OpenCode / Mobile Model B")
155+
await expect(model).toHaveText("Mobile Model B")
156156
await expect(variant).toHaveText("max")
157157
})
158158

@@ -180,7 +180,7 @@ for (const direction of ["ltr", "rtl"] as const) {
180180
await expect(rowA).toContainText("high")
181181
await search.press("Enter")
182182
await expect(dialog).toBeHidden()
183-
await expect(model).toHaveText("OpenCode / Mobile Model A")
183+
await expect(model).toHaveText("Mobile Model A")
184184
await expect(variant).toHaveText("high")
185185
await expect(composer.getByRole("textbox", { name: "Prompt", exact: true })).toBeFocused()
186186
})
@@ -196,7 +196,7 @@ for (const direction of ["ltr", "rtl"] as const) {
196196
await expect(dialog.locator('[data-option-key="opencode:mobile-a"]')).toContainText("high")
197197
await search.press("Enter")
198198
await expect(dialog).toBeHidden()
199-
await expect(model).toHaveText("OpenCode / Mobile Model A")
199+
await expect(model).toHaveText("Mobile Model A")
200200
await expect(variant).toHaveText("high")
201201
await expect(prompt).toBeFocused()
202202
await expect(prompt).toHaveText("keep me")
@@ -235,7 +235,7 @@ test("model dialog toggles a favorite from the keyboard and leads with favorite
235235
await expect(sections).toHaveText(["Favorites", "OpenCode"])
236236
await expect(dialog.locator('[data-option-key="favorite:opencode:mobile-c"]')).toBeVisible()
237237
await dialog.locator('[data-option-key="opencode:mobile-b"]').click()
238-
await expect(model).toHaveText("OpenCode / Mobile Model B")
238+
await expect(model).toHaveText("Mobile Model B")
239239

240240
await model.click()
241241
await expect(sections).toHaveText(["Favorites", "Recent", "OpenCode"])
@@ -262,7 +262,7 @@ test("model dialog opens Manage models from its search row with Enter", async ({
262262
await manage.focus()
263263
await manage.press("Enter")
264264
await expect(page.getByRole("dialog", { name: "Manage models", exact: true })).toBeVisible()
265-
await expect(model).toHaveText("OpenCode / Mobile Model A")
265+
await expect(model).toHaveText("Mobile Model A")
266266
})
267267

268268
test.describe("touch composer pickers", () => {

‎packages/app/e2e/regression/new-session.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ for (const row of [
926926
expect((await listed).ok()).toBe(true)
927927
const composer = page.locator('[data-component="composer"]')
928928
const send = composer.getByRole("button", { name: "Send", exact: true })
929-
await expect(composer.locator('[data-action="composer-model"]')).toHaveText("OpenCode / Accent Model")
929+
await expect(composer.locator('[data-action="composer-model"]')).toHaveText("Accent Model")
930930
await view.editor.fill("Inspect this fixture workspace.")
931931
await expect(send).toBeEnabled()
932932
await expectBackground(send, "icon-button-contrast")

‎packages/app/e2e/user-story/model-selection-flow.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ test("restores each existing session's model and variant when switching tabs", a
140140
const composer = page.locator('[data-component="composer"]')
141141
const modelControl = composer.locator('[data-action="composer-model"]')
142142
const variant = composer.getByRole("button", { name: "Choose model variant", exact: true })
143-
await expect(modelControl).toHaveText("OpenCode / Model A")
143+
await expect(modelControl).toHaveText("Model A")
144144
await expect(variant).toHaveText("balanced")
145145
await variant.click()
146146
await page.getByRole("menuitemradio", { name: "high", exact: true }).click()
147147
await expect(variant).toHaveText("high")
148148

149149
await page.locator(`[data-titlebar-tab-link][href="${hrefB}"]`).click()
150150
await expect(page).toHaveURL(hrefB)
151-
await expect(modelControl).toHaveText("OpenCode / Model B")
151+
await expect(modelControl).toHaveText("Model B")
152152
await expect(variant).toHaveText("balanced")
153153
await variant.click()
154154
await page.getByRole("menuitemradio", { name: "high", exact: true }).click()
@@ -157,11 +157,11 @@ test("restores each existing session's model and variant when switching tabs", a
157157
// A new draft starts from the current session's non-default model and chosen variant.
158158
await page.getByRole("button", { name: "New session", exact: true }).click()
159159
await expect(page).toHaveURL(/\/new-session\?draftId=/)
160-
await expect(modelControl).toHaveText("OpenCode / Model B")
160+
await expect(modelControl).toHaveText("Model B")
161161
await expect(variant).toHaveText("high")
162162

163163
await page.locator(`[data-titlebar-tab-link][href="${hrefA}"]`).click()
164164
await expect(page).toHaveURL(hrefA)
165-
await expect(modelControl).toHaveText("OpenCode / Model A")
165+
await expect(modelControl).toHaveText("Model A")
166166
await expect(variant).toHaveText("high")
167167
})

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type { ServerSDK } from "@/runtime/server/client"
66
import type { SessionMessageHandoff } from "@/session/handoff"
77
import type { ComposerStateTarget } from "./submission-state"
88
import type { createComposerSubmission } from "./submission-state"
9+
import type { ComposerModelLabel } from "./model-label"
910

1011
export type ComposerControls = {
1112
agents: {
@@ -18,10 +19,11 @@ export type ComposerControls = {
1819
model: {
1920
selection: ModelSelection
2021
providerName?: string
22+
label?: ComposerModelLabel
2123
paid: boolean
2224
loading: boolean
2325
/** While loading, the expected model's names from a catalog already loaded for another Location. */
24-
preview?: { provider?: string; model: string; variant: string; variants: string[] }
26+
preview?: { provider?: string; model: string; label?: ComposerModelLabel; variant: string; variants: string[] }
2527
}
2628
}
2729

0 commit comments

Comments
 (0)