@devries-cameron20 / t3code-1 / commits / c96c1b69f5
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

feat(web): pick the model and its effort from one control (#28057)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Theo Browne committed Oct 31, 2026 at 01:58 UTC c96c1b69f5323a654924cc8b18510497c4b55185
22 files changed +1144 -746
apps/web/src/components/chat/ChatComposer.tsx
+2
@@ -92,6 +92,7 @@ import { serializeComposerImages } from "./composerImagePersistence";
92 import {
93 isInsideCollapsedComposerControls,
94 isInsideRestingComposerControlScope,
95 + markOpenToEffort,
96 markOpenToPermissions,
97 } from "./composerEventScope";
98 import {
@@ -2874,6 +2875,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2875 if (!trigger) return;
2876 trigger.focus({ preventScroll: true });
2877 if (command === "composer.mode") markOpenToPermissions(trigger);
2878 + if (command === "composer.effort") markOpenToEffort(trigger);
2879 trigger.click();
2880 },
2881 compactContext: compactThreadContextStable,
apps/web/src/components/chat/CompactComposerControlsMenu.tsx
+2 -18
@@ -1,5 +1,5 @@
1 import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
2 -import { memo, type ReactNode, useRef } from "react";
2 +import { memo, useRef } from "react";
3 import { EllipsisIcon } from "lucide-react";
4 import {
5 Menu,
@@ -19,7 +19,6 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
19 runtimeMode: RuntimeMode;
20 runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
21 showInteractionModeToggle: boolean;
22 - traitsMenuContent?: ReactNode;
22 showPermissions?: boolean;
23 size?: "sm" | "xs";
24 /** Close the portaled popup when its trigger hides. */
@@ -45,28 +44,13 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
44 size={size}
45 className="shrink-0"
46 aria-label="More composer controls"
48 - data-composer-shortcut={
49 - [
50 - props.showPermissions !== false ? "composer.mode" : null,
51 - props.traitsMenuContent ? "composer.effort" : null,
52 - ]
53 - .filter(Boolean)
54 - .join(" ") || undefined
55 - }
47 + data-composer-shortcut={props.showPermissions !== false ? "composer.mode" : undefined}
48 />
49 }
50 >
51 <ComposerControlIcon icon={EllipsisIcon} size={size} />
52 </MenuTrigger>
53 <MenuPopup align="start" {...composerFloatingLayerProps}>
62 - {props.traitsMenuContent ? (
63 - <>
64 - {props.traitsMenuContent}
65 - {props.showInteractionModeToggle || props.showPermissions !== false ? (
66 - <MenuDivider />
67 - ) : null}
68 - </>
69 - ) : null}
54 {props.showInteractionModeToggle ? (
55 <>
56 <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Mode</div>
apps/web/src/components/chat/ComposerControlsBar.tsx
+64 -107
@@ -6,7 +6,6 @@ import { CircleAlertIcon } from "lucide-react";
6 import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
7 import { ComposerControl } from "./ComposerControl";
8 import {
9 - ComposerPermissionsSection,
9 ComposerFooterModeControls,
10 ComposerModelPicker,
11 type RuntimeModeOption,
@@ -22,19 +21,21 @@ import {
21 } from "@t3tools/contracts";
22 import type { EffortDisplay } from "@t3tools/contracts/settings";
23 import { cn } from "~/lib/utils";
25 -import { shortcutLabelForCommand } from "../../keybindings";
24 +import { resolveComposerTraitsInput } from "./composerProviderState";
25 import {
27 - renderProviderTraitsMenuContent,
28 - renderProviderTraitsPicker,
29 -} from "./composerProviderState";
26 + ComposerEffortColumn,
27 + ComposerPickerFooter,
28 + describeComposerEffort,
29 +} from "./ComposerModelEffort";
30 import type { useComposerProviderModel } from "./useComposerProviderModel";
31 import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
32
33 /**
34 - * The composer footer controls: model picker, traits, mode controls and the overflow menu for
35 - * blocks that do not fit. Rendered in the expanded footer or the resting controls host.
34 + * The composer footer controls: the model picker (which also holds effort, speed and
35 + * permissions), mode controls and the overflow menu for blocks that do not fit. Rendered in the
36 + * expanded footer or the resting controls host.
37 */
37 -// Model and effort sit a word space apart, so hover and open states brighten text, not a box.
38 +// Model and effort share one trigger; hover and open states brighten its text, not a box.
39 const TEXT_CONTROL_STATES =
40 "hover:bg-transparent data-pressed:bg-transparent data-popup-open:bg-transparent data-pressed:text-foreground data-popup-open:text-foreground";
41
@@ -137,111 +138,56 @@ export function ComposerControlsBar(props: {
138 modelPickerIconClassName,
139 getModelDisabledReason,
140 } = props;
140 - const providerTraitsMenuContent = renderProviderTraitsMenuContent({
141 - provider: selectedProvider,
142 - instanceId: selectedInstanceId,
143 - ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),
144 - ...(routeKind === "draft" && draftId ? { draftId } : {}),
145 - model: selectedModel,
146 - models: selectedProviderModels,
147 - modelOptions: composerModelOptions?.[selectedInstanceId],
148 - reportedModelSelection,
149 - promptUltrathink,
150 - onPromptEdit,
151 - planModeEnabled,
152 - });
141 const accessMatchesDefault = compatibleRuntimeMode === defaultRuntimeMode;
154 - const permissionsChipHidden = accessMatchesDefault || props.permissionsShownInStrip;
155 - const providerTraitsPickerInput = {
156 - provider: selectedProvider,
157 - instanceId: selectedInstanceId,
158 - ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),
159 - ...(routeKind === "draft" && draftId ? { draftId } : {}),
160 - model: selectedModel,
161 - models: selectedProviderModels,
162 - modelOptions: composerModelOptions?.[selectedInstanceId],
163 - reportedModelSelection,
164 - promptUltrathink,
165 - onPromptEdit,
166 - planModeEnabled,
167 - isComposerOwned: true,
168 - effortDisplay: props.effortDisplay,
169 - triggerClassName: cn("ps-1.5 pe-1", TEXT_CONTROL_STATES),
170 - // Permissions always live in the effort menu, so the section never unmounts while open.
171 - extraMenuContent: (
172 - <ComposerPermissionsSection
173 - runtimeMode={compatibleRuntimeMode}
174 - runtimeModeOptions={compatibleRuntimeModeOptions}
175 - onRuntimeModeChange={handleRuntimeModeChange}
176 - />
177 - ),
178 - ...(permissionsChipHidden
179 - ? {
180 - extraMenuHint: [
181 - `Permissions: ${
182 - compatibleRuntimeModeOptions.find((option) => option.mode === compatibleRuntimeMode)
183 - ?.label ?? compatibleRuntimeMode
184 - }`,
185 - shortcutLabelForCommand(keybindings, "composer.mode"),
186 - ]
187 - .filter(Boolean)
188 - .join(" · "),
189 - }
190 - : {}),
191 - } satisfies Parameters<typeof renderProviderTraitsPicker>[0];
192 - const providerTraitsPicker = renderProviderTraitsPicker(providerTraitsPickerInput);
142 const {
143 accessDisplay,
144 showModeBlock,
145 hiddenBlockCount: restingHiddenBlockCount,
146 hiddenBlockIds: hiddenRestingBlockIds,
198 - traitsHidden: traitsBlockHidden,
199 - effortOwnsModeShortcut,
147 overflowShowsPermissions,
148 + pickerOwnsModeShortcut,
149 } = resolveComposerControlsOwnership({
202 - matchesDefault: permissionsChipHidden,
203 - hasTraits: providerTraitsPicker !== null,
150 + matchesDefault: accessMatchesDefault || props.permissionsShownInStrip,
151 planModeUiEnabled,
152 collapsed: composerControlsCollapsed,
153 measuredHiddenBlockCount,
154 });
208 - const restingProviderTraitsPicker = renderProviderTraitsPicker({
209 - ...providerTraitsPickerInput,
210 - size: composerControlsCollapsed ? "xs" : "sm",
211 - hidden: composerControlsHidden || traitsBlockHidden,
212 - extraMenuOwnsModeShortcut: effortOwnsModeShortcut,
155 + const controlSize = composerControlsCollapsed ? "xs" : "sm";
156 + const traitsInput = resolveComposerTraitsInput({
157 + provider: selectedProvider,
158 + instanceId: selectedInstanceId,
159 + ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),
160 + ...(routeKind === "draft" && draftId ? { draftId } : {}),
161 + model: selectedModel,
162 + models: selectedProviderModels,
163 + modelOptions: composerModelOptions?.[selectedInstanceId],
164 + reportedModelSelection,
165 + promptUltrathink,
166 + onPromptEdit,
167 + planModeEnabled,
168 });
214 - const restingBlockDefs = [
215 - ...(providerTraitsPicker
216 - ? [
217 - {
218 - id: "traits",
219 - content: restingProviderTraitsPicker,
220 - },
221 - ]
222 - : []),
223 - ...(!showModeBlock
224 - ? []
225 - : [
226 - {
227 - id: "mode",
228 - content: (
229 - <ComposerFooterModeControls
230 - showInteractionModeToggle={planModeUiEnabled}
231 - interactionMode={interactionMode}
232 - runtimeMode={compatibleRuntimeMode}
233 - runtimeModeOptions={compatibleRuntimeModeOptions}
234 - size={composerControlsCollapsed ? "xs" : "sm"}
235 - hidden={composerControlsHidden || restingHiddenBlockCount > 0}
236 - accessDisplay={accessDisplay}
237 - emphasized={!accessMatchesDefault}
238 - onToggleInteractionMode={toggleInteractionMode}
239 - onRuntimeModeChange={handleRuntimeModeChange}
240 - />
241 - ),
242 - },
243 - ]),
244 - ];
169 + const effort = describeComposerEffort(traitsInput, props.effortDisplay, controlSize);
170 + const restingBlockDefs = showModeBlock
171 + ? [
172 + {
173 + id: "mode",
174 + content: (
175 + <ComposerFooterModeControls
176 + showInteractionModeToggle={planModeUiEnabled}
177 + interactionMode={interactionMode}
178 + runtimeMode={compatibleRuntimeMode}
179 + runtimeModeOptions={compatibleRuntimeModeOptions}
180 + size={controlSize}
181 + hidden={composerControlsHidden || restingHiddenBlockCount > 0}
182 + accessDisplay={accessDisplay}
183 + emphasized={!accessMatchesDefault}
184 + onToggleInteractionMode={toggleInteractionMode}
185 + onRuntimeModeChange={handleRuntimeModeChange}
186 + />
187 + ),
188 + },
189 + ]
190 + : [];
191 // Its own element, so typing (which rebuilds the controls around it) leaves it cached.
192 const composerModelPicker = (
193 <ComposerModelPicker
@@ -269,12 +215,26 @@ export function ComposerControlsBar(props: {
215 instanceEntries={providerInstanceEntries}
216 keybindings={keybindings}
217 modelOptionsByInstance={modelOptionsByInstance}
272 - size={composerControlsCollapsed ? "xs" : "sm"}
218 + size={controlSize}
219 triggerClassName={cn(
274 - "pe-1",
220 + "group/model-trigger pe-1",
221 TEXT_CONTROL_STATES,
222 composerControlsCollapsed ? "min-w-13 shrink text-xs!" : "min-w-13",
223 )}
224 + triggerSuffix={effort.suffix}
225 + triggerDetail={effort.detail}
226 + triggerShortcuts={
227 + pickerOwnsModeShortcut ? "composer.effort composer.mode" : "composer.effort"
228 + }
229 + effortColumn={<ComposerEffortColumn traits={traitsInput} />}
230 + footer={
231 + <ComposerPickerFooter
232 + traits={traitsInput}
233 + runtimeMode={compatibleRuntimeMode}
234 + runtimeModeOptions={compatibleRuntimeModeOptions}
235 + onRuntimeModeChange={handleRuntimeModeChange}
236 + />
237 + }
238 terminalOpen={terminalOpen}
239 open={modelPickerOpen}
240 instanceIndicatorBackground={
@@ -345,12 +305,9 @@ export function ComposerControlsBar(props: {
305 interactionMode={interactionMode}
306 runtimeMode={compatibleRuntimeMode}
307 runtimeModeOptions={compatibleRuntimeModeOptions}
348 - size={composerControlsCollapsed ? "xs" : "sm"}
308 + size={controlSize}
309 hidden={composerControlsHidden || hiddenRestingBlockIds.length === 0}
350 - showInteractionModeToggle={planModeUiEnabled && hiddenRestingBlockIds.includes("mode")}
351 - traitsMenuContent={
352 - hiddenRestingBlockIds.includes("traits") ? providerTraitsMenuContent : undefined
353 - }
310 + showInteractionModeToggle={planModeUiEnabled && hiddenRestingBlockIds.length > 0}
311 // Permissions join the overflow only when their normal home is in it.
312 showPermissions={overflowShowsPermissions}
313 onToggleInteractionMode={toggleInteractionMode}
apps/web/src/components/chat/ComposerFooterControls.tsx
+3 -3
@@ -93,7 +93,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
93 </Tooltip>
94 ) : null;
95
96 - // The chip opens the same Permissions toggle used in the effort menu.
96 + // The chip opens the same Permissions toggle used in the model picker and the overflow menu.
97 const permissionsTooltip = `Permissions: ${runtimeModeOption.label}. ${runtimeModeOption.description}`;
98 const permissionsChip = (
99 <Menu
@@ -112,7 +112,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
112 ref={permissionsChipRef}
113 data-composer-shortcut="composer.mode"
114 size={size}
115 - // Mirrors the effort chip's trailing pe-1 so both gaps around the bars match.
115 + // Mirrors the model trigger's trailing pe-1 so the gaps on both sides of the chip match.
116 className="ps-1.5"
117 aria-label={`Permissions: ${runtimeModeOption.label}`}
118 />
@@ -156,7 +156,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
156 /**
157 * Permission modes as one horizontal toggle, with the shown mode named below.
158 * Each segment is a real menu radio item, so arrow keys reach it from the rest of the menu
159 - * and a pick closes the menu. Lives inside a Menu: the permissions chip, the effort menu,
159 + * and a pick closes the menu. Lives inside a Menu: the permissions chip, the model picker,
160 * or the overflow menu.
161 */
162 export function ComposerPermissionsSection(props: {
apps/web/src/components/chat/ComposerModelEffort.tsx new
+476
@@ -0,0 +1,476 @@
1 +import {
2 + buildTraitsTriggerDisplay,
3 + getDescriptorStringValue,
4 + REASONING_SELECT_DESCRIPTOR_IDS,
5 + selectableProviderOptionChoices,
6 +} from "@t3tools/client-runtime/model-traits";
7 +import type { ProviderOptionDescriptor, RuntimeMode } from "@t3tools/contracts";
8 +import type { EffortDisplay } from "@t3tools/contracts/settings";
9 +import { CheckIcon, ChevronUpIcon } from "lucide-react";
10 +import { type KeyboardEvent, type ReactNode, use, useRef } from "react";
11 +
12 +import { cn } from "~/lib/utils";
13 +import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
14 +import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
15 +import type { ComposerControlSize } from "./ComposerControl";
16 +import { ComposerPermissionsSection, type RuntimeModeOption } from "./ComposerFooterControls";
17 +import { composerFloatingLayerProps, focusCheckedPermission } from "./composerEventScope";
18 +import { EffortGlyph, FastBolt, resolveEffortGlyph } from "./EffortGlyph";
19 +import { DockedPickerContext } from "./ProviderModelPicker";
20 +import {
21 + getTraitsSectionVisibility,
22 + type TraitsSelectionInput,
23 + ULTRATHINK_IN_BODY_NOTE,
24 + useTraitsSelection,
25 +} from "./TraitsPicker";
26 +
27 +type SelectDescriptor = Extract<ProviderOptionDescriptor, { type: "select" }>;
28 +type BooleanDescriptor = Extract<ProviderOptionDescriptor, { type: "boolean" }>;
29 +
30 +/** Codex service tiers and Claude's Fast mode share the footer's speed control. */
31 +function splitSpeed(
32 + provider: TraitsSelectionInput["provider"],
33 + selects: ReadonlyArray<SelectDescriptor>,
34 + toggles: ReadonlyArray<BooleanDescriptor>,
35 +) {
36 + const speedSelect =
37 + provider === "codex"
38 + ? (selects.find((descriptor) => descriptor.id === "serviceTier") ?? null)
39 + : null;
40 + const fastToggle = toggles.find((descriptor) => descriptor.id === "fastMode") ?? null;
41 + return {
42 + speedSelect,
43 + fastToggle,
44 + columnSelects: selects.filter((descriptor) => descriptor !== speedSelect),
45 + columnToggles: toggles.filter((descriptor) => descriptor !== fastToggle),
46 + };
47 +}
48 +
49 +type ColumnControl =
50 + | { kind: "select"; descriptor: SelectDescriptor }
51 + | { kind: "boolean"; descriptor: BooleanDescriptor };
52 +
53 +/**
54 + * The column lists the model's reasoning control first, under the header that names it, then
55 + * its other options. Picking a level of that control finishes the job and closes the popup.
56 + */
57 +function columnControls(
58 + provider: TraitsSelectionInput["provider"],
59 + selects: ReadonlyArray<SelectDescriptor>,
60 + toggles: ReadonlyArray<BooleanDescriptor>,
61 +) {
62 + const { columnSelects, columnToggles } = splitSpeed(provider, selects, toggles);
63 + const controls: ReadonlyArray<ColumnControl> = [
64 + ...columnSelects.map((descriptor) => ({ kind: "select" as const, descriptor })),
65 + ...columnToggles.map((descriptor) => ({ kind: "boolean" as const, descriptor })),
66 + ];
67 + const effort =
68 + controls.find((control) => REASONING_SELECT_DESCRIPTOR_IDS.has(control.descriptor.id)) ?? null;
69 + return { effort, others: controls.filter((control) => control !== effort) };
70 +}
71 +
72 +/**
73 + * What the model trigger shows after the model name: the effort word (or bars, per the
74 + * Appearance setting), a bolt for Fast, and other traits such as a context window.
75 + */
76 +export function describeComposerEffort(
77 + traits: TraitsSelectionInput | null,
78 + effortDisplay: EffortDisplay,
79 + size: ComposerControlSize,
80 +): { suffix: ReactNode; detail: string | null } {
81 + if (!traits) return { suffix: null, detail: null };
82 + const visibility = getTraitsSectionVisibility(traits);
83 + if (!visibility.hasAnyControls) return { suffix: null, detail: null };
84 + const modelSelection =
85 + traits.instanceId && traits.model
86 + ? { instanceId: traits.instanceId, model: traits.model, options: traits.modelOptions ?? [] }
87 + : null;
88 + const primary = visibility.primarySelectDescriptor;
89 + const display = buildTraitsTriggerDisplay({
90 + provider: traits.provider,
91 + descriptors: visibility.descriptors,
92 + primarySelectDescriptorId: primary?.id ?? null,
93 + ultrathinkPromptControlled: visibility.ultrathinkPromptControlled,
94 + modelSelection,
95 + reportedModelSelection: traits.reportedModelSelection,
96 + });
97 + const glyph =
98 + primary && REASONING_SELECT_DESCRIPTOR_IDS.has(primary.id)
99 + ? resolveEffortGlyph(
100 + primary,
101 + visibility.ultrathinkPromptControlled
102 + ? "ultrathink"
103 + : getDescriptorStringValue(primary, modelSelection, traits.reportedModelSelection),
104 + )
105 + : null;
106 + // Without a reasoning select the whole label is the word; it already names speed and the rest.
107 + // Workflow levels such as Ultracode always show their name; the setting names every level.
108 + const word = glyph
109 + ? (glyph.special ?? (effortDisplay === "label" ? glyph.label : null))
110 + : display.label;
111 + return {
112 + detail: display.label,
113 + suffix: (
114 + <span
115 + className={cn(
116 + "flex shrink-0 items-center gap-1.5 text-muted-foreground group-hover/model-trigger:text-foreground group-data-pressed/model-trigger:text-foreground group-data-popup-open/model-trigger:text-foreground",
117 + // A word space after the model name: the regular trigger's gap is wider than one.
118 + size === "sm" && "-ms-0.5",
119 + )}
120 + >
121 + {word !== null ? (
122 + <span data-composer-control-label>{word}</span>
123 + ) : glyph ? (
124 + <EffortGlyph count={glyph.count} filled={glyph.filled} size={size} />
125 + ) : null}
126 + {glyph && (display.speedLabel === "Fast" || display.speedLabel === "Ultrafast") ? (
127 + <FastBolt ultra={display.speedLabel === "Ultrafast"} />
128 + ) : null}
129 + {glyph && display.otherLabels.length > 0 ? (
130 + <span
131 + // A label, so icon-only footers drop it; compacted rows drop it before the model.
132 + data-composer-control-label
133 + data-composer-secondary-trait
134 + className="max-w-24 truncate text-xs"
135 + >
136 + {display.otherLabels.join(" · ")}
137 + </span>
138 + ) : null}
139 + </span>
140 + ),
141 + };
142 +}
143 +
144 +const COLUMN_ROW =
145 + "flex h-8 w-full shrink-0 cursor-pointer items-center gap-2 rounded-sm px-2 text-left text-sm text-foreground outline-none hover:bg-foreground/[0.09] focus-visible:bg-foreground/[0.09] disabled:cursor-not-allowed disabled:opacity-64";
146 +const COLUMN_LABEL = "px-2 pt-1.5 pb-1 font-medium text-muted-foreground text-xs";
147 +
148 +function ColumnRow(props: {
149 + label: string;
150 + /** Shown on hover; the column is too narrow to print it under the label. */
151 + description?: string | undefined;
152 + selected: boolean;
153 + isDefault?: boolean | undefined;
154 + disabled?: boolean;
155 + /** A level of the reasoning control, where focus lands after a model pick. */
156 + level: boolean;
157 + onPick: () => void;
158 +}) {
159 + const rowProps = {
160 + type: "button",
161 + role: "radio",
162 + "aria-checked": props.selected,
163 + disabled: props.disabled,
164 + "data-effort-row": true,
165 + "data-effort-level": props.level || undefined,
166 + // The reasoning control holds the column's one tab stop; Up and Down move between rows.
167 + tabIndex: props.selected && props.level ? 0 : -1,
168 + className: COLUMN_ROW,
169 + onClick: props.onPick,
170 + } as const;
171 + const content = (
172 + <>
173 + <span className="min-w-0 flex-1 truncate">{props.label}</span>
174 + {props.isDefault ? <span className="text-muted-foreground/70 text-xs">Default</span> : null}
175 + <CheckIcon aria-hidden="true" className={cn("size-3.5", !props.selected && "invisible")} />
176 + </>
177 + );
178 + if (!props.description) return <button {...rowProps}>{content}</button>;
179 + return (
180 + <Tooltip>
181 + <TooltipTrigger render={<button {...rowProps} />}>{content}</TooltipTrigger>
182 + <TooltipPopup side="right" className="max-w-56">
183 + {props.description}
184 + </TooltipPopup>
185 + </Tooltip>
186 + );
187 +}
188 +
189 +function moveBetweenRows(event: KeyboardEvent<HTMLElement>) {
190 + if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return;
191 + const rows = Array.from(
192 + event.currentTarget.querySelectorAll<HTMLButtonElement>("[data-effort-row]:not(:disabled)"),
193 + );
194 + const index = rows.findIndex((row) => row === document.activeElement);
195 + const next =
196 + rows[Math.min(rows.length - 1, Math.max(0, index + (event.key === "ArrowDown" ? 1 : -1)))];
197 + if (!next) return;
198 + event.preventDefault();
199 + event.stopPropagation();
200 + next.focus();
201 + next.scrollIntoView({ block: "nearest" });
202 +}
203 +
204 +function EffortLevels(props: { traits: TraitsSelectionInput; onLevelPick: () => void }) {
205 + const traits = useTraitsSelection(props.traits);
206 + const { effort, others } = columnControls(
207 + props.traits.provider,
208 + traits.selectDescriptors,
209 + traits.booleanDescriptors,
210 + );
211 + if (traits.modelIsUnavailable) {
212 + return (
213 + <>
214 + {traits.descriptors.map((descriptor) => {
215 + const value = traits.currentLabel(descriptor);
216 + return value ? (
217 + <div key={descriptor.id}>
218 + <div className={COLUMN_LABEL}>{descriptor.label}</div>
219 + <div className="px-2 pb-1.5 text-muted-foreground/80 text-xs">{value}</div>
220 + </div>
221 + ) : null;
222 + })}
223 + </>
224 + );
225 + }
226 + if (!effort && others.length === 0) return <NoEffortRow />;
227 + const renderControl = (control: ColumnControl) => {
228 + const isEffort = control === effort;
229 + const { descriptor } = control;
230 + if (control.kind === "boolean") {
231 + return (
232 + <div
233 + key={descriptor.id}
234 + role="radiogroup"
235 + aria-label={descriptor.label}
236 + className="flex flex-col gap-0.5"
237 + >
238 + {isEffort ? null : <div className={COLUMN_LABEL}>{descriptor.label}</div>}
239 + {([true, false] as const).map((value) => (
240 + <ColumnRow
241 + key={String(value)}
242 + label={value ? "On" : "Off"}
243 + selected={(control.descriptor.currentValue === true) === value}
244 + level={isEffort}
245 + onPick={() => {
246 + traits.changeBoolean(descriptor.id, value);
247 + if (isEffort) props.onLevelPick();
248 + }}
249 + />
250 + ))}
251 + </div>
252 + );
253 + }
254 + const locked =
255 + descriptor.id === traits.primarySelectDescriptor?.id && traits.ultrathinkInBodyText;
256 + const value = traits.selectValue(control.descriptor);
257 + return (
258 + <div
259 + key={descriptor.id}
260 + role="radiogroup"
261 + aria-label={descriptor.label}
262 + className="flex flex-col gap-0.5"
263 + >
264 + {isEffort ? null : <div className={COLUMN_LABEL}>{descriptor.label}</div>}
265 + {locked ? (
266 + <div className="px-2 pb-1.5 text-muted-foreground/80 text-xs">
267 + {ULTRATHINK_IN_BODY_NOTE}
268 + </div>
269 + ) : null}
270 + {selectableProviderOptionChoices(control.descriptor).map((option) => (
271 + <ColumnRow
272 + key={option.id}
273 + label={option.label}
274 + selected={option.id === value}
275 + description={option.description}
276 + isDefault={option.isDefault}
277 + disabled={locked}
278 + level={isEffort}
279 + onPick={() => {
280 + traits.changeSelect(control.descriptor, option.id);
281 + if (isEffort) props.onLevelPick();
282 + }}
283 + />
284 + ))}
285 + </div>
286 + );
287 + };
288 + return (
289 + <>
290 + {effort ? renderControl(effort) : null}
291 + {others.map(renderControl)}
292 + </>
293 + );
294 +}
295 +
296 +function NoEffortRow() {
297 + return (
298 + <div className="flex h-8 items-center px-2 text-muted-foreground text-sm">No effort levels</div>
299 + );
300 +}
301 +
302 +/** The model picker's effort column: the selected model's levels and its other options. */
303 +export function ComposerEffortColumn(props: { traits: TraitsSelectionInput | null }) {
304 + const picker = use(DockedPickerContext);
305 + const visibility = props.traits ? getTraitsSectionVisibility(props.traits) : null;
306 + const effort =
307 + props.traits && visibility
308 + ? columnControls(
309 + props.traits.provider,
310 + visibility.selectDescriptors,
311 + visibility.booleanDescriptors,
312 + ).effort
313 + : null;
314 + return (
315 + <>
316 + {/* Matches the search row's box, so one rule runs across the top of the popup. */}
317 + <div className="shrink-0 px-3 pt-2.5">
318 + <div className="flex h-8.25 -translate-y-px items-center gap-2 border-b border-border/70 pb-1.5 text-sm">
319 + <span className="text-muted-foreground">{effort?.descriptor.label ?? "Effort"}</span>
320 + <span className="ms-auto min-w-0 truncate text-muted-foreground text-xs">
321 + {picker.modelLabel}
322 + </span>
323 + </div>
324 + </div>
325 + {/* pt-2.5 puts the first level on the same line as the first model. */}
326 + <div
327 + className="flex min-h-0 flex-1 flex-col gap-0.5 overflow-y-auto overscroll-contain px-2 pt-2.5 pb-1.5"
328 + onKeyDown={moveBetweenRows}
329 + >
330 + {props.traits ? (
331 + <EffortLevels traits={props.traits} onLevelPick={picker.close} />
332 + ) : (
333 + <NoEffortRow />
334 + )}
335 + </div>
336 + </>
337 + );
338 +}
339 +
340 +const FOOTER_SEGMENT =
341 + "flex h-6 cursor-pointer items-center justify-center gap-1 px-2 text-muted-foreground text-xs outline-none first:rounded-l-md last:rounded-r-md hover:text-foreground data-checked:bg-input/72 data-checked:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset";
342 +
343 +function SpeedSegment(props: {
344 + checked: boolean;
345 + label: string;
346 + description?: string | undefined;
347 + onPick: () => void;
348 +}) {
349 + const buttonProps = {
350 + type: "button",
351 + role: "radio",
352 + "aria-checked": props.checked,
353 + "data-checked": props.checked || undefined,
354 + className: FOOTER_SEGMENT,
355 + onClick: props.onPick,
356 + } as const;
357 + const content = (
358 + <>
359 + {props.label === "Fast" || props.label === "Ultrafast" ? (
360 + <FastBolt ultra={props.label === "Ultrafast"} />
361 + ) : null}
362 + {props.label}
363 + </>
364 + );
365 + if (!props.description) return <button {...buttonProps}>{content}</button>;
366 + return (
367 + <Tooltip>
368 + <TooltipTrigger render={<button {...buttonProps} />}>{content}</TooltipTrigger>
369 + <TooltipPopup side="top">{props.description}</TooltipPopup>
370 + </Tooltip>
371 + );
372 +}
373 +
374 +function SpeedControl(props: { traits: TraitsSelectionInput }) {
375 + const traits = useTraitsSelection(props.traits);
376 + const { speedSelect, fastToggle } = splitSpeed(
377 + props.traits.provider,
378 + traits.selectDescriptors,
379 + traits.booleanDescriptors,
380 + );
381 + if (traits.modelIsUnavailable || (!speedSelect && !fastToggle)) return null;
382 + return (
383 + <div
384 + role="radiogroup"
385 + aria-label={speedSelect?.label ?? fastToggle?.label}
386 + className="flex rounded-lg bg-input/40 p-0.5"
387 + >
388 + {speedSelect
389 + ? selectableProviderOptionChoices(speedSelect).map((option) => (
390 + <SpeedSegment
391 + key={option.id}
392 + checked={option.id === traits.selectValue(speedSelect)}
393 + label={option.label}
394 + description={option.description}
395 + onPick={() => traits.changeSelect(speedSelect, option.id)}
396 + />
397 + ))
398 + : fastToggle
399 + ? ([false, true] as const).map((value) => (
400 + <SpeedSegment
401 + key={String(value)}
402 + checked={(fastToggle.currentValue === true) === value}
403 + label={value ? "Fast" : "Standard"}
404 + onPick={() => traits.changeBoolean(fastToggle.id, value)}
405 + />
406 + ))
407 + : null}
408 + </div>
409 + );
410 +}
411 +
412 +/** Permissions change rarely, so the footer names the mode and nests the choice in a menu. */
413 +function PermissionsMenu(props: {
414 + runtimeMode: RuntimeMode;
415 + options: ReadonlyArray<RuntimeModeOption>;
416 + onChange: (mode: RuntimeMode) => void;
417 +}) {
418 + const picker = use(DockedPickerContext);
419 + const triggerRef = useRef<HTMLButtonElement>(null);
420 + const current = props.options.find((option) => option.mode === props.runtimeMode);
421 + if (!current) return null;
422 + const CurrentIcon = current.icon;
423 + return (
424 + <Menu
425 + // Any pick, even the current mode, ends the job; a change also hands focus to the prompt.
426 + onOpenChange={(open, details) => {
427 + if (!open && details.reason === "item-press") picker.close();
428 + }}
429 + onOpenChangeComplete={(open) => {
430 + if (open) focusCheckedPermission(triggerRef.current);
431 + }}
432 + >
433 + <MenuTrigger
434 + render={
435 + <button
436 + ref={triggerRef}
437 + type="button"
438 + data-composer-permissions-trigger
439 + aria-label={`Permissions: ${current.label}`}
440 + className="ms-auto flex h-7 cursor-pointer items-center gap-1.5 rounded-md px-2 text-muted-foreground text-xs outline-none hover:bg-foreground/[0.09] hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset data-popup-open:bg-foreground/[0.09] data-popup-open:text-foreground"
441 + />
442 + }
443 + >
444 + <CurrentIcon aria-hidden="true" className="size-3.5" />
445 + {current.label}
446 + <ChevronUpIcon aria-hidden="true" className="size-3" />
447 + </MenuTrigger>
448 + <MenuPopup side="top" align="end" {...composerFloatingLayerProps}>
449 + <ComposerPermissionsSection
450 + runtimeMode={props.runtimeMode}
451 + runtimeModeOptions={props.options}
452 + onRuntimeModeChange={props.onChange}
453 + />
454 + </MenuPopup>
455 + </Menu>
456 + );
457 +}
458 +
459 +/** The model picker's footer: speed stays one click away, permissions sit one menu deeper. */
460 +export function ComposerPickerFooter(props: {
461 + traits: TraitsSelectionInput | null;
462 + runtimeMode: RuntimeMode;
463 + runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
464 + onRuntimeModeChange: (mode: RuntimeMode) => void;
465 +}) {
466 + return (
467 + <div className="flex flex-wrap items-center gap-2 border-t border-border/70 bg-muted/40 px-3 py-2">
468 + {props.traits ? <SpeedControl traits={props.traits} /> : null}
469 + <PermissionsMenu
470 + runtimeMode={props.runtimeMode}
471 + options={props.runtimeModeOptions}
472 + onChange={props.onRuntimeModeChange}
473 + />
474 + </div>
475 + );
476 +}
apps/web/src/components/chat/ComposerPermissionsSection.browser.test.tsx
+20 -20
@@ -16,20 +16,20 @@ import { runtimeModeConfig, runtimeModeOptions } from "./runtimeModeConfig";
16
17 const options = runtimeModeOptions.map((mode) => ({ mode, ...runtimeModeConfig[mode] }));
18
19 -// Mirrors the effort menu: effort radio items first, then the Permissions section.
20 -function EffortMenu() {
21 - const [effort, setEffort] = useState("high");
19 +// Mirrors the overflow menu: mode radio items first, then the Permissions section.
20 +function OverflowMenu() {
21 + const [interaction, setInteraction] = useState("plan");
22 const [mode, setMode] = useState<RuntimeMode>("full-access");
23 const composerMenuProps = useComposerMenuProps();
24 const triggerRef = useRef<HTMLButtonElement>(null);
25 return (
26 <>
27 <Menu onOpenChangeComplete={(open) => focusRequestedPermission(open, triggerRef.current)}>
28 - <MenuTrigger ref={triggerRef}>Effort</MenuTrigger>
28 + <MenuTrigger ref={triggerRef}>More</MenuTrigger>
29 <MenuPopup {...composerMenuProps}>
30 - <MenuRadioGroup value={effort} onValueChange={setEffort}>
31 - <MenuRadioItem value="low">Low</MenuRadioItem>
32 - <MenuRadioItem value="high">High</MenuRadioItem>
30 + <MenuRadioGroup value={interaction} onValueChange={setInteraction}>
31 + <MenuRadioItem value="default">Chat</MenuRadioItem>
32 + <MenuRadioItem value="plan">Plan</MenuRadioItem>
33 </MenuRadioGroup>
34 <ComposerPermissionsSection
35 runtimeMode={mode}
@@ -43,13 +43,13 @@ function EffortMenu() {
43 );
44 }
45
46 -it("reaches Permissions from the effort items with arrow keys, previews, and picks with Enter", async () => {
47 - await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
48 - const trigger = screen.getByRole("button", { name: "Effort" });
46 +it("reaches Permissions from the mode items with arrow keys, previews, and picks with Enter", async () => {
47 + await using screen = await render(<OverflowMenu />, { router: false }); // no routes involved
48 + const trigger = screen.getByRole("button", { name: "More" });
49 await userEvent.tab();
50 await expect.element(trigger).toHaveFocus();
51 await userEvent.keyboard("{ArrowDown}");
52 - await expect.element(page.getByRole("menuitemradio", { name: "Low" })).toHaveFocus();
52 + await expect.element(page.getByRole("menuitemradio", { name: "Chat" })).toHaveFocus();
53
54 await userEvent.keyboard("{ArrowDown}{ArrowDown}");
55 const supervised = page.getByRole("menuitemradio", { name: "Supervised" });
@@ -66,7 +66,7 @@ it("reaches Permissions from the effort items with arrow keys, previews, and pic
66 await expect.element(page.getByRole("menuitemradio", { name: "Supervised" })).toHaveFocus();
67
68 await userEvent.keyboard("{ArrowUp}");
69 - await expect.element(page.getByRole("menuitemradio", { name: "High" })).toHaveFocus();
69 + await expect.element(page.getByRole("menuitemradio", { name: "Plan" })).toHaveFocus();
70
71 await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");
72 await expect.element(screen.getByRole("status")).toHaveTextContent("auto-accept-edits");
@@ -77,14 +77,14 @@ it("reaches Permissions from the effort items with arrow keys, previews, and pic
77 });
78
79 it("marks the current mode as checked and closes on Escape", async () => {
80 - await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
80 + await using screen = await render(<OverflowMenu />, { router: false }); // no routes involved
81 await userEvent.tab();
82 await userEvent.keyboard("{ArrowDown}");
83 const fullAccess = page.getByRole("menuitemradio", { name: "Full access" });
84 await expect.element(fullAccess).toHaveAttribute("aria-checked", "true");
85 await userEvent.keyboard("{Escape}");
86 await expect.element(fullAccess).not.toBeInTheDocument();
87 - await expect.element(screen.getByRole("button", { name: "Effort" })).toHaveFocus();
87 + await expect.element(screen.getByRole("button", { name: "More" })).toHaveFocus();
88 });
89
90 // The real composer menu focus rule (useComposerMenuProps), with a stub composer handle.
@@ -95,19 +95,19 @@ function withComposer(children: ReactNode) {
95 }
96
97 it("returns focus to the editor after a pick", async () => {
98 - const { handle, ui } = withComposer(<EffortMenu />);
98 + const { handle, ui } = withComposer(<OverflowMenu />);
99 await using screen = await render(ui, { router: false }); // no routes involved
100 await userEvent.tab();
101 await userEvent.keyboard("{ArrowDown}");
102 - await expect.element(page.getByRole("menuitemradio", { name: "Low" })).toHaveFocus();
102 + await expect.element(page.getByRole("menuitemradio", { name: "Chat" })).toHaveFocus();
103 await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");
104 await expect.element(screen.getByRole("status")).toHaveTextContent("approval-required");
105 await vi.waitFor(() => expect(handle.focusAtEnd).toHaveBeenCalled());
106 });
107
108 it("opens on the checked permission when composer.mode marked the trigger", async () => {
109 - await using screen = await render(<EffortMenu />, { router: false }); // no routes involved
110 - const trigger = screen.getByRole("button", { name: "Effort" });
109 + await using screen = await render(<OverflowMenu />, { router: false }); // no routes involved
110 + const trigger = screen.getByRole("button", { name: "More" });
111 markOpenToPermissions(trigger.element() as HTMLElement);
112 await userEvent.click(trigger);
113 await expect.element(page.getByRole("menuitemradio", { name: "Full access" })).toHaveFocus();
@@ -124,7 +124,7 @@ function PermissionsChip() {
124 return (
125 <div data-slot="composer-shell">
126 <button type="button" data-composer-shortcut="composer.effort composer.mode">
127 - Effort
127 + Model
128 </button>
129 {mode === "full-access" ? null : (
130 <ComposerFooterModeControls
@@ -147,5 +147,5 @@ it("returns focus to the editor when picking the default hides the chip", async
147 await userEvent.click(screen.getByRole("button", { name: "Permissions: Supervised" }));
148 await userEvent.click(page.getByRole("menuitemradio", { name: "Full access" }));
149 await vi.waitFor(() => expect(handle.focusAtEnd).toHaveBeenCalled());
150 - await expect.element(screen.getByRole("button", { name: "Effort" })).not.toHaveFocus();
150 + await expect.element(screen.getByRole("button", { name: "Model" })).not.toHaveFocus();
151 });
apps/web/src/components/chat/EffortGlyph.tsx
+19
@@ -1,4 +1,5 @@
1 import type { ProviderOptionDescriptor } from "@t3tools/contracts";
2 +import { ZapIcon } from "lucide-react";
3
4 import type { ComposerControlSize } from "./ComposerControl";
5
@@ -84,3 +85,21 @@ export function EffortGlyph(props: { count: number; filled: number; size?: Compo
85 </svg>
86 );
87 }
88 +
89 +/** One bolt for Fast. Ultrafast adds an outlined echo behind it, cut away by the surface color. */
90 +export function FastBolt(props: { ultra: boolean }) {
91 + if (!props.ultra) {
92 + return (
93 + <ZapIcon aria-hidden="true" data-composer-control-icon className="size-3 fill-current" />
94 + );
95 + }
96 + return (
97 + <span aria-hidden="true" className="relative h-3 w-3.75 shrink-0">
98 + <ZapIcon className="absolute top-0 left-0.75 size-3" />
99 + <ZapIcon
100 + strokeWidth={4}
101 + className="absolute top-0 left-0 size-3 fill-current stroke-(--chat-composer-glass-surface) [paint-order:stroke]"
102 + />
103 + </span>
104 + );
105 +}
apps/web/src/components/chat/ModelListRow.tsx
+45 -39
@@ -1,7 +1,7 @@
1 import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
2 import { memo } from "react";
3 import { CheckIcon, StarIcon } from "lucide-react";
4 -import { getDisplayModelName, getProviderRowLabel } from "./providerIconUtils";
4 +import { getDisplayModelName } from "./providerIconUtils";
5 import { ComboboxItem } from "../ui/combobox";
6 import { Button } from "../ui/button";
7 import { Badge } from "../ui/badge";
@@ -23,8 +23,11 @@ export const ModelListRow = memo(function ModelListRow(props: {
23 acpRegistryAgentId?: string | undefined;
24 acpRegistryIconUrl?: string | undefined;
25 isFavorite: boolean;
26 + /** In Favorites every row is starred, so the star shows only on hover. */
27 + favoriteStarOnHover?: boolean;
28 isSelected: boolean;
27 - showProvider: boolean;
29 + /** Marks this instance apart from another of the same provider. */
30 + showInstanceBadge: boolean;
31 showNewBadge?: boolean;
32 unavailable?: boolean;
33 jumpLabel?: string | null;
@@ -36,11 +39,11 @@ export const ModelListRow = memo(function ModelListRow(props: {
39 name: props.name,
40 subProvider: props.subProvider,
41 };
39 - const providerLabel = getProviderRowLabel(props.providerDisplayName, props.subProvider);
42
43 const row = (
44 <ComboboxItem
45 hideIndicator
46 + selectedFill={false}
47 index={props.index}
48 value={modelPickerModelKey(props.instanceId, props.slug)}
49 disabled={Boolean(props.disabledReason)}
@@ -50,40 +53,43 @@ export const ModelListRow = memo(function ModelListRow(props: {
53 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed",
54 )}
55 >
53 - <div className="min-w-0 flex-1 text-left">
54 - <div className="flex min-w-0 items-center gap-2">
55 - <div className="min-w-0 truncate text-sm font-normal leading-snug">
56 - {getDisplayModelName(model)}
57 - </div>
58 - {props.showNewBadge ? (
59 - <span
60 - 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"
61 - aria-label="New model"
62 - >
63 - New
64 - </span>
65 - ) : null}
66 - {props.unavailable ? (
67 - <Badge variant="outline" size="sm">
68 - Unavailable
69 - </Badge>
70 - ) : null}
56 + {/* One row shape in every tab: the logo names the provider, so Favorites needs no second line. */}
57 + <ProviderInstanceIcon
58 + driverKind={props.driverKind}
59 + displayName={props.providerDisplayName}
60 + accentColor={props.providerAccentColor}
61 + acpRegistryAgentId={props.acpRegistryAgentId}
62 + acpRegistryIconUrl={props.acpRegistryIconUrl}
63 + showBadge={props.showInstanceBadge}
64 + className="size-4"
65 + iconClassName="size-4"
66 + indicatorBackground="var(--popover)"
67 + badgeClassName="right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-5xs"
68 + />
69 + <div className="flex min-w-0 flex-1 items-center gap-2 text-left">
70 + <div className="min-w-0 truncate text-sm font-normal leading-snug">
71 + {getDisplayModelName(model)}
72 + {/* The logo is decorative, so name the provider for screen readers. */}
73 + <span className="sr-only">, {props.providerDisplayName}</span>
74 </div>
72 - {props.showProvider && (
73 - <div className="mt-1 flex items-center gap-1.5">
74 - <ProviderInstanceIcon
75 - driverKind={props.driverKind}
76 - displayName={props.providerDisplayName}
77 - acpRegistryAgentId={props.acpRegistryAgentId}
78 - acpRegistryIconUrl={props.acpRegistryIconUrl}
79 - className="size-3"
80 - iconClassName="size-3"
81 - />
82 - <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
83 - {providerLabel}
84 - </span>
85 - </div>
86 - )}
75 + {props.subProvider ? (
76 + <span className="min-w-0 shrink truncate text-xs text-muted-foreground/70">
77 + {props.subProvider}
78 + </span>
79 + ) : null}
80 + {props.showNewBadge ? (
81 + <span
82 + 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"
83 + aria-label="New model"
84 + >
85 + New
86 + </span>
87 + ) : null}
88 + {props.unavailable ? (
89 + <Badge variant="outline" size="sm">
90 + Unavailable
91 + </Badge>
92 + ) : null}
93 </div>
94
95 <div className="flex shrink-0 items-center gap-1.5">
@@ -108,9 +114,9 @@ export const ModelListRow = memo(function ModelListRow(props: {
114 <StarIcon
115 className={cn(
116 "size-3.5 sm:size-3",
111 - props.isFavorite
112 - ? "fill-current text-warning"
113 - : "opacity-0 group-hover:opacity-100 group-data-highlighted:opacity-100 in-focus-visible:opacity-100 pointer-coarse:opacity-100",
117 + props.isFavorite && "fill-current text-warning",
118 + (!props.isFavorite || props.favoriteStarOnHover) &&
119 + "opacity-0 group-hover:opacity-100 group-data-highlighted:opacity-100 in-focus-visible:opacity-100 pointer-coarse:opacity-100",
120 )}
121 />
122 </Button>
apps/web/src/components/chat/ModelPickerContent.tsx
+53 -16
@@ -21,7 +21,7 @@ import {
21 type ReactNode,
22 type RefObject,
23 } from "react";
24 -import { ChevronRightIcon } from "lucide-react";
24 +import { ArchiveIcon, ChevronRightIcon } from "lucide-react";
25 import { ModelListRow } from "./ModelListRow";
26 import { ModelPickerSidebar } from "./ModelPickerSidebar";
27 import { getProviderStatusMessage, hasProviderSetup } from "./ProviderStatusBanner";
@@ -61,6 +61,7 @@ import { InlineButton } from "../ui/button";
61 import {
62 isProviderInstancePickerReady,
63 isProviderInstancePickerVisible,
64 + shouldShowInstanceBadge,
65 type ProviderInstanceEntry,
66 } from "../../providerInstances";
67 import { providerModelKey, sortProviderModelItems } from "../../modelOrdering";
@@ -164,8 +165,7 @@ function adjacentModelPickerProvider(input: {
165 const EMPTY_MODEL_JUMP_LABELS = new Map<string, string>();
166 const MODEL_LIST_ESTIMATED_ITEM_SIZE = 32;
167 // Rendered heights in `--spacing` units. Chrome is the search box and list padding, plus a 1px border.
167 -const ONE_LINE_ROW_UNITS = 8;
168 -const TWO_LINE_ROW_UNITS = 12;
168 +const ROW_UNITS = 8;
169 const ROW_SEPARATOR_UNITS = 0.5;
170 const LIST_CHROME_UNITS = 15.5;
171
@@ -363,6 +363,10 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
363 onInstanceModelChange: (instanceId: ProviderInstanceId, model: string) => void;
364 /** The owning popup moves focus here when it opens (its `initialFocus`). */
365 searchInputRef: RefObject<HTMLInputElement | null>;
366 + /** Sits beside an effort column: fills the shared row, and stacks above it on narrow screens. */
367 + docked?: boolean;
368 + /** Right at the end of the search text moves into the popup's effort column. */
369 + onFocusEffort?: () => void;
370 }) {
371 const {
372 searchInputRef,
@@ -580,31 +584,28 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
584
585 const isLocked = lockedProvider !== null;
586 const isSearching = searchQuery.trim().length > 0;
583 - // Inside one provider's tab the provider line repeats the selected rail icon on every row.
584 - const rowsMixProviders = isSearching || selectedInstanceId === "favorites";
587 // Fit the tallest tab so switching tabs never resizes the popup and moves the rail under the cursor.
588 const tallestTabUnits = (() => {
589 const unitsByTab = new Map<ProviderInstanceId | "favorites", number>();
588 - const addRow = (tab: ProviderInstanceId | "favorites", twoLine: boolean) => {
589 - const rowUnits = twoLine ? TWO_LINE_ROW_UNITS : ONE_LINE_ROW_UNITS;
590 + const addRow = (tab: ProviderInstanceId | "favorites") => {
591 const previous = unitsByTab.get(tab);
592 unitsByTab.set(
593 tab,
593 - previous === undefined ? rowUnits : previous + ROW_SEPARATOR_UNITS + rowUnits,
594 + previous === undefined ? ROW_UNITS : previous + ROW_SEPARATOR_UNITS + ROW_UNITS,
595 );
596 };
597 const tabsWithLegacyRow = new Set<ProviderInstanceId>();
598 for (const model of flatModels) {
599 if (!matchesLockedProvider(model)) continue;
600 const isFavorite = favoritesSet.has(providerModelKey(model.instanceId, model.slug));
600 - if (isFavorite) addRow("favorites", true);
601 + if (isFavorite) addRow("favorites");
602 if (model.isLegacy && !isFavorite) {
603 tabsWithLegacyRow.add(model.instanceId);
604 } else {
604 - addRow(model.instanceId, Boolean(model.subProvider));
605 + addRow(model.instanceId);
606 }
607 }
607 - for (const instanceId of tabsWithLegacyRow) addRow(instanceId, true);
608 + for (const instanceId of tabsWithLegacyRow) addRow(instanceId);
609 return Math.max(0, ...unitsByTab.values());
610 })();
611 const lockedDisabledInstanceIds = (() => {
@@ -765,7 +766,13 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
766 keybindings,
767 props.terminalOpen,
768 );
769 + const badgedInstanceIds = new Set(
770 + instanceEntries
771 + .filter((entry) => shouldShowInstanceBadge(entry, instanceEntries))
772 + .map((entry) => entry.instanceId),
773 + );
774 const modelListExtraData = {
775 + badgedInstanceIds,
776 favoritesSet,
777 modelJumpLabelByKey,
778 activeModelKey,
@@ -833,7 +840,12 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
840 <WindowKeyDownListener onKeyDown={onWindowKeyDown} />
841 <div
842 ref={pickerContentRef}
836 - className="relative flex max-h-86.5 w-screen max-w-90 flex-row overflow-hidden"
843 + className={cn(
844 + "relative flex w-screen max-w-90 flex-row overflow-hidden",
845 + props.docked
846 + ? "h-full max-sm:h-56 max-sm:min-h-0! max-sm:w-full max-sm:max-w-none"
847 + : "max-h-86.5",
848 + )}
849 style={
850 isSearching
851 ? { height: searchHeight }
@@ -951,6 +963,29 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
963 onRequestClose?.();
964 return;
965 }
966 + if (
967 + props.onFocusEffort &&
968 + e.key === "ArrowRight" &&
969 + !e.altKey &&
970 + !e.ctrlKey &&
971 + !e.metaKey &&
972 + !e.shiftKey &&
973 + e.currentTarget.selectionStart === searchQuery.length
974 + ) {
975 + e.preventDefault();
976 + e.stopPropagation();
977 + // The column shows the selected model's effort, so a highlighted model is picked
978 + // first; the owning popup then moves focus to that model's levels.
979 + const highlighted = highlightedModelKeyRef.current
980 + ? parseModelPickerModelKey(highlightedModelKeyRef.current)
981 + : null;
982 + const pickedNew =
983 + highlighted !== null &&
984 + highlightedModelKeyRef.current !== activeModelKey &&
985 + handleModelSelect(highlighted.slug, highlighted.instanceId) !== null;
986 + if (!pickedNew) props.onFocusEffort();
987 + return;
988 + }
989 if (e.key === "Enter" && highlightedModelKeyRef.current) {
990 (e as typeof e & { preventBaseUIHandler?: () => void }).preventBaseUIHandler?.();
991 e.preventDefault();
@@ -988,10 +1023,11 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
1023 aria-expanded={legacySection.isExpanded}
1024 className="group w-full cursor-pointer"
1025 >
991 - <div className="min-w-0 flex-1 text-left">
1026 + <ArchiveIcon aria-hidden="true" className="size-4 opacity-70" />
1027 + <div className="flex min-w-0 flex-1 items-center gap-2 text-left">
1028 <div className="text-sm font-normal leading-snug">Legacy models</div>
993 - <div className="mt-1 text-xs font-normal leading-snug text-muted-foreground">
994 - {legacySection.legacyModels.length} models
1029 + <div className="text-xs font-normal leading-snug text-muted-foreground/70">
1030 + {legacySection.legacyModels.length}
1031 </div>
1032 </div>
1033 <ChevronRightIcon
@@ -1028,7 +1064,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
1064 ? selectedModelKeySet.has(modelKey)
1065 : modelKey === activeModelKey
1066 }
1031 - showProvider={rowsMixProviders || Boolean(model.subProvider)}
1067 + favoriteStarOnHover={selectedInstanceId === "favorites" && !isSearching}
1068 + showInstanceBadge={badgedInstanceIds.has(model.instanceId)}
1069 showNewBadge={model.badge === "new"}
1070 unavailable={model.isUnavailable === true}
1071 jumpLabel={modelJumpLabelByKey.get(modelKey) ?? null}
apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
+78
@@ -88,3 +88,81 @@ it("keeps each registry image when adding a model from another ACP agent", async
88 await userEvent.keyboard("{Escape}");
89 await vi.waitFor(() => expect(imageWidths()).toEqual([11, 17]));
90 });
91 +
92 +it("keeps a docked picker open after a pick and hands focus to that model's effort", async () => {
93 + const instanceId = ProviderInstanceId.make("codex");
94 + const entries = deriveProviderInstanceEntries([
95 + {
96 + instanceId,
97 + driver: ProviderDriverKind.make("codex"),
98 + enabled: true,
99 + installed: true,
100 + version: null,
101 + status: "ready",
102 + auth: { status: "authenticated" },
103 + checkedAt: "2026-01-01T00:00:00.000Z",
104 + models: [],
105 + slashCommands: [],
106 + skills: [],
107 + },
108 + ]);
109 + const options = new Map([
110 + [
111 + instanceId,
112 + [
113 + { slug: "original", name: "Original model" },
114 + { slug: "second", name: "Second model" },
115 + { slug: "plain", name: "Plain model" },
116 + ],
117 + ],
118 + ]);
119 + // The last level is the selected one; "plain" has no effort to pick.
120 + const levels: Record<string, ReadonlyArray<string>> = {
121 + original: ["Low", "High"],
122 + second: ["Medium"],
123 + plain: [],
124 + };
125 +
126 + function Picker() {
127 + const [model, setModel] = useState("original");
128 + return (
129 + <ProviderModelPicker
130 + environmentId={null}
131 + activeInstanceId={instanceId}
132 + model={model}
133 + lockedProvider={null}
134 + instanceEntries={entries}
135 + modelOptionsByInstance={options}
136 + triggerAriaLabel="Choose model"
137 + onInstanceModelChange={(_, selected) => setModel(selected)}
138 + effortColumn={(levels[model] ?? []).map((level, index, all) => (
139 + <button
140 + key={level}
141 + type="button"
142 + role="radio"
143 + aria-checked={index === all.length - 1}
144 + data-effort-row
145 + data-effort-level
146 + >
147 + {level}
148 + </button>
149 + ))}
150 + />
151 + );
152 + }
153 +
154 + await using screen = await render(<Picker />);
155 + await screen.getByRole("button", { name: "Choose model" }).click();
156 + const search = page.getByPlaceholder("Search models...");
157 + await expect.element(search).toHaveFocus();
158 + await userEvent.keyboard("{ArrowRight}");
159 + await expect.element(page.getByRole("radio", { name: "High" })).toHaveFocus();
160 + await userEvent.keyboard("{ArrowLeft}");
161 + await expect.element(search).toHaveFocus();
162 +
163 + await page.getByRole("option", { name: /Second model/ }).click();
164 + await expect.element(page.getByRole("radio", { name: "Medium" })).toHaveFocus();
165 +
166 + await page.getByRole("option", { name: /Plain model/ }).click();
167 + await expect.element(search).not.toBeInTheDocument();
168 +});
apps/web/src/components/chat/ProviderModelPicker.tsx
+159 -39
@@ -5,7 +5,7 @@ import {
5 type ProviderDriverKind,
6 type ResolvedKeybindingsConfig,
7 } from "@t3tools/contracts";
8 -import { memo, useRef, useState } from "react";
8 +import { createContext, memo, type ReactNode, useRef, useState } from "react";
9 import { Badge } from "../ui/badge";
10 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
11 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
@@ -16,7 +16,7 @@ import { ProviderInstanceIcon } from "./ProviderInstanceIcon";
16 import { ModelEsque, getDisplayModelName, getTriggerDisplayModelName } from "./providerIconUtils";
17 import { shouldShowInstanceBadge, type ProviderInstanceEntry } from "../../providerInstances";
18 import { ComposerControl, type ComposerControlSize } from "./ComposerControl";
19 -import { useComposerMenuProps } from "./composerEventScope";
19 +import { takeOpenTarget, useComposerMenuProps } from "./composerEventScope";
20 import { shortcutLabelForCommand } from "../../keybindings";
21
22 /** Holds the page still behind the open picker; its lifetime is the popup element's. */
@@ -35,7 +35,10 @@ function lockBackgroundScroll(popup: HTMLElement | null) {
35 }
36
37 const shouldAllowOverlayScroll = (target: EventTarget | null) => {
38 - return target instanceof Element && target.closest("[data-model-picker-content]");
38 + return (
39 + target instanceof Element &&
40 + target.closest("[data-model-picker-content], [data-model-picker-effort]")
41 + );
42 };
43 const preventBackgroundWheel = (event: WheelEvent) => {
44 if (shouldAllowOverlayScroll(event.target)) {
@@ -65,6 +68,12 @@ function lockBackgroundScroll(popup: HTMLElement | null) {
68 };
69 }
70
71 +/** What a docked effort column needs from its picker: the model it serves, and a way to close. */
72 +export const DockedPickerContext = createContext<{ modelLabel: string; close: () => void }>({
73 + modelLabel: "",
74 + close: () => {},
75 +});
76 +
77 export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
78 environmentId: EnvironmentId | null;
79 activeInstanceId: ProviderInstanceId;
@@ -91,12 +100,27 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
100 onOpenProviderSetup?: (instanceId: ProviderInstanceId) => void;
101 getModelDisabledReason?: (instanceId: ProviderInstanceId, model: string) => string | null;
102 onInstanceModelChange: (instanceId: ProviderInstanceId, model: string) => void;
103 + /** Shown after the model name inside the same trigger, such as the effort level. */
104 + triggerSuffix?: ReactNode;
105 + /** Names the suffix for the tooltip and screen readers. */
106 + triggerDetail?: string | null;
107 + /** Composer shortcuts this trigger answers besides the picker's own. */
108 + triggerShortcuts?: string;
109 + /**
110 + * Docks an effort column beside the list and a footer under both. Picking a model then keeps
111 + * the popup open and moves focus to the new model's levels.
112 + */
113 + effortColumn?: ReactNode;
114 + footer?: ReactNode;
115 }) {
116 const composerFloatingLayerProps = useComposerMenuProps();
117 const [uncontrolledIsMenuOpen, setUncontrolledIsMenuOpen] = useState(false);
118 const isMenuOpen = props.open ?? uncontrolledIsMenuOpen;
119 const searchInputRef = useRef<HTMLInputElement>(null);
120 + const triggerRef = useRef<HTMLButtonElement>(null);
121 + const popupRef = useRef<HTMLDivElement | null>(null);
122 const size = props.size ?? "sm";
123 + const docked = props.effortColumn !== undefined;
124
125 const activeEntry =
126 props.instanceEntries.find((entry) => entry.instanceId === props.activeInstanceId) ?? null;
@@ -130,10 +154,44 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
154 }
155 };
156
157 + /**
158 + * Focuses the selected reasoning level, else the first level. With `rows: "any"` it falls back
159 + * to the column's other options. False when nothing took focus.
160 + */
161 + const focusEffort = (rows: "levels" | "any") => {
162 + const column = popupRef.current?.querySelector("[data-model-picker-effort]");
163 + const first = (selector: string) =>
164 + column?.querySelector<HTMLElement>(`${selector}[aria-checked="true"]:not(:disabled)`) ??
165 + column?.querySelector<HTMLElement>(`${selector}:not(:disabled)`);
166 + const row =
167 + first("[data-effort-level]") ?? (rows === "any" ? first("[data-effort-row]") : null);
168 + row?.focus({ preventScroll: true });
169 + return row != null;
170 + };
171 + const openTarget = (target: "effort" | "permissions") => {
172 + if (target === "effort") {
173 + focusEffort("any");
174 + return;
175 + }
176 + popupRef.current
177 + ?.querySelector<HTMLButtonElement>("[data-composer-permissions-trigger]")
178 + ?.click();
179 + };
180 +
181 const handleInstanceModelChange = (instanceId: ProviderInstanceId, model: string) => {
182 if (props.disabled) return;
183 props.onInstanceModelChange(instanceId, model);
136 - setIsMenuOpen(false);
184 + if (!docked) {
185 + setIsMenuOpen(false);
186 + return;
187 + }
188 + // The column renders the new model's levels on commit; a model with none closes the popup.
189 + // Levels an Ultrathink prompt locks still count, so the note explaining them stays visible.
190 + window.requestAnimationFrame(() => {
191 + const hasLevels = popupRef.current?.querySelector("[data-effort-level]") != null;
192 + if (hasLevels) focusEffort("levels");
193 + else setIsMenuOpen(false);
194 + });
195 };
196
197 const shortcutLabel = props.keybindings
@@ -169,9 +227,45 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
227 const allModelNames = selectedEntries
228 ? selectedEntries.map((selection) => selection.fullLabel).join(", ") || "Choose models"
229 : undefined;
172 - const triggerTooltipContent = shortcutLabel
173 - ? `${props.triggerLabel ?? allModelNames ?? triggerLabel} · ${shortcutLabel}`
174 - : (props.triggerLabel ?? allModelNames ?? triggerLabel);
230 + const triggerTooltipContent = [
231 + props.triggerLabel ?? allModelNames ?? triggerLabel,
232 + props.triggerDetail,
233 + shortcutLabel,
234 + ]
235 + .filter(Boolean)
236 + .join(" · ");
237 +
238 + const picker = (
239 + <ModelPickerContent
240 + searchInputRef={searchInputRef}
241 + environmentId={props.environmentId}
242 + activeInstanceId={activeInstanceId}
243 + model={props.model}
244 + {...(props.selectedModels !== undefined ? { selectedModels: props.selectedModels } : {})}
245 + {...(props.onToggleModel
246 + ? {
247 + onToggleModel: (instanceId: ProviderInstanceId, model: string) => {
248 + if (!props.disabled) props.onToggleModel?.(instanceId, model);
249 + },
250 + }
251 + : {})}
252 + lockedProvider={props.lockedProvider}
253 + lockedContinuationGroupKey={props.lockedContinuationGroupKey ?? null}
254 + instanceEntries={props.instanceEntries}
255 + {...(props.keybindings ? { keybindings: props.keybindings } : {})}
256 + modelOptionsByInstance={props.modelOptionsByInstance}
257 + terminalOpen={props.terminalOpen ?? false}
258 + onRequestClose={() => setIsMenuOpen(false)}
259 + {...(props.onOpenProviderSetup ? { onOpenProviderSetup: props.onOpenProviderSetup } : {})}
260 + getModelDisabledReason={(instanceId, model) =>
261 + props.disabled
262 + ? "Model picker is disabled"
263 + : (props.getModelDisabledReason?.(instanceId, model) ?? null)
264 + }
265 + onInstanceModelChange={handleInstanceModelChange}
266 + {...(docked ? { docked, onFocusEffort: () => void focusEffort("any") } : {})}
267 + />
268 + );
269
270 return (
271 <Popover
@@ -183,15 +277,34 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
277 }
278 setIsMenuOpen(open);
279 }}
280 + onOpenChangeComplete={(open) => {
281 + const target = takeOpenTarget(triggerRef.current);
282 + if (open && docked && target) openTarget(target);
283 + }}
284 >
285 <PopoverTrigger
286 render={
287 <ComposerControl
190 - aria-label={
191 - props.triggerAriaLabel ?? props.triggerLabel ?? allModelNames ?? triggerLabel
192 - }
288 + ref={triggerRef}
289 + aria-label={[
290 + props.triggerAriaLabel ?? props.triggerLabel ?? allModelNames ?? triggerLabel,
291 + props.triggerDetail,
292 + ]
293 + .filter(Boolean)
294 + .join(", ")}
295 size={size}
296 data-chat-provider-model-picker="true"
297 + data-composer-shortcut={props.triggerShortcuts}
298 + onClick={(event) => {
299 + if (!isMenuOpen || !docked) return;
300 + const target = takeOpenTarget(triggerRef.current);
301 + if (!target) return;
302 + // A shortcut aimed at the open picker moves within it instead of closing it.
303 + (
304 + event as typeof event & { preventBaseUIHandler?: () => void }
305 + ).preventBaseUIHandler?.();
306 + openTarget(target);
307 + }}
308 className={cn(
309 "min-w-0 shrink justify-between whitespace-nowrap",
310 props.compact
@@ -267,6 +380,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
380 </TooltipTrigger>
381 <TooltipPopup side="top">{triggerTooltipContent}</TooltipPopup>
382 </Tooltip>
383 + {props.triggerSuffix}
384 {selectedModel?.isUnavailable && !selectedEntries && props.triggerLabel === undefined ? (
385 <Badge variant="outline" size="sm">
386 Unavailable
@@ -276,41 +390,47 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
390 </PopoverTrigger>
391 <PopoverPopup
392 {...(props.isComposerOwned ? composerFloatingLayerProps : {})}
279 - ref={lockBackgroundScroll}
393 + ref={(popup) => {
394 + popupRef.current = popup;
395 + const unlock = lockBackgroundScroll(popup);
396 + return () => {
397 + popupRef.current = null;
398 + unlock?.();
399 + };
400 + }}
401 initialFocus={searchInputRef}
402 align="start"
403 className="before:hidden"
404 padding="none"
405 touchBackdrop
406 >
286 - <ModelPickerContent
287 - searchInputRef={searchInputRef}
288 - environmentId={props.environmentId}
289 - activeInstanceId={activeInstanceId}
290 - model={props.model}
291 - {...(props.selectedModels !== undefined ? { selectedModels: props.selectedModels } : {})}
292 - {...(props.onToggleModel
293 - ? {
294 - onToggleModel: (instanceId: ProviderInstanceId, model: string) => {
295 - if (!props.disabled) props.onToggleModel?.(instanceId, model);
296 - },
297 - }
298 - : {})}
299 - lockedProvider={props.lockedProvider}
300 - lockedContinuationGroupKey={props.lockedContinuationGroupKey ?? null}
301 - instanceEntries={props.instanceEntries}
302 - {...(props.keybindings ? { keybindings: props.keybindings } : {})}
303 - modelOptionsByInstance={props.modelOptionsByInstance}
304 - terminalOpen={props.terminalOpen ?? false}
305 - onRequestClose={() => setIsMenuOpen(false)}
306 - {...(props.onOpenProviderSetup ? { onOpenProviderSetup: props.onOpenProviderSetup } : {})}
307 - getModelDisabledReason={(instanceId, model) =>
308 - props.disabled
309 - ? "Model picker is disabled"
310 - : (props.getModelDisabledReason?.(instanceId, model) ?? null)
311 - }
312 - onInstanceModelChange={handleInstanceModelChange}
313 - />
407 + {props.effortColumn ? (
408 + <DockedPickerContext
409 + value={{ modelLabel: triggerTitle, close: () => setIsMenuOpen(false) }}
410 + >
411 + <div className="flex flex-col">
412 + <div className="flex max-h-86.5 max-sm:max-h-none max-sm:flex-col">
413 + {picker}
414 + <div
415 + data-model-picker-effort
416 + className="flex min-h-0 w-48 shrink-0 flex-col border-l border-border/70 bg-muted/40 max-sm:max-h-64 max-sm:w-full max-sm:border-t max-sm:border-l-0"
417 + onKeyDown={(event) => {
418 + if (event.key !== "ArrowLeft" || event.altKey || event.ctrlKey || event.metaKey)
419 + return;
420 + event.preventDefault();
421 + event.stopPropagation();
422 + searchInputRef.current?.focus();
423 + }}
424 + >
425 + {props.effortColumn}
426 + </div>
427 + </div>
428 + {props.footer}
429 + </div>
430 + </DockedPickerContext>
431 + ) : (
432 + picker
433 + )}
434 {props.selectedModels === undefined ? (
435 <ChatGptSharingControl provider={activeEntry?.snapshot ?? null} />
436 ) : null}
apps/web/src/components/chat/TraitsPicker.tsx
+135 -317
@@ -16,7 +16,6 @@ import {
16 type ScopedThreadRef,
17 type ServerProviderModel,
18 } from "@t3tools/contracts";
19 -import type { EffortDisplay } from "@t3tools/contracts/settings";
19 import {
20 buildProviderOptionSelectionsFromDescriptors,
21 getProviderOptionCurrentLabel,
@@ -24,8 +23,8 @@ import {
23 isClaudeUltrathinkPrompt,
24 normalizeModelSlug,
25 } from "@t3tools/shared/model";
27 -import { memo, type ReactNode, useRef } from "react";
28 -import { GaugeIcon, ZapIcon } from "lucide-react";
26 +import { memo } from "react";
27 +import { GaugeIcon } from "lucide-react";
28 import {
29 Menu,
30 MenuGroup,
@@ -41,9 +40,7 @@ import { cn } from "~/lib/utils";
40 import { Badge } from "../ui/badge";
41 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
42 import { ComposerControl, ComposerControlIcon, type ComposerControlSize } from "./ComposerControl";
44 -import { focusRequestedPermission, useComposerMenuProps } from "./composerEventScope";
43 import { useComposerMenuState } from "./useComposerMenuState";
46 -import { EffortGlyph, resolveEffortGlyph } from "./EffortGlyph";
44
45 type ProviderOptions = ReadonlyArray<ProviderOptionSelection>;
46
@@ -190,12 +187,12 @@ function getSelectedTraits(
187 };
188 }
189
193 -function getTraitsSectionVisibility(input: {
190 +export function getTraitsSectionVisibility(input: {
191 provider: ProviderDriverKind;
192 models: ReadonlyArray<ServerProviderModel>;
193 model: string | null | undefined;
194 promptUltrathink?: PromptUltrathink | undefined;
198 - modelOptions: ProviderOptions | null | undefined;
195 + modelOptions?: ProviderOptions | null | undefined;
196 allowPromptInjectedEffort?: boolean;
197 planModeEnabled: boolean;
198 }) {
@@ -293,19 +290,7 @@ export function getReasoningTraitStep(input: {
290 return null;
291 }
292
296 -export function shouldRenderTraitsControls(input: {
297 - provider: ProviderDriverKind;
298 - models: ReadonlyArray<ServerProviderModel>;
299 - model: string | null | undefined;
300 - promptUltrathink?: PromptUltrathink | undefined;
301 - modelOptions: ProviderOptions | null | undefined;
302 - allowPromptInjectedEffort?: boolean;
303 - planModeEnabled: boolean;
304 -}): boolean {
305 - return getTraitsSectionVisibility(input).hasAnyControls;
306 -}
307 -
308 -interface TraitsMenuContentProps {
293 +export interface TraitsMenuContentProps {
294 provider: ProviderDriverKind;
295 instanceId?: ProviderInstanceId;
296 models: ReadonlyArray<ServerProviderModel>;
@@ -318,18 +303,12 @@ interface TraitsMenuContentProps {
303 allowPromptInjectedEffort?: boolean;
304 planModeEnabled: boolean;
305 triggerClassName?: string;
321 - isComposerOwned?: boolean;
322 - /** Composer chips name the effort level unless the user picked bars. */
323 - effortDisplay?: EffortDisplay;
324 - /** Extra section shown below the traits in the picker popup (Permissions). */
325 - extraMenuContent?: ReactNode;
326 - /** This trigger also answers composer.mode (while the permissions chip is hidden). */
327 - extraMenuOwnsModeShortcut?: boolean;
328 - /** Extra tooltip text naming what else the menu holds. */
329 - extraMenuHint?: string;
306 }
307
332 -export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
308 +export type TraitsSelectionInput = TraitsMenuContentProps & TraitsPersistence;
309 +
310 +/** The model's traits with their shown values, and writers that persist a change. */
311 +export function useTraitsSelection({
312 provider,
313 instanceId,
314 models,
@@ -340,8 +319,9 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
319 reportedModelSelection,
320 allowPromptInjectedEffort = true,
321 planModeEnabled,
322 + triggerClassName: _triggerClassName,
323 ...persistence
344 -}: TraitsMenuContentProps & TraitsPersistence) {
324 +}: TraitsSelectionInput) {
325 const modelSelection =
326 instanceId && model ? { instanceId, model, options: modelOptions ?? [] } : null;
327 const setProviderModelOptions = useComposerDraftStore((store) => store.setProviderModelOptions);
@@ -369,32 +349,51 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
349 allowPromptInjectedEffort,
350 planModeEnabled,
351 });
352 + return {
353 + ...selected,
354 + /** The option a select shows, where an Ultrathink prompt owns the primary select. */
355 + selectValue: (descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>) =>
356 + selected.ultrathinkPromptControlled && descriptor.id === selected.primarySelectDescriptor?.id
357 + ? "ultrathink"
358 + : (getDescriptorStringValue(descriptor, modelSelection, reportedModelSelection) ?? ""),
359 + currentLabel: (descriptor: ProviderOptionDescriptor) =>
360 + getProviderOptionCurrentLabel(descriptor, modelSelection, reportedModelSelection),
361 + changeSelect: (
362 + descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>,
363 + value: string,
364 + ) => {
365 + // Whether a pick applies, and the options it writes, do not depend on the prompt text.
366 + const change = getTraitSelectChange(selected, descriptor, "", value);
367 + if (!change) return;
368 + onPromptEdit?.(
369 + (prompt) => getTraitSelectChange(selected, descriptor, prompt, value)?.prompt ?? prompt,
370 + );
371 + if ("modelOptions" in change) updateModelOptions(change.modelOptions);
372 + },
373 + changeBoolean: (descriptorId: string, value: boolean) => {
374 + updateModelOptions(
375 + buildProviderOptionSelectionsFromDescriptors(
376 + replaceDescriptorCurrentValue(selected.descriptors, descriptorId, value),
377 + ),
378 + );
379 + },
380 + };
381 +}
382 +
383 +export const ULTRATHINK_IN_BODY_NOTE =
384 + 'Your prompt contains "ultrathink" in the text. Remove it to change this option.';
385 +
386 +const TraitsMenuContent = memo(function TraitsMenuContentImpl(props: TraitsSelectionInput) {
387 + const traits = useTraitsSelection(props);
388 const {
389 descriptors,
390 selectDescriptors,
391 booleanDescriptors,
392 primarySelectDescriptor,
377 - ultrathinkPromptControlled,
393 ultrathinkInBodyText,
394 hasAnyControls,
395 modelIsUnavailable,
381 - } = selected;
382 - const updateDescriptors = (nextDescriptors: ReadonlyArray<ProviderOptionDescriptor>) => {
383 - updateModelOptions(buildProviderOptionSelectionsFromDescriptors(nextDescriptors));
384 - };
385 -
386 - const handleSelectChange = (
387 - descriptor: Extract<ProviderOptionDescriptor, { type: "select" }>,
388 - value: string,
389 - ) => {
390 - // Whether a pick applies, and the options it writes, do not depend on the prompt text.
391 - const change = getTraitSelectChange(selected, descriptor, "", value);
392 - if (!change) return;
393 - onPromptEdit?.(
394 - (prompt) => getTraitSelectChange(selected, descriptor, prompt, value)?.prompt ?? prompt,
395 - );
396 - if ("modelOptions" in change) updateModelOptions(change.modelOptions);
397 - };
396 + } = traits;
397
398 if (!hasAnyControls) {
399 return null;
@@ -404,11 +403,7 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
403 return (
404 <>
405 {descriptors.map((descriptor, index) => {
407 - const value = getProviderOptionCurrentLabel(
408 - descriptor,
409 - modelSelection,
410 - reportedModelSelection,
411 - );
406 + const value = traits.currentLabel(descriptor);
407 if (!value) return null;
408 return (
409 <div key={descriptor.id}>
@@ -428,200 +423,100 @@ export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
423
424 return (
425 <>
431 - {selectDescriptors.map((descriptor, index) => {
432 - const selectedValue =
433 - ultrathinkPromptControlled && descriptor.id === primarySelectDescriptor?.id
434 - ? "ultrathink"
435 - : (getDescriptorStringValue(descriptor, modelSelection, reportedModelSelection) ?? "");
436 -
437 - return (
438 - <div key={descriptor.id}>
439 - {index > 0 ? <MenuDivider /> : null}
440 - <MenuGroup>
441 - <div className="px-2 pt-1.5 pb-1 font-medium text-muted-foreground text-xs">
442 - {descriptor.label}
443 - </div>
444 - {ultrathinkInBodyText && descriptor.id === primarySelectDescriptor?.id ? (
445 - <div className="px-2 pb-1.5 text-muted-foreground/80 text-xs">
446 - Your prompt contains &quot;ultrathink&quot; in the text. Remove it to change this
447 - option.
448 - </div>
449 - ) : null}
450 - <MenuRadioGroup
451 - value={selectedValue}
452 - onValueChange={(value) => handleSelectChange(descriptor, value)}
453 - >
454 - {selectableProviderOptionChoices(descriptor).map((option) => (
455 - <MenuRadioItem
456 - key={option.id}
457 - value={option.id}
458 - hideIndicator
459 - closeOnClick
460 - disabled={ultrathinkInBodyText && descriptor.id === primarySelectDescriptor?.id}
461 - >
462 - <span className="flex w-full min-w-0 flex-col">
463 - <span className="flex min-w-0 items-center gap-1">
464 - <span className="min-w-0 truncate">{option.label}</span>
465 - {option.isDefault ? <DefaultBadge /> : null}
466 - </span>
467 - {option.description ? (
468 - <span className="max-w-56 text-pretty text-muted-foreground/80 text-xs">
469 - {option.description}
470 - </span>
471 - ) : null}
472 - </span>
473 - </MenuRadioItem>
474 - ))}
475 - </MenuRadioGroup>
476 - </MenuGroup>
477 - </div>
478 - );
479 - })}
480 - {booleanDescriptors.map((descriptor, index) => {
481 - const selectedValue = descriptor.currentValue === true ? "on" : "off";
482 -
483 - return (
484 - <div key={descriptor.id}>
485 - {index > 0 || selectDescriptors.length > 0 ? <MenuDivider /> : null}
486 - <MenuGroup>
487 - <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">
488 - {descriptor.label}
426 + {selectDescriptors.map((descriptor, index) => (
427 + <div key={descriptor.id}>
428 + {index > 0 ? <MenuDivider /> : null}
429 + <MenuGroup>
430 + <div className="px-2 pt-1.5 pb-1 font-medium text-muted-foreground text-xs">
431 + {descriptor.label}
432 + </div>
433 + {ultrathinkInBodyText && descriptor.id === primarySelectDescriptor?.id ? (
434 + <div className="px-2 pb-1.5 text-muted-foreground/80 text-xs">
435 + {ULTRATHINK_IN_BODY_NOTE}
436 </div>
490 - <MenuRadioGroup
491 - value={selectedValue}
492 - onValueChange={(value) => {
493 - updateDescriptors(
494 - replaceDescriptorCurrentValue(descriptors, descriptor.id, value === "on"),
495 - );
496 - }}
497 - >
498 - {(["on", "off"] as const).map((value) => (
499 - <MenuRadioItem key={value} value={value} hideIndicator closeOnClick>
500 - <span className="flex w-full min-w-0 items-center justify-between gap-3">
501 - <span>{value === "on" ? "On" : "Off"}</span>
437 + ) : null}
438 + <MenuRadioGroup
439 + value={traits.selectValue(descriptor)}
440 + onValueChange={(value) => traits.changeSelect(descriptor, value)}
441 + >
442 + {selectableProviderOptionChoices(descriptor).map((option) => (
443 + <MenuRadioItem
444 + key={option.id}
445 + value={option.id}
446 + hideIndicator
447 + closeOnClick
448 + disabled={ultrathinkInBodyText && descriptor.id === primarySelectDescriptor?.id}
449 + >
450 + <span className="flex w-full min-w-0 flex-col">
451 + <span className="flex min-w-0 items-center gap-1">
452 + <span className="min-w-0 truncate">{option.label}</span>
453 + {option.isDefault ? <DefaultBadge /> : null}
454 </span>
503 - </MenuRadioItem>
504 - ))}
505 - </MenuRadioGroup>
506 - </MenuGroup>
507 - </div>
508 - );
509 - })}
455 + {option.description ? (
456 + <span className="max-w-56 text-pretty text-muted-foreground/80 text-xs">
457 + {option.description}
458 + </span>
459 + ) : null}
460 + </span>
461 + </MenuRadioItem>
462 + ))}
463 + </MenuRadioGroup>
464 + </MenuGroup>
465 + </div>
466 + ))}
467 + {booleanDescriptors.map((descriptor, index) => (
468 + <div key={descriptor.id}>
469 + {index > 0 || selectDescriptors.length > 0 ? <MenuDivider /> : null}
470 + <MenuGroup>
471 + <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">
472 + {descriptor.label}
473 + </div>
474 + <MenuRadioGroup
475 + value={descriptor.currentValue === true ? "on" : "off"}
476 + onValueChange={(value) => traits.changeBoolean(descriptor.id, value === "on")}
477 + >
478 + {(["on", "off"] as const).map((value) => (
479 + <MenuRadioItem key={value} value={value} hideIndicator closeOnClick>
480 + <span className="flex w-full min-w-0 items-center justify-between gap-3">
481 + <span>{value === "on" ? "On" : "Off"}</span>
482 + </span>
483 + </MenuRadioItem>
484 + ))}
485 + </MenuRadioGroup>
486 + </MenuGroup>
487 + </div>
488 + ))}
489 </>
490 );
491 });
492
514 -/** One bolt for Fast. Ultrafast adds an outlined echo behind it, cut away by the surface color. */
515 -function FastBolt(props: { ultra: boolean }) {
516 - if (!props.ultra) {
517 - return (
518 - <ZapIcon aria-hidden="true" data-composer-control-icon className="size-3 fill-current" />
519 - );
520 - }
521 - return (
522 - <span aria-hidden="true" className="relative h-3 w-3.75 shrink-0">
523 - <ZapIcon className="absolute top-0 left-0.75 size-3" />
524 - <ZapIcon
525 - strokeWidth={4}
526 - className="absolute top-0 left-0 size-3 fill-current stroke-(--chat-composer-glass-surface) [paint-order:stroke]"
527 - />
528 - </span>
529 - );
530 -}
531 -
493 export const TraitsPicker = memo(function TraitsPicker({
533 - provider,
534 - instanceId,
535 - models,
536 - model,
537 - promptUltrathink,
538 - onPromptEdit,
539 - modelOptions,
540 - reportedModelSelection,
541 - allowPromptInjectedEffort = true,
542 - planModeEnabled,
543 - triggerClassName,
544 - isComposerOwned,
545 - effortDisplay = "label",
546 - extraMenuContent,
547 - extraMenuOwnsModeShortcut,
548 - extraMenuHint,
494 size = "sm",
495 hidden = false,
496 disabled = false,
552 - ...persistence
553 -}: TraitsMenuContentProps &
554 - TraitsPersistence & {
555 - size?: ComposerControlSize;
556 - hidden?: boolean;
557 - disabled?: boolean;
558 - }) {
559 - const composerFloatingLayerProps = useComposerMenuProps();
497 + ...props
498 +}: TraitsSelectionInput & {
499 + size?: ComposerControlSize;
500 + hidden?: boolean;
501 + disabled?: boolean;
502 +}) {
503 const [isMenuOpen, setIsMenuOpen] = useComposerMenuState(hidden || disabled);
561 - const triggerRef = useRef<HTMLButtonElement>(null);
562 - const { descriptors, primarySelectDescriptor, ultrathinkPromptControlled } =
563 - getTraitsSectionVisibility({
564 - provider,
565 - models,
566 - model,
567 - promptUltrathink,
568 - modelOptions,
569 - allowPromptInjectedEffort,
570 - planModeEnabled,
571 - });
572 - if (
573 - !shouldRenderTraitsControls({
574 - provider,
575 - models,
576 - model,
577 - promptUltrathink,
578 - modelOptions,
579 - allowPromptInjectedEffort,
580 - planModeEnabled,
581 - })
582 - ) {
504 + const traits = useTraitsSelection(props);
505 + if (!traits.hasAnyControls) {
506 return null;
507 }
585 -
586 - const {
587 - label: triggerLabel,
588 - speedLabel,
589 - otherLabels,
590 - } = buildTraitsTriggerDisplay({
591 - provider,
592 - descriptors,
593 - primarySelectDescriptorId: primarySelectDescriptor?.id ?? null,
594 - ultrathinkPromptControlled,
595 - modelSelection: instanceId && model ? { instanceId, model, options: modelOptions ?? [] } : null,
596 - reportedModelSelection,
508 + const { label: triggerLabel } = buildTraitsTriggerDisplay({
509 + provider: props.provider,
510 + descriptors: traits.descriptors,
511 + primarySelectDescriptorId: traits.primarySelectDescriptor?.id ?? null,
512 + ultrathinkPromptControlled: traits.ultrathinkPromptControlled,
513 + modelSelection:
514 + props.instanceId && props.model
515 + ? { instanceId: props.instanceId, model: props.model, options: props.modelOptions ?? [] }
516 + : null,
517 + reportedModelSelection: props.reportedModelSelection,
518 });
598 - const isCodexStyle = provider === "codex";
599 - // In the composer the glyph has no word, so the tooltip and label name the control.
600 - const triggerDescription = isComposerOwned
601 - ? [`Effort: ${triggerLabel}`, speedLabel, extraMenuHint].filter(Boolean).join(" · ")
602 - : triggerLabel;
603 - const effortGlyph =
604 - isComposerOwned &&
605 - primarySelectDescriptor &&
606 - REASONING_SELECT_DESCRIPTOR_IDS.has(primarySelectDescriptor.id)
607 - ? resolveEffortGlyph(
608 - primarySelectDescriptor,
609 - ultrathinkPromptControlled
610 - ? "ultrathink"
611 - : getDescriptorStringValue(
612 - primarySelectDescriptor,
613 - instanceId && model ? { instanceId, model, options: modelOptions ?? [] } : null,
614 - reportedModelSelection,
615 - ),
616 - )
617 - : null;
618 - // Workflow levels such as Ultracode always show their name; the setting names every level.
619 - // Traits the bars cannot show, such as an agent mode, appear as words in the composer.
620 - const effortWord = effortGlyph
621 - ? (effortGlyph.special ?? (effortDisplay === "label" ? effortGlyph.label : null))
622 - : isComposerOwned
623 - ? triggerLabel
624 - : null;
519 + const isCodexStyle = props.provider === "codex";
520
521 return (
522 <Menu
@@ -629,7 +524,6 @@ export const TraitsPicker = memo(function TraitsPicker({
524 onOpenChange={(open) => {
525 setIsMenuOpen(open && !disabled);
526 }}
632 - onOpenChangeComplete={(open) => focusRequestedPermission(open, triggerRef.current)}
527 >
528 <Tooltip>
529 <TooltipTrigger
@@ -637,79 +531,21 @@ export const TraitsPicker = memo(function TraitsPicker({
531 <MenuTrigger
532 render={
533 <ComposerControl
640 - ref={triggerRef}
534 disabled={disabled}
642 - aria-label={triggerDescription}
643 - data-composer-shortcut={
644 - isComposerOwned
645 - ? extraMenuOwnsModeShortcut
646 - ? "composer.effort composer.mode"
647 - : "composer.effort"
648 - : undefined
649 - }
535 + aria-label={triggerLabel}
536 size={size}
537 className={cn(
538 isCodexStyle
539 ? "min-w-0 max-w-40 shrink justify-start overflow-hidden whitespace-nowrap sm:max-w-48"
540 : "shrink-0 whitespace-nowrap",
655 - triggerClassName,
656 - // Effort reads on from the model name, "Opus 5.5 High", at about the space
657 - // inside the name: this cancels the model chip's end padding and the row gap.
658 - isComposerOwned && (effortWord !== null ? "-ms-1 ps-0" : "-ms-1 ps-0.5"),
659 - // The word is muted next to the model name and brightens like it on hover.
660 - effortWord !== null &&
661 - "text-muted-foreground hover:text-foreground data-pressed:text-foreground data-popup-open:text-foreground",
541 + props.triggerClassName,
542 )}
543 />
544 }
545 />
546 }
547 >
668 - {effortGlyph ? (
669 - <span className="flex items-center gap-1.5">
670 - {effortWord === null ? (
671 - <EffortGlyph count={effortGlyph.count} filled={effortGlyph.filled} size={size} />
672 - ) : null}
673 - {effortWord !== null ? (
674 - <>
675 - <span data-composer-control-label>{effortWord}</span>
676 - {/* Icon-only footers hide labels and reveal this instead. */}
677 - <GaugeIcon
678 - aria-hidden="true"
679 - data-composer-control-compact-icon
680 - className="invisible absolute size-3.5"
681 - />
682 - </>
683 - ) : (
684 - <span data-composer-control-label className="sr-only">
685 - {triggerLabel}
686 - </span>
687 - )}
688 - {speedLabel === "Fast" || speedLabel === "Ultrafast" ? (
689 - <FastBolt ultra={speedLabel === "Ultrafast"} />
690 - ) : null}
691 - {otherLabels.length > 0 ? (
692 - <span
693 - aria-hidden="true"
694 - // A label, so icon-only footers drop it; compacted rows drop it before the model.
695 - data-composer-control-label
696 - data-composer-secondary-trait
697 - className="max-w-24 truncate text-xs"
698 - >
699 - {otherLabels.join(" · ")}
700 - </span>
701 - ) : null}
702 - </span>
703 - ) : effortWord !== null ? (
704 - <>
705 - <span data-composer-control-label>{effortWord}</span>
706 - <GaugeIcon
707 - aria-hidden="true"
708 - data-composer-control-compact-icon
709 - className="invisible absolute size-3.5"
710 - />
711 - </>
712 - ) : isCodexStyle ? (
548 + {isCodexStyle ? (
549 <span
550 className={cn(
551 "flex min-w-0 w-full items-center",
@@ -728,28 +564,10 @@ export const TraitsPicker = memo(function TraitsPicker({
564 </>
565 )}
566 </TooltipTrigger>
731 - <TooltipPopup side="top">{triggerDescription}</TooltipPopup>
567 + <TooltipPopup side="top">{triggerLabel}</TooltipPopup>
568 </Tooltip>
733 - <MenuPopup align="start" {...(isComposerOwned ? composerFloatingLayerProps : {})}>
734 - <TraitsMenuContent
735 - provider={provider}
736 - {...(instanceId ? { instanceId } : {})}
737 - models={models}
738 - model={model}
739 - promptUltrathink={promptUltrathink}
740 - {...(onPromptEdit ? { onPromptEdit } : {})}
741 - modelOptions={modelOptions}
742 - reportedModelSelection={reportedModelSelection}
743 - allowPromptInjectedEffort={allowPromptInjectedEffort}
744 - planModeEnabled={planModeEnabled}
745 - {...persistence}
746 - />
747 - {extraMenuContent ? (
748 - <>
749 - <MenuDivider />
750 - {extraMenuContent}
751 - </>
752 - ) : null}
569 + <MenuPopup align="start">
570 + <TraitsMenuContent {...props} />
571 </MenuPopup>
572 </Menu>
573 );
apps/web/src/components/chat/composerControlsOwnership.test.ts
+10 -24
@@ -4,20 +4,19 @@ import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
4
5 const base = {
6 matchesDefault: true,
7 - hasTraits: true,
7 planModeUiEnabled: false,
8 collapsed: false,
9 measuredHiddenBlockCount: 0,
10 };
11
12 describe("resolveComposerControlsOwnership", () => {
14 - it("hides the chip at the default and lets the effort menu answer composer.mode", () => {
13 + it("hides the chip at the default and lets the model picker answer composer.mode", () => {
14 const result = resolveComposerControlsOwnership(base);
15 expect(result).toMatchObject({
16 accessDisplay: "hidden",
17 showModeBlock: false,
18 hiddenBlockIds: [],
20 - effortOwnsModeShortcut: true,
19 + pickerOwnsModeShortcut: true,
20 });
21 });
22
@@ -26,23 +25,22 @@ describe("resolveComposerControlsOwnership", () => {
25 expect(result).toMatchObject({
26 accessDisplay: "label",
27 showModeBlock: true,
29 - effortOwnsModeShortcut: false,
28 + pickerOwnsModeShortcut: false,
29 });
30 });
31
33 - it("never leaves an empty overflow menu: the effort chip overflows with the chip", () => {
32 + it("gives an overflowed chip's Permissions to the overflow menu when it has no Plan toggle", () => {
33 const result = resolveComposerControlsOwnership({
34 ...base,
35 matchesDefault: false,
36 measuredHiddenBlockCount: 1,
37 });
39 - expect(result.hiddenBlockIds).toEqual(["traits", "mode"]);
38 + expect(result.hiddenBlockIds).toEqual(["mode"]);
39 expect(result.overflowShowsPermissions).toBe(true);
41 - // One composer.mode target: the overflow menu, not the overflowed effort chip.
42 - expect(result.effortOwnsModeShortcut).toBe(false);
40 + expect(result.pickerOwnsModeShortcut).toBe(false);
41 });
42
45 - it("keeps the Plan toggle block at the default and overflows it before the effort chip", () => {
43 + it("keeps the Plan toggle block at the default and leaves Permissions with the picker", () => {
44 const result = resolveComposerControlsOwnership({
45 ...base,
46 planModeUiEnabled: true,
@@ -51,7 +49,7 @@ describe("resolveComposerControlsOwnership", () => {
49 expect(result.showModeBlock).toBe(true);
50 expect(result.hiddenBlockIds).toEqual(["mode"]);
51 expect(result.overflowShowsPermissions).toBe(false);
54 - expect(result.effortOwnsModeShortcut).toBe(true);
52 + expect(result.pickerOwnsModeShortcut).toBe(true);
53 });
54
55 it("overflows only the chip when the Plan toggle gives the overflow menu content", () => {
@@ -62,21 +60,9 @@ describe("resolveComposerControlsOwnership", () => {
60 measuredHiddenBlockCount: 1,
61 });
62 expect(result.hiddenBlockIds).toEqual(["mode"]);
65 - // Permissions stay in the visible effort menu, which now answers composer.mode.
63 + // Permissions stay in the model picker, which now answers composer.mode.
64 expect(result.overflowShowsPermissions).toBe(false);
67 - expect(result.effortOwnsModeShortcut).toBe(true);
68 - });
69 -
70 - it("keeps a permissions icon for models without traits, even at the default", () => {
71 - const result = resolveComposerControlsOwnership({ ...base, hasTraits: false });
72 - expect(result.accessDisplay).toBe("icon");
73 - const overflowed = resolveComposerControlsOwnership({
74 - ...base,
75 - hasTraits: false,
76 - measuredHiddenBlockCount: 1,
77 - });
78 - expect(overflowed.hiddenBlockIds).toEqual(["mode"]);
79 - expect(overflowed.overflowShowsPermissions).toBe(true);
65 + expect(result.pickerOwnsModeShortcut).toBe(true);
66 });
67
68 it("shows the non-default chip as an icon in the compacted row", () => {
apps/web/src/components/chat/composerControlsOwnership.ts
+18 -46
@@ -1,63 +1,35 @@
1 /**
2 - * Where the permissions control lives, which blocks overflow, and which menu answers the
3 - * composer.mode shortcut. Blocks are ordered [traits, mode]; the last block overflows first.
4 - * The rule: Permissions have exactly one visible home and composer.mode exactly one target.
2 + * Where the permissions chip shows, whether the mode block overflows, and which control answers
3 + * the composer.mode shortcut. The model picker's footer always holds Permissions, so the chip
4 + * only shows while the mode differs from the default. The rule: composer.mode has one target.
5 */
6 export function resolveComposerControlsOwnership(input: {
7 /** Permissions hide while the mode is the default, or while the new-thread strip names it. */
8 readonly matchesDefault: boolean;
9 - /** The model has an effort (traits) menu, which then always holds Permissions. */
10 - readonly hasTraits: boolean;
9 readonly planModeUiEnabled: boolean;
10 readonly collapsed: boolean;
11 /** How many trailing blocks the width measurement moved into the overflow menu. */
12 readonly measuredHiddenBlockCount: number;
13 }) {
16 - const accessDisplay = !input.matchesDefault
17 - ? input.collapsed
14 + const accessDisplay = input.matchesDefault
15 + ? ("hidden" as const)
16 + : input.collapsed
17 ? ("icon" as const)
19 - : ("label" as const)
20 - : // Without traits there is no effort menu to hold Permissions, so keep an icon.
21 - input.hasTraits
22 - ? ("hidden" as const)
23 - : ("icon" as const);
24 - const showModeBlock = !(accessDisplay === "hidden" && !input.planModeUiEnabled);
25 - const blockIds = [
26 - ...(input.hasTraits ? ["traits" as const] : []),
27 - ...(showModeBlock ? ["mode" as const] : []),
28 - ];
29 - const hiddenFor = (count: number) => blockIds.slice(blockIds.length - count);
30 - const overflowShowsPermissionsFor = (hidden: ReadonlyArray<string>) =>
31 - hidden.includes(input.hasTraits ? "traits" : "mode");
32 - const overflowHasContent = (hidden: ReadonlyArray<string>) =>
33 - hidden.includes("traits") ||
34 - (input.planModeUiEnabled && hidden.includes("mode")) ||
35 - overflowShowsPermissionsFor(hidden);
36 -
37 - let hiddenBlockCount = Math.min(input.measuredHiddenBlockCount, blockIds.length);
38 - // An overflow menu with nothing in it must not exist: overflow one more block instead.
39 - while (
40 - hiddenBlockCount > 0 &&
41 - hiddenBlockCount < blockIds.length &&
42 - !overflowHasContent(hiddenFor(hiddenBlockCount))
43 - ) {
44 - hiddenBlockCount += 1;
45 - }
46 - const hiddenBlockIds = hiddenFor(hiddenBlockCount);
47 - const modeHidden = hiddenBlockIds.includes("mode");
48 - const traitsHidden = hiddenBlockIds.includes("traits");
18 + : ("label" as const);
19 + const showModeBlock = accessDisplay !== "hidden" || input.planModeUiEnabled;
20 + const modeHidden = showModeBlock && input.measuredHiddenBlockCount > 0;
21 + const hiddenBlockIds = modeHidden ? (["mode"] as const) : ([] as const);
22 + // An overflowed chip needs a home for Permissions only when the Plan toggle is not there to fill
23 + // the overflow menu; otherwise Permissions stay in the model picker.
24 + const overflowShowsPermissions =
25 + modeHidden && accessDisplay !== "hidden" && !input.planModeUiEnabled;
26 return {
27 accessDisplay,
28 showModeBlock,
52 - hiddenBlockCount,
29 + hiddenBlockCount: hiddenBlockIds.length,
30 hiddenBlockIds,
54 - traitsHidden,
55 - modeHidden,
56 - /**
57 - * The effort chip answers composer.mode while the chip is hidden or overflowed, until the
58 - * effort chip overflows too; then the overflow menu (which holds Permissions) answers it.
59 - */
60 - effortOwnsModeShortcut: (input.matchesDefault || modeHidden) && !traitsHidden,
61 - overflowShowsPermissions: overflowShowsPermissionsFor(hiddenBlockIds),
31 + overflowShowsPermissions,
32 + /** Without a visible chip or an overflow menu holding it, the model picker answers composer.mode. */
33 + pickerOwnsModeShortcut: !overflowShowsPermissions && (accessDisplay === "hidden" || modeHidden),
34 };
35 }
apps/web/src/components/chat/composerEventScope.ts
+27 -2
@@ -59,10 +59,35 @@ export function markOpenToPermissions(trigger: HTMLElement): void {
59 export function focusRequestedPermission(open: boolean, trigger: HTMLElement | null): void {
60 if (!trigger?.dataset.openToPermissions) return;
61 delete trigger.dataset.openToPermissions;
62 - if (!open) return;
63 - const popupId = trigger.getAttribute("aria-controls");
62 + if (open) focusCheckedPermission(trigger);
63 +}
64 +
65 +/** Focuses the checked permission in the menu this trigger opened. */
66 +export function focusCheckedPermission(trigger: HTMLElement | null): void {
67 + const popupId = trigger?.getAttribute("aria-controls");
68 const popup = popupId ? document.getElementById(popupId) : null;
69 popup
70 ?.querySelector<HTMLElement>("[data-composer-permissions] [aria-checked='true']")
71 ?.focus({ preventScroll: true });
72 }
73 +
74 +/**
75 + * composer.effort marks the model picker trigger it opens; the picker then moves focus to the
76 + * selected effort level once its popup is open.
77 + */
78 +export function markOpenToEffort(trigger: HTMLElement): void {
79 + trigger.dataset.openToEffort = "true";
80 +}
81 +
82 +/** Reads and clears an open-to mark: effort from composer.effort, permissions from composer.mode. */
83 +export function takeOpenTarget(trigger: HTMLElement | null): "effort" | "permissions" | null {
84 + if (trigger?.dataset.openToEffort) {
85 + delete trigger.dataset.openToEffort;
86 + return "effort";
87 + }
88 + if (trigger?.dataset.openToPermissions) {
89 + delete trigger.dataset.openToPermissions;
90 + return "permissions";
91 + }
92 + return null;
93 +}
apps/web/src/components/chat/composerProviderState.tsx
+22 -94
@@ -7,7 +7,6 @@ import {
7 type ScopedThreadRef,
8 type ServerProviderModel,
9 } from "@t3tools/contracts";
10 -import type { EffortDisplay } from "@t3tools/contracts/settings";
10 import {
11 buildExplicitProviderOptionSelectionsFromDescriptors,
12 getProviderOptionCurrentValue,
@@ -15,17 +14,13 @@ import {
14 isClaudeUltrathinkPrompt,
15 normalizeModelSlug,
16 } from "@t3tools/shared/model";
18 -import type { ReactNode } from "react";
17
18 import type { DraftId } from "../../composerDraftStore";
19 import { getProviderModelCapabilities } from "../../providerModels";
22 -import type { ComposerControlSize } from "./ComposerControl";
20 import {
21 getReasoningTraitStep,
25 - shouldRenderTraitsControls,
26 - TraitsMenuContent,
27 - TraitsPicker,
22 type PromptUltrathink,
23 + type TraitsSelectionInput,
24 } from "./TraitsPicker";
25
26 type ComposerProviderStateInput = {
@@ -48,11 +43,11 @@ type ComposerProviderState = {
43 modelPickerIconClassName?: string;
44 };
45
51 -type TraitsRenderInput = {
46 +type ComposerTraitsTarget = {
47 provider: ProviderDriverKind;
53 - instanceId?: ProviderInstanceId;
54 - threadRef?: ScopedThreadRef;
55 - draftId?: DraftId;
48 + instanceId: ProviderInstanceId;
49 + threadRef?: ScopedThreadRef | undefined;
50 + draftId?: DraftId | undefined;
51 model: string;
52 models: ReadonlyArray<ServerProviderModel>;
53 modelOptions: ReadonlyArray<ProviderOptionSelection> | undefined;
@@ -60,14 +55,6 @@ type TraitsRenderInput = {
55 promptUltrathink: PromptUltrathink;
56 onPromptEdit: (edit: (prompt: string) => string) => void;
57 planModeEnabled: boolean;
63 - size?: ComposerControlSize;
64 - hidden?: boolean;
65 - triggerClassName?: string;
66 - isComposerOwned?: boolean;
67 - effortDisplay?: EffortDisplay;
68 - extraMenuContent?: ReactNode;
69 - extraMenuOwnsModeShortcut?: boolean;
70 - extraMenuHint?: string;
58 };
59
60 export function getComposerPromptInjectionState(prompt: string): ComposerPromptInjectionState {
@@ -217,81 +204,22 @@ export function getComposerReasoningStep(input: {
204 };
205 }
206
220 -function renderTraitsControl(
221 - Component: typeof TraitsMenuContent | typeof TraitsPicker,
222 - input: TraitsRenderInput,
223 -): ReactNode {
224 - const {
225 - provider,
226 - instanceId,
227 - threadRef,
228 - draftId,
229 - model,
230 - models,
231 - modelOptions,
232 - reportedModelSelection,
233 - promptUltrathink,
234 - onPromptEdit,
235 - planModeEnabled,
236 - size,
237 - hidden,
238 - triggerClassName,
239 - isComposerOwned,
240 - effortDisplay,
241 - extraMenuContent,
242 - extraMenuOwnsModeShortcut,
243 - extraMenuHint,
244 - } = input;
245 - const hasTarget = threadRef !== undefined || draftId !== undefined;
246 - const { selections: resolvedModelOptions } = resolveComposerOptionSelections(
247 - models,
248 - model,
249 - provider,
250 - modelOptions,
251 - planModeEnabled,
252 - );
253 - if (
254 - !hasTarget ||
255 - !shouldRenderTraitsControls({
256 - provider,
257 - models,
258 - model,
259 - modelOptions: resolvedModelOptions,
260 - promptUltrathink,
261 - planModeEnabled,
262 - })
263 - ) {
264 - return null;
265 - }
266 - return (
267 - <Component
268 - provider={provider}
269 - {...(instanceId ? { instanceId } : {})}
270 - models={models}
271 - {...(threadRef ? { threadRef } : {})}
272 - {...(draftId ? { draftId } : {})}
273 - model={model}
274 - modelOptions={resolvedModelOptions}
275 - reportedModelSelection={reportedModelSelection}
276 - promptUltrathink={promptUltrathink}
277 - onPromptEdit={onPromptEdit}
278 - planModeEnabled={planModeEnabled}
279 - {...(size !== undefined ? { size } : {})}
280 - {...(hidden !== undefined ? { hidden } : {})}
281 - {...(triggerClassName !== undefined ? { triggerClassName } : {})}
282 - {...(isComposerOwned ? { isComposerOwned } : {})}
283 - {...(effortDisplay ? { effortDisplay } : {})}
284 - {...(extraMenuContent ? { extraMenuContent } : {})}
285 - {...(extraMenuOwnsModeShortcut ? { extraMenuOwnsModeShortcut } : {})}
286 - {...(extraMenuHint ? { extraMenuHint } : {})}
287 - />
207 +/**
208 + * The composer's traits input with the model's implicit defaults applied, so a pick writes what
209 + * the composer would send. Null without a draft or thread to persist to.
210 + */
211 +export function resolveComposerTraitsInput(
212 + input: ComposerTraitsTarget,
213 +): TraitsSelectionInput | null {
214 + const { threadRef, draftId, ...rest } = input;
215 + const { selections } = resolveComposerOptionSelections(
216 + input.models,
217 + input.model,
218 + input.provider,
219 + input.modelOptions,
220 + input.planModeEnabled,
221 );
289 -}
290 -
291 -export function renderProviderTraitsMenuContent(input: TraitsRenderInput): ReactNode {
292 - return renderTraitsControl(TraitsMenuContent, input);
293 -}
294 -
295 -export function renderProviderTraitsPicker(input: TraitsRenderInput): ReactNode {
296 - return renderTraitsControl(TraitsPicker, input);
222 + const persistence = threadRef ? { threadRef } : draftId ? { draftId } : null;
223 + if (!persistence) return null;
224 + return { ...rest, ...persistence, modelOptions: selections };
225 }
apps/web/src/components/chat/providerIconUtils.ts
-15
@@ -35,21 +35,6 @@ export function getDisplayModelName(
35 return stripLeadingQualifier(name, model.subProvider);
36 }
37
38 -export function getProviderRowLabel(
39 - providerDisplayName: string,
40 - subProvider: string | undefined,
41 -): string {
42 - const provider = providerDisplayName.trim();
43 - const sub = subProvider?.trim();
44 - if (!sub) {
45 - return providerDisplayName;
46 - }
47 - if (provider && new RegExp(`^${escapeRegExp(provider)}\\s+\\S`, "i").test(sub)) {
48 - return sub;
49 - }
50 - return `${providerDisplayName} · ${sub}`;
51 -}
52 -
38 export function getTriggerDisplayModelName(
39 model: ModelEsque,
40 driverKind: ProviderDriverKind | null | undefined,
apps/web/src/components/ui/combobox.tsx
+5 -1
@@ -185,14 +185,18 @@ function ComboboxItem({
185 className,
186 children,
187 hideIndicator: _hideIndicator = false,
188 + selectedFill = true,
189 ...props
190 }: ComboboxPrimitive.Item.Props & {
191 hideIndicator?: boolean;
192 + /** Off for rows that mark selection themselves, so a fill only means hover or highlight. */
193 + selectedFill?: boolean;
194 }) {
195 return (
196 <ComboboxPrimitive.Item
197 className={cn(
195 - "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none not-data-disabled:hover:bg-foreground/[0.09] data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-selected:bg-foreground/[0.06] data-selected:text-foreground data-highlighted:bg-foreground/[0.09] data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-foreground/[0.09] [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
198 + "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none not-data-disabled:hover:bg-foreground/[0.09] data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-selected:text-foreground data-highlighted:bg-foreground/[0.09] data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-foreground/[0.09] [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
199 + selectedFill && "data-selected:bg-foreground/[0.06]",
200 className,
201 )}
202 data-slot="combobox-item"
docs/user/keybindings.md
+2 -1
@@ -37,7 +37,8 @@ lowest, and decrease wraps from the lowest level to the highest.
37
38 In the model picker, press Left in an empty search field or Shift+Tab to reach
39 the provider list. Use Up/Down to move and Enter to choose. Right returns to
40 -model search. `mod+shift+up` and `mod+shift+down` switch providers directly and clear the
40 +model search. Right at the end of the search moves to the highlighted model's effort
41 +levels, and Left comes back. Choosing a model keeps the picker open on its effort. `mod+shift+up` and `mod+shift+down` switch providers directly and clear the
42 search. These provider shortcuts can also be changed in Settings.
43
44 These shortcuts run inside the focused web or desktop client. `mod` uses Command
docs/user/permission-modes.md
+2 -2
@@ -2,8 +2,8 @@
2
3 Permission modes control when an agent needs your approval to act. Choose a mode in the message
4 composer; it applies to that thread. A new thread names its mode under the composer. In a thread
5 -on your default mode, open **Permissions** from the effort menu or press `mod+shift+a`. A thread on
6 -another mode, or a model without an effort menu, shows the mode next to the model.
5 +on your default mode, open the model picker and choose **Permissions** at its bottom, or press
6 +`mod+shift+a`. A thread on another mode shows the mode next to the model.
7
8 Set the default for new threads in **Settings → Threads → New threads → Permissions**.
9 Projects can override the environment default. New threads use this setting rather than the
docs/user/providers-acp.md
+1 -1
@@ -82,7 +82,7 @@ The model picker lists the models the agent reports. If the agent reports none,
82 your own model IDs under **Custom models** in the instance settings.
83
84 Other settings the agent offers, such as reasoning effort or approval mode, appear in the
85 -composer's model options menu like they do for built-in providers. Agents with their own plan and
85 +composer's model picker, beside the model list, like they do for built-in providers. Agents with their own plan and
86 build modes follow T3 Code's Plan and Build toggle. Models and options that change while an agent
87 is running update the picker without waiting for another provider probe.
88
docs/user/providers-antigravity.md
+1 -1
@@ -69,7 +69,7 @@ Leave the field blank to use the managed runtime, or a compatible executable on
69 ## Models and threads
70
71 The model list comes from your Antigravity account, including Claude and GPT models
72 -when your plan has them. Pick a thinking level in the composer's effort menu; it
72 +when your plan has them. Pick a thinking level beside the model list in the model picker; it
73 shows only the levels the selected model supports. A resumed thread keeps its
74 selected model. If access to that model ends, select another available model
75 before continuing.