Skip to content

Commit c96c1b6

Browse files
t3dotggclaude
andauthored
feat(web): pick the model and its effort from one control (#28057)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 94a53a2 commit c96c1b6

22 files changed

Lines changed: 1144 additions & 746 deletions

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ import { serializeComposerImages } from "./composerImagePersistence";
9292
import {
9393
isInsideCollapsedComposerControls,
9494
isInsideRestingComposerControlScope,
95+
markOpenToEffort,
9596
markOpenToPermissions,
9697
} from "./composerEventScope";
9798
import {
@@ -2874,6 +2875,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
28742875
if (!trigger) return;
28752876
trigger.focus({ preventScroll: true });
28762877
if (command === "composer.mode") markOpenToPermissions(trigger);
2878+
if (command === "composer.effort") markOpenToEffort(trigger);
28772879
trigger.click();
28782880
},
28792881
compactContext: compactThreadContextStable,

‎apps/web/src/components/chat/CompactComposerControlsMenu.tsx‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
2-
import { memo, type ReactNode, useRef } from "react";
2+
import { memo, useRef } from "react";
33
import { EllipsisIcon } from "lucide-react";
44
import {
55
Menu,
@@ -19,7 +19,6 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
1919
runtimeMode: RuntimeMode;
2020
runtimeModeOptions: ReadonlyArray<RuntimeModeOption>;
2121
showInteractionModeToggle: boolean;
22-
traitsMenuContent?: ReactNode;
2322
showPermissions?: boolean;
2423
size?: "sm" | "xs";
2524
/** Close the portaled popup when its trigger hides. */
@@ -45,28 +44,13 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
4544
size={size}
4645
className="shrink-0"
4746
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}
5648
/>
5749
}
5850
>
5951
<ComposerControlIcon icon={EllipsisIcon} size={size} />
6052
</MenuTrigger>
6153
<MenuPopup align="start" {...composerFloatingLayerProps}>
62-
{props.traitsMenuContent ? (
63-
<>
64-
{props.traitsMenuContent}
65-
{props.showInteractionModeToggle || props.showPermissions !== false ? (
66-
<MenuDivider />
67-
) : null}
68-
</>
69-
) : null}
7054
{props.showInteractionModeToggle ? (
7155
<>
7256
<div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Mode</div>

‎apps/web/src/components/chat/ComposerControlsBar.tsx‎

Lines changed: 64 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { CircleAlertIcon } from "lucide-react";
66
import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
77
import { ComposerControl } from "./ComposerControl";
88
import {
9-
ComposerPermissionsSection,
109
ComposerFooterModeControls,
1110
ComposerModelPicker,
1211
type RuntimeModeOption,
@@ -22,19 +21,21 @@ import {
2221
} from "@t3tools/contracts";
2322
import type { EffortDisplay } from "@t3tools/contracts/settings";
2423
import { cn } from "~/lib/utils";
25-
import { shortcutLabelForCommand } from "../../keybindings";
24+
import { resolveComposerTraitsInput } from "./composerProviderState";
2625
import {
27-
renderProviderTraitsMenuContent,
28-
renderProviderTraitsPicker,
29-
} from "./composerProviderState";
26+
ComposerEffortColumn,
27+
ComposerPickerFooter,
28+
describeComposerEffort,
29+
} from "./ComposerModelEffort";
3030
import type { useComposerProviderModel } from "./useComposerProviderModel";
3131
import { resolveComposerControlsOwnership } from "./composerControlsOwnership";
3232

3333
/**
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.
3637
*/
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.
3839
const TEXT_CONTROL_STATES =
3940
"hover:bg-transparent data-pressed:bg-transparent data-popup-open:bg-transparent data-pressed:text-foreground data-popup-open:text-foreground";
4041

@@ -137,111 +138,56 @@ export function ComposerControlsBar(props: {
137138
modelPickerIconClassName,
138139
getModelDisabledReason,
139140
} = 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-
});
153141
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);
193142
const {
194143
accessDisplay,
195144
showModeBlock,
196145
hiddenBlockCount: restingHiddenBlockCount,
197146
hiddenBlockIds: hiddenRestingBlockIds,
198-
traitsHidden: traitsBlockHidden,
199-
effortOwnsModeShortcut,
200147
overflowShowsPermissions,
148+
pickerOwnsModeShortcut,
201149
} = resolveComposerControlsOwnership({
202-
matchesDefault: permissionsChipHidden,
203-
hasTraits: providerTraitsPicker !== null,
150+
matchesDefault: accessMatchesDefault || props.permissionsShownInStrip,
204151
planModeUiEnabled,
205152
collapsed: composerControlsCollapsed,
206153
measuredHiddenBlockCount,
207154
});
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,
213168
});
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+
: [];
245191
// Its own element, so typing (which rebuilds the controls around it) leaves it cached.
246192
const composerModelPicker = (
247193
<ComposerModelPicker
@@ -269,12 +215,26 @@ export function ComposerControlsBar(props: {
269215
instanceEntries={providerInstanceEntries}
270216
keybindings={keybindings}
271217
modelOptionsByInstance={modelOptionsByInstance}
272-
size={composerControlsCollapsed ? "xs" : "sm"}
218+
size={controlSize}
273219
triggerClassName={cn(
274-
"pe-1",
220+
"group/model-trigger pe-1",
275221
TEXT_CONTROL_STATES,
276222
composerControlsCollapsed ? "min-w-13 shrink text-xs!" : "min-w-13",
277223
)}
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+
}
278238
terminalOpen={terminalOpen}
279239
open={modelPickerOpen}
280240
instanceIndicatorBackground={
@@ -345,12 +305,9 @@ export function ComposerControlsBar(props: {
345305
interactionMode={interactionMode}
346306
runtimeMode={compatibleRuntimeMode}
347307
runtimeModeOptions={compatibleRuntimeModeOptions}
348-
size={composerControlsCollapsed ? "xs" : "sm"}
308+
size={controlSize}
349309
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}
354311
// Permissions join the overflow only when their normal home is in it.
355312
showPermissions={overflowShowsPermissions}
356313
onToggleInteractionMode={toggleInteractionMode}

‎apps/web/src/components/chat/ComposerFooterControls.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
9393
</Tooltip>
9494
) : null;
9595

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.
9797
const permissionsTooltip = `Permissions: ${runtimeModeOption.label}. ${runtimeModeOption.description}`;
9898
const permissionsChip = (
9999
<Menu
@@ -112,7 +112,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
112112
ref={permissionsChipRef}
113113
data-composer-shortcut="composer.mode"
114114
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.
116116
className="ps-1.5"
117117
aria-label={`Permissions: ${runtimeModeOption.label}`}
118118
/>
@@ -156,7 +156,7 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
156156
/**
157157
* Permission modes as one horizontal toggle, with the shown mode named below.
158158
* 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,
160160
* or the overflow menu.
161161
*/
162162
export function ComposerPermissionsSection(props: {

0 commit comments

Comments
 (0)