Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions apps/web/src/components/chat/ComposerModelEffort.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,17 @@ export function ComposerEffortColumn(props: { traits: TraitsSelectionInput | nul
? gt("Options", { $context: "heading for model options" })
: gt("Effort", { $context: "heading for reasoning effort levels" }))}
</span>
<span className="ms-auto min-w-0 truncate text-muted-foreground text-xs">
{picker.modelLabel}
</span>
<Tooltip>
<TooltipTrigger
tabIndex={-1}
render={<span className="ms-auto min-w-0 truncate text-muted-foreground text-xs" />}
>
{picker.modelLabel}
</TooltipTrigger>
<TooltipPopup side="top" align="end">
{picker.modelTitle}
</TooltipPopup>
</Tooltip>
</div>
</div>
{/* pt-2.5 puts the first level on the same line as the first model. */}
Expand Down
77 changes: 44 additions & 33 deletions apps/web/src/components/chat/ModelListRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ export const ModelListRow = memo(function ModelListRow(props: {
name: props.name,
subProvider: props.subProvider,
};
const displayName = getDisplayModelName(model);
const identity = [
...new Set([displayName, props.subProvider, props.providerDisplayName, props.slug]),
]
.filter(Boolean)
.join(" · ");

const row = (
<ComboboxItem
Expand Down Expand Up @@ -68,39 +74,43 @@ export const ModelListRow = memo(function ModelListRow(props: {
indicatorBackground="var(--popover)"
badgeClassName="right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-5xs"
/>
<div className="flex min-w-0 flex-1 items-center gap-2 text-left">
<div
className="min-w-0 truncate text-sm font-normal leading-snug"
// Names the row in full on hover only when it is cut off.
onPointerEnter={(event) => {
const name = event.currentTarget;
name.title = name.scrollWidth > name.clientWidth ? getDisplayModelName(model) : "";
}}
<Tooltip
// A disabled row's reason tooltip names the model instead.
disabled={Boolean(props.disabledReason)}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
>
<TooltipTrigger
tabIndex={-1}
render={<div className="flex min-w-0 flex-1 items-center gap-2 text-left" />}
>
{getDisplayModelName(model)}
{/* The logo is decorative, so name the provider for screen readers. */}
<span className="sr-only">, {props.providerDisplayName}</span>
</div>
{props.isSelected ? <CheckIcon className="size-3.5 shrink-0" aria-hidden="true" /> : null}
{props.subProvider ? (
<span className="min-w-0 shrink truncate text-xs text-muted-foreground/70">
{props.subProvider}
</span>
) : null}
{props.showNewBadge ? (
<span
className="shrink-0 rounded border border-update/35 bg-update/15 px-0.5 py-px text-3xs font-bold uppercase leading-none tracking-wide text-update-foreground"
aria-label={gt("New model")}
>
{gt("New", { $context: "badge on a newly added model" })}
</span>
) : null}
{props.unavailable ? (
<Badge variant="outline" size="sm">
<T context="badge on a model that cannot be selected">Unavailable</T>
</Badge>
) : null}
</div>
<div className="min-w-0 truncate text-sm font-normal leading-snug">
{displayName}
{/* The logo is decorative, so name the provider for screen readers. */}
<span className="sr-only">, {props.providerDisplayName}</span>
</div>
{props.isSelected ? <CheckIcon className="size-3.5 shrink-0" aria-hidden="true" /> : null}
{props.subProvider ? (
<span className="min-w-0 shrink truncate text-xs text-muted-foreground/70">
{props.subProvider}
</span>
) : null}
{props.showNewBadge ? (
<span
className="shrink-0 rounded border border-update/35 bg-update/15 px-0.5 py-px text-3xs font-bold uppercase leading-none tracking-wide text-update-foreground"
aria-label={gt("New model")}
>
{gt("New", { $context: "badge on a newly added model" })}
</span>
) : null}
{props.unavailable ? (
<Badge variant="outline" size="sm">
<T context="badge on a model that cannot be selected">Unavailable</T>
</Badge>
) : null}
</TooltipTrigger>
<TooltipPopup side="top" align="start">
{identity}
</TooltipPopup>
</Tooltip>

<div className="flex shrink-0 items-center gap-1.5">
<Tooltip>
Expand Down Expand Up @@ -147,7 +157,8 @@ export const ModelListRow = memo(function ModelListRow(props: {
<Tooltip>
<TooltipTrigger render={row} />
<TooltipPopup side="left" align="center">
{props.disabledReason}
<div>{props.disabledReason}</div>
<div className="text-muted-foreground">{identity}</div>
</TooltipPopup>
</Tooltip>
);
Expand Down
73 changes: 73 additions & 0 deletions apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import "~/index.css";
import { render } from "../../../test/render";
import { __setClientSettingsForTests } from "../../hooks/useSettings";
import { deriveProviderInstanceEntries } from "../../providerInstances";
import { ComposerEffortColumn } from "./ComposerModelEffort";
import { ProviderModelPicker } from "./ProviderModelPicker";

it("keeps each registry image when adding a model from another ACP agent", async () => {
Expand Down Expand Up @@ -177,6 +178,78 @@ 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 and the docked header in full 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 longSubProvider = "Alibaba Cloud International Model Studio";
const options = new Map([
[
instanceId,
[
{ slug: "glm-5.3", name: "GLM-5.3", subProvider: longSubProvider },
{ slug: "kimi-k2-0905", name: "Kimi K2 0905", shortName: "Kimi K2", subProvider: "Pi" },
{ slug: "qwen-max", name: "Qwen Max" },
],
],
]);

await using screen = await render(
<ProviderModelPicker
environmentId={null}
activeInstanceId={instanceId}
model="kimi-k2-0905"
lockedProvider={null}
instanceEntries={entries}
modelOptionsByInstance={options}
triggerAriaLabel="Choose model"
onInstanceModelChange={() => {}}
getModelDisabledReason={(_, model) => (model === "qwen-max" ? "Not here." : null)}
effortColumn={<ComposerEffortColumn traits={null} />}
/>,
);
await screen.getByRole("button", { name: "Choose model" }).click();

// A disabled row's reason tooltip still names the model.
await userEvent.hover(page.getByRole("option", { name: /Qwen Max/ }));
await vi.waitFor(() =>
expect(document.querySelector('[data-slot="tooltip-popup"]')?.textContent).toBe(
"Not here.Qwen Max · OpenCode Zen · qwen-max",
),
);

const option = page.getByRole("option", { name: /GLM-5\.3/ });
await expect.element(option).toBeVisible();
await userEvent.hover(option.getByText(longSubProvider));
await vi.waitFor(() =>
expect(
[...document.querySelectorAll('[data-slot="tooltip-popup"]')].map((el) => el.textContent),
).toContain(`GLM-5.3 · ${longSubProvider} · OpenCode Zen · glm-5.3`),
);

// The header shows the short name; its hover names the full model and slug.
await userEvent.hover(page.getByText("Kimi K2", { exact: true }).last());
await vi.waitFor(() =>
expect(
[...document.querySelectorAll('[data-slot="tooltip-popup"]')].map((el) => el.textContent),
).toContain("Kimi K2 0905 · kimi-k2-0905"),
);
});

it("lists a model reported twice by one provider once, with contiguous jump shortcuts", async () => {
const instanceId = ProviderInstanceId.make("claude");
const entries = deriveProviderInstanceEntries([
Expand Down
8 changes: 6 additions & 2 deletions apps/web/src/components/chat/ProviderModelPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,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; modelTitle: string }>({
modelLabel: "",
modelTitle: "",
});

export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
environmentId: EnvironmentId | null;
Expand Down Expand Up @@ -182,6 +185,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
const triggerLabel = selectedModel
? withUnavailable(getDisplayModelName(selectedModel), selectedModel.isUnavailable)
: triggerTitle;
const modelTitle = selectedModel ? `${triggerLabel} · ${selectedModel.slug}` : triggerTitle;
const showInstanceBadge =
activeEntry !== null && shouldShowInstanceBadge(activeEntry, props.instanceEntries);

Expand Down Expand Up @@ -470,7 +474,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
touchBackdrop
>
{props.effortColumn ? (
<DockedPickerContext value={{ modelLabel: triggerTitle }}>
<DockedPickerContext value={{ modelLabel: triggerTitle, modelTitle }}>
<div className="flex max-h-(--available-height) flex-col">
{/* One fixed height, so a model with more options never resizes the popup. Short
windows shrink it and keep the footer. */}
Expand Down
Loading