diff --git a/apps/web/src/components/chat/ComposerModelEffort.browser.test.tsx b/apps/web/src/components/chat/ComposerModelEffort.browser.test.tsx index ab7d560d5c676..c53962cb7db2b 100644 --- a/apps/web/src/components/chat/ComposerModelEffort.browser.test.tsx +++ b/apps/web/src/components/chat/ComposerModelEffort.browser.test.tsx @@ -6,11 +6,14 @@ import { } from "@t3tools/contracts"; import { createModelCapabilities } from "@t3tools/shared/model"; import { useState } from "react"; -import { expect, it } from "vite-plus/test"; +import { expect, it, vi } from "vite-plus/test"; import { page, userEvent } from "vite-plus/test/browser"; +import "~/index.css"; + import { render } from "../../../test/render"; import { ComposerEffortColumn, describeComposerEffort } from "./ComposerModelEffort"; +import { DockedPickerContext } from "./ProviderModelPicker"; import type { TraitsSelectionInput } from "./TraitsPicker"; // Shaped like Devin over ACP: its session mode comes first, and its reasoning id is its own. @@ -122,3 +125,39 @@ it("draws an agent's reasoning as bars and keeps its mode out of the levels", as .toBeInTheDocument(); await expect.element(page.getByRole("menuitemradio")).not.toBeInTheDocument(); }); + +it("names the selected model in full when the column header cuts it off", async () => { + // The header shows the trigger's short name; the hover names the model in full. + const modelLabel = "Opus 5.5 Fast Long Context"; + const modelName = "Claude Opus 5.5 Fast Long Context"; + const column = (label: string, name: string) => ( + + {/* The docked column's width. */} +
+ {})} /> +
+
+ ); + await using screen = await render(column(modelLabel, modelName), { + router: false, // no routes involved + }); + const header = screen.getByText(modelLabel); + const clipped = header.element(); + await vi.waitFor(() => expect(clipped.scrollWidth).toBeGreaterThan(clipped.clientWidth)); + + await userEvent.hover(header); + await vi.waitFor(() => + expect( + clipped.closest("[title]")?.getAttribute("title") ?? "", + "hover title of the cut-off model label", + ).toBe(modelName), + ); + + // Picking another model with the keyboard leaves the pointer resting on the header. + await screen.rerender(column("Sonnet 5.5 Long Context", "Claude Sonnet 5.5 Long Context")); + const next = screen.getByText("Sonnet 5.5 Long Context").element(); + expect( + next.closest("[title]")?.getAttribute("title") ?? "", + "title after a model change", + ).not.toBe(modelName); +}); diff --git a/apps/web/src/components/chat/ComposerModelEffort.tsx b/apps/web/src/components/chat/ComposerModelEffort.tsx index f56997ff2a6a1..9309e98a3252f 100644 --- a/apps/web/src/components/chat/ComposerModelEffort.tsx +++ b/apps/web/src/components/chat/ComposerModelEffort.tsx @@ -23,6 +23,7 @@ import { Switch } from "../ui/switch"; import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; import type { ComposerControlSize } from "./ComposerControl"; import { ComposerPermissionsSection, type RuntimeModeOption } from "./ComposerFooterControls"; +import { titleWhenClipped } from "./clippedTitle"; import { composerFloatingLayerProps, focusCheckedPermission } from "./composerEventScope"; import { EffortGlyph, FastBolt, resolveEffortGlyph } from "./EffortGlyph"; import { DockedPickerContext } from "./ProviderModelPicker"; @@ -505,7 +506,12 @@ export function ComposerEffortColumn(props: { traits: TraitsSelectionInput | nul {controls?.effort?.descriptor.label ?? (controls?.others.length ? "Options" : "Effort")} - + {/* Keyed so a model picked under a resting pointer drops the last model's title. */} + {picker.modelLabel} diff --git a/apps/web/src/components/chat/ModelListRow.tsx b/apps/web/src/components/chat/ModelListRow.tsx index 69da770f1f84b..134e1f1498584 100644 --- a/apps/web/src/components/chat/ModelListRow.tsx +++ b/apps/web/src/components/chat/ModelListRow.tsx @@ -10,6 +10,7 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; import { cn } from "~/lib/utils"; import { modelPickerModelKey } from "./modelPickerKeys"; import { ProviderInstanceIcon } from "./ProviderInstanceIcon"; +import { titleWhenClipped } from "./clippedTitle"; export const ModelListRow = memo(function ModelListRow(props: { index: number; @@ -34,11 +35,7 @@ export const ModelListRow = memo(function ModelListRow(props: { disabledReason?: string | null; onToggleFavorite: (instanceId: ProviderInstanceId, slug: string) => void; }) { - const model = { - slug: props.slug, - name: props.name, - subProvider: props.subProvider, - }; + const displayName = getDisplayModelName(props); const row = ( -
-
{ - const name = event.currentTarget; - name.title = name.scrollWidth > name.clientWidth ? getDisplayModelName(model) : ""; - }} - > - {getDisplayModelName(model)} +
+
+ {displayName} {/* The logo is decorative, so name the provider for screen readers. */} , {props.providerDisplayName}
diff --git a/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx b/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx index a3c927b4c272b..c22bbeb024b64 100644 --- a/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx +++ b/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx @@ -176,6 +176,55 @@ it("keeps a docked picker open after a pick and hands focus to that model's effo await expect.element(search).not.toBeInTheDocument(); }); +it("names a row's cut-off sub-provider and its provider instance on hover", async () => { + const instanceId = ProviderInstanceId.make("opencode-zen"); + const entries = deriveProviderInstanceEntries([ + { + instanceId, + driver: ProviderDriverKind.make("opencode"), + displayName: "OpenCode Zen", + enabled: true, + installed: true, + version: null, + status: "ready", + auth: { status: "authenticated" }, + checkedAt: "2026-01-01T00:00:00.000Z", + models: [], + slashCommands: [], + skills: [], + }, + ]); + const name = "DeepSeek V4.1 Flash Free"; + const subProvider = "Alibaba Cloud International Model Studio"; + const options = new Map([[instanceId, [{ slug: "deepseek-v4.1-flash", name, subProvider }]]]); + + await using screen = await render( + {}} + />, + ); + await screen.getByRole("button", { name: "Choose model" }).click(); + const label = page.getByRole("option", { name: new RegExp(name) }).getByText(subProvider); + const clipped = label.element(); + await vi.waitFor(() => expect(clipped.scrollWidth).toBeGreaterThan(clipped.clientWidth)); + + await userEvent.hover(label); + await vi.waitFor(() => { + const title = clipped.closest("[title]")?.getAttribute("title") ?? ""; + const hint = "hover title of a row with a cut-off sub-provider"; + expect(title, hint).toContain(name); + expect(title, hint).toContain(subProvider); + expect(title, hint).toContain("OpenCode Zen"); + }); +}); + it("opens on the active provider when every favorite belongs to a disabled provider", async () => { const entries = deriveProviderInstanceEntries( ["Codex", "Claude"].map((name) => ({ diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx index dc24671c301ba..e04e515eecaa1 100644 --- a/apps/web/src/components/chat/ProviderModelPicker.tsx +++ b/apps/web/src/components/chat/ProviderModelPicker.tsx @@ -84,7 +84,10 @@ function lockBackgroundScroll(popup: HTMLElement | null) { } /** What a docked effort column needs from its picker: the model it serves. */ -export const DockedPickerContext = createContext<{ modelLabel: string }>({ modelLabel: "" }); +export const DockedPickerContext = createContext<{ modelLabel: string; modelName: string }>({ + modelLabel: "", + modelName: "", +}); export const ProviderModelPicker = memo(function ProviderModelPicker(props: { environmentId: EnvironmentId | null; @@ -457,7 +460,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: { touchBackdrop > {props.effortColumn ? ( - +
{/* One fixed height, so a model with more options never resizes the popup. Short windows shrink it and keep the footer. */} diff --git a/apps/web/src/components/chat/clippedTitle.ts b/apps/web/src/components/chat/clippedTitle.ts new file mode 100644 index 0000000000000..85512cbf3b3fb --- /dev/null +++ b/apps/web/src/components/chat/clippedTitle.ts @@ -0,0 +1,12 @@ +import type { PointerEvent } from "react"; + +/** A pointer-enter handler that titles the element with `title` only while it or a child is cut off. */ +export function titleWhenClipped(title: string) { + return (event: PointerEvent) => { + const element = event.currentTarget; + const clipped = [element, ...element.children].some( + (node) => node.scrollWidth > node.clientWidth, + ); + element.title = clipped ? title : ""; + }; +}