Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Redesign model picker with favorites and search (#2153)
Ellie Gummere66c326b8c424
diff --git a/apps/desktop/src/clientPersistence.test.ts b/apps/desktop/src/clientPersistence.test.tsindex 27f1e1d91..19f9b09f9 100644--- a/apps/desktop/src/clientPersistence.test.ts+++ b/apps/desktop/src/clientPersistence.test.ts@@ -52,6 +52,7 @@ const clientSettings: ClientSettings = {confirmThreadArchive: true,confirmThreadDelete: false,diffWordWrap: true,+ favorites: [],sidebarProjectGroupingMode: "repository_path",sidebarProjectGroupingOverrides: {"environment-1:/tmp/project-a": "separate",diff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.tsindex 15edd4295..bbb7e1b43 100644--- a/apps/server/src/keybindings.test.ts+++ b/apps/server/src/keybindings.test.ts@@ -192,6 +192,9 @@ it.layer(NodeServices.layer)("keybindings", (it) => {assert.equal(defaultsByCommand.get("thread.next"), "mod+shift+]");assert.equal(defaultsByCommand.get("thread.jump.1"), "mod+1");assert.equal(defaultsByCommand.get("thread.jump.9"), "mod+9");+ assert.equal(defaultsByCommand.get("modelPicker.toggle"), "mod+shift+m");+ assert.equal(defaultsByCommand.get("modelPicker.jump.1"), "mod+1");+ assert.equal(defaultsByCommand.get("modelPicker.jump.9"), "mod+9");}),);diff --git a/apps/server/src/keybindings.ts b/apps/server/src/keybindings.tsindex 07ae9156c..9689254c1 100644--- a/apps/server/src/keybindings.ts+++ b/apps/server/src/keybindings.ts@@ -13,6 +13,7 @@ import {KeybindingShortcut,KeybindingWhenNode,MAX_KEYBINDINGS_COUNT,+ MODEL_PICKER_JUMP_KEYBINDING_COMMANDS,MAX_WHEN_EXPRESSION_DEPTH,ResolvedKeybindingRule,ResolvedKeybindingsConfig,@@ -65,6 +66,7 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [{ key: "mod+n", command: "chat.new", when: "!terminalFocus" },{ key: "mod+shift+o", command: "chat.new", when: "!terminalFocus" },{ key: "mod+shift+n", command: "chat.newLocal", when: "!terminalFocus" },+ { key: "mod+shift+m", command: "modelPicker.toggle", when: "!terminalFocus" },{ key: "mod+o", command: "editor.openFavorite" },{ key: "mod+shift+[", command: "thread.previous" },{ key: "mod+shift+]", command: "thread.next" },@@ -72,6 +74,11 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [key: `mod+${index + 1}`,command,})),+ ...MODEL_PICKER_JUMP_KEYBINDING_COMMANDS.map((command, index) => ({+ key: `mod+${index + 1}`,+ command,+ when: "modelPickerOpen",+ })),];function normalizeKeyToken(token: string): string {diff --git a/apps/server/src/provider/opencodeRuntime.test.ts b/apps/server/src/provider/opencodeRuntime.test.tsindex 0ea63f8d5..0e7024efc 100644--- a/apps/server/src/provider/opencodeRuntime.test.ts+++ b/apps/server/src/provider/opencodeRuntime.test.ts@@ -1,37 +1,36 @@-import assert from "node:assert/strict";+import { describe, expect, it } from "vitest";-import { describe, it, vi } from "vitest";+import { DEFAULT_OPENCODE_MODEL_CAPABILITIES, flattenOpenCodeModels } from "./opencodeRuntime.ts";-const childProcessMock = vi.hoisted(() => ({- execFileSync: vi.fn((command: string, args: ReadonlyArray<string>) => {- if (command === "which" && args[0] === "opencode") {- return "/opt/homebrew/bin/opencode\n";- }- return "";- }),- spawn: vi.fn(),-}));--vi.mock("node:child_process", () => childProcessMock);--describe("resolveOpenCodeBinaryPath", () => {- it("returns absolute binary paths without PATH lookup", async () => {- const { resolveOpenCodeBinaryPath } = await import("./opencodeRuntime.ts");-- assert.equal(resolveOpenCodeBinaryPath("/usr/local/bin/opencode"), "/usr/local/bin/opencode");- assert.equal(childProcessMock.execFileSync.mock.calls.length, 0);- });-- it("resolves command names through PATH", async () => {- const { resolveOpenCodeBinaryPath } = await import("./opencodeRuntime.ts");+describe("flattenOpenCodeModels", () => {+ it("keeps the canonical model name separate from the subprovider label", () => {+ const models = flattenOpenCodeModels({+ providerList: {+ connected: ["github-copilot"],+ all: [+ {+ id: "github-copilot",+ name: "GitHub Copilot",+ models: {+ "claude-opus-4.5": {+ id: "claude-opus-4.5",+ name: "Claude Opus 4.5",+ variants: {},+ },+ },+ },+ ],+ },+ agents: [],+ } as unknown as Parameters<typeof flattenOpenCodeModels>[0]);- assert.equal(resolveOpenCodeBinaryPath("opencode"), "/opt/homebrew/bin/opencode");- assert.deepEqual(childProcessMock.execFileSync.mock.calls[0], [- "which",- ["opencode"],+ expect(models).toEqual([{- encoding: "utf8",- timeout: 3_000,+ slug: "github-copilot/claude-opus-4.5",+ name: "Claude Opus 4.5",+ subProvider: "GitHub Copilot",+ isCustom: false,+ capabilities: DEFAULT_OPENCODE_MODEL_CAPABILITIES,},]);});diff --git a/apps/server/src/provider/opencodeRuntime.ts b/apps/server/src/provider/opencodeRuntime.tsindex 4778f6eac..91a855bce 100644--- a/apps/server/src/provider/opencodeRuntime.ts+++ b/apps/server/src/provider/opencodeRuntime.ts@@ -558,7 +558,8 @@ export function flattenOpenCodeModels(for (const model of Object.values(provider.models)) {models.push({slug: toOpenCodeModelSlug(provider.id, model.id),- name: `${provider.name} · ${model.name}`,+ name: model.name,+ subProvider: provider.name,isCustom: false,capabilities: openCodeCapabilitiesForModel({providerID: provider.id,diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsxindex a2b27bb1e..b1ce57235 100644--- a/apps/web/src/components/AppSidebarLayout.tsx+++ b/apps/web/src/components/AppSidebarLayout.tsx@@ -3,14 +3,39 @@ import { useNavigate } from "@tanstack/react-router";import ThreadSidebar from "./Sidebar";import { Sidebar, SidebarProvider, SidebarRail } from "./ui/sidebar";+import {+ clearShortcutModifierState,+ syncShortcutModifierStateFromKeyboardEvent,+} from "../shortcutModifierState";const THREAD_SIDEBAR_WIDTH_STORAGE_KEY = "chat_thread_sidebar_width";const THREAD_SIDEBAR_MIN_WIDTH = 13 * 16;const THREAD_MAIN_CONTENT_MIN_WIDTH = 40 * 16;-export function AppSidebarLayout({ children }: { children: ReactNode }) {const navigate = useNavigate();+ useEffect(() => {+ const onWindowKeyDown = (event: KeyboardEvent) => {+ syncShortcutModifierStateFromKeyboardEvent(event);+ };+ const onWindowKeyUp = (event: KeyboardEvent) => {+ syncShortcutModifierStateFromKeyboardEvent(event);+ };+ const onWindowBlur = () => {+ clearShortcutModifierState();+ };++ window.addEventListener("keydown", onWindowKeyDown, true);+ window.addEventListener("keyup", onWindowKeyUp, true);+ window.addEventListener("blur", onWindowBlur);++ return () => {+ window.removeEventListener("keydown", onWindowKeyDown, true);+ window.removeEventListener("keyup", onWindowKeyUp, true);+ window.removeEventListener("blur", onWindowBlur);+ };+ }, []);+useEffect(() => {const onMenuAction = window.desktopBridge?.onMenuAction;if (typeof onMenuAction !== "function") {@@ -18,8 +43,9 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {}const unsubscribe = onMenuAction((action) => {- if (action !== "open-settings") return;- void navigate({ to: "/settings" });+ if (action === "open-settings") {+ void navigate({ to: "/settings" });+ }});return () => {diff --git a/apps/web/src/components/ChatView.browser.tsx b/apps/web/src/components/ChatView.browser.tsxindex 41f627332..6857a51b5 100644--- a/apps/web/src/components/ChatView.browser.tsx+++ b/apps/web/src/components/ChatView.browser.tsx@@ -1384,6 +1384,18 @@ function dispatchChatNewShortcut(): void {);}+function releaseModShortcut(key?: string): void {+ window.dispatchEvent(+ new KeyboardEvent("keyup", {+ key: key ?? (isMacPlatform(navigator.platform) ? "Meta" : "Control"),+ metaKey: false,+ ctrlKey: false,+ bubbles: true,+ cancelable: true,+ }),+ );+}+async function triggerChatNewShortcutUntilPath(router: ReturnType<typeof getRouter>,predicate: (pathname: string) => boolean,@@ -4006,6 +4018,29 @@ describe("ChatView timeline estimator parity (full app)", () => {node: { type: "identifier", name: "terminalFocus" },},},+ {+ command: "thread.jump.1",+ shortcut: {+ key: "1",+ metaKey: true,+ ctrlKey: false,+ shiftKey: false,+ altKey: false,+ modKey: false,+ },+ },+ {+ command: "modelPicker.jump.1",+ shortcut: {+ key: "1",+ metaKey: true,+ ctrlKey: false,+ shiftKey: false,+ altKey: false,+ modKey: false,+ },+ whenAst: { type: "identifier", name: "modelPickerOpen" },+ },],};},@@ -5520,6 +5555,208 @@ describe("ChatView timeline estimator parity (full app)", () => {}});+ it("opens the model picker when selecting /model", async () => {+ const mounted = await mountChatView({+ viewport: DEFAULT_VIEWPORT,+ snapshot: createSnapshotForTargetUser({+ targetMessageId: "msg-user-model-command-target" as MessageId,+ targetText: "model command thread",+ }),+ });++ try {+ await waitForComposerEditor();+ await page.getByTestId("composer-editor").fill("/mod");++ const menuItem = await waitForComposerMenuItem("slash:model");+ await menuItem.click();++ await vi.waitFor(() => {+ expect(document.querySelector(".model-picker-list")).not.toBeNull();+ expect(findComposerProviderModelPicker()?.textContent).not.toContain("/model");+ });++ await new Promise<void>((resolve) => {+ requestAnimationFrame(() => {+ requestAnimationFrame(() => resolve());+ });+ });++ await vi.waitFor(() => {+ const searchInput = document.querySelector<HTMLInputElement>(+ 'input[placeholder="Search models..."]',+ );+ expect(searchInput).not.toBeNull();+ expect(document.activeElement).toBe(searchInput);+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("toggles the model picker and shows jump keys immediately from the shortcut", async () => {+ const snapshot = createSnapshotForTargetUser({+ targetMessageId: "msg-user-model-picker-shortcut-target" as MessageId,+ targetText: "model picker shortcut thread",+ });+ const mounted = await mountChatView({+ viewport: DEFAULT_VIEWPORT,+ snapshot: {+ ...snapshot,+ projects: snapshot.projects.map((project) =>+ project.id === PROJECT_ID+ ? Object.assign({}, project, {+ defaultModelSelection: { provider: "codex", model: "gpt-5.4" },+ })+ : project,+ ),+ threads: snapshot.threads.map((thread) =>+ thread.id === THREAD_ID+ ? Object.assign({}, thread, {+ modelSelection: { provider: "codex", model: "gpt-5.4" },+ })+ : thread,+ ),+ },+ configureFixture: (nextFixture) => {+ nextFixture.serverConfig = {+ ...nextFixture.serverConfig,+ keybindings: [+ {+ command: "modelPicker.toggle",+ shortcut: {+ key: "m",+ metaKey: false,+ ctrlKey: true,+ shiftKey: true,+ altKey: false,+ modKey: false,+ },+ whenAst: {+ type: "not",+ node: { type: "identifier", name: "terminalFocus" },+ },+ },+ {+ command: "thread.jump.1",+ shortcut: {+ key: "1",+ metaKey: false,+ ctrlKey: true,+ shiftKey: false,+ altKey: false,+ modKey: false,+ },+ },+ {+ command: "modelPicker.jump.1",+ shortcut: {+ key: "1",+ metaKey: false,+ ctrlKey: true,+ shiftKey: false,+ altKey: false,+ modKey: false,+ },+ whenAst: { type: "identifier", name: "modelPickerOpen" },+ },+ ],+ providers: [+ {+ ...nextFixture.serverConfig.providers[0]!,+ provider: "codex",+ models: [+ {+ slug: "gpt-5.1-codex-max",+ name: "GPT-5.1 Codex Max",+ isCustom: false,+ capabilities: {+ supportsFastMode: true,+ supportsThinkingToggle: false,+ reasoningEffortLevels: [],+ promptInjectedEffortLevels: [],+ contextWindowOptions: [],+ },+ },+ {+ slug: "gpt-5.3-codex",+ name: "GPT-5.3 Codex",+ isCustom: false,+ capabilities: {+ supportsFastMode: true,+ supportsThinkingToggle: false,+ reasoningEffortLevels: [],+ promptInjectedEffortLevels: [],+ contextWindowOptions: [],+ },+ },+ {+ slug: "gpt-5.4",+ name: "GPT-5.4",+ isCustom: false,+ capabilities: {+ supportsFastMode: true,+ supportsThinkingToggle: false,+ reasoningEffortLevels: [],+ promptInjectedEffortLevels: [],+ contextWindowOptions: [],+ },+ },+ ],+ },+ ],+ };+ },+ });++ try {+ await waitForServerConfigToApply();+ await waitForComposerEditor();++ const initialPath = mounted.router.state.location.pathname;+ window.dispatchEvent(+ new KeyboardEvent("keydown", {+ key: "m",+ ctrlKey: true,+ shiftKey: true,+ bubbles: true,+ cancelable: true,+ }),+ );++ await vi.waitFor(() => {+ expect(document.querySelector(".model-picker-list")).not.toBeNull();+ });++ const jumpLabel = isMacPlatform(navigator.platform) ? "⌃1" : "Ctrl+1";+ await vi.waitFor(() => {+ expect(+ Array.from(+ document.querySelectorAll<HTMLElement>('.model-picker-list [data-slot="kbd"]'),+ ).some((element) => element.textContent?.trim() === jumpLabel),+ ).toBe(true);+ });+ expect(mounted.router.state.location.pathname).toBe(initialPath);++ window.dispatchEvent(+ new KeyboardEvent("keydown", {+ key: "m",+ ctrlKey: true,+ shiftKey: true,+ bubbles: true,+ cancelable: true,+ }),+ );++ await vi.waitFor(() => {+ expect(document.querySelector(".model-picker-list")).toBeNull();+ });+ } finally {+ releaseModShortcut("Control");+ await mounted.cleanup();+ }+ });+it("shows a tooltip with the skill description when hovering a skill pill", async () => {const mounted = await mountChatView({viewport: DEFAULT_VIEWPORT,diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex 47dad09ea..535c0d9fc 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -2233,6 +2233,7 @@ export default function ChatView(props: ChatViewProps) {const shortcutContext = {terminalFocus: isTerminalFocused(),terminalOpen: Boolean(terminalState.terminalOpen),+ modelPickerOpen: composerRef.current?.isModelPickerOpen() ?? false,};const command = resolveShortcutCommand(event, keybindings, {@@ -2282,6 +2283,13 @@ export default function ChatView(props: ChatViewProps) {return;}+ if (command === "modelPicker.toggle") {+ event.preventDefault();+ event.stopPropagation();+ composerRef.current?.toggleModelPicker();+ return;+ }+const scriptId = projectScriptIdFromCommand(command);if (!scriptId || !activeProject) return;const script = activeProject.scripts.find((entry) => entry.id === scriptId);@@ -3341,6 +3349,8 @@ export default function ChatView(props: ChatViewProps) {activeThreadActivities={activeThread?.activities}resolvedTheme={resolvedTheme}settings={settings}+ keybindings={keybindings}+ terminalOpen={Boolean(terminalState.terminalOpen)}gitCwd={gitCwd}promptRef={promptRef}composerImagesRef={composerImagesRef}diff --git a/apps/web/src/components/CommandPalette.logic.ts b/apps/web/src/components/CommandPalette.logic.tsindex 866db58fb..450f678dd 100644--- a/apps/web/src/components/CommandPalette.logic.ts+++ b/apps/web/src/components/CommandPalette.logic.ts@@ -151,22 +151,26 @@ export function buildThreadActionItems<TThread extends BuildThreadActionItemsThrconst leadingContent = input.renderLeadingContent?.(thread);const trailingContent = input.renderTrailingContent?.(thread);- return {- kind: "action",- value: `thread:${thread.id}`,- searchTerms: [thread.title, projectTitle ?? "", thread.branch ?? ""],- title: thread.title,- description: descriptionParts.join(" · "),- timestamp: formatRelativeTimeLabel(- thread.latestUserMessageAt ?? thread.updatedAt ?? thread.createdAt,- ),- icon: input.icon,- ...(leadingContent ? { titleLeadingContent: leadingContent } : {}),- ...(trailingContent ? { titleTrailingContent: trailingContent } : {}),- run: async () => {- await input.runThread(thread);+ return Object.assign(+ {+ kind: "action" as const,+ value: `thread:${thread.id}`,+ searchTerms: [thread.title, projectTitle ?? ``, thread.branch ?? ``],+ title: thread.title,+ description: descriptionParts.join(` · `),+ timestamp: formatRelativeTimeLabel(+ thread.latestUserMessageAt ?? thread.updatedAt ?? thread.createdAt,+ ),+ icon: input.icon,+ },+ leadingContent ? { titleLeadingContent: leadingContent } : {},+ trailingContent ? { titleTrailingContent: trailingContent } : {},+ {+ run: async () => {+ await input.runThread(thread);+ },},- };+ );});}diff --git a/apps/web/src/components/Icons.tsx b/apps/web/src/components/Icons.tsxindex 9a7ac5fbb..98bc509a6 100644--- a/apps/web/src/components/Icons.tsx+++ b/apps/web/src/components/Icons.tsx@@ -1,4 +1,5 @@import { type SVGProps, useId } from "react";+import { cn } from "~/lib/utils";export type Icon = React.FC<SVGProps<SVGSVGElement>>;@@ -14,8 +15,12 @@ export const GitHubIcon: Icon = (props) => (</svg>);-export const CursorIcon: Icon = (props) => (- <svg {...props} viewBox="0 0 466.73 532.09" fill="currentColor">+export const CursorIcon: Icon = ({ className, ...props }) => (+ <svg+ {...props}+ viewBox="0 0 466.73 532.09"+ className={cn("fill-[#26251E] dark:fill-[#EDECEC]", className)}+ ><path d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z" /></svg>);@@ -290,18 +295,25 @@ export const Zed: Icon = (props) => {);};-export const OpenAI: Icon = (props) => (- <svg {...props} preserveAspectRatio="xMidYMid" viewBox="0 0 256 260" fill="currentColor">+export const OpenAI: Icon = ({ className, ...props }) => (+ <svg+ {...props}+ preserveAspectRatio="xMidYMid"+ viewBox="0 0 256 260"+ className={cn("fill-black dark:fill-white", className)}+ ><path d="M239.184 106.203a64.716 64.716 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.716 64.716 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.665 64.665 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.767 64.767 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483Zm-97.56 136.338a48.397 48.397 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.595 8.595 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601Zm-104.466-44.61a48.345 48.345 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.339 8.339 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803ZM23.549 85.38a48.499 48.499 0 0 1 25.58-21.333v61.39a8.288 8.288 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.819.819 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405v.256Zm179.466 41.695-63.08-36.63L161.73 77.86a.819.819 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.544 8.544 0 0 0-4.4-7.213Zm21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.716.716 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391v.205ZM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.595 8.595 0 0 0-4.246 7.367l-.051 72.697Zm11.868-25.58 28.138-16.217 28.188 16.218v32.434l-28.086 16.218-28.188-16.218-.052-32.434Z" /></svg>);-export const ClaudeAI: Icon = (props) => (- <svg {...props} preserveAspectRatio="xMidYMid" viewBox="0 0 256 257">- <path- fill="currentColor"- d="m50.228 170.321 50.357-28.257.843-2.463-.843-1.361h-2.462l-8.426-.518-28.775-.778-24.952-1.037-24.175-1.296-6.092-1.297L0 125.796l.583-3.759 5.12-3.434 7.324.648 16.202 1.101 24.304 1.685 17.629 1.037 26.118 2.722h4.148l.583-1.685-1.426-1.037-1.101-1.037-25.147-17.045-27.22-18.017-14.258-10.37-7.713-5.25-3.888-4.925-1.685-10.758 7-7.713 9.397.649 2.398.648 9.527 7.323 20.35 15.75L94.817 91.9l3.889 3.24 1.555-1.102.195-.777-1.75-2.917-14.453-26.118-15.425-26.572-6.87-11.018-1.814-6.61c-.648-2.723-1.102-4.991-1.102-7.778l7.972-10.823L71.42 0 82.05 1.426l4.472 3.888 6.61 15.101 10.694 23.786 16.591 32.34 4.861 9.592 2.592 8.879.973 2.722h1.685v-1.556l1.36-18.211 2.528-22.36 2.463-28.776.843-8.1 4.018-9.722 7.971-5.25 6.222 2.981 5.12 7.324-.713 4.73-3.046 19.768-5.962 30.98-3.889 20.739h2.268l2.593-2.593 10.499-13.934 17.628-22.036 7.778-8.749 9.073-9.657 5.833-4.601h11.018l8.1 12.055-3.628 12.443-11.342 14.388-9.398 12.184-13.48 18.147-8.426 14.518.778 1.166 2.01-.194 30.46-6.481 16.462-2.982 19.637-3.37 8.88 4.148.971 4.213-3.5 8.62-20.998 5.184-24.628 4.926-36.682 8.685-.454.324.519.648 16.526 1.555 7.065.389h17.304l32.21 2.398 8.426 5.574 5.055 6.805-.843 5.184-12.962 6.611-17.498-4.148-40.83-9.721-14-3.5h-1.944v1.167l11.666 11.406 21.387 19.314 26.767 24.887 1.36 6.157-3.434 4.86-3.63-.518-23.526-17.693-9.073-7.972-20.545-17.304h-1.36v1.814l4.73 6.935 25.017 37.59 1.296 11.536-1.814 3.76-6.481 2.268-7.13-1.297-14.647-20.544-15.1-23.138-12.185-20.739-1.49.843-7.194 77.448-3.37 3.953-7.778 2.981-6.48-4.925-3.436-7.972 3.435-15.749 4.148-20.544 3.37-16.333 3.046-20.285 1.815-6.74-.13-.454-1.49.194-15.295 20.999-23.267 31.433-18.406 19.702-4.407 1.75-7.648-3.954.713-7.064 4.277-6.286 25.47-32.405 15.36-20.092 9.917-11.6-.065-1.686h-.583L44.07 198.125l-12.055 1.555-5.185-4.86.648-7.972 2.463-2.593 20.35-13.999-.064.065Z"- />+export const ClaudeAI: Icon = ({ className, ...props }) => (+ <svg+ {...props}+ preserveAspectRatio="xMidYMid"+ viewBox="0 0 256 257"+ className={cn("fill-[#d97757]", className)}+ >+ <path d="m50.228 170.321 50.357-28.257.843-2.463-.843-1.361h-2.462l-8.426-.518-28.775-.778-24.952-1.037-24.175-1.296-6.092-1.297L0 125.796l.583-3.759 5.12-3.434 7.324.648 16.202 1.101 24.304 1.685 17.629 1.037 26.118 2.722h4.148l.583-1.685-1.426-1.037-1.101-1.037-25.147-17.045-27.22-18.017-14.258-10.37-7.713-5.25-3.888-4.925-1.685-10.758 7-7.713 9.397.649 2.398.648 9.527 7.323 20.35 15.75L94.817 91.9l3.889 3.24 1.555-1.102.195-.777-1.75-2.917-14.453-26.118-15.425-26.572-6.87-11.018-1.814-6.61c-.648-2.723-1.102-4.991-1.102-7.778l7.972-10.823L71.42 0 82.05 1.426l4.472 3.888 6.61 15.101 10.694 23.786 16.591 32.34 4.861 9.592 2.592 8.879.973 2.722h1.685v-1.556l1.36-18.211 2.528-22.36 2.463-28.776.843-8.1 4.018-9.722 7.971-5.25 6.222 2.981 5.12 7.324-.713 4.73-3.046 19.768-5.962 30.98-3.889 20.739h2.268l2.593-2.593 10.499-13.934 17.628-22.036 7.778-8.749 9.073-9.657 5.833-4.601h11.018l8.1 12.055-3.628 12.443-11.342 14.388-9.398 12.184-13.48 18.147-8.426 14.518.778 1.166 2.01-.194 30.46-6.481 16.462-2.982 19.637-3.37 8.88 4.148.971 4.213-3.5 8.62-20.998 5.184-24.628 4.926-36.682 8.685-.454.324.519.648 16.526 1.555 7.065.389h17.304l32.21 2.398 8.426 5.574 5.055 6.805-.843 5.184-12.962 6.611-17.498-4.148-40.83-9.721-14-3.5h-1.944v1.167l11.666 11.406 21.387 19.314 26.767 24.887 1.36 6.157-3.434 4.86-3.63-.518-23.526-17.693-9.073-7.972-20.545-17.304h-1.36v1.814l4.73 6.935 25.017 37.59 1.296 11.536-1.814 3.76-6.481 2.268-7.13-1.297-14.647-20.544-15.1-23.138-12.185-20.739-1.49.843-7.194 77.448-3.37 3.953-7.778 2.981-6.48-4.925-3.436-7.972 3.435-15.749 4.148-20.544 3.37-16.333 3.046-20.285 1.815-6.74-.13-.454-1.49.194-15.295 20.999-23.267 31.433-18.406 19.702-4.407 1.75-7.648-3.954.713-7.064 4.277-6.286 25.47-32.405 15.36-20.092 9.917-11.6-.065-1.686h-.583L44.07 198.125l-12.055 1.555-5.185-4.86.648-7.972 2.463-2.593 20.35-13.999-.064.065Z" /></svg>);@@ -565,3 +577,14 @@ export const OpenCodeIcon: Icon = (props) => (</defs></svg>);++export const GithubCopilotIcon: Icon = ({ className, ...props }) => (+ <svg+ {...props}+ preserveAspectRatio="xMidYMid"+ viewBox="0 0 256 208"+ className={cn("fill-black dark:fill-white", className)}+ >+ <path d="M205.3 31.4c14 14.8 20 35.2 22.5 63.6 6.6 0 12.8 1.5 17 7.2l7.8 10.6c2.2 3 3.4 6.6 3.4 10.4v28.7a12 12 0 0 1-4.8 9.5C215.9 187.2 172.3 208 128 208c-49 0-98.2-28.3-123.2-46.6a12 12 0 0 1-4.8-9.5v-28.7c0-3.8 1.2-7.4 3.4-10.5l7.8-10.5c4.2-5.7 10.4-7.2 17-7.2 2.5-28.4 8.4-48.8 22.5-63.6C77.3 3.2 112.6 0 127.6 0h.4c14.7 0 50.4 2.9 77.3 31.4ZM128 78.7c-3 0-6.5.2-10.3.6a27.1 27.1 0 0 1-6 12.1 45 45 0 0 1-32 13c-6.8 0-13.9-1.5-19.7-5.2-5.5 1.9-10.8 4.5-11.2 11-.5 12.2-.6 24.5-.6 36.8 0 6.1 0 12.3-.2 18.5 0 3.6 2.2 6.9 5.5 8.4C79.9 185.9 105 192 128 192s48-6 74.5-18.1a9.4 9.4 0 0 0 5.5-8.4c.3-18.4 0-37-.8-55.3-.4-6.6-5.7-9.1-11.2-11-5.8 3.7-13 5.1-19.7 5.1a45 45 0 0 1-32-12.9 27.1 27.1 0 0 1-6-12.1c-3.4-.4-6.9-.5-10.3-.6Zm-27 44c5.8 0 10.5 4.6 10.5 10.4v19.2a10.4 10.4 0 0 1-20.8 0V133c0-5.8 4.6-10.4 10.4-10.4Zm53.4 0c5.8 0 10.4 4.6 10.4 10.4v19.2a10.4 10.4 0 0 1-20.8 0V133c0-5.8 4.7-10.4 10.4-10.4Zm-73-94.4c-11.2 1.1-20.6 4.8-25.4 10-10.4 11.3-8.2 40.1-2.2 46.2A31.2 31.2 0 0 0 75 91.7c6.8 0 19.6-1.5 30.1-12.2 4.7-4.5 7.5-15.7 7.2-27-.3-9.1-2.9-16.7-6.7-19.9-4.2-3.6-13.6-5.2-24.2-4.3Zm69 4.3c-3.8 3.2-6.4 10.8-6.7 19.9-.3 11.3 2.5 22.5 7.2 27a41.7 41.7 0 0 0 30 12.2c8.9 0 17-2.9 21.3-7.2 6-6.1 8.2-34.9-2.2-46.3-4.8-5-14.2-8.8-25.4-9.9-10.6-1-20 .7-24.2 4.3ZM128 56c-2.6 0-5.6.2-9 .5.4 1.7.5 3.7.7 5.7 0 1.5 0 3-.2 4.5 3.2-.3 6-.3 8.5-.3 2.6 0 5.3 0 8.5.3-.2-1.6-.2-3-.2-4.5.2-2 .3-4 .7-5.7-3.4-.3-6.4-.5-9-.5Z" />+ </svg>+);diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 827277939..8335042c1 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -75,11 +75,13 @@ import { useUiStateStore } from "../uiStateStore";import {resolveShortcutCommand,shortcutLabelForCommand,- shouldShowThreadJumpHints,+ shouldShowThreadJumpHintsForModifiers,threadJumpCommandForIndex,threadJumpIndexFromCommand,threadTraversalDirectionFromCommand,} from "../keybindings";+import { useModelPickerOpen } from "../modelPickerOpenState";+import { useShortcutModifierState } from "../shortcutModifierState";import { useGitStatus } from "../lib/gitStatusState";import { readLocalApi } from "../localApi";import { useComposerDraftStore } from "../composerDraftStore";@@ -199,24 +201,6 @@ const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> =separate: "Keep separate",};-function threadJumpLabelMapsEqual(- left: ReadonlyMap<string, string>,- right: ReadonlyMap<string, string>,-): boolean {- if (left === right) {- return true;- }- if (left.size !== right.size) {- return false;- }- for (const [key, value] of left) {- if (right.get(key) !== value) {- return false;- }- }- return true;-}-function formatProjectMemberActionLabel(member: SidebarProjectGroupMember,groupedProjectCount: number,@@ -2715,6 +2699,8 @@ export default function Sidebar() {const clearSelection = useThreadSelectionStore((s) => s.clearSelection);const setSelectionAnchor = useThreadSelectionStore((s) => s.setAnchor);const platform = navigator.platform;+ const shortcutModifiers = useShortcutModifierState();+ const modelPickerOpen = useModelPickerOpen();const primaryEnvironmentId = usePrimaryEnvironmentId();const savedEnvironmentRegistry = useSavedEnvironmentRegistryStore((s) => s.byId);const savedEnvironmentRuntimeById = useSavedEnvironmentRuntimeStore((s) => s.byId);@@ -2822,8 +2808,9 @@ export default function Sidebar() {routeThreadRef,).terminalOpen: false,+ modelPickerOpen,}),- [routeThreadRef],+ [modelPickerOpen, routeThreadRef],);const newThreadShortcutLabelOptions = useMemo(() => ({@@ -3016,12 +3003,37 @@ export default function Sidebar() {() => [...threadJumpCommandByKey.keys()],[threadJumpCommandByKey],);- const [threadJumpLabelByKey, setThreadJumpLabelByKey] =- useState<ReadonlyMap<string, string>>(EMPTY_THREAD_JUMP_LABELS);- const threadJumpLabelsRef = useRef<ReadonlyMap<string, string>>(EMPTY_THREAD_JUMP_LABELS);- threadJumpLabelsRef.current = threadJumpLabelByKey;- const showThreadJumpHintsRef = useRef(showThreadJumpHints);- showThreadJumpHintsRef.current = showThreadJumpHints;+ const sidebarShortcutContext = useMemo(+ () => ({+ terminalFocus: false,+ terminalOpen: routeThreadRef+ ? selectThreadTerminalState(+ useTerminalStateStore.getState().terminalStateByThreadKey,+ routeThreadRef,+ ).terminalOpen+ : false,+ modelPickerOpen,+ }),+ [modelPickerOpen, routeThreadRef],+ );+ const threadJumpLabelByKey = useMemo(+ () =>+ buildThreadJumpLabelMap({+ keybindings,+ platform,+ terminalOpen: sidebarShortcutContext.terminalOpen,+ threadJumpCommandByKey,+ }),+ [keybindings, platform, sidebarShortcutContext.terminalOpen, threadJumpCommandByKey],+ );+ const shouldShowThreadJumpHintsNow = shouldShowThreadJumpHintsForModifiers(+ shortcutModifiers,+ keybindings,+ {+ platform,+ context: sidebarShortcutContext,+ },+ );const visibleThreadJumpLabelByKey = showThreadJumpHints? threadJumpLabelByKey: EMPTY_THREAD_JUMP_LABELS;@@ -3052,52 +3064,12 @@ export default function Sidebar() {}, [prewarmedSidebarThreadRefs]);useEffect(() => {- const clearThreadJumpHints = () => {- setThreadJumpLabelByKey((current) =>- current === EMPTY_THREAD_JUMP_LABELS ? current : EMPTY_THREAD_JUMP_LABELS,- );- updateThreadJumpHintsVisibility(false);- };- const shouldIgnoreThreadJumpHintUpdate = (event: globalThis.KeyboardEvent) =>- !event.metaKey &&- !event.ctrlKey &&- !event.altKey &&- !event.shiftKey &&- event.key !== "Meta" &&- event.key !== "Control" &&- event.key !== "Alt" &&- event.key !== "Shift" &&- !showThreadJumpHintsRef.current &&- threadJumpLabelsRef.current === EMPTY_THREAD_JUMP_LABELS;+ updateThreadJumpHintsVisibility(shouldShowThreadJumpHintsNow);+ }, [shouldShowThreadJumpHintsNow, updateThreadJumpHintsVisibility]);+ useEffect(() => {const onWindowKeyDown = (event: globalThis.KeyboardEvent) => {- if (shouldIgnoreThreadJumpHintUpdate(event)) {- return;- }const shortcutContext = getCurrentSidebarShortcutContext();- const shouldShowHints = shouldShowThreadJumpHints(event, keybindings, {- platform,- context: shortcutContext,- });- if (!shouldShowHints) {- if (- showThreadJumpHintsRef.current ||- threadJumpLabelsRef.current !== EMPTY_THREAD_JUMP_LABELS- ) {- clearThreadJumpHints();- }- } else {- setThreadJumpLabelByKey((current) => {- const nextLabelMap = buildThreadJumpLabelMap({- keybindings,- platform,- terminalOpen: shortcutContext.terminalOpen,- threadJumpCommandByKey,- });- return threadJumpLabelMapsEqual(current, nextLabelMap) ? current : nextLabelMap;- });- updateThreadJumpHintsVisibility(true);- }if (event.defaultPrevented || event.repeat) {return;@@ -3147,43 +3119,10 @@ export default function Sidebar() {navigateToThread(scopeThreadRef(targetThread.environmentId, targetThread.id));};- const onWindowKeyUp = (event: globalThis.KeyboardEvent) => {- if (shouldIgnoreThreadJumpHintUpdate(event)) {- return;- }- const shortcutContext = getCurrentSidebarShortcutContext();- const shouldShowHints = shouldShowThreadJumpHints(event, keybindings, {- platform,- context: shortcutContext,- });- if (!shouldShowHints) {- clearThreadJumpHints();- return;- }- setThreadJumpLabelByKey((current) => {- const nextLabelMap = buildThreadJumpLabelMap({- keybindings,- platform,- terminalOpen: shortcutContext.terminalOpen,- threadJumpCommandByKey,- });- return threadJumpLabelMapsEqual(current, nextLabelMap) ? current : nextLabelMap;- });- updateThreadJumpHintsVisibility(true);- };-- const onWindowBlur = () => {- clearThreadJumpHints();- };-window.addEventListener("keydown", onWindowKeyDown);- window.addEventListener("keyup", onWindowKeyUp);- window.addEventListener("blur", onWindowBlur);return () => {window.removeEventListener("keydown", onWindowKeyDown);- window.removeEventListener("keyup", onWindowKeyUp);- window.removeEventListener("blur", onWindowBlur);};}, [getCurrentSidebarShortcutContext,@@ -3193,9 +3132,7 @@ export default function Sidebar() {platform,routeThreadKey,sidebarThreadByKey,- threadJumpCommandByKey,threadJumpThreadKeys,- updateThreadJumpHintsVisibility,]);useEffect(() => {diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsxindex 4cc2c85ca..3d3b081af 100644--- a/apps/web/src/components/chat/ChatComposer.tsx+++ b/apps/web/src/components/chat/ChatComposer.tsx@@ -6,6 +6,7 @@ import type {ProviderApprovalDecision,ProviderInteractionMode,ProviderKind,+ ResolvedKeybindingsConfig,RuntimeMode,ScopedThreadRef,ServerProvider,@@ -59,7 +60,7 @@ import {shouldUseCompactComposerFooter,} from "../composerFooterLayout";import { type ComposerPromptEditorHandle, ComposerPromptEditor } from "../ComposerPromptEditor";-import { AVAILABLE_PROVIDER_OPTIONS, ProviderModelPicker } from "./ProviderModelPicker";+import { ProviderModelPicker } from "./ProviderModelPicker";import { type ComposerCommandItem, ComposerCommandMenu } from "./ComposerCommandMenu";import { ComposerPendingApprovalActions } from "./ComposerPendingApprovalActions";import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";@@ -317,6 +318,9 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(export interface ChatComposerHandle {focusAtEnd: () => void;focusAt: (cursor: number) => void;+ openModelPicker: () => void;+ toggleModelPicker: () => void;+ isModelPickerOpen: () => boolean;readSnapshot: () => {value: string;cursor: number;@@ -410,6 +414,8 @@ export interface ChatComposerProps {// MiscresolvedTheme: "light" | "dark";settings: UnifiedSettings;+ keybindings: ResolvedKeybindingsConfig;+ terminalOpen: boolean;gitCwd: string | null;// Refs the parent needs kept in sync@@ -497,6 +503,8 @@ export const ChatComposer = memo(activeThreadActivities,resolvedTheme,settings,+ keybindings,+ terminalOpen,gitCwd,promptRef,composerImagesRef,@@ -622,23 +630,6 @@ export const ChatComposer = memo(? selectedModelForPicker: (normalizeModelSlug(selectedModelForPicker, selectedProvider) ?? selectedModelForPicker);}, [modelOptionsByProvider, selectedModelForPicker, selectedProvider]);- const searchableModelOptions = useMemo(- () =>- AVAILABLE_PROVIDER_OPTIONS.filter(- (option) => lockedProvider === null || option.value === lockedProvider,- ).flatMap((option) =>- modelOptionsByProvider[option.value].map(({ slug, name }) => ({- provider: option.value,- providerLabel: option.label,- slug,- name,- searchSlug: slug.toLowerCase(),- searchName: name.toLowerCase(),- searchProvider: option.label.toLowerCase(),- })),- ),- [lockedProvider, modelOptionsByProvider],- );// ------------------------------------------------------------------// Context window@@ -664,6 +655,7 @@ export const ChatComposer = memo(const [isDragOverComposer, setIsDragOverComposer] = useState(false);const [isComposerFooterCompact, setIsComposerFooterCompact] = useState(false);const [isComposerPrimaryActionsCompact, setIsComposerPrimaryActionsCompact] = useState(false);+ const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);// ------------------------------------------------------------------// Refs@@ -782,31 +774,8 @@ export const ChatComposer = memo((skill.scope ? `${skill.scope} skill` : "Run provider skill"),}));}- return searchableModelOptions- .filter(({ searchSlug, searchName, searchProvider }) => {- const query = composerTrigger.query.trim().toLowerCase();- if (!query) return true;- return (- searchSlug.includes(query) ||- searchName.includes(query) ||- searchProvider.includes(query)- );- })- .map(({ provider, providerLabel, slug, name }) => ({- id: `model:${provider}:${slug}`,- type: "model",- provider,- model: slug,- label: name,- description: `${providerLabel} · ${slug}`,- }));- }, [- composerTrigger,- searchableModelOptions,- selectedProvider,- selectedProviderStatus,- workspaceEntries,- ]);+ return [];+ }, [composerTrigger, selectedProvider, selectedProviderStatus, workspaceEntries]);const composerMenuOpen = Boolean(composerTrigger);const composerMenuSearchKey = composerTrigger@@ -1276,7 +1245,7 @@ export const ChatComposer = memo(rangeStart: number,rangeEnd: number,replacement: string,- options?: { expectedText?: string },+ options?: { expectedText?: string; focusEditorAfterReplace?: boolean },): boolean => {const currentText = promptRef.current;const safeStart = Math.max(0, Math.min(currentText.length, rangeStart));@@ -1305,9 +1274,11 @@ export const ChatComposer = memo(}setComposerCursor(nextCursor);setComposerTrigger(detectComposerTrigger(next.text, nextExpandedCursor));- window.requestAnimationFrame(() => {- composerEditorRef.current?.focusAt(nextCursor);- });+ if (options?.focusEditorAfterReplace !== false) {+ window.requestAnimationFrame(() => {+ composerEditorRef.current?.focusAt(nextCursor);+ });+ }return true;},[@@ -1377,20 +1348,13 @@ export const ChatComposer = memo(}if (item.type === "slash-command") {if (item.command === "model") {- const replacement = "/model ";- const replacementRangeEnd = extendReplacementRangeForTrailingSpace(- snapshot.value,- trigger.rangeEnd,- replacement,- );- const applied = applyPromptReplacement(- trigger.rangeStart,- replacementRangeEnd,- replacement,- { expectedText: snapshot.value.slice(trigger.rangeStart, replacementRangeEnd) },- );+ const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {+ expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),+ focusEditorAfterReplace: false,+ });if (applied) {setComposerHighlightedItemId(null);+ setIsComposerModelPickerOpen(true);}return;}@@ -1439,20 +1403,8 @@ export const ChatComposer = memo(}return;}- onProviderModelSelect(item.provider, item.model);- const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {- expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),- });- if (applied) {- setComposerHighlightedItemId(null);- }},- [- applyPromptReplacement,- handleInteractionModeChange,- onProviderModelSelect,- resolveActiveComposerTrigger,- ],+ [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],);const onComposerMenuItemHighlighted = useCallback(@@ -1633,6 +1585,13 @@ export const ChatComposer = memo(focusAt: (cursor: number) => {composerEditorRef.current?.focusAt(cursor);},+ openModelPicker: () => {+ setIsComposerModelPickerOpen(true);+ },+ toggleModelPicker: () => {+ setIsComposerModelPickerOpen((open) => !open);+ },+ isModelPickerOpen: () => isComposerModelPickerOpen,readSnapshot: () => {return readComposerSnapshot();},@@ -1710,6 +1669,7 @@ export const ChatComposer = memo(promptRef,composerImagesRef,composerTerminalContextsRef,+ isComposerModelPickerOpen,readComposerSnapshot,selectedModel,selectedModelOptionsForDispatch,@@ -1925,13 +1885,19 @@ export const ChatComposer = memo(model={selectedModelForPickerWithCustomFallback}lockedProvider={lockedProvider}providers={providerStatuses}+ keybindings={keybindings}modelOptionsByProvider={modelOptionsByProvider}+ terminalOpen={terminalOpen}+ open={isComposerModelPickerOpen}{...(composerProviderState.modelPickerIconClassName? {activeProviderIconClassName:composerProviderState.modelPickerIconClassName,}: {})}+ onOpenChange={(open) => {+ setIsComposerModelPickerOpen(open);+ }}onProviderModelChange={onProviderModelSelect}/>diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsxindex de7cf2b2b..5d13e6593 100644--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx@@ -10,7 +10,6 @@ import { memo, useLayoutEffect, useMemo, useRef } from "react";import { type ComposerSlashCommand, type ComposerTriggerKind } from "../../composer-logic";import { formatProviderSkillInstallSource } from "~/providerSkillPresentation";import { cn } from "~/lib/utils";-import { Badge } from "../ui/badge";import {Command,CommandGroup,@@ -45,14 +44,6 @@ export type ComposerCommandItem =label: string;description: string;}- | {- id: string;- type: "model";- provider: ProviderKind;- model: string;- label: string;- description: string;- }| {id: string;type: "skill";@@ -255,11 +246,6 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {<SkillGlyph className="size-3.5" /></span>) : null}- {props.item.type === "model" ? (- <Badge variant="outline" className="px-1.5 py-0 text-[10px]">- model- </Badge>- ) : null}<span className="flex min-w-0 flex-1 items-center gap-2"><span className="shrink-0">{props.item.label}</span><span className="min-w-0 flex-1 truncate text-muted-foreground/70 text-xs">diff --git a/apps/web/src/components/chat/ModelListRow.tsx b/apps/web/src/components/chat/ModelListRow.tsxnew file mode 100644index 000000000..6cd097ad1--- /dev/null+++ b/apps/web/src/components/chat/ModelListRow.tsx@@ -0,0 +1,104 @@+import { type ProviderKind } from "@t3tools/contracts";+import { memo } from "react";+import { StarIcon } from "lucide-react";+import {+ getDisplayModelName,+ getProviderLabel,+ getTriggerDisplayModelLabel,+ type ModelEsque,+ PROVIDER_ICON_BY_PROVIDER,+} from "./providerIconUtils";+import { ComboboxItem } from "../ui/combobox";+import { Kbd } from "../ui/kbd";+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";+import { cn } from "~/lib/utils";++export const ModelListRow = memo(function ModelListRow(props: {+ index: number;+ model: ModelEsque;+ provider: ProviderKind;+ isFavorite: boolean;+ showProvider: boolean;+ preferShortName?: boolean;+ useTriggerLabel?: boolean;+ showNewBadge?: boolean;+ jumpLabel?: string | null;+ onToggleFavorite: () => void;+}) {+ const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.provider];++ return (+ <ComboboxItem+ hideIndicator+ index={props.index}+ value={`${props.provider}:${props.model.slug}`}+ contentClassName="flex w-full items-start gap-2"+ className={cn(+ "w-full cursor-pointer rounded px-3 py-2 transition-colors group",+ "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",+ )}+ >+ <Tooltip>+ <TooltipTrigger+ render={+ <button+ className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"+ onClick={(event) => {+ event.stopPropagation();+ props.onToggleFavorite();+ }}+ onKeyDown={(event) => {+ event.stopPropagation();+ }}+ type="button"+ aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}+ >+ <StarIcon+ className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}+ />+ </button>+ }+ />+ <TooltipPopup side="top" align="center">+ {props.isFavorite ? "Remove from favorites" : "Add to favorites"}+ </TooltipPopup>+ </Tooltip>++ <div className="min-w-0 flex-1 text-left">+ <div className="flex items-center justify-between gap-2 min-w-0">+ <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">+ <span className="truncate">+ {props.useTriggerLabel+ ? getTriggerDisplayModelLabel(props.model)+ : getDisplayModelName(+ props.model,+ props.preferShortName ? { preferShortName: true } : undefined,+ )}+ </span>+ {props.showNewBadge ? (+ <span+ className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"+ aria-label="New model"+ >+ New+ </span>+ ) : null}+ </div>+ {props.jumpLabel ? (+ <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">+ {props.jumpLabel}+ </Kbd>+ ) : null}+ </div>+ {props.showProvider && (+ <div className="flex items-center gap-1 mt-0.5">+ <ProviderIcon className="size-3 shrink-0" />+ <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">+ {getProviderLabel(props.provider, props.model)}+ </span>+ </div>+ )}+ </div>+ </ComboboxItem>+ );+});diff --git a/apps/web/src/components/chat/ModelPickerContent.tsx b/apps/web/src/components/chat/ModelPickerContent.tsxnew file mode 100644index 000000000..82720425e--- /dev/null+++ b/apps/web/src/components/chat/ModelPickerContent.tsx@@ -0,0 +1,519 @@+import {+ type ProviderKind,+ PROVIDER_DISPLAY_NAMES,+ type ResolvedKeybindingsConfig,+ type ServerProvider,+} from "@t3tools/contracts";+import { resolveSelectableModel } from "@t3tools/shared/model";+import { memo, useMemo, useState, useCallback, useEffect, useLayoutEffect, useRef } from "react";+import { SearchIcon } from "lucide-react";+import { ModelListRow } from "./ModelListRow";+import { ModelPickerSidebar } from "./ModelPickerSidebar";+import { isModelPickerNewModel } from "./modelPickerModelHighlights";+import { buildModelPickerSearchText, scoreModelPickerSearch } from "./modelPickerSearch";+import { Combobox, ComboboxEmpty, ComboboxInput, ComboboxList } from "../ui/combobox";+import { ModelEsque, PROVIDER_ICON_BY_PROVIDER } from "./providerIconUtils";+import {+ modelPickerJumpCommandForIndex,+ modelPickerJumpIndexFromCommand,+ resolveShortcutCommand,+ shortcutLabelForCommand,+} from "../../keybindings";+import { useSettings, useUpdateSettings } from "~/hooks/useSettings";+import { cn } from "~/lib/utils";+import { TooltipProvider } from "../ui/tooltip";++type ModelPickerItem = {+ slug: string;+ name: string;+ shortName?: string;+ subProvider?: string;+ provider: ProviderKind;+};++const EMPTY_MODEL_JUMP_LABELS = new Map<string, string>();++export const ModelPickerContent = memo(function ModelPickerContent(props: {+ provider: ProviderKind;+ model: string;+ lockedProvider: ProviderKind | null;+ providers?: ReadonlyArray<ServerProvider>;+ keybindings?: ResolvedKeybindingsConfig;+ modelOptionsByProvider: Record<ProviderKind, ReadonlyArray<ModelEsque>>;+ terminalOpen: boolean;+ onRequestClose?: () => void;+ onProviderModelChange: (provider: ProviderKind, model: string) => void;+}) {+ const { keybindings: providedKeybindings, modelOptionsByProvider, onProviderModelChange } = props;+ const [searchQuery, setSearchQuery] = useState("");+ const searchInputRef = useRef<HTMLInputElement>(null);+ const listRegionRef = useRef<HTMLDivElement>(null);+ const highlightedModelKeyRef = useRef<string | null>(null);+ const favorites = useSettings((s) => s.favorites ?? []);+ const [selectedProvider, setSelectedProvider] = useState<ProviderKind | "favorites">(() => {+ if (props.lockedProvider !== null) {+ return props.lockedProvider;+ }+ return favorites.length > 0 ? "favorites" : props.provider;+ });+ const keybindings = useMemo<ResolvedKeybindingsConfig>(+ () => providedKeybindings ?? [],+ [providedKeybindings],+ );+ const { updateSettings } = useUpdateSettings();++ const focusSearchInput = useCallback(() => {+ searchInputRef.current?.focus({ preventScroll: true });+ }, []);++ const handleSelectProvider = useCallback(+ (provider: ProviderKind | "favorites") => {+ setSelectedProvider(provider);+ window.requestAnimationFrame(() => {+ focusSearchInput();+ });+ },+ [focusSearchInput],+ );++ useLayoutEffect(() => {+ focusSearchInput();+ const frame = window.requestAnimationFrame(() => {+ focusSearchInput();+ });+ const timeout = window.setTimeout(() => {+ focusSearchInput();+ }, 0);+ return () => {+ window.cancelAnimationFrame(frame);+ window.clearTimeout(timeout);+ };+ }, [focusSearchInput]);++ // Create a Set for efficient lookup+ const favoritesSet = useMemo(() => {+ return new Set(favorites.map((fav) => `${fav.provider}:${fav.model}`));+ }, [favorites]);+ const favoriteOrder = useMemo(() => {+ return new Map(+ favorites.map((favorite, index) => [`${favorite.provider}:${favorite.model}`, index]),+ );+ }, [favorites]);++ const readyProviderSet = useMemo(() => {+ if (!props.providers || props.providers.length === 0) {+ return null;+ }+ return new Set(+ props.providers+ .filter((provider) => provider.status === "ready")+ .map((provider) => provider.provider),+ );+ }, [props.providers]);++ // Flatten models into a searchable array+ const flatModels = useMemo(() => {+ return Object.entries(props.modelOptionsByProvider).flatMap(([providerKind, models]) => {+ if (readyProviderSet && !readyProviderSet.has(providerKind as ProviderKind)) {+ return [];+ }+ return models.map((m) => ({+ slug: m.slug,+ name: m.name,+ ...(m.shortName ? { shortName: m.shortName } : {}),+ ...(m.subProvider ? { subProvider: m.subProvider } : {}),+ provider: providerKind as ProviderKind,+ })) satisfies Array<ModelPickerItem>;+ });+ }, [props.modelOptionsByProvider, readyProviderSet]);++ // Filter models based on search query and selected provider+ const filteredModels = useMemo(() => {+ let result = flatModels;++ // Apply tokenized fuzzy search across the combined provider/model search fields.+ if (searchQuery.trim()) {+ const rankedMatches = result+ .map((model) => ({+ model,+ score: scoreModelPickerSearch(+ {+ ...model,+ isFavorite: favoritesSet.has(`${model.provider}:${model.slug}`),+ },+ searchQuery,+ ),+ isFavorite: favoritesSet.has(`${model.provider}:${model.slug}`),+ tieBreaker: buildModelPickerSearchText(model),+ }))+ .filter(+ (+ rankedModel,+ ): rankedModel is {+ model: ModelPickerItem;+ score: number;+ isFavorite: boolean;+ tieBreaker: string;+ } => rankedModel.score !== null,+ );++ // When searching, we only respect locked provider, ignoring sidebar selection+ if (props.lockedProvider !== null) {+ return rankedMatches+ .filter((rankedModel) => rankedModel.model.provider === props.lockedProvider)+ .toSorted((a, b) => {+ const scoreDelta = a.score - b.score;+ if (scoreDelta !== 0) {+ return scoreDelta;+ }+ if (a.isFavorite !== b.isFavorite) {+ return a.isFavorite ? -1 : 1;+ }+ return a.tieBreaker.localeCompare(b.tieBreaker);+ })+ .map((rankedModel) => rankedModel.model);+ }++ return rankedMatches+ .toSorted((a, b) => {+ const scoreDelta = a.score - b.score;+ if (scoreDelta !== 0) {+ return scoreDelta;+ }+ if (a.isFavorite !== b.isFavorite) {+ return a.isFavorite ? -1 : 1;+ }+ return a.tieBreaker.localeCompare(b.tieBreaker);+ })+ .map((rankedModel) => rankedModel.model);+ }++ // Locked provider mode always shows that provider's models, with favorites first.+ if (props.lockedProvider !== null) {+ result = result.filter((m) => m.provider === props.lockedProvider);+ } else if (selectedProvider === "favorites") {+ result = result.filter((m) => favoritesSet.has(`${m.provider}:${m.slug}`));+ } else {+ result = result.filter((m) => m.provider === selectedProvider);+ }++ return result.toSorted((a, b) => {+ const aOrder = favoriteOrder.get(`${a.provider}:${a.slug}`);+ const bOrder = favoriteOrder.get(`${b.provider}:${b.slug}`);++ if (aOrder !== undefined && bOrder !== undefined) {+ return aOrder - bOrder;+ }+ if (aOrder !== undefined) {+ return -1;+ }+ if (bOrder !== undefined) {+ return 1;+ }+ return 0;+ });+ }, [+ favoriteOrder,+ favoritesSet,+ flatModels,+ props.lockedProvider,+ searchQuery,+ selectedProvider,+ ]);++ const handleModelSelect = useCallback(+ (modelSlug: string, provider: ProviderKind) => {+ const resolvedModel = resolveSelectableModel(+ provider,+ modelSlug,+ modelOptionsByProvider[provider],+ );+ if (resolvedModel) {+ onProviderModelChange(provider, resolvedModel);+ }+ },+ [modelOptionsByProvider, onProviderModelChange],+ );++ const toggleFavorite = useCallback(+ (provider: ProviderKind, model: string) => {+ const newFavorites = [...favorites];+ const index = newFavorites.findIndex((f) => f.provider === provider && f.model === model);+ if (index >= 0) {+ newFavorites.splice(index, 1);+ } else {+ newFavorites.push({ provider, model });+ }+ updateSettings({ favorites: newFavorites });+ },+ [favorites, updateSettings],+ );++ const isLocked = props.lockedProvider !== null;+ const isSearching = searchQuery.trim().length > 0;+ const showSidebar = !isLocked && !isSearching;+ const LockedProviderIcon =+ isLocked && props.lockedProvider ? PROVIDER_ICON_BY_PROVIDER[props.lockedProvider] : null;+ const modelJumpCommandByKey = useMemo(() => {+ const mapping = new Map<+ string,+ NonNullable<ReturnType<typeof modelPickerJumpCommandForIndex>>+ >();+ for (const [visibleModelIndex, model] of filteredModels.entries()) {+ const jumpCommand = modelPickerJumpCommandForIndex(visibleModelIndex);+ if (!jumpCommand) {+ return mapping;+ }+ mapping.set(`${model.provider}:${model.slug}`, jumpCommand);+ }+ return mapping;+ }, [filteredModels]);+ const modelJumpModelKeys = useMemo(+ () => [...modelJumpCommandByKey.keys()],+ [modelJumpCommandByKey],+ );+ const allModelKeys = useMemo(+ (): string[] => flatModels.map((model) => `${model.provider}:${model.slug}`),+ [flatModels],+ );+ const filteredModelKeys = useMemo(+ (): string[] => filteredModels.map((model) => `${model.provider}:${model.slug}`),+ [filteredModels],+ );+ const filteredModelByKey = useMemo(+ (): ReadonlyMap<string, ModelPickerItem> =>+ new Map(filteredModels.map((model) => [`${model.provider}:${model.slug}`, model] as const)),+ [filteredModels],+ );+ const modelJumpShortcutContext = useMemo(+ () =>+ ({+ terminalFocus: false,+ terminalOpen: props.terminalOpen,+ modelPickerOpen: true,+ }) as const,+ [props.terminalOpen],+ );+ const modelJumpLabelByKey = useMemo((): ReadonlyMap<string, string> => {+ if (modelJumpCommandByKey.size === 0) {+ return EMPTY_MODEL_JUMP_LABELS;+ }+ const shortcutLabelOptions = {+ platform: navigator.platform,+ context: modelJumpShortcutContext,+ };+ const mapping = new Map<string, string>();+ for (const [modelKey, command] of modelJumpCommandByKey) {+ const label = shortcutLabelForCommand(keybindings, command, shortcutLabelOptions);+ if (label) {+ mapping.set(modelKey, label);+ }+ }+ return mapping.size > 0 ? mapping : EMPTY_MODEL_JUMP_LABELS;+ }, [keybindings, modelJumpCommandByKey, modelJumpShortcutContext]);++ useEffect(() => {+ const onWindowKeyDown = (event: globalThis.KeyboardEvent) => {+ if (event.defaultPrevented || event.repeat) {+ return;+ }++ const command = resolveShortcutCommand(event, keybindings, {+ platform: navigator.platform,+ context: modelJumpShortcutContext,+ });+ const jumpIndex = modelPickerJumpIndexFromCommand(command ?? "");+ if (jumpIndex === null) {+ return;+ }++ const targetModelKey = modelJumpModelKeys[jumpIndex];+ if (!targetModelKey) {+ return;+ }+ const [provider, slug] = targetModelKey.split(":") as [ProviderKind, string];+ event.preventDefault();+ event.stopPropagation();+ handleModelSelect(slug, provider);+ };++ window.addEventListener("keydown", onWindowKeyDown, true);++ return () => {+ window.removeEventListener("keydown", onWindowKeyDown, true);+ };+ }, [handleModelSelect, keybindings, modelJumpModelKeys, modelJumpShortcutContext]);++ useLayoutEffect(() => {+ const listRegion = listRegionRef.current;+ if (!listRegion) {+ return;+ }++ let cancelled = false;+ let frame = 0;+ let nestedFrame = 0;+ let timeout = 0;++ const measureScrollArea = () => {+ if (cancelled) {+ return;+ }+ const viewport = listRegion.querySelector<HTMLElement>('[data-slot="scroll-area-viewport"]');+ if (!viewport || viewport.scrollHeight <= viewport.clientHeight) {+ return;+ }+ const originalScrollTop = viewport.scrollTop;+ const maxScrollTop = viewport.scrollHeight - viewport.clientHeight;+ if (maxScrollTop <= 0) {+ return;+ }+ viewport.scrollTop = Math.min(originalScrollTop + 1, maxScrollTop);+ viewport.scrollTop = originalScrollTop;+ };++ queueMicrotask(measureScrollArea);+ frame = window.requestAnimationFrame(() => {+ measureScrollArea();+ nestedFrame = window.requestAnimationFrame(measureScrollArea);+ });+ timeout = window.setTimeout(measureScrollArea, 0);++ return () => {+ cancelled = true;+ window.cancelAnimationFrame(frame);+ window.cancelAnimationFrame(nestedFrame);+ window.clearTimeout(timeout);+ };+ }, [filteredModelKeys]);++ return (+ <TooltipProvider delay={0}>+ <div+ className={cn(+ "relative flex h-screen max-h-96 w-screen max-w-100 overflow-hidden rounded-lg border bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",+ isLocked ? "flex-col" : "flex-row",+ )}+ >+ {/* Locked provider header (only shown in locked mode) */}+ {isLocked && LockedProviderIcon && props.lockedProvider && (+ <div className="flex items-center gap-2 px-4 py-3 border-b">+ <LockedProviderIcon className="size-5 shrink-0" />+ <span className="font-medium text-sm">+ {PROVIDER_DISPLAY_NAMES[props.lockedProvider]}+ </span>+ </div>+ )}++ {/* Sidebar (only in unlocked mode) */}+ {showSidebar && (+ <ModelPickerSidebar+ selectedProvider={selectedProvider}+ onSelectProvider={handleSelectProvider}+ {...(props.providers && { providers: props.providers })}+ />+ )}++ {/* Main content area */}+ <Combobox+ inline+ items={allModelKeys}+ filteredItems={filteredModelKeys}+ filter={null}+ autoHighlight+ open+ value={`${props.provider}:${props.model}`}+ onItemHighlighted={(modelKey) => {+ highlightedModelKeyRef.current = typeof modelKey === "string" ? modelKey : null;+ }}+ onValueChange={(modelKey) => {+ if (typeof modelKey !== "string") {+ return;+ }+ const [provider, slug] = modelKey.split(":") as [ProviderKind, string];+ handleModelSelect(slug, provider);+ }}+ >+ <div+ className={cn(+ "flex min-h-0 flex-1 flex-col overflow-hidden",+ isLocked ? "min-w-0" : showSidebar && "border-l",+ )}+ >+ {/* Search bar */}+ <div className="border-b px-3 py-2">+ <ComboboxInput+ ref={searchInputRef}+ className="[&_input]:font-sans rounded-md"+ inputClassName="border-0 shadow-none ring-0 focus-visible:ring-0"+ placeholder="Search models..."+ showTrigger={false}+ startAddon={<SearchIcon className="size-4 shrink-0 text-muted-foreground/50" />}+ value={searchQuery}+ onChange={(e) => setSearchQuery(e.target.value)}+ onKeyDown={(e) => {+ if (e.key === "Escape") {+ e.preventDefault();+ e.stopPropagation();+ props.onRequestClose?.();+ return;+ }+ if (e.key === "Enter" && highlightedModelKeyRef.current) {+ (+ e as typeof e & { preventBaseUIHandler?: () => void }+ ).preventBaseUIHandler?.();+ e.preventDefault();+ e.stopPropagation();+ const [provider, slug] = highlightedModelKeyRef.current.split(":") as [+ ProviderKind,+ string,+ ];+ handleModelSelect(slug, provider);+ return;+ }+ e.stopPropagation();+ }}+ onMouseDown={(e) => e.stopPropagation()}+ onTouchStart={(e) => e.stopPropagation()}+ size="sm"+ />+ </div>++ {/* Model list */}+ <div+ ref={listRegionRef}+ className="relative min-h-0 flex-1 before:pointer-events-none before:absolute before:inset-0 before:bg-muted/40"+ >+ <ComboboxList className="model-picker-list size-full divide-y px-2 py-1">+ {filteredModelKeys.map((modelKey, index) => {+ const model = filteredModelByKey.get(modelKey);+ if (!model) {+ return null;+ }+ return (+ <ModelListRow+ key={modelKey}+ index={index}+ model={model}+ provider={model.provider}+ isFavorite={favoritesSet.has(modelKey)}+ showProvider={!isLocked}+ preferShortName={!isLocked}+ useTriggerLabel={isLocked}+ showNewBadge={isModelPickerNewModel(model.provider, model.slug)}+ jumpLabel={modelJumpLabelByKey.get(modelKey) ?? null}+ onToggleFavorite={() => toggleFavorite(model.provider, model.slug)}+ />+ );+ })}+ </ComboboxList>+ </div>+ <ComboboxEmpty className="not-empty:py-6 empty:h-0 text-xs font-normal leading-snug">+ No models found+ </ComboboxEmpty>+ </div>+ </Combobox>+ </div>+ </TooltipProvider>+ );+});diff --git a/apps/web/src/components/chat/ModelPickerSidebar.tsx b/apps/web/src/components/chat/ModelPickerSidebar.tsxnew file mode 100644index 000000000..b4f23cacd--- /dev/null+++ b/apps/web/src/components/chat/ModelPickerSidebar.tsx@@ -0,0 +1,210 @@+import { type ProviderKind, type ServerProvider } from "@t3tools/contracts";+import { memo } from "react";+import { Clock3Icon, SparklesIcon, StarIcon } from "lucide-react";+import { Gemini, GithubCopilotIcon } from "../Icons";+import { AVAILABLE_PROVIDER_OPTIONS, PROVIDER_ICON_BY_PROVIDER } from "./providerIconUtils";+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";+import { cn } from "~/lib/utils";+import { getProviderSnapshot } from "../../providerModels";++function describeUnavailableProvider(label: string, live: ServerProvider | undefined): string {+ if (!live) {+ return `${label} — waiting for provider status…`;+ }+ if (live.status === "ready") {+ return label;+ }+ const kind =+ live.status === "error"+ ? "Unavailable"+ : live.status === "warning"+ ? "Limited"+ : live.status === "disabled"+ ? "Disabled in settings"+ : "Not ready";+ const msg = live.message?.trim();+ return msg ? `${label} — ${kind}. ${msg}` : `${label} — ${kind}.`;+}++const SELECTED_BUTTON_CLASS = "bg-background text-foreground shadow-sm";+const SELECTED_INDICATOR_CLASS =+ "pointer-events-none absolute -right-1 top-1/2 z-10 h-5 w-0.5 -translate-y-1/2 rounded-l-full bg-primary";+const BADGE_BASE_CLASS =+ "pointer-events-none absolute -right-0.5 top-0.5 z-10 flex size-3.5 items-center justify-center rounded-full bg-transparent shadow-sm ";+const NEW_BADGE_CLASS = `${BADGE_BASE_CLASS} text-amber-600 dark:text-amber-300 `;+const SOON_BADGE_CLASS = `${BADGE_BASE_CLASS} text-muted-foreground `;++/** Opens toward the rail so the list stays readable (not over the model names). */+const PICKER_TOOLTIP_SIDE = "left" as const;+const PICKER_TOOLTIP_CLASS = "max-w-64 text-balance font-normal leading-snug";++export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {+ selectedProvider: ProviderKind | "favorites";+ onSelectProvider: (provider: ProviderKind | "favorites") => void;+ providers?: ReadonlyArray<ServerProvider>;+}) {+ const handleProviderClick = (provider: ProviderKind | "favorites") => {+ props.onSelectProvider(provider);+ };++ return (+ <div className="flex flex-col w-12 border-r bg-muted/30 p-1 overflow-y-auto gap-1">+ {/* Favorites section */}+ <div className="pb-1 mb-1 border-b">+ <div className="relative w-full">+ {props.selectedProvider === "favorites" && <div className={SELECTED_INDICATOR_CLASS} />}+ <Tooltip>+ <TooltipTrigger+ render={+ <button+ className={cn(+ "relative isolate flex w-full cursor-pointer aspect-square items-center justify-center rounded transition-colors hover:bg-muted",+ props.selectedProvider === "favorites" && SELECTED_BUTTON_CLASS,+ )}+ onClick={() => handleProviderClick("favorites")}+ type="button"+ data-model-picker-provider="favorites"+ aria-label="Favorites"+ >+ <StarIcon className="size-5 fill-current shrink-0" aria-hidden />+ </button>+ }+ />+ <TooltipPopup+ side={PICKER_TOOLTIP_SIDE}+ align="center"+ className={PICKER_TOOLTIP_CLASS}+ >+ Favorites+ </TooltipPopup>+ </Tooltip>+ </div>+ </div>++ {/* Provider buttons */}+ {AVAILABLE_PROVIDER_OPTIONS.map((option) => {+ const OptionIcon = PROVIDER_ICON_BY_PROVIDER[option.value];+ const liveProvider = props.providers+ ? getProviderSnapshot(props.providers, option.value)+ : undefined;++ const isDisabled = !liveProvider || liveProvider.status !== "ready";+ const isSelected = props.selectedProvider === option.value;+ const badge = option.pickerSidebarBadge;++ const providerTooltip = isDisabled+ ? describeUnavailableProvider(option.label, liveProvider)+ : badge === "new"+ ? `${option.label} — New`+ : option.label;++ const button = (+ <button+ data-model-picker-provider={option.value}+ className={cn(+ "relative isolate flex w-full cursor-pointer aspect-square items-center justify-center rounded transition-colors hover:bg-muted",+ isSelected && SELECTED_BUTTON_CLASS,+ isDisabled && "opacity-50 cursor-not-allowed hover:bg-transparent",+ )}+ onClick={() => !isDisabled && handleProviderClick(option.value)}+ disabled={isDisabled}+ type="button"+ aria-label={+ isDisabled+ ? (providerTooltip ?? option.label)+ : badge === "new"+ ? `${option.label}, new`+ : option.label+ }+ >+ <OptionIcon className="size-5 shrink-0" aria-hidden />+ {badge === "new" ? (+ <span className={NEW_BADGE_CLASS} aria-hidden>+ <SparklesIcon className="size-2" />+ </span>+ ) : badge === "soon" ? (+ <span className={SOON_BADGE_CLASS} aria-hidden>+ <Clock3Icon className="size-2" />+ </span>+ ) : null}+ </button>+ );++ const trigger = isDisabled ? (+ <span className="relative block w-full">{button}</span>+ ) : (+ button+ );++ return (+ <div key={option.value} className="relative w-full">+ {isSelected && <div className={SELECTED_INDICATOR_CLASS} />}+ <Tooltip>+ <TooltipTrigger render={trigger} />+ <TooltipPopup+ side={PICKER_TOOLTIP_SIDE}+ align="center"+ className={PICKER_TOOLTIP_CLASS}+ >+ {providerTooltip}+ </TooltipPopup>+ </Tooltip>+ </div>+ );+ })}++ {/* Gemini button (coming soon) */}+ <Tooltip>+ <TooltipTrigger+ render={+ <span className="relative block w-full">+ <button+ className={cn(+ "relative isolate flex w-full aspect-square items-center justify-center rounded opacity-50 cursor-not-allowed transition-colors hover:bg-transparent",+ )}+ disabled+ type="button"+ data-model-picker-provider="gemini-coming-soon"+ aria-label="Gemini — coming soon"+ >+ <Gemini className="size-5 text-muted-foreground/85" aria-hidden />+ <span className={SOON_BADGE_CLASS} aria-hidden>+ <Clock3Icon className="size-2" />+ </span>+ </button>+ </span>+ }+ />+ <TooltipPopup side={PICKER_TOOLTIP_SIDE} align="center" className={PICKER_TOOLTIP_CLASS}>+ Gemini — Coming soon+ </TooltipPopup>+ </Tooltip>+ {/* Github Copilot button (coming soon) */}+ <Tooltip>+ <TooltipTrigger+ render={+ <span className="relative block w-full">+ <button+ className={cn(+ "relative isolate flex w-full aspect-square items-center justify-center rounded opacity-50 cursor-not-allowed transition-colors hover:bg-transparent",+ )}+ disabled+ type="button"+ data-model-picker-provider="github-copilot-coming-soon"+ aria-label="Github Copilot — coming soon"+ >+ <GithubCopilotIcon className="size-5 text-muted-foreground/85" aria-hidden />+ <span className={SOON_BADGE_CLASS} aria-hidden>+ <Clock3Icon className="size-2" />+ </span>+ </button>+ </span>+ }+ />+ <TooltipPopup side={PICKER_TOOLTIP_SIDE} align="center" className={PICKER_TOOLTIP_CLASS}>+ Github Copilot — Coming soon+ </TooltipPopup>+ </Tooltip>+ </div>+ );+});diff --git a/apps/web/src/components/chat/ProviderModelPicker.browser.tsx b/apps/web/src/components/chat/ProviderModelPicker.browser.tsxindex abedcd6ee..f4854dd9a 100644--- a/apps/web/src/components/chat/ProviderModelPicker.browser.tsx+++ b/apps/web/src/components/chat/ProviderModelPicker.browser.tsx@@ -1,11 +1,70 @@import { type ProviderKind, type ServerProvider } from "@t3tools/contracts";-import { page } from "vitest/browser";-import { afterEach, describe, expect, it, vi } from "vitest";+import { EnvironmentId } from "@t3tools/contracts";+import { page, userEvent } from "vitest/browser";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import { render } from "vitest-browser-react";import { ProviderModelPicker } from "./ProviderModelPicker";import { getCustomModelOptionsByProvider } from "../../modelSelection";-import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";+import { DEFAULT_CLIENT_SETTINGS, DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";+import { __resetLocalApiForTests } from "../../localApi";++// Mock the environments/runtime module to provide a mock primary environment connection+vi.mock("../../environments/runtime", () => {+ const primaryConnection = {+ kind: "primary" as const,+ knownEnvironment: {+ id: "environment-local",+ label: "Local environment",+ source: "manual" as const,+ environmentId: EnvironmentId.make("environment-local"),+ target: {+ httpBaseUrl: "http://localhost:3000",+ wsBaseUrl: "ws://localhost:3000",+ },+ },+ environmentId: EnvironmentId.make("environment-local"),+ client: {+ server: {+ getConfig: vi.fn(),+ updateSettings: vi.fn(),+ },+ },+ ensureBootstrapped: async () => undefined,+ reconnect: async () => undefined,+ dispose: async () => undefined,+ };++ return {+ getEnvironmentHttpBaseUrl: () => "http://localhost:3000",+ getSavedEnvironmentRecord: () => null,+ getSavedEnvironmentRuntimeState: () => null,+ hasSavedEnvironmentRegistryHydrated: () => true,+ listSavedEnvironmentRecords: () => [],+ resetSavedEnvironmentRegistryStoreForTests: vi.fn(),+ resetSavedEnvironmentRuntimeStoreForTests: vi.fn(),+ resolveEnvironmentHttpUrl: (_environmentId: unknown, path: string) =>+ new URL(path, "http://localhost:3000").toString(),+ waitForSavedEnvironmentRegistryHydration: async () => undefined,+ addSavedEnvironment: vi.fn(),+ disconnectSavedEnvironment: vi.fn(),+ ensureEnvironmentConnectionBootstrapped: async () => undefined,+ getPrimaryEnvironmentConnection: () => primaryConnection,+ readEnvironmentConnection: () => primaryConnection,+ reconnectSavedEnvironment: vi.fn(),+ removeSavedEnvironment: vi.fn(),+ requireEnvironmentConnection: () => primaryConnection,+ resetEnvironmentServiceForTests: vi.fn(),+ startEnvironmentConnectionService: vi.fn(),+ subscribeEnvironmentConnections: () => () => {},+ useSavedEnvironmentRegistryStore: (+ selector: (state: { byId: Record<string, never> }) => unknown,+ ) => selector({ byId: {} }),+ useSavedEnvironmentRuntimeStore: (+ selector: (state: { byId: Record<string, never> }) => unknown,+ ) => selector({ byId: {} }),+ };+});function effort(value: string, isDefault = false) {return {@@ -129,6 +188,21 @@ function buildCodexProvider(models: ServerProvider["models"]): ServerProvider {};}+function buildOpenCodeProvider(models: ServerProvider["models"]): ServerProvider {+ return {+ provider: "opencode",+ enabled: true,+ installed: true,+ version: "1.0.0",+ status: "ready",+ auth: { status: "authenticated" },+ checkedAt: new Date().toISOString(),+ models,+ slashCommands: [],+ skills: [],+ };+}+async function mountPicker(props: {provider: ProviderKind;model: string;@@ -168,12 +242,40 @@ async function mountPicker(props: {};}+function getModelPickerListElement() {+ const modelPickerList = document.querySelector<HTMLElement>(".model-picker-list");+ expect(modelPickerList).not.toBeNull();+ return modelPickerList!;+}++function getModelPickerListText() {+ return getModelPickerListElement().textContent ?? "";+}++function getVisibleModelNames() {+ return Array.from(getModelPickerListElement().querySelectorAll<HTMLDivElement>("div.font-medium"))+ .map((element) => element.textContent?.replace(/New$/u, "").trim() ?? "")+ .filter((text) => text.length > 0);+}++function getSidebarProviderOrder() {+ return Array.from(document.querySelectorAll<HTMLElement>("[data-model-picker-provider]")).map(+ (element) => element.dataset.modelPickerProvider ?? "",+ );+}+describe("ProviderModelPicker", () => {- afterEach(() => {+ beforeEach(async () => {+ // Reset test environment before each test+ await __resetLocalApiForTests();+ });++ afterEach(async () => {document.body.innerHTML = "";+ await __resetLocalApiForTests();});- it("shows provider submenus when provider switching is allowed", async () => {+ it("shows provider sidebar in unlocked mode", async () => {const mounted = await mountPicker({provider: "claudeAgent",model: "claude-opus-4-6",@@ -185,16 +287,16 @@ describe("ProviderModelPicker", () => {await vi.waitFor(() => {const text = document.body.textContent ?? "";- expect(text).toContain("Codex");+ expect(text).not.toContain("Codex");expect(text).toContain("Claude");- expect(text).not.toContain("Claude Sonnet 4.6");+ expect(text).toContain("Claude Opus 4.6");});} finally {await mounted.cleanup();}});- it("opens provider submenus with a visible gap from the parent menu", async () => {+ it("shows favorites first in the provider sidebar", async () => {const mounted = await mountPicker({provider: "claudeAgent",model: "claude-opus-4-6",@@ -203,43 +305,575 @@ describe("ProviderModelPicker", () => {try {await page.getByRole("button").click();- const providerTrigger = page.getByRole("menuitem", { name: "Codex" });- await providerTrigger.hover();await vi.waitFor(() => {- expect(document.body.textContent ?? "").toContain("GPT-5 Codex");+ expect(getSidebarProviderOrder().slice(0, 3)).toEqual([+ "favorites",+ "codex",+ "claudeAgent",+ ]);});+ } finally {+ await mounted.cleanup();+ }+ });- const providerTriggerElement = Array.from(- document.querySelectorAll<HTMLElement>('[role="menuitem"]'),- ).find((element) => element.textContent?.includes("Codex"));- if (!providerTriggerElement) {- throw new Error("Expected the Codex provider trigger to be mounted.");- }+ it("filters models by selected provider in sidebar", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });- const providerTriggerRect = providerTriggerElement.getBoundingClientRect();- const modelElement = Array.from(- document.querySelectorAll<HTMLElement>('[role="menuitemradio"]'),- ).find((element) => element.textContent?.includes("GPT-5 Codex"));- if (!modelElement) {- throw new Error("Expected the submenu model option to be mounted.");- }+ try {+ await page.getByRole("button").click();- const submenuPopup = modelElement.closest('[data-slot="menu-sub-content"]');- if (!(submenuPopup instanceof HTMLElement)) {- throw new Error("Expected submenu popup to be mounted.");- }+ // Start with Claude models visible+ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).not.toContain("GPT-5 Codex");+ expect(text).toContain("Claude Opus 4.6");+ });- const submenuRect = submenuPopup.getBoundingClientRect();+ // Click on Codex provider in sidebar+ await vi.waitFor(() => {+ expect(document.querySelector('[data-model-picker-provider="codex"]')).not.toBeNull();+ });+ await page.getByRole("button", { name: "Codex", exact: true }).click();- expect(submenuRect.left).toBeGreaterThanOrEqual(providerTriggerRect.right);- expect(submenuRect.left - providerTriggerRect.right).toBeGreaterThanOrEqual(2);+ // Now should only show Codex models+ await vi.waitFor(() => {+ const listText = getModelPickerListText();+ expect(listText).toContain("GPT-5 Codex");+ expect(listText).not.toContain("Claude Opus 4.6");+ });} finally {await mounted.cleanup();}});- it("shows models directly when the provider is locked mid-thread", async () => {+ it("focuses the search input after selecting a sidebar provider", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ expect(document.querySelector('[data-model-picker-provider="codex"]')).not.toBeNull();+ });+ await page.getByRole("button", { name: "Codex", exact: true }).click();++ await vi.waitFor(() => {+ const searchInput = document.querySelector<HTMLInputElement>(+ 'input[placeholder="Search models..."]',+ );+ expect(searchInput).not.toBeNull();+ expect(document.activeElement).toBe(searchInput);+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("shows locked provider header and only its models in locked mode", async () => {+ localStorage.setItem(+ "t3code:client-settings:v1",+ JSON.stringify({+ ...DEFAULT_CLIENT_SETTINGS,+ favorites: [+ { provider: "codex", model: "gpt-5-codex" },+ { provider: "claudeAgent", model: "claude-sonnet-4-6" },+ ],+ }),+ );++ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: "claudeAgent",+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ // Should show locked provider label+ expect(text).toContain("Claude");+ expect(getVisibleModelNames()).toEqual([+ "Claude Sonnet 4.6",+ "Claude Opus 4.6",+ "Claude Haiku 4.5",+ ]);+ });+ } finally {+ localStorage.removeItem("t3code:client-settings:v1");+ await mounted.cleanup();+ }+ });++ it("falls back to the active provider's first model when props.model belongs to another provider (#1982)", async () => {+ const host = document.createElement("div");+ document.body.append(host);+ const onProviderModelChange = vi.fn();+ const modelOptionsByProvider = {+ claudeAgent: [+ { slug: "claude-opus-4-6", name: "Claude Opus 4.6" },+ { slug: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },+ ],+ codex: [{ slug: "gpt-5-codex", name: "GPT-5 Codex" }],+ cursor: [],+ opencode: [],+ } as const;+ const screen = await render(+ <ProviderModelPicker+ provider="claudeAgent"+ model="gpt-5-codex"+ lockedProvider={null}+ providers={TEST_PROVIDERS}+ modelOptionsByProvider={modelOptionsByProvider}+ onProviderModelChange={onProviderModelChange}+ />,+ { container: host },+ );++ try {+ const trigger = document.querySelector<HTMLElement>(+ '[data-chat-provider-model-picker="true"]',+ );+ expect(trigger).not.toBeNull();+ const label = trigger?.textContent ?? "";+ expect(label).not.toContain("gpt-5-codex");+ expect(label).toContain("Claude Opus 4.6");+ } finally {+ await screen.unmount();+ host.remove();+ }+ });++ it("uses the trigger label for locked opencode rows", async () => {+ const providers: ReadonlyArray<ServerProvider> = [+ buildOpenCodeProvider([+ {+ slug: "github-copilot/claude-opus-4.5",+ name: "Claude Opus 4.5",+ subProvider: "GitHub Copilot",+ shortName: "Opus 4.5",+ isCustom: false,+ capabilities: {+ reasoningEffortLevels: [effort("low"), effort("medium", true), effort("high")],+ supportsFastMode: false,+ supportsThinkingToggle: false,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+ },+ },+ ]),+ ];+ const mounted = await mountPicker({+ provider: "opencode",+ model: "github-copilot/claude-opus-4.5",+ lockedProvider: "opencode",+ providers,+ });++ try {+ await vi.waitFor(() => {+ const trigger = document.querySelector<HTMLElement>(+ '[data-chat-provider-model-picker="true"]',+ );+ expect(trigger?.textContent).toContain("GitHub Copilot");+ expect(trigger?.textContent).toContain("Opus 4.5");+ });++ await page.getByRole("button").click();++ await vi.waitFor(() => {+ expect(getVisibleModelNames()).toEqual(["GitHub Copilot · Opus 4.5"]);+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("searches models by name in flat list", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).toContain("Claude Opus 4.6");+ expect(text).not.toContain("GPT-5 Codex");+ });++ // Find and type in search box+ const searchInput = page.getByPlaceholder("Search models...");+ await searchInput.fill("claude");++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).toContain("Claude Opus 4.6");+ expect(text).not.toContain("GPT-5 Codex");+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("supports arrow-key navigation in the model picker", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: "claudeAgent",+ });++ try {+ await page.getByRole("button").click();++ const searchInput = page.getByPlaceholder("Search models...");+ await userEvent.click(searchInput);+ await userEvent.keyboard("{ArrowDown}");+ await vi.waitFor(() => {+ const highlightedItem = document.querySelector<HTMLElement>(+ '[data-slot="combobox-item"][data-highlighted]',+ );+ expect(highlightedItem).not.toBeNull();+ expect(highlightedItem?.textContent).toContain("Claude Opus 4.6");+ });+ await userEvent.keyboard("{ArrowDown}");+ await vi.waitFor(() => {+ const highlightedItem = document.querySelector<HTMLElement>(+ '[data-slot="combobox-item"][data-highlighted]',+ );+ expect(highlightedItem).not.toBeNull();+ expect(highlightedItem?.textContent).toContain("Claude Sonnet 4.6");+ });+ await userEvent.keyboard("{Enter}");++ expect(mounted.onProviderModelChange).toHaveBeenCalledWith(+ "claudeAgent",+ "claude-sonnet-4-6",+ );+ } finally {+ await mounted.cleanup();+ }+ });++ it("hides the provider sidebar while searching", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ expect(getSidebarProviderOrder().length).toBeGreaterThan(0);+ });++ await page.getByPlaceholder("Search models...").fill("cla");++ await vi.waitFor(() => {+ expect(getSidebarProviderOrder()).toEqual([]);+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("closes the picker when escape is pressed in search", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ const searchInput = page.getByPlaceholder("Search models...");+ await searchInput.click();+ const searchInputElement = document.querySelector<HTMLInputElement>(+ 'input[placeholder="Search models..."]',+ );+ expect(searchInputElement).not.toBeNull();+ searchInputElement!.dispatchEvent(+ new KeyboardEvent("keydown", { key: "Escape", bubbles: true }),+ );++ await vi.waitFor(() => {+ expect(document.querySelector(".model-picker-list")).toBeNull();+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("searches models by provider name", async () => {+ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).toContain("Claude Opus 4.6");+ expect(text).not.toContain("GPT-5 Codex");+ });++ // Search by provider name+ const searchInput = page.getByPlaceholder("Search models...");+ await searchInput.fill("codex");++ await vi.waitFor(() => {+ const listText = getModelPickerListText();+ expect(listText).toContain("GPT-5 Codex");+ expect(listText).not.toContain("Claude Opus 4.6");+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("matches fuzzy multi-token queries across provider and model text", async () => {+ const providers: ReadonlyArray<ServerProvider> = [+ buildCodexProvider([+ {+ slug: "gpt-5-codex",+ name: "GPT-5 Codex",+ isCustom: false,+ capabilities: {+ reasoningEffortLevels: [effort("low"), effort("medium", true), effort("high")],+ supportsFastMode: true,+ supportsThinkingToggle: false,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+ },+ },+ ]),+ buildOpenCodeProvider([+ {+ slug: "github-copilot/claude-opus-4.7",+ name: "Claude Opus 4.7",+ subProvider: "GitHub Copilot",+ isCustom: false,+ capabilities: {+ reasoningEffortLevels: [effort("low"), effort("medium", true), effort("high")],+ supportsFastMode: false,+ supportsThinkingToggle: false,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+ },+ },+ ]),+ ];+ const mounted = await mountPicker({+ provider: "opencode",+ model: "github-copilot/claude-opus-4.7",+ lockedProvider: null,+ providers,+ });++ try {+ await page.getByRole("button").click();+ await page.getByPlaceholder("Search models...").fill("coplt op");++ await vi.waitFor(() => {+ const listText = getModelPickerListText();+ expect(listText).toContain("Claude Opus 4.7");+ expect(listText).not.toContain("GPT-5 Codex");+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("renders each search result with its own provider branding", async () => {+ const providers: ReadonlyArray<ServerProvider> = [+ buildOpenCodeProvider([+ {+ slug: "github-copilot/claude-opus-4.7",+ name: "Claude Opus 4.7",+ subProvider: "GitHub Copilot",+ isCustom: false,+ capabilities: {+ reasoningEffortLevels: [effort("low"), effort("medium", true), effort("high")],+ supportsFastMode: false,+ supportsThinkingToggle: false,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+ },+ },+ ]),+ {+ ...TEST_PROVIDERS[1]!,+ models: [+ {+ slug: "claude-opus-4-6",+ name: "Claude Opus 4.6",+ isCustom: false,+ capabilities: {+ reasoningEffortLevels: [+ effort("low"),+ effort("medium", true),+ effort("high"),+ effort("max"),+ ],+ supportsFastMode: false,+ supportsThinkingToggle: true,+ contextWindowOptions: [],+ promptInjectedEffortLevels: [],+ },+ },+ ],+ },+ ];+ const mounted = await mountPicker({+ provider: "opencode",+ model: "github-copilot/claude-opus-4.7",+ lockedProvider: null,+ providers,+ });++ try {+ await page.getByRole("button").click();+ await page.getByPlaceholder("Search models...").fill("opus");++ await vi.waitFor(() => {+ const listText = getModelPickerListText();+ expect(listText).toContain("OpenCode · GitHub Copilot");+ expect(listText).toContain("Claude");+ expect(listText).not.toContain("OpenCodeClaude Opus 4.6");+ });+ } finally {+ await mounted.cleanup();+ }+ });++ it("toggles favorite stars when clicked", async () => {+ localStorage.removeItem("t3code:client-settings:v1");++ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).toContain("Claude Opus 4.6");+ });++ const getFirstStarButton = () => {+ const starButton = document.querySelector<HTMLButtonElement>(+ 'button[aria-label*="favorites"]',+ );+ expect(starButton).not.toBeNull();+ return starButton!;+ };++ const firstStar = getFirstStarButton();+ const initialAriaLabel = firstStar.getAttribute("aria-label");+ expect(+ initialAriaLabel === "Add to favorites" || initialAriaLabel === "Remove from favorites",+ ).toBe(true);++ await page.getByRole("button", { name: initialAriaLabel! }).first().click();++ const expectedAriaLabel =+ initialAriaLabel === "Add to favorites" ? "Remove from favorites" : "Add to favorites";++ await vi.waitFor(() => {+ expect(getFirstStarButton().getAttribute("aria-label")).toBe(expectedAriaLabel);+ });+ } finally {+ await mounted.cleanup();+ localStorage.removeItem("t3code:client-settings:v1");+ }+ });++ it("does not duplicate favorited models across favorites and all models sections", async () => {+ localStorage.removeItem("t3code:client-settings:v1");++ const mounted = await mountPicker({+ provider: "claudeAgent",+ model: "claude-opus-4-6",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();++ await vi.waitFor(() => {+ const text = document.body.textContent ?? "";+ expect(text).toContain("Claude Opus 4.6");+ });++ const favoriteButton = page.getByRole("button", {+ name: "Add to favorites",+ });+ await favoriteButton.first().click();++ await vi.waitFor(async () => {+ const favoritedModelRows = Array.from(+ getModelPickerListElement().querySelectorAll<HTMLDivElement>("div.font-medium"),+ ).filter((element) => element.textContent?.trim() === "Claude Opus 4.6");+ expect(favoritedModelRows.length).toBe(1);+ });+ } finally {+ await mounted.cleanup();+ localStorage.removeItem("t3code:client-settings:v1");+ }+ });++ it("shows favorited models first within the selected provider list", async () => {+ localStorage.setItem(+ "t3code:client-settings:v1",+ JSON.stringify({+ ...DEFAULT_CLIENT_SETTINGS,+ favorites: [{ provider: "codex", model: "gpt-5.3-codex" }],+ }),+ );++ const mounted = await mountPicker({+ provider: "codex",+ model: "gpt-5-codex",+ lockedProvider: null,+ });++ try {+ await page.getByRole("button").click();+ await page.getByRole("button", { name: "Codex", exact: true }).click();++ await vi.waitFor(() => {+ expect(getVisibleModelNames().slice(0, 2)).toEqual(["GPT-5.3 Codex", "GPT-5 Codex"]);+ });+ } finally {+ await mounted.cleanup();+ localStorage.removeItem("t3code:client-settings:v1");+ }+ });++ it("dispatches callback with correct provider and model when selected", async () => {const mounted = await mountPicker({provider: "claudeAgent",model: "claude-opus-4-6",@@ -252,15 +886,23 @@ describe("ProviderModelPicker", () => {await vi.waitFor(() => {const text = document.body.textContent ?? "";expect(text).toContain("Claude Sonnet 4.6");- expect(text).toContain("Claude Haiku 4.5");- expect(text).not.toContain("Codex");});++ // Click on a model+ const modelRow = page.getByText("Claude Sonnet 4.6").first();+ await modelRow.click();++ // Verify callback was called with correct values+ expect(mounted.onProviderModelChange).toHaveBeenCalledWith(+ "claudeAgent",+ "claude-sonnet-4-6",+ );} finally {await mounted.cleanup();}});- it("only shows codex spark when the server reports it for the account", async () => {+ it("only shows codex spark when the server reports it", async () => {const providersWithoutSpark: ReadonlyArray<ServerProvider> = [buildCodexProvider([{@@ -309,15 +951,14 @@ describe("ProviderModelPicker", () => {];const hidden = await mountPicker({- provider: "claudeAgent",- model: "claude-opus-4-6",+ provider: "codex",+ model: "gpt-5.3-codex",lockedProvider: null,providers: providersWithoutSpark,});try {await page.getByRole("button").click();- await page.getByRole("menuitem", { name: "Codex" }).hover();await vi.waitFor(() => {const text = document.body.textContent ?? "";@@ -329,15 +970,14 @@ describe("ProviderModelPicker", () => {}const visible = await mountPicker({- provider: "claudeAgent",- model: "claude-opus-4-6",+ provider: "codex",+ model: "gpt-5.3-codex",lockedProvider: null,providers: providersWithSpark,});try {await page.getByRole("button").click();- await page.getByRole("menuitem", { name: "Codex" }).hover();await vi.waitFor(() => {expect(document.body.textContent ?? "").toContain("GPT-5.3 Codex Spark");@@ -347,27 +987,7 @@ describe("ProviderModelPicker", () => {}});- it("dispatches the canonical slug when a model is selected", async () => {- const mounted = await mountPicker({- provider: "claudeAgent",- model: "claude-opus-4-6",- lockedProvider: "claudeAgent",- });-- try {- await page.getByRole("button").click();- await page.getByRole("menuitemradio", { name: "Claude Sonnet 4.6" }).click();-- expect(mounted.onProviderModelChange).toHaveBeenCalledWith(- "claudeAgent",- "claude-sonnet-4-6",- );- } finally {- await mounted.cleanup();- }- });-- it("shows disabled providers as non-selectable entries", async () => {+ it("shows disabled providers grayed out in sidebar", async () => {const disabledProviders = TEST_PROVIDERS.slice();const claudeIndex = disabledProviders.findIndex((provider) => provider.provider === "claudeAgent",@@ -380,6 +1000,7 @@ describe("ProviderModelPicker", () => {status: "disabled",};}+const mounted = await mountPicker({provider: "codex",model: "gpt-5-codex",@@ -392,9 +1013,9 @@ describe("ProviderModelPicker", () => {await vi.waitFor(() => {const text = document.body.textContent ?? "";- expect(text).toContain("Claude");- expect(text).toContain("Disabled");- expect(text).not.toContain("Claude Sonnet 4.6");+ expect(text).toContain("GPT-5 Codex");+ // Disabled provider should not have its models shown+ expect(text).not.toContain("Claude Opus 4.6");});} finally {await mounted.cleanup();diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsxindex 8b20237a8..4f4140f83 100644--- a/apps/web/src/components/chat/ProviderModelPicker.tsx+++ b/apps/web/src/components/chat/ProviderModelPicker.tsx@@ -1,87 +1,78 @@-import { type ProviderKind, type ServerProvider } from "@t3tools/contracts";-import { resolveSelectableModel } from "@t3tools/shared/model";-import { memo, useState } from "react";+import {+ type ProviderKind,+ type ResolvedKeybindingsConfig,+ type ServerProvider,+} from "@t3tools/contracts";+import { memo, useEffect, useState } from "react";import type { VariantProps } from "class-variance-authority";-import { type ProviderPickerKind, PROVIDER_OPTIONS } from "../../session-logic";import { ChevronDownIcon } from "lucide-react";import { Button, buttonVariants } from "../ui/button";-import {- Menu,- MenuGroup,- MenuItem,- MenuPopup,- MenuRadioGroup,- MenuRadioItem,- MenuSeparator as MenuDivider,- MenuSub,- MenuSubPopup,- MenuSubTrigger,- MenuTrigger,-} from "../ui/menu";-import { ClaudeAI, CursorIcon, Gemini, Icon, OpenAI, OpenCodeIcon } from "../Icons";+import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";import { cn } from "~/lib/utils";-import { getProviderSnapshot } from "../../providerModels";--function isAvailableProviderOption(option: (typeof PROVIDER_OPTIONS)[number]): option is {- value: ProviderKind;- label: string;- available: true;-} {- return option.available;-}--const PROVIDER_ICON_BY_PROVIDER: Record<ProviderPickerKind, Icon> = {- codex: OpenAI,- claudeAgent: ClaudeAI,- opencode: OpenCodeIcon,- cursor: CursorIcon,-};--export const AVAILABLE_PROVIDER_OPTIONS = PROVIDER_OPTIONS.filter(isAvailableProviderOption);-const UNAVAILABLE_PROVIDER_OPTIONS = PROVIDER_OPTIONS.filter((option) => !option.available);-const COMING_SOON_PROVIDER_OPTIONS = [{ id: "gemini", label: "Gemini", icon: Gemini }] as const;--function providerIconClassName(- provider: ProviderKind | ProviderPickerKind,- fallbackClassName: string,-): string {- return provider === "claudeAgent" ? "text-[#d97757]" : fallbackClassName;-}+import { ModelPickerContent } from "./ModelPickerContent";+import {+ ModelEsque,+ PROVIDER_ICON_BY_PROVIDER,+ getTriggerDisplayModelLabel,+ getTriggerDisplayModelName,+} from "./providerIconUtils";+import { setModelPickerOpen } from "../../modelPickerOpenState";export const ProviderModelPicker = memo(function ProviderModelPicker(props: {provider: ProviderKind;model: string;lockedProvider: ProviderKind | null;providers?: ReadonlyArray<ServerProvider>;- modelOptionsByProvider: Record<ProviderKind, ReadonlyArray<{ slug: string; name: string }>>;+ keybindings?: ResolvedKeybindingsConfig;+ modelOptionsByProvider: Record<ProviderKind, ReadonlyArray<ModelEsque>>;activeProviderIconClassName?: string;compact?: boolean;disabled?: boolean;+ terminalOpen?: boolean;+ open?: boolean;triggerVariant?: VariantProps<typeof buttonVariants>["variant"];triggerClassName?: string;+ onOpenChange?: (open: boolean) => void;onProviderModelChange: (provider: ProviderKind, model: string) => void;}) {- const [isMenuOpen, setIsMenuOpen] = useState(false);+ const [uncontrolledIsMenuOpen, setUncontrolledIsMenuOpen] = useState(false);const activeProvider = props.lockedProvider ?? props.provider;+ const isMenuOpen = props.open ?? uncontrolledIsMenuOpen;const selectedProviderOptions = props.modelOptionsByProvider[activeProvider];- const selectedModelLabel =- selectedProviderOptions.find((option) => option.slug === props.model)?.name ?? props.model;+ // If the current slug belongs to a different provider (for example after a provider+ // switch or disable), prefer the active provider's first option so the trigger icon+ // and label stay in sync instead of showing a stale foreign slug.+ const selectedModel =+ selectedProviderOptions.find((option) => option.slug === props.model) ??+ selectedProviderOptions[0];const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[activeProvider];- const handleModelChange = (provider: ProviderKind, value: string) => {+ const triggerTitle = selectedModel ? getTriggerDisplayModelName(selectedModel) : props.model;+ const triggerSubtitle = selectedModel?.subProvider;+ const triggerLabel = selectedModel ? getTriggerDisplayModelLabel(selectedModel) : props.model;++ const setIsMenuOpen = (open: boolean) => {+ props.onOpenChange?.(open);+ if (props.open === undefined) {+ setUncontrolledIsMenuOpen(open);+ }+ };++ useEffect(() => {+ setModelPickerOpen(isMenuOpen);+ return () => {+ setModelPickerOpen(false);+ };+ }, [isMenuOpen]);++ const handleProviderModelChange = (provider: ProviderKind, model: string) => {if (props.disabled) return;- if (!value) return;- const resolvedModel = resolveSelectableModel(- provider,- value,- props.modelOptionsByProvider[provider],- );- if (!resolvedModel) return;- props.onProviderModelChange(provider, resolvedModel);+ props.onProviderModelChange(provider, model);setIsMenuOpen(false);};return (- <Menu+ <Popoveropen={isMenuOpen}onOpenChange={(open) => {if (props.disabled) {@@ -91,7 +82,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {setIsMenuOpen(open);}}>- <MenuTrigger+ <PopoverTriggerrender={<Buttonsize="sm"@@ -114,128 +105,54 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {><ProviderIconaria-hidden="true"- className={cn(- "size-4 shrink-0",- providerIconClassName(activeProvider, "text-muted-foreground/70"),- props.activeProviderIconClassName,- )}+ className={cn("size-4 shrink-0", props.activeProviderIconClassName)}/>- <span className="min-w-0 flex-1 truncate">{selectedModelLabel}</span>- <ChevronDownIcon aria-hidden="true" className="size-3 shrink-0 opacity-60" />- </span>- </MenuTrigger>- <MenuPopup align="start">- {props.lockedProvider !== null ? (- <MenuGroup>- <MenuRadioGroup- value={props.model}- onValueChange={(value) => handleModelChange(props.lockedProvider!, value)}- >- {props.modelOptionsByProvider[props.lockedProvider].map((modelOption) => (- <MenuRadioItem- key={`${props.lockedProvider}:${modelOption.slug}`}- value={modelOption.slug}- onClick={() => setIsMenuOpen(false)}- >- {modelOption.name}- </MenuRadioItem>- ))}- </MenuRadioGroup>- </MenuGroup>- ) : (- <>- {AVAILABLE_PROVIDER_OPTIONS.map((option) => {- const OptionIcon = PROVIDER_ICON_BY_PROVIDER[option.value];- const liveProvider = props.providers- ? getProviderSnapshot(props.providers, option.value)- : undefined;- if (liveProvider && liveProvider.status !== "ready") {- const unavailableLabel = !liveProvider.enabled- ? "Disabled"- : !liveProvider.installed- ? "Not installed"- : "Unavailable";- return (- <MenuItem key={option.value} disabled>- <OptionIcon- aria-hidden="true"- className={cn(- "size-4 shrink-0 opacity-80",- providerIconClassName(option.value, "text-muted-foreground/85"),- )}- />- <span>{option.label}</span>- <span className="ms-auto text-[11px] text-muted-foreground/80 uppercase tracking-[0.08em]">- {unavailableLabel}- </span>- </MenuItem>- );+ <Tooltip>+ <TooltipTrigger+ render={+ <span+ className={cn(+ "min-w-0 flex-1 overflow-hidden",+ triggerSubtitle+ ? "grid grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] items-center gap-1"+ : "truncate",+ )}+ />}- return (- <MenuSub key={option.value}>- <MenuSubTrigger>- <OptionIcon- aria-hidden="true"- className={cn(- "size-4 shrink-0",- providerIconClassName(option.value, "text-muted-foreground/85"),- )}- />- {option.label}- </MenuSubTrigger>- <MenuSubPopup className="[--available-height:min(24rem,70vh)]" sideOffset={4}>- <MenuGroup>- <MenuRadioGroup- value={props.provider === option.value ? props.model : ""}- onValueChange={(value) => handleModelChange(option.value, value)}- >- {props.modelOptionsByProvider[option.value].map((modelOption) => (- <MenuRadioItem- key={`${option.value}:${modelOption.slug}`}- value={modelOption.slug}- onClick={() => setIsMenuOpen(false)}- >- {modelOption.name}- </MenuRadioItem>- ))}- </MenuRadioGroup>- </MenuGroup>- </MenuSubPopup>- </MenuSub>- );- })}- {UNAVAILABLE_PROVIDER_OPTIONS.length > 0 && <MenuDivider />}- {UNAVAILABLE_PROVIDER_OPTIONS.map((option) => {- const OptionIcon = PROVIDER_ICON_BY_PROVIDER[option.value];- return (- <MenuItem key={option.value} disabled>- <OptionIcon- aria-hidden="true"- className="size-4 shrink-0 text-muted-foreground/85 opacity-80"- />- <span>{option.label}</span>- <span className="ms-auto text-[11px] text-muted-foreground/80 uppercase tracking-[0.08em]">- Coming soon- </span>- </MenuItem>- );- })}- {UNAVAILABLE_PROVIDER_OPTIONS.length === 0 && <MenuDivider />}- {COMING_SOON_PROVIDER_OPTIONS.map((option) => {- const OptionIcon = option.icon;- return (- <MenuItem key={option.id} disabled>- <OptionIcon aria-hidden="true" className="size-4 shrink-0 opacity-80" />- <span>{option.label}</span>- <span className="ms-auto text-[11px] text-muted-foreground/80 uppercase tracking-[0.08em]">- Coming soon+ >+ {triggerSubtitle ? (+ <>+ <span className="min-w-0 truncate">{triggerSubtitle}</span>+ <span aria-hidden="true" className="shrink-0 opacity-60">+ ·</span>- </MenuItem>- );- })}- </>- )}- </MenuPopup>- </Menu>+ <span className="min-w-0 truncate">{triggerTitle}</span>+ </>+ ) : (+ triggerTitle+ )}+ </TooltipTrigger>+ <TooltipPopup side="top">{triggerLabel}</TooltipPopup>+ </Tooltip>+ <ChevronDownIcon aria-hidden="true" className="size-3 shrink-0 opacity-60" />+ </span>+ </PopoverTrigger>+ <PopoverPopup+ align="start"+ className="border-0 bg-transparent p-0 shadow-none before:hidden [--viewport-inline-padding:0] *:data-[slot=popover-viewport]:p-0"+ >+ <ModelPickerContent+ provider={props.provider}+ model={props.model}+ lockedProvider={props.lockedProvider}+ {...(props.providers && { providers: props.providers })}+ {...(props.keybindings ? { keybindings: props.keybindings } : {})}+ modelOptionsByProvider={props.modelOptionsByProvider}+ terminalOpen={props.terminalOpen ?? false}+ onRequestClose={() => setIsMenuOpen(false)}+ onProviderModelChange={handleProviderModelChange}+ />+ </PopoverPopup>+ </Popover>);});diff --git a/apps/web/src/components/chat/modelPickerModelHighlights.ts b/apps/web/src/components/chat/modelPickerModelHighlights.tsnew file mode 100644index 000000000..c3661fda2--- /dev/null+++ b/apps/web/src/components/chat/modelPickerModelHighlights.ts@@ -0,0 +1,13 @@+import type { ProviderKind } from "@t3tools/contracts";++/**+ * Model slugs that show a gold "NEW" chip in the model picker list.+ * Add entries as `provider:slug` when you want to highlight freshly shipped models.+ */+const NEW_MODEL_KEYS = new Set<string>([+ // Example: "claudeAgent:claude-opus-4-7",+]);++export function isModelPickerNewModel(provider: ProviderKind, slug: string): boolean {+ return NEW_MODEL_KEYS.has(`${provider}:${slug}`);+}diff --git a/apps/web/src/components/chat/modelPickerSearch.test.ts b/apps/web/src/components/chat/modelPickerSearch.test.tsnew file mode 100644index 000000000..1ce629d8a--- /dev/null+++ b/apps/web/src/components/chat/modelPickerSearch.test.ts@@ -0,0 +1,109 @@+import { describe, expect, it } from "vitest";++import { buildModelPickerSearchText, scoreModelPickerSearch } from "./modelPickerSearch";++describe("buildModelPickerSearchText", () => {+ it("builds provider-agnostic search text from generic fields", () => {+ expect(+ buildModelPickerSearchText({+ provider: "opencode",+ name: "Claude Opus 4.7",+ subProvider: "GitHub Copilot",+ }),+ ).toBe("claude opus 4.7 github copilot opencode opencode");+ });+});++describe("scoreModelPickerSearch", () => {+ it("matches typo-tolerant multi-token queries", () => {+ expect(+ scoreModelPickerSearch(+ {+ provider: "opencode",+ name: "Claude Opus 4.7",+ subProvider: "GitHub Copilot",+ },+ "coplt op",+ ),+ ).not.toBeNull();+ });++ it("rejects results when any query token does not match", () => {+ expect(+ scoreModelPickerSearch(+ {+ provider: "codex",+ name: "GPT-5 Codex",+ },+ "coplt op",+ ),+ ).toBeNull();+ });++ it("ranks exact token matches ahead of fuzzier matches", () => {+ const exactScore = scoreModelPickerSearch(+ {+ provider: "opencode",+ name: "Claude Opus 4.7",+ subProvider: "GitHub Copilot",+ },+ "copilot opus",+ );+ const fuzzyScore = scoreModelPickerSearch(+ {+ provider: "opencode",+ name: "Claude Opus 4.7",+ subProvider: "GitHub Copilot",+ },+ "coplt op",+ );++ expect(exactScore).not.toBeNull();+ expect(fuzzyScore).not.toBeNull();+ expect(exactScore!).toBeLessThan(fuzzyScore!);+ });++ it("gives favorite models a strong enough ranking boost for partial queries", () => {+ const favoriteScore = scoreModelPickerSearch(+ {+ provider: "claudeAgent",+ name: "Claude Opus 4.7",+ isFavorite: true,+ },+ "opu",+ );+ const nonFavoriteScore = scoreModelPickerSearch(+ {+ provider: "cursor",+ name: "Opus 4.5",+ },+ "opu",+ );++ expect(favoriteScore).not.toBeNull();+ expect(nonFavoriteScore).not.toBeNull();+ expect(favoriteScore!).toBeLessThan(nonFavoriteScore!);+ });++ it("does not let the favorite boost outrank clearly better textual matches", () => {+ const favoriteScore = scoreModelPickerSearch(+ {+ provider: "claudeAgent",+ name: "Claude Opus 4.7",+ isFavorite: true,+ },+ "opus 4.7",+ );+ const nonFavoriteExactScore = scoreModelPickerSearch(+ {+ provider: "cursor",+ name: "Opus 4.7",+ },+ "opus 4.7",+ );++ expect(favoriteScore).not.toBeNull();+ expect(nonFavoriteExactScore).not.toBeNull();+ expect(nonFavoriteExactScore!).toBeLessThan(favoriteScore!);+ });+});diff --git a/apps/web/src/components/chat/modelPickerSearch.ts b/apps/web/src/components/chat/modelPickerSearch.tsnew file mode 100644index 000000000..a4871fa0f--- /dev/null+++ b/apps/web/src/components/chat/modelPickerSearch.ts@@ -0,0 +1,83 @@+import { type ProviderKind, PROVIDER_DISPLAY_NAMES } from "@t3tools/contracts";+import { normalizeSearchQuery, scoreQueryMatch } from "@t3tools/shared/searchRanking";++type ModelPickerSearchableModel = {+ provider: ProviderKind;+ name: string;+ shortName?: string;+ subProvider?: string;+ isFavorite?: boolean;+};++const MODEL_PICKER_FAVORITE_SCORE_BOOST = 24;++function getModelPickerSearchFields(model: ModelPickerSearchableModel): string[] {+ return [+ normalizeSearchQuery(model.name),+ ...(model.shortName ? [normalizeSearchQuery(model.shortName)] : []),+ ...(model.subProvider ? [normalizeSearchQuery(model.subProvider)] : []),+ normalizeSearchQuery(model.provider),+ normalizeSearchQuery(PROVIDER_DISPLAY_NAMES[model.provider]),+ buildModelPickerSearchText(model),+ ];+}++function scoreModelPickerSearchToken(+ field: string,+ token: string,+ fieldBase: number,+): number | null {+ return scoreQueryMatch({+ value: field,+ query: token,+ exactBase: fieldBase,+ prefixBase: fieldBase + 2,+ boundaryBase: fieldBase + 4,+ includesBase: fieldBase + 6,+ ...(token.length >= 3 ? { fuzzyBase: fieldBase + 100 } : {}),+ });+}++export function buildModelPickerSearchText(model: ModelPickerSearchableModel): string {+ return normalizeSearchQuery(+ [+ model.name,+ model.shortName,+ model.subProvider,+ model.provider,+ PROVIDER_DISPLAY_NAMES[model.provider],+ ]+ .filter((value): value is string => typeof value === "string" && value.length > 0)+ .join(" "),+ );+}++export function scoreModelPickerSearch(+ model: ModelPickerSearchableModel,+ query: string,+): number | null {+ const tokens = normalizeSearchQuery(query)+ .split(/\s+/u)+ .filter((token) => token.length > 0);++ if (tokens.length === 0) {+ return 0;+ }++ const fields = getModelPickerSearchFields(model);+ let score = 0;++ for (const token of tokens) {+ const tokenScores = fields+ .map((field, index) => scoreModelPickerSearchToken(field, token, index * 10))+ .filter((fieldScore): fieldScore is number => fieldScore !== null);++ if (tokenScores.length === 0) {+ return null;+ }++ score += Math.min(...tokenScores);+ }++ return model.isFavorite ? score - MODEL_PICKER_FAVORITE_SCORE_BOOST : score;+}diff --git a/apps/web/src/components/chat/providerIconUtils.ts b/apps/web/src/components/chat/providerIconUtils.tsnew file mode 100644index 000000000..66f522077--- /dev/null+++ b/apps/web/src/components/chat/providerIconUtils.ts@@ -0,0 +1,52 @@+import { type ProviderKind, PROVIDER_DISPLAY_NAMES } from "@t3tools/contracts";+import { ClaudeAI, CursorIcon, Icon, OpenAI, OpenCodeIcon } from "../Icons";+import { PROVIDER_OPTIONS } from "../../session-logic";++export const PROVIDER_ICON_BY_PROVIDER: Record<ProviderKind, Icon> = {+ codex: OpenAI,+ claudeAgent: ClaudeAI,+ opencode: OpenCodeIcon,+ cursor: CursorIcon,+};++function isAvailableProviderOption(option: (typeof PROVIDER_OPTIONS)[number]): option is {+ value: ProviderKind;+ label: string;+ available: true;+ pickerSidebarBadge?: "new" | "soon";+} {+ return option.available;+}++export const AVAILABLE_PROVIDER_OPTIONS = PROVIDER_OPTIONS.filter(isAvailableProviderOption);++export type ModelEsque = {+ slug: string;+ name: string;+ shortName?: string | undefined;+ subProvider?: string | undefined;+};++export function getProviderLabel(provider: ProviderKind, model: ModelEsque): string {+ const providerLabel = PROVIDER_DISPLAY_NAMES[provider];+ return model.subProvider ? `${providerLabel} · ${model.subProvider}` : providerLabel;+}++export function getDisplayModelName(+ model: ModelEsque,+ options?: { preferShortName?: boolean },+): string {+ if (options?.preferShortName && model.shortName) {+ return model.shortName;+ }+ return model.name;+}++export function getTriggerDisplayModelName(model: ModelEsque): string {+ return getDisplayModelName(model, { preferShortName: true });+}++export function getTriggerDisplayModelLabel(model: ModelEsque): string {+ const title = getTriggerDisplayModelName(model);+ return model.subProvider ? `${model.subProvider} · ${title}` : title;+}diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsxindex 676db613a..d6db87d48 100644--- a/apps/web/src/components/ui/autocomplete.tsx+++ b/apps/web/src/components/ui/autocomplete.tsx@@ -193,7 +193,7 @@ function AutocompleteList({ className, ...props }: AutocompletePrimitive.List.Prreturn (<ScrollArea scrollbarGutter scrollFade><AutocompletePrimitive.List- className={cn("not-empty:scroll-py-1 not-empty:p-1 in-data-has-overflow-y:pe-3", className)}+ className={cn("not-empty:scroll-py-1 not-empty:p-1", className)}data-slot="autocomplete-list"{...props}/>diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsxindex 52dd996ec..ff6056e9c 100644--- a/apps/web/src/components/ui/combobox.tsx+++ b/apps/web/src/components/ui/combobox.tsx@@ -186,10 +186,12 @@ function ComboboxPopup({function ComboboxItem({className,+ contentClassName,children,hideIndicator = false,...props}: ComboboxPrimitive.Item.Props & {+ contentClassName?: string;hideIndicator?: boolean;}) {return (@@ -204,7 +206,14 @@ function ComboboxItem({<ComboboxPrimitive.ItemIndicator className={cn("col-start-1", hideIndicator && "hidden")}><CheckIcon /></ComboboxPrimitive.ItemIndicator>- <div className={hideIndicator ? "col-start-1 col-span-full" : "col-start-2"}>{children}</div>+ <div+ className={cn(+ hideIndicator ? "col-start-1 col-span-full" : "col-start-2",+ contentClassName,+ )}+ >+ {children}+ </div></ComboboxPrimitive.Item>);}@@ -264,10 +273,7 @@ function ComboboxList({ className, ...props }: ComboboxPrimitive.List.Props) {return (<ScrollArea scrollbarGutter scrollFade><ComboboxPrimitive.List- className={cn(- "not-empty:scroll-py-1 not-empty:px-1 not-empty:py-1 in-data-has-overflow-y:pe-3",- className,- )}+ className={cn("not-empty:scroll-py-1 not-empty:px-1 not-empty:py-1", className)}data-slot="combobox-list"{...props}/>diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsxindex 50deb1ba8..c8aa6dc96 100644--- a/apps/web/src/components/ui/scroll-area.tsx+++ b/apps/web/src/components/ui/scroll-area.tsx@@ -17,13 +17,16 @@ function ScrollArea({hideScrollbars?: boolean;}) {return (- <ScrollAreaPrimitive.Root className={cn("size-full min-h-0", className)} {...props}>+ <ScrollAreaPrimitive.Root+ className={cn("relative size-full min-h-0 overflow-hidden rounded-[inherit]", className)}+ {...props}+ ><ScrollAreaPrimitive.ViewportclassName={cn("h-full overscroll-contain rounded-[inherit] outline-none transition-shadows focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-has-overflow-x:overscroll-x-contain",scrollFade &&"mask-t-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-start)))] mask-b-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-end)))] mask-l-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-start)))] mask-r-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-end)))] [--fade-size:1.5rem]",- scrollbarGutter && "data-has-overflow-y:pe-2.5 data-has-overflow-x:pb-2.5",+ scrollbarGutter && "[scrollbar-gutter:stable]",hideScrollbars &&"[-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",)}diff --git a/apps/web/src/composer-logic.test.ts b/apps/web/src/composer-logic.test.tsindex 1c18af54e..eaec8b44f 100644--- a/apps/web/src/composer-logic.test.ts+++ b/apps/web/src/composer-logic.test.ts@@ -36,18 +36,25 @@ describe("detectComposerTrigger", () => {});});- it("detects slash model query after /model", () => {- const text = "/model spark";+ it("keeps /model as a slash command item", () => {+ const text = "/model";const trigger = detectComposerTrigger(text, text.length);expect(trigger).toEqual({- kind: "slash-model",- query: "spark",+ kind: "slash-command",+ query: "model",rangeStart: 0,rangeEnd: text.length,});});+ it("does not keep a subcommand trigger active after /model arguments", () => {+ const text = "/model spark";+ const trigger = detectComposerTrigger(text, text.length);++ expect(trigger).toBeNull();+ });+it("detects non-model slash commands while typing", () => {const text = "/pl";const trigger = detectComposerTrigger(text, text.length);diff --git a/apps/web/src/composer-logic.ts b/apps/web/src/composer-logic.tsindex a5b26b0e2..fb63d2581 100644--- a/apps/web/src/composer-logic.ts+++ b/apps/web/src/composer-logic.ts@@ -1,7 +1,7 @@import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";-export type ComposerTriggerKind = "path" | "slash-command" | "slash-model" | "skill";+export type ComposerTriggerKind = "path" | "slash-command" | "skill";export type ComposerSlashCommand = "model" | "plan" | "default";export interface ComposerTrigger {@@ -224,14 +224,6 @@ export function detectComposerTrigger(text: string, cursorInput: number): Composconst commandMatch = /^\/(\S*)$/.exec(linePrefix);if (commandMatch) {const commandQuery = commandMatch[1] ?? "";- if (commandQuery.toLowerCase() === "model") {- return {- kind: "slash-model",- query: "",- rangeStart: lineStart,- rangeEnd: cursor,- };- }return {kind: "slash-command",query: commandQuery,@@ -239,16 +231,6 @@ export function detectComposerTrigger(text: string, cursorInput: number): ComposrangeEnd: cursor,};}-- const modelMatch = /^\/model(?:\s+(.*))?$/.exec(linePrefix);- if (modelMatch) {- return {- kind: "slash-model",- query: (modelMatch[1] ?? "").trim(),- rangeStart: lineStart,- rangeEnd: cursor,- };- }}const tokenStart = tokenStartForCursor(text, cursor);diff --git a/apps/web/src/hooks/useSettings.ts b/apps/web/src/hooks/useSettings.tsindex c2301b23a..18b2668a6 100644--- a/apps/web/src/hooks/useSettings.ts+++ b/apps/web/src/hooks/useSettings.ts@@ -10,8 +10,9 @@* store.*/import { useCallback, useMemo, useSyncExternalStore } from "react";-import { ServerSettings, ServerSettingsPatch } from "@t3tools/contracts";+import { ServerSettings, type ServerSettingsPatch } from "@t3tools/contracts";import {+ type ClientSettingsPatch,type ClientSettings,DEFAULT_CLIENT_SETTINGS,DEFAULT_UNIFIED_SETTINGS,@@ -98,7 +99,7 @@ const SERVER_SETTINGS_KEYS = new Set<string>(Struct.keys(ServerSettings.fields))function splitPatch(patch: Partial<UnifiedSettings>): {serverPatch: ServerSettingsPatch;- clientPatch: Partial<ClientSettings>;+ clientPatch: ClientSettingsPatch;} {const serverPatch: Record<string, unknown> = {};const clientPatch: Record<string, unknown> = {};@@ -111,7 +112,7 @@ function splitPatch(patch: Partial<UnifiedSettings>): {}return {serverPatch: serverPatch as ServerSettingsPatch,- clientPatch: clientPatch as Partial<ClientSettings>,+ clientPatch: clientPatch as ClientSettingsPatch,};}diff --git a/apps/web/src/index.css b/apps/web/src/index.cssindex 6a4db3985..5c568ad5d 100644--- a/apps/web/src/index.css+++ b/apps/web/src/index.css@@ -534,3 +534,25 @@ label:has(> select#reasoning-effort) select {-webkit-background-clip: text;animation: ultrathink-rainbow 10s linear infinite;}++/* Thin scrollbar for model picker */+.model-picker-list::-webkit-scrollbar {+ width: 4px;+}++.model-picker-list::-webkit-scrollbar-thumb {+ background: rgba(0, 0, 0, 0.1);+ border-radius: 2px;+}++.model-picker-list::-webkit-scrollbar-thumb:hover {+ background: rgba(0, 0, 0, 0.2);+}++.dark .model-picker-list::-webkit-scrollbar-thumb {+ background: rgba(255, 255, 255, 0.08);+}++.dark .model-picker-list::-webkit-scrollbar-thumb:hover {+ background: rgba(255, 255, 255, 0.15);+}diff --git a/apps/web/src/keybindings.test.ts b/apps/web/src/keybindings.test.tsindex 683afbbfe..85c14fa0a 100644--- a/apps/web/src/keybindings.test.ts+++ b/apps/web/src/keybindings.test.ts@@ -11,6 +11,8 @@ import {isChatNewShortcut,isChatNewLocalShortcut,isDiffToggleShortcut,+ modelPickerJumpCommandForIndex,+ modelPickerJumpIndexFromCommand,isOpenFavoriteEditorShortcut,isTerminalClearShortcut,isTerminalCloseShortcut,@@ -18,6 +20,7 @@ import {isTerminalSplitShortcut,isTerminalToggleShortcut,resolveShortcutCommand,+ shouldShowModelPickerJumpHints,shouldShowThreadJumpHints,shortcutLabelForCommand,terminalDeleteShortcutData,@@ -107,6 +110,11 @@ const DEFAULT_BINDINGS = compile([command: "commandPalette.toggle",whenAst: whenNot(whenIdentifier("terminalFocus")),},+ {+ shortcut: modShortcut("m", { shiftKey: true }),+ command: "modelPicker.toggle",+ whenAst: whenNot(whenIdentifier("terminalFocus")),+ },{ shortcut: modShortcut("o", { shiftKey: true }), command: "chat.new" },{ shortcut: modShortcut("n", { shiftKey: true }), command: "chat.newLocal" },{ shortcut: modShortcut("o"), command: "editor.openFavorite" },@@ -115,6 +123,21 @@ const DEFAULT_BINDINGS = compile([{ shortcut: modShortcut("1"), command: "thread.jump.1" },{ shortcut: modShortcut("2"), command: "thread.jump.2" },{ shortcut: modShortcut("3"), command: "thread.jump.3" },+ {+ shortcut: modShortcut("1"),+ command: "modelPicker.jump.1",+ whenAst: whenIdentifier("modelPickerOpen"),+ },+ {+ shortcut: modShortcut("2"),+ command: "modelPicker.jump.2",+ whenAst: whenIdentifier("modelPickerOpen"),+ },+ {+ shortcut: modShortcut("3"),+ command: "modelPicker.jump.3",+ whenAst: whenIdentifier("modelPickerOpen"),+ },]);describe("isTerminalToggleShortcut", () => {@@ -268,6 +291,10 @@ describe("shortcutLabelForCommand", () => {shortcutLabelForCommand(DEFAULT_BINDINGS, "commandPalette.toggle", "MacIntel"),"⌘K",);+ assert.strictEqual(+ shortcutLabelForCommand(DEFAULT_BINDINGS, "modelPicker.toggle", "Linux"),+ "Ctrl+Shift+M",+ );assert.strictEqual(shortcutLabelForCommand(DEFAULT_BINDINGS, "editor.openFavorite", "Linux"),"Ctrl+O",@@ -280,6 +307,13 @@ describe("shortcutLabelForCommand", () => {shortcutLabelForCommand(DEFAULT_BINDINGS, "thread.previous", "Linux"),"Ctrl+Shift+[",);+ assert.strictEqual(+ shortcutLabelForCommand(DEFAULT_BINDINGS, "modelPicker.jump.3", {+ platform: "MacIntel",+ context: { modelPickerOpen: true },+ }),+ "⌘3",+ );});it("returns null for commands shadowed by a later conflicting shortcut", () => {@@ -361,6 +395,32 @@ describe("thread navigation helpers", () => {});});+describe("model picker navigation helpers", () => {+ it("maps jump commands to visible model indices", () => {+ assert.strictEqual(modelPickerJumpCommandForIndex(0), "modelPicker.jump.1");+ assert.strictEqual(modelPickerJumpCommandForIndex(2), "modelPicker.jump.3");+ assert.isNull(modelPickerJumpCommandForIndex(9));+ assert.strictEqual(modelPickerJumpIndexFromCommand("modelPicker.jump.1"), 0);+ assert.strictEqual(modelPickerJumpIndexFromCommand("modelPicker.jump.3"), 2);+ assert.isNull(modelPickerJumpIndexFromCommand("thread.jump.1"));+ });++ it("shows jump hints only while the model picker context is active", () => {+ assert.isFalse(+ shouldShowModelPickerJumpHints(event({ metaKey: true }), DEFAULT_BINDINGS, {+ platform: "MacIntel",+ context: { modelPickerOpen: false },+ }),+ );+ assert.isTrue(+ shouldShowModelPickerJumpHints(event({ metaKey: true }), DEFAULT_BINDINGS, {+ platform: "MacIntel",+ context: { modelPickerOpen: true },+ }),+ );+ });+});+describe("chat/editor shortcuts", () => {it("matches chat.new shortcut", () => {assert.isTrue(diff --git a/apps/web/src/keybindings.ts b/apps/web/src/keybindings.tsindex 977c1319b..dbf2450f7 100644--- a/apps/web/src/keybindings.ts+++ b/apps/web/src/keybindings.ts@@ -2,8 +2,10 @@ import {type KeybindingCommand,type KeybindingShortcut,type KeybindingWhenNode,+ MODEL_PICKER_JUMP_KEYBINDING_COMMANDS,type ResolvedKeybindingsConfig,THREAD_JUMP_KEYBINDING_COMMANDS,+ type ModelPickerJumpKeybindingCommand,type ThreadJumpKeybindingCommand,} from "@t3tools/contracts";import { isMacPlatform } from "./lib/utils";@@ -18,6 +20,13 @@ export interface ShortcutEventLike {altKey: boolean;}+export interface ShortcutModifierStateLike {+ metaKey: boolean;+ ctrlKey: boolean;+ shiftKey: boolean;+ altKey: boolean;+}+export interface ShortcutMatchContext {terminalFocus: boolean;terminalOpen: boolean;@@ -71,7 +80,7 @@ function resolveEventKeys(event: ShortcutEventLike): Set<string> {}function matchesShortcutModifiers(- event: ShortcutEventLike,+ event: ShortcutModifierStateLike,shortcut: KeybindingShortcut,platform = navigator.platform,): boolean {@@ -269,13 +278,60 @@ export function shouldShowThreadJumpHints(event: ShortcutEventLike,keybindings: ResolvedKeybindingsConfig,options?: ShortcutMatchOptions,+): boolean {+ return shouldShowThreadJumpHintsForModifiers(event, keybindings, options);+}++export function shouldShowThreadJumpHintsForModifiers(+ modifiers: ShortcutModifierStateLike,+ keybindings: ResolvedKeybindingsConfig,+ options?: ShortcutMatchOptions,): boolean {const platform = resolvePlatform(options);for (const command of THREAD_JUMP_KEYBINDING_COMMANDS) {const shortcut = findEffectiveShortcutForCommand(keybindings, command, options);if (!shortcut) continue;- if (matchesShortcutModifiers(event, shortcut, platform)) {+ if (matchesShortcutModifiers(modifiers, shortcut, platform)) {+ return true;+ }+ }++ return false;+}++export function modelPickerJumpCommandForIndex(+ index: number,+): ModelPickerJumpKeybindingCommand | null {+ return MODEL_PICKER_JUMP_KEYBINDING_COMMANDS[index] ?? null;+}++export function modelPickerJumpIndexFromCommand(command: string): number | null {+ const index = MODEL_PICKER_JUMP_KEYBINDING_COMMANDS.indexOf(+ command as ModelPickerJumpKeybindingCommand,+ );+ return index === -1 ? null : index;+}++export function shouldShowModelPickerJumpHints(+ event: ShortcutEventLike,+ keybindings: ResolvedKeybindingsConfig,+ options?: ShortcutMatchOptions,+): boolean {+ return shouldShowModelPickerJumpHintsForModifiers(event, keybindings, options);+}++export function shouldShowModelPickerJumpHintsForModifiers(+ modifiers: ShortcutModifierStateLike,+ keybindings: ResolvedKeybindingsConfig,+ options?: ShortcutMatchOptions,+): boolean {+ const platform = resolvePlatform(options);++ for (const command of MODEL_PICKER_JUMP_KEYBINDING_COMMANDS) {+ const shortcut = findEffectiveShortcutForCommand(keybindings, command, options);+ if (!shortcut) continue;+ if (matchesShortcutModifiers(modifiers, shortcut, platform)) {return true;}}diff --git a/apps/web/src/localApi.test.ts b/apps/web/src/localApi.test.tsindex 4258ccb38..f53122175 100644--- a/apps/web/src/localApi.test.ts+++ b/apps/web/src/localApi.test.ts@@ -532,6 +532,7 @@ describe("wsApi", () => {confirmThreadArchive: true,confirmThreadDelete: false,diffWordWrap: true,+ favorites: [],sidebarProjectGroupingMode: "repository_path" as const,sidebarProjectGroupingOverrides: {"environment-local:/tmp/project": "separate" as const,@@ -589,6 +590,7 @@ describe("wsApi", () => {confirmThreadArchive: true,confirmThreadDelete: false,diffWordWrap: true,+ favorites: [],sidebarProjectGroupingMode: "repository_path" as const,sidebarProjectGroupingOverrides: {"environment-local:/tmp/project": "separate" as const,diff --git a/apps/web/src/modelPickerOpenState.ts b/apps/web/src/modelPickerOpenState.tsnew file mode 100644index 000000000..5a4993c16--- /dev/null+++ b/apps/web/src/modelPickerOpenState.ts@@ -0,0 +1,17 @@+import { create } from "zustand";++const useModelPickerOpenStore = create<{+ open: boolean;+ setOpen: (open: boolean) => void;+}>((set) => ({+ open: false,+ setOpen: (open) => set((current) => (current.open === open ? current : { open })),+}));++export function useModelPickerOpen(): boolean {+ return useModelPickerOpenStore((store) => store.open);+}++export function setModelPickerOpen(open: boolean): void {+ useModelPickerOpenStore.getState().setOpen(open);+}diff --git a/apps/web/src/modelSelection.ts b/apps/web/src/modelSelection.tsindex 60ab386b8..2ffa8e201 100644--- a/apps/web/src/modelSelection.ts+++ b/apps/web/src/modelSelection.ts@@ -16,6 +16,7 @@ import {getProviderModels,resolveSelectableProvider,} from "./providerModels";+import { ModelEsque } from "./components/chat/providerIconUtils";const MAX_CUSTOM_MODEL_COUNT = 32;export const MAX_CUSTOM_MODEL_LENGTH = 256;@@ -31,6 +32,8 @@ export type ProviderCustomModelConfig = {export interface AppModelOption {slug: string;name: string;+ shortName?: string;+ subProvider?: string;isCustom: boolean;}@@ -103,9 +106,11 @@ export function getAppModelOptions(selectedModel?: string | null,): AppModelOption[] {const options: AppModelOption[] = getProviderModels(providers, provider).map(- ({ slug, name, isCustom }) => ({+ ({ slug, name, shortName, subProvider, isCustom }) => ({slug,name,+ ...(shortName ? { shortName } : {}),+ ...(subProvider ? { subProvider } : {}),isCustom,}),);@@ -169,7 +174,7 @@ export function getCustomModelOptionsByProvider(providers: ReadonlyArray<ServerProvider>,selectedProvider?: ProviderKind | null,selectedModel?: string | null,-): Record<ProviderKind, ReadonlyArray<{ slug: string; name: string }>> {+): Record<ProviderKind, ReadonlyArray<ModelEsque>> {return {codex: getAppModelOptions(settings,diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.tsindex 477bc57be..44e0498d7 100644--- a/apps/web/src/session-logic.ts+++ b/apps/web/src/session-logic.ts@@ -28,11 +28,13 @@ export const PROVIDER_OPTIONS: Array<{value: ProviderPickerKind;label: string;available: boolean;+ /** Shown on the model picker sidebar when relevant */+ pickerSidebarBadge?: "new" | "soon";}> = [{ value: "codex", label: "Codex", available: true },{ value: "claudeAgent", label: "Claude", available: true },- { value: "opencode", label: "OpenCode", available: true },- { value: "cursor", label: "Cursor", available: true },+ { value: "opencode", label: "OpenCode", available: true, pickerSidebarBadge: "new" },+ { value: "cursor", label: "Cursor", available: true, pickerSidebarBadge: "new" },];export interface WorkLogEntry {diff --git a/apps/web/src/shortcutModifierState.test.ts b/apps/web/src/shortcutModifierState.test.tsnew file mode 100644index 000000000..46a7fc4aa--- /dev/null+++ b/apps/web/src/shortcutModifierState.test.ts@@ -0,0 +1,146 @@+import { describe, expect, it } from "vitest";++import {+ areShortcutModifierStatesEqual,+ clearShortcutModifierState,+ readShortcutModifierState,+ setShortcutModifierState,+ syncShortcutModifierStateFromKeyboardEvent,+} from "./shortcutModifierState";++function keyboardEventLike(type: "keydown" | "keyup", init: Partial<KeyboardEvent>): KeyboardEvent {+ return {+ type,+ key: "",+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ shiftKey: false,+ ...init,+ } as KeyboardEvent;+}++describe("shortcutModifierState", () => {+ it("compares modifier states by value", () => {+ expect(+ areShortcutModifierStatesEqual(+ { metaKey: false, ctrlKey: true, altKey: false, shiftKey: true },+ { metaKey: false, ctrlKey: true, altKey: false, shiftKey: true },+ ),+ ).toBe(true);+ expect(+ areShortcutModifierStatesEqual(+ { metaKey: false, ctrlKey: true, altKey: false, shiftKey: true },+ { metaKey: false, ctrlKey: false, altKey: false, shiftKey: true },+ ),+ ).toBe(false);+ });++ it("preserves the current store object when modifier values do not change", () => {+ clearShortcutModifierState();++ const initialState = readShortcutModifierState();+ setShortcutModifierState({+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ shiftKey: false,+ });++ expect(readShortcutModifierState()).toBe(initialState);++ setShortcutModifierState({+ metaKey: false,+ ctrlKey: true,+ altKey: false,+ shiftKey: false,+ });+ const updatedState = readShortcutModifierState();+ expect(updatedState).not.toBe(initialState);+ expect(updatedState).toEqual({+ metaKey: false,+ ctrlKey: true,+ altKey: false,+ shiftKey: false,+ });++ setShortcutModifierState({+ metaKey: false,+ ctrlKey: true,+ altKey: false,+ shiftKey: false,+ });+ expect(readShortcutModifierState()).toBe(updatedState);++ clearShortcutModifierState();+ const clearedState = readShortcutModifierState();+ expect(clearedState).toEqual({+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ shiftKey: false,+ });+ expect(clearedState).not.toBe(updatedState);++ clearShortcutModifierState();+ expect(readShortcutModifierState()).toBe(clearedState);+ });++ it("tracks bare modifier keydown and keyup events explicitly", () => {+ clearShortcutModifierState();++ syncShortcutModifierStateFromKeyboardEvent(+ keyboardEventLike("keydown", {+ key: "Meta",+ metaKey: false,+ }),+ );+ expect(readShortcutModifierState()).toEqual({+ metaKey: true,+ ctrlKey: false,+ altKey: false,+ shiftKey: false,+ });++ syncShortcutModifierStateFromKeyboardEvent(+ keyboardEventLike("keydown", {+ key: "Shift",+ metaKey: true,+ shiftKey: false,+ }),+ );+ expect(readShortcutModifierState()).toEqual({+ metaKey: true,+ ctrlKey: false,+ altKey: false,+ shiftKey: true,+ });++ syncShortcutModifierStateFromKeyboardEvent(+ keyboardEventLike("keyup", {+ key: "Meta",+ metaKey: true,+ shiftKey: true,+ }),+ );+ expect(readShortcutModifierState()).toEqual({+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ shiftKey: true,+ });++ syncShortcutModifierStateFromKeyboardEvent(+ keyboardEventLike("keyup", {+ key: "Shift",+ shiftKey: true,+ }),+ );+ expect(readShortcutModifierState()).toEqual({+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ shiftKey: false,+ });+ });+});diff --git a/apps/web/src/shortcutModifierState.ts b/apps/web/src/shortcutModifierState.tsnew file mode 100644index 000000000..370f3b0a7--- /dev/null+++ b/apps/web/src/shortcutModifierState.ts@@ -0,0 +1,96 @@+import { create } from "zustand";++export interface ShortcutModifierState {+ metaKey: boolean;+ ctrlKey: boolean;+ altKey: boolean;+ shiftKey: boolean;+}++const EMPTY_SHORTCUT_MODIFIER_STATE: ShortcutModifierState = {+ metaKey: false,+ ctrlKey: false,+ altKey: false,+ shiftKey: false,+};++export function areShortcutModifierStatesEqual(+ left: ShortcutModifierState,+ right: ShortcutModifierState,+): boolean {+ return (+ left.metaKey === right.metaKey &&+ left.ctrlKey === right.ctrlKey &&+ left.altKey === right.altKey &&+ left.shiftKey === right.shiftKey+ );+}++const useShortcutModifierStateStore = create<{+ state: ShortcutModifierState;+ setState: (state: ShortcutModifierState) => void;+ clear: () => void;+}>((set) => ({+ state: EMPTY_SHORTCUT_MODIFIER_STATE,+ setState: (state) =>+ set((current) => (areShortcutModifierStatesEqual(current.state, state) ? current : { state })),+ clear: () =>+ set((current) =>+ areShortcutModifierStatesEqual(current.state, EMPTY_SHORTCUT_MODIFIER_STATE)+ ? current+ : { state: EMPTY_SHORTCUT_MODIFIER_STATE },+ ),+}));++export function useShortcutModifierState(): ShortcutModifierState {+ return useShortcutModifierStateStore((store) => store.state);+}++function normalizeModifierKey(key: string): keyof ShortcutModifierState | null {+ switch (key) {+ case "Meta":+ case "OS":+ case "Command":+ return "metaKey";+ case "Control":+ return "ctrlKey";+ case "Alt":+ case "Option":+ return "altKey";+ case "Shift":+ return "shiftKey";+ default:+ return null;+ }+}++export function syncShortcutModifierStateFromKeyboardEvent(event: KeyboardEvent): void {+ const normalizedModifierKey = normalizeModifierKey(event.key);+ if (normalizedModifierKey) {+ const currentState = useShortcutModifierStateStore.getState().state;+ useShortcutModifierStateStore.getState().setState({+ ...currentState,+ [normalizedModifierKey]: event.type === "keydown",+ });+ return;+ }++ useShortcutModifierStateStore.getState().setState({+ metaKey: event.metaKey,+ ctrlKey: event.ctrlKey,+ altKey: event.altKey,+ shiftKey: event.shiftKey,+ });+}++export function setShortcutModifierState(state: ShortcutModifierState): void {+ useShortcutModifierStateStore.getState().setState(state);+}++export function clearShortcutModifierState(): void {+ useShortcutModifierStateStore.getState().clear();+}++export function readShortcutModifierState(): ShortcutModifierState {+ return useShortcutModifierStateStore.getState().state;+}diff --git a/packages/contracts/src/keybindings.test.ts b/packages/contracts/src/keybindings.test.tsindex 79c2feb8b..f04069701 100644--- a/packages/contracts/src/keybindings.test.ts+++ b/packages/contracts/src/keybindings.test.ts@@ -53,6 +53,18 @@ it.effect("parses keybinding rules", () =>});assert.strictEqual(parsedLocal.command, "chat.newLocal");+ const parsedModelPickerToggle = yield* decode(KeybindingRule, {+ key: "mod+shift+m",+ command: "modelPicker.toggle",+ });+ assert.strictEqual(parsedModelPickerToggle.command, "modelPicker.toggle");++ const parsedModelPickerJump = yield* decode(KeybindingRule, {+ key: "mod+1",+ command: "modelPicker.jump.1",+ });+ assert.strictEqual(parsedModelPickerJump.command, "modelPicker.jump.1");+const parsedThreadPrevious = yield* decode(KeybindingRule, {key: "mod+shift+[",command: "thread.previous",diff --git a/packages/contracts/src/keybindings.ts b/packages/contracts/src/keybindings.tsindex 1296e74c1..d3b85d1cd 100644--- a/packages/contracts/src/keybindings.ts+++ b/packages/contracts/src/keybindings.ts@@ -20,6 +20,20 @@ export const THREAD_JUMP_KEYBINDING_COMMANDS = [] as const;export type ThreadJumpKeybindingCommand = (typeof THREAD_JUMP_KEYBINDING_COMMANDS)[number];+export const MODEL_PICKER_JUMP_KEYBINDING_COMMANDS = [+ "modelPicker.jump.1",+ "modelPicker.jump.2",+ "modelPicker.jump.3",+ "modelPicker.jump.4",+ "modelPicker.jump.5",+ "modelPicker.jump.6",+ "modelPicker.jump.7",+ "modelPicker.jump.8",+ "modelPicker.jump.9",+] as const;+export type ModelPickerJumpKeybindingCommand =+ (typeof MODEL_PICKER_JUMP_KEYBINDING_COMMANDS)[number];+export const THREAD_KEYBINDING_COMMANDS = ["thread.previous","thread.next",@@ -27,6 +41,12 @@ export const THREAD_KEYBINDING_COMMANDS = [] as const;export type ThreadKeybindingCommand = (typeof THREAD_KEYBINDING_COMMANDS)[number];+export const MODEL_PICKER_KEYBINDING_COMMANDS = [+ "modelPicker.toggle",+ ...MODEL_PICKER_JUMP_KEYBINDING_COMMANDS,+] as const;+export type ModelPickerKeybindingCommand = (typeof MODEL_PICKER_KEYBINDING_COMMANDS)[number];+const STATIC_KEYBINDING_COMMANDS = ["terminal.toggle","terminal.split",@@ -37,6 +57,7 @@ const STATIC_KEYBINDING_COMMANDS = ["chat.new","chat.newLocal","editor.openFavorite",+ ...MODEL_PICKER_KEYBINDING_COMMANDS,...THREAD_KEYBINDING_COMMANDS,] as const;diff --git a/packages/contracts/src/server.ts b/packages/contracts/src/server.tsindex c08dfa6cd..3cd25f2e8 100644--- a/packages/contracts/src/server.ts+++ b/packages/contracts/src/server.ts@@ -53,6 +53,8 @@ export type ServerProviderAuth = typeof ServerProviderAuth.Type;export const ServerProviderModel = Schema.Struct({slug: TrimmedNonEmptyString,name: TrimmedNonEmptyString,+ shortName: Schema.optional(TrimmedNonEmptyString),+ subProvider: Schema.optional(TrimmedNonEmptyString),isCustom: Schema.Boolean,capabilities: Schema.NullOr(ModelCapabilities),});diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.tsindex 6c45dde53..cad1d197c 100644--- a/packages/contracts/src/settings.ts+++ b/packages/contracts/src/settings.ts@@ -9,7 +9,7 @@ import {DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER,OpenCodeModelOptions,} from "./model.ts";-import { ModelSelection } from "./orchestration.ts";+import { ModelSelection, ProviderKind } from "./orchestration.ts";// ── Client Settings (local-only) ───────────────────────────────@@ -37,6 +37,12 @@ export const ClientSettingsSchema = Schema.Struct({confirmThreadArchive: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),confirmThreadDelete: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),diffWordWrap: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),+ favorites: Schema.Array(+ Schema.Struct({+ provider: ProviderKind,+ model: TrimmedNonEmptyString,+ }),+ ).pipe(Schema.withDecodingDefault(Effect.succeed([]))),sidebarProjectGroupingMode: SidebarProjectGroupingMode.pipe(Schema.withDecodingDefault(Effect.succeed(DEFAULT_SIDEBAR_PROJECT_GROUPING_MODE)),),@@ -241,6 +247,7 @@ const OpenCodeSettingsPatch = Schema.Struct({});export const ServerSettingsPatch = Schema.Struct({+ // Server settingsenableAssistantStreaming: Schema.optionalKey(Schema.Boolean),defaultThreadEnvMode: Schema.optionalKey(ThreadEnvMode),addProjectBaseDirectory: Schema.optionalKey(Schema.String),@@ -261,3 +268,25 @@ export const ServerSettingsPatch = Schema.Struct({),});export type ServerSettingsPatch = typeof ServerSettingsPatch.Type;++export const ClientSettingsPatch = Schema.Struct({+ confirmThreadArchive: Schema.optionalKey(Schema.Boolean),+ confirmThreadDelete: Schema.optionalKey(Schema.Boolean),+ diffWordWrap: Schema.optionalKey(Schema.Boolean),+ favorites: Schema.optionalKey(+ Schema.Array(+ Schema.Struct({+ provider: ProviderKind,+ model: TrimmedNonEmptyString,+ }),+ ),+ ),+ sidebarProjectGroupingMode: Schema.optionalKey(SidebarProjectGroupingMode),+ sidebarProjectGroupingOverrides: Schema.optionalKey(+ Schema.Record(TrimmedNonEmptyString, SidebarProjectGroupingMode),+ ),+ sidebarProjectSortOrder: Schema.optionalKey(SidebarProjectSortOrder),+ sidebarThreadSortOrder: Schema.optionalKey(SidebarThreadSortOrder),+ timestampFormat: Schema.optionalKey(TimestampFormat),+});+export type ClientSettingsPatch = typeof ClientSettingsPatch.Type;