diff --git a/apps/web/src/components/chat/ComposerModelEffort.tsx b/apps/web/src/components/chat/ComposerModelEffort.tsx
index 1d0227c0f6482..f486e1115b4d0 100644
--- a/apps/web/src/components/chat/ComposerModelEffort.tsx
+++ b/apps/web/src/components/chat/ComposerModelEffort.tsx
@@ -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" }))}
-
- {picker.modelLabel}
-
+
+ }
+ >
+ {picker.modelLabel}
+
+
+ {picker.modelTitle}
+
+
{/* pt-2.5 puts the first level on the same line as the first model. */}
diff --git a/apps/web/src/components/chat/ModelListRow.tsx b/apps/web/src/components/chat/ModelListRow.tsx
index 74dae2dc23582..a69e16051269a 100644
--- a/apps/web/src/components/chat/ModelListRow.tsx
+++ b/apps/web/src/components/chat/ModelListRow.tsx
@@ -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 = (
-
-
{
- const name = event.currentTarget;
- name.title = name.scrollWidth > name.clientWidth ? getDisplayModelName(model) : "";
- }}
+
+ }
>
- {getDisplayModelName(model)}
- {/* The logo is decorative, so name the provider for screen readers. */}
- , {props.providerDisplayName}
-
- {props.isSelected ?
: null}
- {props.subProvider ? (
-
- {props.subProvider}
-
- ) : null}
- {props.showNewBadge ? (
-
- {gt("New", { $context: "badge on a newly added model" })}
-
- ) : null}
- {props.unavailable ? (
-
- Unavailable
-
- ) : null}
-
+
+ {displayName}
+ {/* The logo is decorative, so name the provider for screen readers. */}
+ , {props.providerDisplayName}
+
+ {props.isSelected ? : null}
+ {props.subProvider ? (
+
+ {props.subProvider}
+
+ ) : null}
+ {props.showNewBadge ? (
+
+ {gt("New", { $context: "badge on a newly added model" })}
+
+ ) : null}
+ {props.unavailable ? (
+
+ Unavailable
+
+ ) : null}
+
+
+ {identity}
+
+
@@ -147,7 +157,8 @@ export const ModelListRow = memo(function ModelListRow(props: {
- {props.disabledReason}
+ {props.disabledReason}
+ {identity}
);
diff --git a/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx b/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
index 06bb36a34c07f..fd0d4441c2a4d 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
@@ -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 () => {
@@ -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(
+ {}}
+ getModelDisabledReason={(_, model) => (model === "qwen-max" ? "Not here." : null)}
+ effortColumn={}
+ />,
+ );
+ 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([
diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx
index 254b1ffeac937..8a8b8dd296870 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.tsx
@@ -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;
@@ -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);
@@ -470,7 +474,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. */}