From ac0fa47e995cf884f6a986effd2d438bba5d9cfd Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:52:34 +0200 Subject: [PATCH] feat(desktop): pick models from a model dialog with favorites and recent (#55838) --- packages/app/component-tests/composer.spec.ts | 5 +- packages/app/e2e/regression/composer.spec.ts | 17 +- .../regression/mobile-model-pickers.spec.ts | 169 +++- packages/app/e2e/utils/mock-server.ts | 5 +- .../app/src/composer/composer.stories.tsx | 1 + packages/app/src/composer/composer.tsx | 50 +- packages/app/src/composer/selection.ts | 23 +- packages/app/src/composer/submit.test.ts | 1 + packages/app/src/providers/models/details.tsx | 137 +++ packages/app/src/providers/models/models.tsx | 20 +- .../src/providers/models/select-dialog.css | 129 +++ .../models/select-dialog.stories.tsx | 71 +- .../src/providers/models/select-dialog.tsx | 920 ++++++++++-------- .../app/src/providers/models/selection.tsx | 24 +- packages/app/src/runtime/i18n/en.ts | 17 + .../src/runtime/server/persistence.test.ts | 16 +- .../app/src/runtime/server/persistence.ts | 1 + packages/app/src/runtime/server/runtime.tsx | 8 +- packages/app/src/session/story-model.tsx | 1 + .../app/src/shell/commands/menu-dismiss.ts | 24 +- .../app/src/shell/commands/safe-triangle.ts | 64 ++ .../test-browser/fixtures/model-selection.ts | 9 +- .../.storybook/mocks/app/context/command.ts | 11 + packages/ui/src/icons/catalog.ts | 28 + 24 files changed, 1297 insertions(+), 454 deletions(-) create mode 100644 packages/app/src/providers/models/details.tsx create mode 100644 packages/app/src/shell/commands/safe-triangle.ts diff --git a/packages/app/component-tests/composer.spec.ts b/packages/app/component-tests/composer.spec.ts index 9a12b2f90c3..4b6202692db 100644 --- a/packages/app/component-tests/composer.spec.ts +++ b/packages/app/component-tests/composer.spec.ts @@ -277,7 +277,10 @@ story("renders a draft once and supports editing, caret restoration, and failure // Closing the model picker restores the controller's saved caret through its editor ref. await component.locator('[data-action="composer-model"]').click() - await page.getByRole("menu").getByRole("textbox").press("Escape") + await page + .getByRole("dialog", { name: "Select model", exact: true }) + .getByRole("searchbox", { name: "Search models", exact: true }) + .press("Escape") await expect(input).toBeFocused() await input.pressSequentially("!") await expect(input).toHaveText("XY!reserve this draft on failure") diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts index 2eca83f154c..2ecd96107e9 100644 --- a/packages/app/e2e/regression/composer.spec.ts +++ b/packages/app/e2e/regression/composer.spec.ts @@ -100,9 +100,11 @@ test("an existing session's model waits for its agent instead of showing a fallb await agents.promise await route.fallback() }) + const catalog = ["/api/model", "/api/provider", "/api/config"].map((path) => page.waitForResponse((response) => new URL(response.url()).pathname === path), ) + await page.goto(sessionHref(sessionID)) await Promise.all(catalog) await expect(page.locator('[data-component="composer-editor"]')).toBeEditable() @@ -121,6 +123,7 @@ test("names a Console-managed provider without its workspace unless a direct con { id: "ses_managed_root", model: { id: "alpha", providerID: "opencode" } }, { id: "ses_managed_openai", model: { id: "gpt", providerID: "console-openai" } }, ] + const managed = { integrationID: "opencode" } await openSession(page, { name: "ManagedProvider", @@ -498,10 +501,16 @@ test("marks a Console provider with its workspace only when it is also connected }, }) - await page.locator('[data-component="composer"] [data-action="composer-model"]').click() - const menu = page.getByRole("menu") - await expect(menu.getByRole("menuitemradio", { name: "Direct Gemini", exact: true })).toBeVisible() - const headings = menu.locator('[data-slot="menu-v2-group-label"]') + const trigger = page.locator('[data-component="composer"] [data-action="composer-model"]') + await trigger.hover() + const details = page.getByRole("tooltip") + await expect(details.getByText("Console Model", { exact: true })).toBeVisible() + await expect(details.getByText("OpenCode", { exact: true })).toBeVisible() + await expect(details.getByText(/Anomaly \//)).toHaveCount(0) + await trigger.click() + const menu = page.getByRole("dialog", { name: "Select model", exact: true }) + await expect(menu.getByRole("button", { name: "Direct Gemini", exact: true })).toBeVisible() + const headings = menu.locator('[data-slot="model-dialog-group-title"]') await expect(headings).toHaveCount(4) await expect(headings.filter({ hasText: /^GoogleAnomaly$/ })).toHaveCount(1) await expect(headings.filter({ hasText: /^Google$/ })).toHaveCount(1) diff --git a/packages/app/e2e/regression/mobile-model-pickers.spec.ts b/packages/app/e2e/regression/mobile-model-pickers.spec.ts index 7e535a5bb3b..c2996795fe2 100644 --- a/packages/app/e2e/regression/mobile-model-pickers.spec.ts +++ b/packages/app/e2e/regression/mobile-model-pickers.spec.ts @@ -122,25 +122,148 @@ for (const direction of ["ltr", "rtl"] as const) { }) } - test(`desktop model and variant pickers retain menus in ${direction}`, async ({ page }) => { - await page.setViewportSize({ width: 1280, height: 900 }) - await openPickerSession(page, direction, true) - const composer = page.locator('[data-component="composer"]') - const variant = composer.getByRole("button", { name: "Choose model variant", exact: true }) + test(`desktop model button opens the model dialog in ${direction}`, async ({ page }) => { + const { composer, model, variant, dialog } = await openDesktopPicker(page, direction) await variant.click() await page.getByRole("menuitemradio", { name: "high", exact: true }).click() await expect(variant).toHaveText("high") - await expect(page.locator('[data-slot="mobile-drawer-content"]')).toHaveCount(0) - const model = composer.locator('[data-action="composer-model"]') - await expect(model).toHaveAttribute("data-control-type", "popover") + await expect(model).toHaveAttribute("data-control-type", "dialog") await model.click() - await expect(page.getByPlaceholder("Search models", { exact: true })).toBeFocused() - await page.getByRole("menuitemradio", { name: /Mobile Model B/ }).click() + await expect(dialog.getByRole("searchbox", { name: "Search models", exact: true })).toBeFocused() + await expect(page.getByRole("menu")).toHaveCount(0) + await dialog.locator('[data-option-key="opencode:mobile-b"]').click() + await expect(dialog).toBeHidden() await expect(model).toHaveText("OpenCode / Mobile Model B") await expect(page.locator('[data-slot="mobile-drawer-content"]')).toHaveCount(0) + await expect(composer.getByRole("textbox", { name: "Prompt", exact: true })).toBeFocused() + }) + + test(`model dialog flyout applies a model and variant in ${direction}`, async ({ page }) => { + const { model, variant, dialog } = await openDesktopPicker(page, direction) + const flyout = dialog.locator('[data-slot="model-dialog-flyout"]') + await model.click() + await dialog.locator('[data-option-key="opencode:mobile-a"]').hover() + await expect(flyout.getByRole("menuitemradio", { name: "balanced", exact: true })).toHaveAttribute( + "aria-checked", + "true", + ) + await dialog.locator('[data-option-key="opencode:mobile-b"]').hover() + await expect(flyout.getByText("OpenCode · 1M context", { exact: true })).toBeVisible() + await expect(flyout.getByText("Text, Image, PDF, Tools", { exact: true })).toBeVisible() + await flyout.getByRole("menuitemradio", { name: "max", exact: true }).click() + await expect(dialog).toBeHidden() + await expect(model).toHaveText("OpenCode / Mobile Model B") + await expect(variant).toHaveText("max") + }) + + test(`model dialog arrow keys stage a variant in ${direction}`, async ({ page }) => { + const { composer, model, variant, dialog } = await openDesktopPicker(page, direction) + const search = dialog.getByRole("searchbox", { name: "Search models", exact: true }) + const rowA = dialog.locator('[data-option-key="opencode:mobile-a"]') + const next = direction === "rtl" ? "ArrowLeft" : "ArrowRight" + await model.click() + await expect(search).toBeFocused() + await search.press(next) + await expect(rowA).toContainText("high") + await search.press("Escape") + await expect(dialog).toBeHidden() + await expect(variant).toHaveText("balanced") + + await model.click() + await search.fill("Mobile Model A") + await search.press(next) + await expect(search).toHaveValue("Mobile Model A") + await expect(rowA).toContainText("balanced") + await search.press("ArrowDown") + await search.press("ArrowUp") + await search.press(next) + await expect(rowA).toContainText("high") + await search.press("Enter") + await expect(dialog).toBeHidden() + await expect(model).toHaveText("OpenCode / Mobile Model A") + await expect(variant).toHaveText("high") + await expect(composer.getByRole("textbox", { name: "Prompt", exact: true })).toBeFocused() + }) + + test(`model shortcut opens the model dialog in ${direction}`, async ({ page }) => { + const { composer, model, variant, dialog } = await openDesktopPicker(page, direction) + const prompt = composer.getByRole("textbox", { name: "Prompt", exact: true }) + await prompt.fill("keep me") + await prompt.press("ControlOrMeta+Quote") + const search = dialog.getByRole("searchbox", { name: "Search models", exact: true }) + await expect(search).toBeFocused() + await search.press(direction === "rtl" ? "ArrowLeft" : "ArrowRight") + await expect(dialog.locator('[data-option-key="opencode:mobile-a"]')).toContainText("high") + await search.press("Enter") + await expect(dialog).toBeHidden() + await expect(model).toHaveText("OpenCode / Mobile Model A") + await expect(variant).toHaveText("high") + await expect(prompt).toBeFocused() + await expect(prompt).toHaveText("keep me") }) } +test("desktop model button shows the model details", async ({ page }) => { + const { model } = await openDesktopPicker(page, "ltr") + await model.hover() + const details = page.getByRole("tooltip") + await expect(details.getByText("Mobile Model A", { exact: true })).toBeVisible() + await expect(details.getByText("OpenCode", { exact: true })).toBeVisible() + await expect(details.getByText("1,000,000", { exact: true })).toBeVisible() + await expect(details.getByText("Input & Output", { exact: true })).toBeVisible() +}) + +test("model dialog shows a summary for models without variants", async ({ page }) => { + const { model, dialog } = await openDesktopPicker(page, "ltr") + const flyout = dialog.locator('[data-slot="model-dialog-flyout"]') + await model.click() + await dialog.locator('[data-option-key="opencode:mobile-c"]').hover() + await expect(flyout.getByText("OpenCode · 262K context", { exact: true })).toBeVisible() + await expect(flyout.getByRole("menuitemradio")).toHaveCount(0) +}) + +test("model dialog toggles a favorite from the keyboard and leads with favorite and recent models", async ({ + page, +}) => { + const { model, dialog } = await openDesktopPicker(page, "ltr") + const sections = dialog.locator('[data-slot="model-dialog-group-title"]') + const search = dialog.getByRole("searchbox", { name: "Search models", exact: true }) + await model.click() + await expect(sections).toHaveText(["OpenCode"]) + await search.press("ArrowDown") + await search.press("ArrowDown") + await search.press("ControlOrMeta+f") + await expect(sections).toHaveText(["Favorites", "OpenCode"]) + await expect(dialog.locator('[data-option-key="favorite:opencode:mobile-c"]')).toBeVisible() + await dialog.locator('[data-option-key="opencode:mobile-b"]').click() + await expect(model).toHaveText("OpenCode / Mobile Model B") + + await model.click() + await expect(sections).toHaveText(["Favorites", "Recent", "OpenCode"]) + await expect(dialog.locator('[data-option-key="recent:opencode:mobile-b"]')).toHaveAttribute("aria-pressed", "true") + await search.fill("Mobile") + await expect(sections).toHaveText(["OpenCode"]) + await search.press("Escape") + await expect(dialog).toBeHidden() + await model.click() + await search.press("ArrowUp") + await expect(dialog.locator('[data-option-key="favorite:opencode:mobile-c"]')).toHaveAttribute("data-active", "") + await search.press("ControlOrMeta+f") + await expect(sections).toHaveText(["Recent", "OpenCode"]) + await expect(dialog.locator('[data-option-key="opencode:mobile-c"]')).toHaveAttribute("data-active", "") +}) + +test("model dialog opens Manage models from its search row with Enter", async ({ page }) => { + const { model, dialog } = await openDesktopPicker(page, "ltr") + await model.click() + await expect(dialog.getByRole("searchbox", { name: "Search models", exact: true })).toBeFocused() + const manage = dialog.getByRole("button", { name: "Manage models", exact: true }) + await manage.focus() + await manage.press("Enter") + await expect(page.getByRole("dialog", { name: "Manage models", exact: true })).toBeVisible() + await expect(model).toHaveText("OpenCode / Mobile Model A") +}) + test.describe("touch composer pickers", () => { test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true }) @@ -175,6 +298,19 @@ test.describe("touch composer pickers", () => { }) }) +async function openDesktopPicker(page: Page, direction: "ltr" | "rtl") { + await page.setViewportSize({ width: 1280, height: 900 }) + await openPickerSession(page, direction, true) + const composer = page.locator('[data-component="composer"]') + + return { + composer, + model: composer.locator('[data-action="composer-model"]'), + variant: composer.getByRole("button", { name: "Choose model variant", exact: true }), + dialog: page.getByRole("dialog", { name: "Select model", exact: true }), + } +} + async function openPickerSession(page: Page, direction: "ltr" | "rtl", paid: boolean) { await mockOpenCodeServer(page, { ...fixture, @@ -188,14 +324,19 @@ async function openPickerSession(page: Page, direction: "ltr" | "rtl", paid: boo id: "opencode", name: "OpenCode", models: Object.fromEntries( - ["a", "b"].map((id) => [ + ["a", "b", "c"].map((id) => [ `mobile-${id}`, { id: `mobile-${id}`, name: `Mobile Model ${id.toUpperCase()}`, cost: { input: paid ? 1 : 0, output: paid ? 1 : 0 }, - limit: { context: 200_000 }, - variants: { balanced: {}, high: {} }, + limit: { context: id === "c" ? 262_144 : 1_000_000 }, + capabilities: { + tools: id !== "c", + input: id === "c" ? ["text"] : ["text", "image", "pdf"], + output: ["text"], + }, + variants: id === "c" ? {} : { balanced: {}, high: {}, max: {} }, }, ]), ), @@ -212,7 +353,7 @@ async function openPickerSession(page: Page, direction: "ltr" | "rtl", paid: boo localStorage.setItem( "opencode.global.dat:model", JSON.stringify({ - user: ["a", "b"].map((id) => ({ providerID: "opencode", modelID: `mobile-${id}`, visibility: "show" })), + user: ["a", "b", "c"].map((id) => ({ providerID: "opencode", modelID: `mobile-${id}`, visibility: "show" })), recent: [], variant: {}, }), diff --git a/packages/app/e2e/utils/mock-server.ts b/packages/app/e2e/utils/mock-server.ts index 2f34bd5a340..3836672cabb 100644 --- a/packages/app/e2e/utils/mock-server.ts +++ b/packages/app/e2e/utils/mock-server.ts @@ -1,6 +1,7 @@ import type { Page } from "@playwright/test" import type { OpenCodeEvent, SessionMessageInfo } from "@opencode/client/promise" import { Permission } from "@opencode/schema/permission" +import { Model } from "@opencode/schema/model" import { Worktree } from "@opencode/schema/worktree" import { Duration, Effect, Layer, Option, Predicate, Schema } from "effect" import { HttpRouter, HttpServer, HttpServerResponse } from "effect/http" @@ -1429,6 +1430,7 @@ function location(config: MockServerConfig, directory = config.directory) { (root) => root !== undefined && (directory === root || directory.startsWith(`${root}/`)), ), ) + const root = listed ? (listed.canonical ?? listed.worktree) : undefined if (listed && root) return { directory, project: { id: listed.id, directory: root, canonical: root } } @@ -1475,7 +1477,7 @@ function currentModels(catalog: MockProviderCatalog) { modelID: model.api?.id ?? model.id, providerID: provider.id, name: model.name, - capabilities: { tools: true, input: ["text"], output: ["text"] }, + capabilities: model.capabilities ?? { tools: true, input: ["text"], output: ["text"] }, variants: Object.entries(model.variants ?? {}).map(([id, settings]) => Predicate.isObject(settings) ? { id, settings } : { id }, ), @@ -1610,6 +1612,7 @@ const decodeModel = Schema.decodeUnknownOption( api: lenient(Schema.Struct({ id: Schema.String })), limit: lenient(Schema.Struct({ context: lenient(Schema.Number), output: lenient(Schema.Number) })), cost: lenient(Schema.Struct({ input: lenient(Schema.Number), output: lenient(Schema.Number) })), + capabilities: lenient(Model.Capabilities), variants: lenient(Schema.Record(Schema.String, Schema.Unknown)), }), ) diff --git a/packages/app/src/composer/composer.stories.tsx b/packages/app/src/composer/composer.stories.tsx index 5e0a43e9a57..5c23a8059ae 100644 --- a/packages/app/src/composer/composer.stories.tsx +++ b/packages/app/src/composer/composer.stories.tsx @@ -82,6 +82,7 @@ function ComposerStory(props: { key: () => ({ providerID: modelOption().provider.id, modelID: modelOption().id }), current: () => modelOption(), recent: () => [modelOption()], + favorite: { list: () => [], toggle() {} }, list: () => [modelOption()], cycle() {}, set() {}, diff --git a/packages/app/src/composer/composer.tsx b/packages/app/src/composer/composer.tsx index 28dfb3e9846..d4e63d49494 100644 --- a/packages/app/src/composer/composer.tsx +++ b/packages/app/src/composer/composer.tsx @@ -4,9 +4,12 @@ import { Button } from "@opencode/ui/button" import { useDialog } from "@opencode/ui/context/dialog" import { Icon } from "@opencode/ui/icon" import { Keybind } from "@opencode/ui/keybind" +import { consoleModelGroup } from "@/providers/models/provider-group" +import { consoleProviderName } from "@/providers/catalog/console" import { Tooltip } from "@opencode/ui/tooltip" import { ComposerEditor } from "./editor/editor" -import { ModelSelectorPopover } from "@/providers/models/select-dialog" +import { DialogSelectModel, ModelSelectorDrawer } from "@/providers/models/select-dialog" +import { ModelDetails } from "@/providers/models/details" import { DialogSelectModelUnpaid } from "@/providers/models/unpaid" import { formatKeybind, useCommand } from "@/shell/commands/command" import { useLanguage } from "@/runtime/i18n/language" @@ -79,6 +82,16 @@ function ComposerModelControl(props: { }) { const shouldAnimate = createMemo((previous) => previous ?? props.loading) const mobile = createMediaQuery("(max-width: 767px)") + const dialog = useDialog() + const managed = createMemo(() => consoleModelGroup(props.model.list())) + + const providerName = (provider: { id: string; name: string }) => { + const group = managed() + + return group?.providers.some((item) => item.id === provider.id) + ? consoleProviderName(group, provider.name) + : provider.name + } const content = () => ( <> @@ -103,17 +116,33 @@ function ComposerModelControl(props: { - {props.title} - - + + {props.title} + + + } + > + {(model) => ( +
+ +
+ {props.title} + +
+
+ )} +
} > { + if (!props.paid) return props.onUnpaidClick() + void dialog.show(() => , props.onClose) + }} > {content()} } > - ( diff --git a/packages/app/src/composer/selection.ts b/packages/app/src/composer/selection.ts index d007c607216..c920984505e 100644 --- a/packages/app/src/composer/selection.ts +++ b/packages/app/src/composer/selection.ts @@ -17,6 +17,7 @@ export function createComposerControls(input: { model?: ModelSelection } = {}) { const sdk = useWorkspaceLocation() const data = useData() const providers = useProviders(() => sdk().directory) + const canonical = (provider: { id: string; canonical?: string }) => provider.canonical ?? provider.id.replace(/^console-/, "") @@ -123,6 +124,13 @@ export function createComposerModelSelection(input: { .filter((item): item is NonNullable => !!item), ) + const favoriteModels = createMemo(() => + models.favorite + .list() + .map(models.find) + .filter((item): item is NonNullable => !!item), + ) + const selection = { trackSessionCommit: local.model.trackSessionCommit, remembered: () => Object.fromEntries(Object.entries(remembered).map(([name, model]) => [name, { model }])), @@ -130,6 +138,7 @@ export function createComposerModelSelection(input: { key, current, recent: recentModels, + favorite: { list: favoriteModels, toggle: models.favorite.toggle }, list: models.list, cycle(direction: 1 | -1) { const items = recentModels() @@ -163,9 +172,8 @@ export function createComposerModelSelection(input: { visible: models.visible, setVisibility: models.setVisibility, variant: { - configured() { + configured(model = current()) { const item = input.agent() - const model = current() if (!item || !model) return const global = configuredModel() @@ -186,13 +194,14 @@ export function createComposerModelSelection(input: { return model && valid(model) ? model.variant : undefined }, - current() { - const model = current() + current(item?: ModelKey) { + const model = item ? models.find(item) : current() + const same = !item || (current()?.provider.id === item.providerID && current()?.id === item.modelID) return resolveModelVariant({ - variants: this.list(), - selected: this.selected(), - configured: this.configured(), + variants: Object.keys(model?.variants ?? {}), + selected: same ? this.selected() : undefined, + configured: this.configured(model), preferred: model ? models.variant.get({ providerID: model.provider.id, modelID: model.id }) : undefined, }) }, diff --git a/packages/app/src/composer/submit.test.ts b/packages/app/src/composer/submit.test.ts index 7c99f964894..c0875664786 100644 --- a/packages/app/src/composer/submit.test.ts +++ b/packages/app/src/composer/submit.test.ts @@ -25,6 +25,7 @@ const selection = { key: () => ({ providerID: "provider-1", modelID: "model-1" }), current: () => selectedModel, recent: () => [selectedModel], + favorite: { list: () => [], toggle() {} }, list: () => [selectedModel], cycle() {}, set() {}, diff --git a/packages/app/src/providers/models/details.tsx b/packages/app/src/providers/models/details.tsx new file mode 100644 index 00000000000..5a1b29fbb26 --- /dev/null +++ b/packages/app/src/providers/models/details.tsx @@ -0,0 +1,137 @@ +import { For, Show } from "solid-js" +import { Icon } from "@opencode/ui/icon" +import type { IconName } from "@opencode/ui/icons/catalog" +import { useLanguage } from "@/runtime/i18n/language" +import type { ModelSelection } from "./selection" +import { ProviderModelIcon } from "./provider-group" + +type ModelInfo = NonNullable> + +type Input = keyof ModelInfo["capabilities"]["input"] + +const inputs: Input[] = ["text", "image", "pdf", "audio", "video"] + +const inputIcons: Record = { + text: "outline-text", + image: "outline-photo", + pdf: "file-document", + audio: "outline-audio", + video: "outline-video", +} + +export function ModelDetails(props: { model: ModelInfo; provider: string; compact?: boolean; standalone?: boolean }) { + const language = useLanguage() + const input = () => inputs.filter((type) => props.model.capabilities.input[type]) + + const modalities = () => + inputs.filter((type) => props.model.capabilities.input[type] || props.model.capabilities.output[type]) + + const label = (type: Input) => language.t(`model.details.input.${type}`) + + const summary = () => + new Intl.ListFormat(language.intl(), { style: "short", type: "unit" }).format([ + ...input().map(label), + ...(props.model.capabilities.toolcall ? [language.t("model.details.tools")] : []), + ]) + + return ( + +
+
+ + {props.model.name} +
+
+
+
+
+
+ {language.t("model.tooltip.provider")} +
+
+ {props.provider} +
+
+
+
+ {language.t("model.tooltip.context.label")} +
+
{props.model.limit.context.toLocaleString(language.intl())}
+
+
+
+
+ + {(type) => ( +
+ +
{label(type)}
+
+ {props.model.capabilities.input[type] && props.model.capabilities.output[type] + ? language.t("model.details.inputOutput") + : props.model.capabilities.input[type] + ? language.t("model.details.input") + : language.t("model.details.output")} +
+
+ )} +
+ +
+ +
+ {language.t("model.tooltip.reasoning")} +
+
+ +
+
+
+ +
+ +
+ {language.t("model.details.tools")} +
+
+ +
+
+
+
+
+
+ } + > +
+ + {language.t("model.details.summary", { + provider: props.provider, + context: new Intl.NumberFormat(language.intl(), { + notation: "compact", + maximumFractionDigits: 0, + roundingMode: "trunc", + }).format(props.model.limit.context), + })} + + {(value) =>
{value()}
}
+
+
+ ) +} diff --git a/packages/app/src/providers/models/models.tsx b/packages/app/src/providers/models/models.tsx index 33b67a9d520..512381cf24f 100644 --- a/packages/app/src/providers/models/models.tsx +++ b/packages/app/src/providers/models/models.tsx @@ -40,7 +40,8 @@ const createModelsController = (directory: Accessor) => { () => new Map( available().map( - (model) => [modelKey({ providerID: model.provider.id, modelID: model.id }), Date.parse(model.release_date)] as const, + (model) => + [modelKey({ providerID: model.provider.id, modelID: model.id }), Date.parse(model.release_date)] as const, ), ), ) @@ -130,6 +131,19 @@ const createModelsController = (directory: Accessor) => { setStore("recent", uniq) } + // Newest favorite first, as in the TUI. + const toggleFavorite = (model: ModelKey) => { + const key = modelKey(model) + const rest = store.favorite.filter((item) => modelKey(item) !== key) + + setStore( + "favorite", + rest.length === store.favorite.length + ? [{ providerID: model.providerID, modelID: model.modelID }, ...rest] + : rest, + ) + } + const variantKey = (model: ModelKey) => `${model.providerID}/${model.modelID}` const getVariant = (model: ModelKey) => store.variant?.[variantKey(model)] @@ -155,6 +169,10 @@ const createModelsController = (directory: Accessor) => { list: models.recent, push, }, + favorite: { + list: models.favorite, + toggle: toggleFavorite, + }, variant: { get: getVariant, set: setVariant, diff --git a/packages/app/src/providers/models/select-dialog.css b/packages/app/src/providers/models/select-dialog.css index bfd9e8422eb..84720dfe9b9 100644 --- a/packages/app/src/providers/models/select-dialog.css +++ b/packages/app/src/providers/models/select-dialog.css @@ -36,3 +36,132 @@ padding-inline: 0; } } + +[data-component="dialog-v2"]:has(.model-dialog) [data-slot="dialog-container"] { + width: min(calc(100vw - 24px), 480px); + min-height: 0; +} + +.model-dialog { + [data-slot="model-dialog-search"] { + flex-shrink: 0; + padding: 6px; + } + + [data-slot="model-dialog-search-box"] { + display: flex; + align-items: center; + gap: 8px; + height: 32px; + padding-inline: 12px 4px; + border-radius: 6px; + background: color-mix(in srgb, var(--v2-background-bg-layer-02) 60%, transparent); + color: var(--v2-icon-icon-muted); + + &:hover, + &:focus-within { + background: var(--v2-background-bg-layer-02); + } + + input { + flex: 1; + min-width: 0; + height: 100%; + border: 0; + outline: 0; + background: transparent; + color: var(--v2-text-text-base); + font-size: 14px; + font-weight: 440; + letter-spacing: -0.04px; + appearance: none; + } + + input::placeholder { + color: var(--v2-text-text-faint); + } + + input::-webkit-search-cancel-button { + display: none; + } + } + + [data-slot="model-dialog-results"] { + display: flex; + flex-direction: column; + gap: 6px; + padding: 0 6px 6px; + } + + [data-slot="model-dialog-group"] { + display: flex; + flex-direction: column; + gap: 1px; + } + + [data-slot="model-dialog-group-title"] { + display: flex; + flex-shrink: 0; + align-items: center; + gap: 6px; + height: 28px; + padding: 0 12px; + color: var(--v2-text-text-faint); + font-size: 13px; + font-weight: 530; + line-height: var(--line-height-compact); + letter-spacing: -0.25px; + user-select: none; + } + + [data-slot="model-dialog-row"] { + display: flex; + width: 100%; + height: 28px; + flex-shrink: 0; + align-items: center; + gap: 8px; + padding: 0 12px; + border: 0; + border-radius: 6px; + background: transparent; + color: var(--v2-text-text-base); + font-size: 13px; + font-weight: 440; + line-height: var(--line-height-base); + letter-spacing: -0.04px; + text-align: start; + cursor: default; + scroll-margin: 6px 0; + + &[data-active] { + background: var(--v2-overlay-simple-overlay-hover); + } + } + + [data-slot="model-dialog-variant"] { + color: var(--v2-text-text-muted); + } + + [data-slot="model-dialog-hints"] { + display: flex; + height: 32px; + flex-shrink: 0; + align-items: center; + gap: 16px; + padding: 0 12px; + border-top: 0.5px solid var(--v2-border-border-base); + color: var(--v2-text-text-faint); + font-size: 11px; + + > span { + display: flex; + align-items: center; + gap: 6px; + } + } +} + +[data-color-scheme="dark"] .model-dialog [data-slot="model-dialog-row"][data-active] { + background: var(--v2-alpha-light-10); +} diff --git a/packages/app/src/providers/models/select-dialog.stories.tsx b/packages/app/src/providers/models/select-dialog.stories.tsx index 088bcc794a3..65085a552c1 100644 --- a/packages/app/src/providers/models/select-dialog.stories.tsx +++ b/packages/app/src/providers/models/select-dialog.stories.tsx @@ -1,7 +1,9 @@ import { Button } from "@opencode/ui/button" -import { createSignal } from "solid-js" +import { useDialog } from "@opencode/ui/context/dialog" +import { onMount } from "solid-js" +import { createStore } from "solid-js/store" import type { ModelSelection } from "./selection" -import { ModelSelectorPopoverView } from "./select-dialog" +import { DialogSelectModel } from "./select-dialog" const chatgpt = { id: "gpt-5.6-sol", @@ -47,27 +49,52 @@ const models = [ }, ] -function SelectorStory(props: { plan: boolean }) { - const [current, setCurrent] = createSignal(models[0].id) +function SelectorStory(props: { favorite?: boolean }) { + const dialog = useDialog() + + const [store, setStore] = createStore<{ current: string; favorite: string[]; variant?: string }>({ + current: models[0].id, + favorite: props.favorite ? [models[1].id] : [], + }) + + const find = (id: string) => models.find((model) => model.id === id) + + const selection = { + ready: Object.assign(() => true, { promise: undefined }), + key: () => ({ providerID: "openai", modelID: store.current }), + current: () => find(store.current), + recent: () => [find(store.current)].filter((model) => !!model), + favorite: { + list: () => store.favorite.flatMap((id) => find(id) ?? []), + toggle: (key: { modelID: string }) => + setStore("favorite", (ids) => + ids.includes(key.modelID) ? ids.filter((id) => id !== key.modelID) : [key.modelID, ...ids], + ), + }, + list: () => models, + cycle() {}, + set: (key: { modelID: string } | undefined) => key && setStore("current", key.modelID), + visible: () => true, + setVisibility() {}, + variant: { + configured: () => undefined, + selected: () => store.variant, + current: () => store.variant, + list: () => [], + set: (variant: string | undefined) => setStore("variant", variant), + cycle() {}, + }, + } satisfies ModelSelection + + const open = () => dialog.show(() => ) + + onMount(open) return (
- ( - - )} - all={() => models} - models={(search) => models.filter((model) => model.name.toLowerCase().includes(search.toLowerCase()))} - groups={(items) => [{ category: "openai", items }]} - current={`openai:${current()}`} - chatgptPlan={props.plan} - select={(item) => setCurrent(item.id)} - onManage={() => undefined} - onConnect={() => undefined} - onClose={() => undefined} - /> +
) } @@ -77,6 +104,6 @@ export default { id: "app-dialog-model-selector", } -export const ChatGPTPlan = { render: () => } +export const Dialog = { render: () => } -export const ApiKey = { render: () => } +export const Favorites = { render: () => } diff --git a/packages/app/src/providers/models/select-dialog.tsx b/packages/app/src/providers/models/select-dialog.tsx index d9d5d532663..4c4364eae56 100644 --- a/packages/app/src/providers/models/select-dialog.tsx +++ b/packages/app/src/providers/models/select-dialog.tsx @@ -1,27 +1,38 @@ import { Popover } from "@kobalte/core/popover" -import { Component, ComponentProps, createEffect, createMemo, For, JSX, Show, Suspense, lazy, on } from "solid-js" +import { + Component, + ComponentProps, + createEffect, + createMemo, + For, + JSX, + Show, + Suspense, + lazy, + on, + onCleanup, +} from "solid-js" import { createStore } from "solid-js/store" -import { createMediaQuery } from "@solid-primitives/media" import { useLocal, type ModelSelection } from "@/providers/models/selection" import { isFreeModel } from "@/providers/models/models" import { useDialog } from "@opencode/ui/context/dialog" import { popularProviders } from "@/providers/catalog/providers" import { Button } from "@opencode/ui/button" import { Badge } from "@opencode/ui/badge" -import { Dialog, DialogBody, DialogHeader, DialogTitleGroup } from "@opencode/ui/dialog" +import { Dialog, DialogBody, DialogTitle } from "@opencode/ui/dialog" import { Icon } from "@opencode/ui/icon" +import { Keybind } from "@opencode/ui/keybind" import { ScrollView } from "@opencode/ui/scroll-view" import { Tooltip } from "@opencode/ui/tooltip" -import { Menu } from "@opencode/ui/menu" import { TextInput } from "@opencode/ui/text-input" import { ModelTooltip } from "./tooltip" +import { ModelDetails } from "./details" import { useLanguage } from "@/runtime/i18n/language" import { ExternalLink } from "@/runtime/platform/external-link" import { useData } from "@/runtime/server/current" import { useWorkspaceLocation } from "@/workspaces/location" -import { decode64 } from "@/runtime/persistence/base64" -import { handleDocumentSearchKeydown } from "@/shell/commands/search-keydown" -import { createMenuDismissController } from "@/shell/commands/menu-dismiss" +import { createSafeTriangle } from "@/shell/commands/safe-triangle" +import { formatKeybindParts, matchKeybind, parseKeybind } from "@/shell/commands/command" import { createEventListener } from "@solid-primitives/event-listener" import { matchesModelSearch } from "./search" import { SettingsList } from "@/settings/list" @@ -33,6 +44,7 @@ import { } from "@/providers/models/provider-group" import { consoleProviderName } from "@/providers/catalog/console" import "@/settings/settings.css" +import "@/shell/commands/dialog.css" import "./select-dialog.css" const MobilePanelDrawer = lazy(async () => { @@ -45,12 +57,10 @@ type ModelState = ModelSelection type ModelItem = ReturnType[number] +const favoriteKeybind = parseKeybind("mod+f") + const modelKey = (model: ModelItem) => `${model.provider.id}:${model.id}` -const manageKey = "action:manage" - -const connectKey = "action:connect" - const sortModelGroups = (a: { category: string; items: ModelItem[] }, b: { category: string; items: ModelItem[] }) => { const aIndex = popularProviders.indexOf(a.category) const bIndex = popularProviders.indexOf(b.category) @@ -81,7 +91,11 @@ const ModelList: Component<{ onSelect: props.onSelect, }) - const [store, setStore] = createStore<{ search: string; active: string; collapsed: Record }>({ + const [store, setStore] = createStore<{ + search: string + active: string + collapsed: Record + }>({ search: "", active: props.mobile ? (controller.current() ?? "") : "", collapsed: {}, @@ -157,9 +171,7 @@ const ModelList: Component<{ placement="right-start" gutter={12} openDelay={0} - value={ - - } + value={} > {item.name}
@@ -256,15 +268,14 @@ type ModelSelectorTriggerProps = Omit, "a type ModelSelectorTrigger = (props: ModelSelectorTriggerProps) => JSX.Element -export function ModelSelectorPopover(props: { +// Phones pick models from a drawer; wider screens use DialogSelectModel. +export function ModelSelectorDrawer(props: { provider?: string model?: ModelState trigger: ModelSelectorTrigger onClose?: () => void }) { const dialog = useDialog() - const mobile = createMediaQuery("(max-width: 767px)") - const data = useData() const location = useWorkspaceLocation() const controller = createModelSelectorController({ @@ -273,15 +284,7 @@ export function ModelSelectorPopover(props: { onSelect: () => props.onClose?.(), }) - const chatgptPlan = () => { - if (!controller.current()?.startsWith("openai:")) return false - - const connection = data.location.integration - .list(location().ref) - ?.find((integration) => integration.id === "openai")?.connections[0] - - return connection?.type === "credential" && connection.method === "oauth" - } + const chatgptPlan = createChatgptPlan(controller.current) const manage = async () => { const { DialogManageModels } = await import("./manage") @@ -294,37 +297,19 @@ export function ModelSelectorPopover(props: { } return ( - props.onClose?.()} - /> - } - > - props.onClose?.()} - onManage={manage} - /> - + props.onClose?.()} + /> ) } -function ModelSelectorDrawer(props: { +function ModelDrawer(props: { trigger: ModelSelectorTrigger model?: ModelState provider?: string @@ -487,377 +472,550 @@ function createModelSelectorController(input: { return value ? modelKey(value) : undefined }, - select: (item: ModelItem) => { + select: (item: ModelItem, variant?: string | null) => { model.set({ modelID: item.id, providerID: item.provider.id }, { recent: true }) + + if (variant !== undefined) model.variant.set(variant ?? undefined) input.onSelect() }, + variant: (item: ModelItem) => model.variant.current({ providerID: item.provider.id, modelID: item.id }), + favorites: () => model.favorite.list().filter((item) => !input.provider() || item.provider.id === input.provider()), + recent: () => + model + .recent() + .flatMap((item) => (item && (!input.provider() || item.provider.id === input.provider()) ? [item] : [])), + toggleFavorite: (item: ModelItem) => model.favorite.toggle({ providerID: item.provider.id, modelID: item.id }), } } -export function ModelSelectorPopoverView(props: { - trigger: ModelSelectorTrigger - all: () => ModelItem[] - models: (search: string) => ModelItem[] - groups: (models: ModelItem[]) => { category: string; items: ModelItem[] }[] - current: string | undefined - chatgptPlan?: boolean - select: (item: ModelItem) => void - onManage: () => void - onConnect: () => void - onClose: () => void -}) { - const language = useLanguage() - const [store, setStore] = createStore({ open: false, search: "", active: "" }) - let searchRef: HTMLInputElement | undefined - let contentRef: HTMLDivElement | undefined - const dismiss = createMenuDismissController(() => contentRef) - - const models = createMemo(() => props.models(store.search)) - const groups = createMemo(() => props.groups(models())) - const keys = () => [...groups().flatMap((group) => group.items.map(modelKey)), manageKey, connectKey] - - const managed = createMemo(() => consoleModelGroup(props.all())) +function createProviderLabels(all: () => ModelItem[]) { + const managed = createMemo(() => consoleModelGroup(all())) const managedIDs = createMemo(() => new Set(managed()?.providers.map((provider) => provider.id))) const canonical = (provider: ModelItem["provider"]) => provider.canonical ?? provider.id.replace(/^console-/, "") - // The workspace badge only disambiguates a managed provider that is also connected directly. const direct = createMemo( () => new Set( - props - .all() + all() .filter((item) => !managedIDs().has(item.provider.id)) .map((item) => canonical(item.provider)), ), ) - const initialActive = () => { - const selected = props.current - const options = keys() + return { + name: (provider: ModelItem["provider"]) => { + const group = managed() - if (selected && options.includes(selected)) return selected + return group && managedIDs().has(provider.id) ? consoleProviderName(group, provider.name) : provider.name + }, + // The workspace badge only disambiguates a managed provider that is also connected directly. + workspace: (provider: ModelItem["provider"]) => { + const group = managed() - return options[0] ?? "" + if (!group || !managedIDs().has(provider.id) || !direct().has(canonical(provider))) return + + return group.workspace + }, + } +} + +type ModelGroup = { category: string; items: ModelItem[]; title?: string } + +// Favorites and recent models lead the list until a search narrows it. They also stay in their provider group. +function withSections(input: { + groups: ModelGroup[] + favorites: ModelItem[] + recent: ModelItem[] + titles: { favorite: string; recent: string } +}): ModelGroup[] { + const favorites = new Set(input.favorites.map(modelKey)) + + const recent = input.recent.filter((item) => !favorites.has(modelKey(item))) + + return [ + ...(input.favorites.length > 0 + ? [{ category: "favorite", title: input.titles.favorite, items: input.favorites }] + : []), + ...(recent.length > 0 ? [{ category: "recent", title: input.titles.recent, items: recent }] : []), + ...input.groups, + ] +} + +// A model can appear in a section and in its provider group, so section rows get their own key. +const rowKey = (group: ModelGroup, item: ModelItem) => + group.title ? `${group.category}:${modelKey(item)}` : modelKey(item) + +// Steps to the next row for a different model, so a section copy never hands the arrow keys to its twin. +function nextRow(rows: { id: string; item: ModelItem }[], active: string, delta: number) { + const start = Math.max( + rows.findIndex((row) => row.id === active), + 0, + ) + + const model = rows[start] ? modelKey(rows[start].item) : undefined + + return ( + Array.from( + { length: rows.length }, + (_, step) => rows[(start + (delta + rows.length) * (step + 1)) % rows.length], + ).find((row) => modelKey(row.item) !== model)?.id ?? active + ) +} + +function createChatgptPlan(current: () => string | undefined) { + const data = useData() + const location = useWorkspaceLocation() + + return () => { + if (!current()?.startsWith("openai:")) return false + + const connection = data.location.integration + .list(location().ref) + ?.find((integration) => integration.id === "openai")?.connections[0] + + return connection?.type === "credential" && connection.method === "oauth" + } +} + +function ChatgptPlanFooter() { + const language = useLanguage() + + return ( + <> +
+
+ + {language.t("dialog.model.chatgptPlan")} + + {language.t("dialog.model.chatgptManageUsage")} + + +
+ + ) +} + +export function DialogSelectModel(props: { provider?: string; model?: ModelState }) { + const dialog = useDialog() + const language = useLanguage() + + const controller = createModelSelectorController({ + model: props.model, + provider: () => props.provider, + onSelect: () => dialog.close(), + }) + + const labels = createProviderLabels(controller.all) + const chatgptPlan = createChatgptPlan(controller.current) + + const [store, setStore] = createStore({ + search: "", + active: controller.current() ?? "", + flyout: "", + keyboard: true, + navigated: false, + warm: false, + position: { left: 0, top: 0 }, + }) + + const [staged, setStaged] = createStore>({}) + + let container: HTMLElement | undefined + let input: HTMLInputElement | undefined + let flyoutRef: HTMLDivElement | undefined + let timer: ReturnType | undefined + onCleanup(() => clearTimeout(timer)) + + const models = createMemo(() => controller.models(store.search)) + + const groups = createMemo((): ModelGroup[] => { + const providers = controller.groups(models()) + + if (store.search.trim()) return providers + + return withSections({ + groups: providers, + favorites: controller.favorites(), + recent: controller.recent(), + titles: { favorite: language.t("dialog.model.favorites"), recent: language.t("dialog.model.recent") }, + }) + }) + + const rows = createMemo(() => + groups().flatMap((group) => group.items.map((item) => ({ id: rowKey(group, item), item }))), + ) + + const rowItem = (id: string) => rows().find((row) => row.id === id)?.item + const activeItem = () => rowItem(store.active) + const flyoutItem = () => (store.flyout ? rowItem(store.flyout) : undefined) + const variantsOf = (item: ModelItem) => Object.keys(item.variants ?? {}) + + setStore("active", rows().find((row) => modelKey(row.item) === controller.current())?.id ?? "") + + const variant = (item: ModelItem) => + modelKey(item) in staged ? (staged[modelKey(item)] ?? undefined) : controller.variant(item) + + const choose = (item: ModelItem, value?: string | null) => + controller.select(item, value === undefined ? staged[modelKey(item)] : value) + + const manage = async () => { + const { DialogManageModels } = await import("./manage") + void dialog.show(() => ) } - const activeItem = () => - store.active ? contentRef?.querySelector(`[data-option-key="${CSS.escape(store.active)}"]`) : undefined + const location = useWorkspaceLocation() - const setOpen = (open: boolean) => { - if (open) { - dismiss.allowTriggerRestore() - setStore({ open: true, active: initialActive() }) - setTimeout(() => - requestAnimationFrame(() => { - searchRef?.focus() - activeItem()?.scrollIntoView({ block: "nearest" }) - }), + const connect = async () => { + const { DialogConnectProvider } = await import("@/providers/connect/dialog") + void dialog.show(() => ) + } + + const setSearch = (value: string) => { + const first = controller.models(value)[0] + setStore({ search: value, active: first ? modelKey(first) : "", flyout: "", keyboard: true, navigated: false }) + } + + const triangle = createSafeTriangle({ + flyout: () => (flyoutItem() && flyoutRef?.isConnected ? flyoutRef : undefined), + }) + + const openFlyout = (id: string, row: HTMLElement) => { + const box = row.closest('[data-slot="dialog-container"]')?.getBoundingClientRect() + + if (!box) return + const left = language.direction() === "rtl" ? box.left - 4 - 200 : box.right + 4 + setStore({ flyout: id, warm: true, position: { left, top: row.getBoundingClientRect().top - 2 } }) + } + + const hover = (id: string, row: HTMLElement) => { + if (store.active === id && !store.keyboard) return + setStore({ active: id, keyboard: false }) + clearTimeout(timer) + + if (store.warm) { + openFlyout(id, row) + + return + } + + setStore("flyout", "") + timer = setTimeout(() => openFlyout(id, row), 100) + } + + // Rows the pointer crosses on its way into the open flyout leave it alone. + const move = (id: string, event: MouseEvent & { currentTarget: HTMLElement }) => { + const row = event.currentTarget + const point = { x: event.clientX, y: event.clientY } + + if (flyoutItem() && store.flyout !== id && triangle.hold(point, () => hover(id, row))) return + triangle.anchor(point) + hover(id, row) + } + + const close = () => setStore("flyout", "") + + createEffect(() => { + if (!flyoutItem()) { + triangle.reset() + + return + } + // Outside the rows, such as the gap before the flyout, leaving the triangle closes it. + + createEventListener(document, "pointermove", (event: PointerEvent) => { + const target = event.target + + if (target instanceof Element && target.closest('[data-slot="model-dialog-row"]')) return + + if (target instanceof Node && flyoutRef?.contains(target)) return + + if (!triangle.contains({ x: event.clientX, y: event.clientY })) close() + }) + }) + + // The flyout is placed once when it opens, so moving the rows under it closes it instead. + createEventListener(window, "resize", close) + + const onKeyDown = (event: KeyboardEvent) => { + if (event.isComposing) return + + if (matchKeybind(favoriteKeybind, event)) { + const item = activeItem() + + if (!item) return + event.preventDefault() + controller.toggleFavorite(item) + // Unfavoriting removes the Favorites row that was highlighted, so keep the model highlighted in its group. + setStore({ flyout: "", keyboard: true, active: rowItem(store.active) ? store.active : modelKey(item) }) + + return + } + + if (event.metaKey || event.altKey || event.ctrlKey) return + + if (event.key === "ArrowDown" || event.key === "ArrowUp") { + event.preventDefault() + + if (rows().length === 0) return + setStore({ + active: nextRow(rows(), store.active, event.key === "ArrowDown" ? 1 : -1), + keyboard: true, + navigated: true, + flyout: "", + }) + queueMicrotask(() => + container + ?.querySelector(`[data-option-key="${CSS.escape(store.active)}"]`) + ?.scrollIntoView({ block: "nearest" }), ) return } - setStore({ open: false, search: "", active: "" }) - } + // While searching, left and right edit the query until the arrows have moved through the results. + if ((event.key === "ArrowLeft" || event.key === "ArrowRight") && (!store.search || store.navigated)) { + const item = activeItem() - const selectModel = (item: ModelItem) => { - dismiss.preventTriggerRestore() - setOpen(false) - dismiss.afterClose(() => props.select(item)) - } - - const manage = () => { - dismiss.preventTriggerRestore() - setOpen(false) - dismiss.afterClose(props.onManage) - } - - const connect = () => { - dismiss.preventTriggerRestore() - setOpen(false) - dismiss.afterClose(props.onConnect) - } - - const selectActive = () => { - const item = models().find((item) => modelKey(item) === store.active) - - if (item) { - selectModel(item) + if (!item || variantsOf(item).length === 0) return + event.preventDefault() + const options = [undefined, ...variantsOf(item)] + const direction = (event.key === "ArrowRight") !== (language.direction() === "rtl") ? 1 : -1 + const index = options.indexOf(variant(item)) + setStaged(modelKey(item), options[(index + direction + options.length) % options.length] ?? null) + setStore({ keyboard: true, flyout: "" }) return } - if (store.active === manageKey) manage() + if (event.key !== "Enter") return + const item = activeItem() - if (store.active === connectKey) connect() + if (!item) return + event.preventDefault() + choose(item) } - const moveActive = (delta: number) => { - const options = keys() + const Row = (row: { id: string; item: ModelItem; section: boolean }) => { + const selected = () => controller.current() === modelKey(row.item) + const active = () => store.active === row.id - if (options.length === 0) return - const index = options.indexOf(store.active) - const start = index === -1 ? 0 : index - setStore("active", options[(start + delta + options.length) % options.length]) - queueMicrotask(() => activeItem()?.scrollIntoView({ block: "nearest" })) - } + return ( + - -
- -
- -
- 0} - fallback={ -
- {language.t("dialog.model.empty")} -
- } - > - - {(group) => ( - - - - {group.items[0].provider.name}} - > - {(workspace) => ( - <> - - {consoleProviderName(workspace(), group.items[0].provider.name)} - - - {workspace().workspace} - - - )} - - - - - {(item) => ( - - } - > - { - setStore("active", modelKey(item)) - setTimeout(() => searchRef?.focus()) - }} - onSelect={() => selectModel(item)} - > - {item.name} - - {language.t("model.tag.free")} - - - {language.t("model.tag.latest")} - - - - )} - - - - )} - -
-
-
-
-
- { - setStore("active", manageKey) - setTimeout(() => searchRef?.focus()) - }} - onSelect={manage} - > - - {language.t("dialog.model.manage")} - - { - setStore("active", connectKey) - setTimeout(() => searchRef?.focus()) - }} - onSelect={connect} - > - - {language.t("command.provider.connect")} - -
- -
-
- - {language.t("dialog.model.chatgptPlan")} - - {language.t("dialog.model.chatgptManageUsage")} - - -
+ if (flyoutItem() && triangle.contains({ x: event.clientX, y: event.clientY })) return + close() + }} + onClick={() => choose(row.item)} + > + + {row.item.name} + + {labels.name(row.item.provider)} - - - - ) -} - -export const DialogSelectModel: Component<{ provider?: string; model?: ModelState }> = (props) => { - const dialog = useDialog() - const language = useLanguage() - const local = useLocal() - const directory = () => decode64(local.slug()) - - const provider = () => { - void import("@/providers/connect/dialog").then((x) => { - void dialog.show(() => ) - }) - } - - const manage = () => { - void import("./manage").then((x) => { - dialog.show(() => ) - }) + + + {language.t("model.tag.free")} + + + {language.t("model.tag.latest")} + + 0}> + + {variant(row.item) ?? language.t("common.default")} + + + + + + + + + ) } return ( - - - - - - - dialog.close()} /> -
- + +
+ {language.t("dialog.model.select.title")} +
+ +
+
input?.focus()}> + + (input = element)} + type="search" + value={store.search} + autofocus + placeholder={language.t("dialog.model.search.placeholder")} + aria-label={language.t("dialog.model.search.placeholder")} + spellcheck={false} + autocorrect="off" + autocomplete="off" + autocapitalize="off" + onInput={(event) => setSearch(event.currentTarget.value)} + onKeyDown={onKeyDown} + /> + + + + + + + + + +
+
+ { + container = element + // Scrolling moves the flyout's row away without a pointer event, which would leave it detached. + createEventListener(element, "scroll", close) + }} + > +
+ 0} + fallback={
{language.t("dialog.model.empty")}
} + > + + {(group) => ( +
+
+ + + {labels.name(group.items[0].provider)} + + {(workspace) => {workspace()}} + + + } + > + {(title) => {title()}} + +
+ + {(item) => } + +
+ )} +
+
+
+
+ + + +
+ + + {language.t("dialog.model.hint.navigate")} + + + + {language.t("dialog.model.hint.variant")} + + + + {language.t("dialog.model.hint.select")} + + + + {language.t("dialog.model.hint.favorite")} +
+ + {(item) => ( + // Inside the dialog content, so clicks here are not outside clicks that dismiss the dialog. +
(flyoutRef = element)} + data-component="menu-v2-content" + data-slot="model-dialog-flyout" + class="!fixed max-h-[400px] w-[200px] overflow-y-auto !p-0 !animate-none" + style={{ left: `${store.position.left}px`, top: `${store.position.top}px` }} + onMouseEnter={() => triangle.cancel()} + > + 0}> +
+ + {(value) => ( +
event.currentTarget.setAttribute("data-highlighted", "")} + onMouseLeave={(event) => event.currentTarget.removeAttribute("data-highlighted")} + onClick={() => choose(item(), value ?? null)} + > + + {value ?? language.t("common.default")} + + + + +
+ )} +
+
+
+ +
+ )} +
) } diff --git a/packages/app/src/providers/models/selection.tsx b/packages/app/src/providers/models/selection.tsx index 3e0b9a12b54..0773ccfac1f 100644 --- a/packages/app/src/providers/models/selection.tsx +++ b/packages/app/src/providers/models/selection.tsx @@ -290,9 +290,8 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ return models.find(item) }) - const configured = () => { + const configured = (model = current()) => { const item = agent.current() - const model = current() if (!item || !model) return const global = configuredModel() @@ -350,6 +349,15 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ } const recent = createMemo(() => models.recent.list().filter(validModel).map(models.find).filter(Boolean)) + + const favorite = createMemo(() => + models.favorite + .list() + .filter(validModel) + .map(models.find) + .filter((item): item is NonNullable => !!item), + ) + const pending = new Map() const sameSelection = (a: State, b: State) => @@ -393,6 +401,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ key, current, recent, + favorite: { list: favorite, toggle: models.favorite.toggle }, list: models.list, trackSessionCommit(sessionID: string, selection: { agent: string; model: ModelKey; variant?: string }) { pending.set(sessionID, selection) @@ -446,13 +455,14 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({ variant: { configured, selected, - current() { - const model = current() + current(item?: ModelKey) { + const model = item ? models.find(item) : current() + const same = !item || (current()?.provider.id === item.providerID && current()?.id === item.modelID) return resolveModelVariant({ - variants: this.list(), - selected: this.selected(), - configured: this.configured(), + variants: Object.keys(model?.variants ?? {}), + selected: same ? this.selected() : undefined, + configured: configured(model), preferred: model ? models.variant.get({ providerID: model.provider.id, modelID: model.id }) : undefined, }) }, diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index bef27cb34cf..4ee45ce0b1a 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -123,6 +123,12 @@ export const dict = { "dialog.model.manage.description": "Customize which models appear in the model selector.", "dialog.model.chatgptPlan": "Using ChatGPT plan", "dialog.model.chatgptManageUsage": "Manage usage", + "dialog.model.favorites": "Favorites", + "dialog.model.recent": "Recent", + "dialog.model.hint.navigate": "Navigate", + "dialog.model.hint.variant": "Variant", + "dialog.model.hint.select": "Select", + "dialog.model.hint.favorite": "Favorite", "dialog.model.unpaid.freeModels.title": "Free models provided by OpenCode", "dialog.model.unpaid.addMore.title": "Add more models from popular providers", @@ -248,6 +254,17 @@ export const dict = { "model.tooltip.reasoning.allowed": "Allows reasoning", "model.tooltip.reasoning.none": "No reasoning", "model.tooltip.context": "Context limit {{limit}}", + "model.details.input.text": "Text", + "model.details.input.image": "Image", + "model.details.input.audio": "Audio", + "model.details.input.video": "Video", + "model.details.input.pdf": "PDF", + "model.details.input": "Input", + "model.details.output": "Output", + "model.details.inputOutput": "Input & Output", + "model.details.tools": "Tools", + "model.details.supported": "Supported", + "model.details.summary": "{{provider}} · {{context}} context", "common.search.placeholder": "Search", "common.goBack": "Navigate back", diff --git a/packages/app/src/runtime/server/persistence.test.ts b/packages/app/src/runtime/server/persistence.test.ts index 93c0d9f67ea..78934a506d9 100644 --- a/packages/app/src/runtime/server/persistence.test.ts +++ b/packages/app/src/runtime/server/persistence.test.ts @@ -78,9 +78,17 @@ describe("server persistence schema", () => { describe("model persistence schema", () => { test("defaults missing state and keeps valid entries beside malformed entries", () => { - const decode = Schema.decodeUnknownSync(Persistence.withInitial(ModelState, { user: [], recent: [], variant: {} })) - expect(decode({})).toEqual({ user: [], recent: [], variant: {} }) - expect(decode({ user: null, recent: 1, variant: [] })).toEqual({ user: [], recent: [], variant: {} }) + const decode = Schema.decodeUnknownSync( + Persistence.withInitial(ModelState, { user: [], recent: [], favorite: [], variant: {} }), + ) + + expect(decode({})).toEqual({ user: [], recent: [], favorite: [], variant: {} }) + expect(decode({ user: null, recent: 1, favorite: "x", variant: [] })).toEqual({ + user: [], + recent: [], + favorite: [], + variant: {}, + }) const state = decode({ user: [ @@ -90,6 +98,7 @@ describe("model persistence schema", () => { { providerID: "provider", modelID: "hidden", visibility: "hide" }, ], recent: [false, { providerID: "provider", modelID: "model" }, { providerID: "missing-model" }], + favorite: [{ providerID: "provider", modelID: "model" }, { modelID: "missing-provider" }], variant: { model: "high" }, }) @@ -99,6 +108,7 @@ describe("model persistence schema", () => { { providerID: "provider", modelID: "hidden", visibility: "hide" }, ], recent: [{ providerID: "provider", modelID: "model" }], + favorite: [{ providerID: "provider", modelID: "model" }], variant: { model: "high" }, }) expect(Schema.encodeSync(ModelState)(state)).toEqual(state) diff --git a/packages/app/src/runtime/server/persistence.ts b/packages/app/src/runtime/server/persistence.ts index 3d25f438788..33fd86b2065 100644 --- a/packages/app/src/runtime/server/persistence.ts +++ b/packages/app/src/runtime/server/persistence.ts @@ -57,6 +57,7 @@ export const ModelState = Persistence.struct({ }), ), recent: Persistence.array(Persistence.struct({ providerID: Schema.String, modelID: Schema.String })), + favorite: Persistence.array(Persistence.struct({ providerID: Schema.String, modelID: Schema.String })), variant: Schema.Record( Schema.String, Schema.mutableKey( diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx index 5812225ba20..6cbdf74ec97 100644 --- a/packages/app/src/runtime/server/runtime.tsx +++ b/packages/app/src/runtime/server/runtime.tsx @@ -118,6 +118,7 @@ function createGlobalModels() { const [store, setStore, _, ready] = persisted(Persist.global("model"), ModelState, { user: [], recent: [], + favorite: [], variant: {}, }) @@ -138,6 +139,11 @@ function createGlobalModels() { return store.recent }, + favorite: () => { + loaded() + + return store.favorite + }, // Marks models visible in the picker regardless of the "latest per family" default. show(models: ReadonlyArray<{ providerID: string; modelID: string }>) { const seen = new Map(store.user.map((item, index) => [`${item.providerID}:${item.modelID}`, index])) @@ -265,7 +271,7 @@ function createServerController( return list().find((project) => project.id === location.project.id) }) - .catch((error: unknown) => { + .catch((error) => { showToast({ variant: "error", title: language.t("common.requestFailed"), diff --git a/packages/app/src/session/story-model.tsx b/packages/app/src/session/story-model.tsx index 6c2934d5722..03a9dd01da5 100644 --- a/packages/app/src/session/story-model.tsx +++ b/packages/app/src/session/story-model.tsx @@ -63,6 +63,7 @@ const modelSelection = { key: () => ({ providerID: storyComposerModel.provider.id, modelID: storyComposerModel.id }), current: () => storyComposerModel, recent: () => [storyComposerModel], + favorite: { list: () => [], toggle() {} }, list: () => [storyComposerModel], cycle() {}, set() {}, diff --git a/packages/app/src/shell/commands/menu-dismiss.ts b/packages/app/src/shell/commands/menu-dismiss.ts index 062401d7896..347f21a11d1 100644 --- a/packages/app/src/shell/commands/menu-dismiss.ts +++ b/packages/app/src/shell/commands/menu-dismiss.ts @@ -1,6 +1,13 @@ /** Coordinates focus restoration and actions that must run after menu content unmounts. */ export function createMenuDismissController(content: () => HTMLElement | undefined) { let restoreTrigger = true + let pending: (() => void) | undefined + + const run = () => { + const callback = pending + pending = undefined + callback?.() + } return { /** Allows the menu primitive to restore focus to its trigger when closing. */ @@ -13,18 +20,31 @@ export function createMenuDismissController(content: () => HTMLElement | undefin }, /** Applies the current restoration policy during the menu primitive's close-focus event. */ onCloseAutoFocus(event: Event) { - if (!restoreTrigger) event.preventDefault() + if (restoreTrigger) return + event.preventDefault() + const focused = document.activeElement + // Kobalte's dropdown focuses its trigger after this handler anyway, so undo that before the next paint. + queueMicrotask(() => { + const trigger = document.activeElement + + if (trigger !== focused && trigger instanceof HTMLElement) trigger.blur() + run() + }) }, /** Runs an action after the menu unmounts and its focus-close work has settled. */ afterClose(callback: () => void) { + pending = callback + const complete = () => { + if (!pending) return + if (content()?.isConnected) { requestAnimationFrame(complete) return } - requestAnimationFrame(() => requestAnimationFrame(callback)) + requestAnimationFrame(() => requestAnimationFrame(run)) } requestAnimationFrame(complete) diff --git a/packages/app/src/shell/commands/safe-triangle.ts b/packages/app/src/shell/commands/safe-triangle.ts new file mode 100644 index 00000000000..d83624529c1 --- /dev/null +++ b/packages/app/src/shell/commands/safe-triangle.ts @@ -0,0 +1,64 @@ +import { onCleanup } from "solid-js" + +type Point = { x: number; y: number } + +/** + * Keeps a flyout open while the pointer heads toward it across neighboring rows. The triangle runs from the + * pointer's last position on the owning row to the flyout's near corners. A pointer that rests inside it hands + * over to the row underneath after `timeout`, as on macOS. + */ +export function createSafeTriangle(input: { flyout: () => Element | undefined; timeout?: number }) { + let apex: Point | undefined + let timer: ReturnType | undefined + onCleanup(() => clearTimeout(timer)) + + const corners = () => { + const box = input.flyout()?.getBoundingClientRect() + + if (!box || !apex) return + + const x = box.left > apex.x ? box.left : box.right + + return [apex, { x, y: box.top }, { x, y: box.bottom }] + } + + const contains = (point: Point) => { + const triangle = corners() + + if (!triangle) return false + const side = (a: Point, b: Point) => (point.x - b.x) * (a.y - b.y) - (a.x - b.x) * (point.y - b.y) + const signs = [side(triangle[0], triangle[1]), side(triangle[1], triangle[2]), side(triangle[2], triangle[0])] + + return !(signs.some((value) => value < 0) && signs.some((value) => value > 0)) + } + + return { + corners, + contains, + /** Records the pointer on the row that owns the open flyout. */ + anchor(point: Point) { + clearTimeout(timer) + apex = point + }, + /** Returns whether a pointer on another row should leave the flyout alone, scheduling `settle` if it rests. */ + hold(point: Point, settle: () => void) { + clearTimeout(timer) + + if (!contains(point)) return false + timer = setTimeout(() => { + apex = undefined + settle() + }, input.timeout ?? 300) + + return true + }, + /** Cancels a pending hand-over, such as when the pointer reaches the flyout. */ + cancel() { + clearTimeout(timer) + }, + reset() { + clearTimeout(timer) + apex = undefined + }, + } +} diff --git a/packages/app/test-browser/fixtures/model-selection.ts b/packages/app/test-browser/fixtures/model-selection.ts index 3be282494b3..616f33a2566 100644 --- a/packages/app/test-browser/fixtures/model-selection.ts +++ b/packages/app/test-browser/fixtures/model-selection.ts @@ -131,6 +131,7 @@ function fixture(input: { session?: Commit; agents?: Agent[]; config?: ConfigMod const [preferences, setPreferences] = createStore({ user: [] as Array, recent: [] as ModelKey[], + favorite: [] as ModelKey[], variant: (input.preferred ? { "provider/a": input.preferred } : {}) as Record, }) @@ -143,7 +144,13 @@ function fixture(input: { session?: Commit; agents?: Agent[]; config?: ConfigMod state, set, setPreferences, - preferences: { store: preferences, set: setPreferences, ready: () => true, recent: () => preferences.recent }, + preferences: { + store: preferences, + set: setPreferences, + ready: () => true, + recent: () => preferences.recent, + favorite: () => preferences.favorite, + }, data: { session: { get: (id: string) => state.sessions[id] }, location: { diff --git a/packages/storybook/.storybook/mocks/app/context/command.ts b/packages/storybook/.storybook/mocks/app/context/command.ts index 0feb451429c..abbdaffb8ba 100644 --- a/packages/storybook/.storybook/mocks/app/context/command.ts +++ b/packages/storybook/.storybook/mocks/app/context/command.ts @@ -28,6 +28,17 @@ export function parseKeybind(config: string) { }) } +export function matchKeybind(keybinds: ReturnType, event: KeyboardEvent) { + return keybinds.some( + (keybind) => + keybind.key === event.key.toLowerCase() && + keybind.ctrl === event.ctrlKey && + keybind.meta === event.metaKey && + keybind.shift === event.shiftKey && + keybind.alt === event.altKey, + ) +} + export function formatKeybind(config: string) { return config === "none" ? "" : config } diff --git a/packages/ui/src/icons/catalog.ts b/packages/ui/src/icons/catalog.ts index cac5d3c1bcf..369ca4340cd 100644 --- a/packages/ui/src/icons/catalog.ts +++ b/packages/ui/src/icons/catalog.ts @@ -278,6 +278,34 @@ const icons = { viewBox: "0 0 16 16", body: ``, }, + "outline-text": { + viewBox: "0 0 14 14", + body: ``, + }, + "outline-photo": { + viewBox: "0 0 14 14", + body: ``, + }, + "file-document": { + viewBox: "0 0 14 14", + body: ``, + }, + "outline-audio": { + viewBox: "0 0 14 14", + body: ``, + }, + "outline-video": { + viewBox: "0 0 14 14", + body: ``, + }, + "outline-brain": { + viewBox: "0 0 14 14", + body: ``, + }, + "outline-console": { + viewBox: "0 0 14 14", + body: ``, + }, } /** Icon names derived from the shared artwork, with no UI or runtime dependencies. */