@@ -6,7 +6,6 @@ import { CircleAlertIcon } from "lucide-react";
66import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu" ;
77import { ComposerControl } from "./ComposerControl" ;
88import {
9- ComposerPermissionsSection ,
109 ComposerFooterModeControls ,
1110 ComposerModelPicker ,
1211 type RuntimeModeOption ,
@@ -22,19 +21,21 @@ import {
2221} from "@t3tools/contracts" ;
2322import type { EffortDisplay } from "@t3tools/contracts/settings" ;
2423import { cn } from "~/lib/utils" ;
25- import { shortcutLabelForCommand } from "../../keybindings " ;
24+ import { resolveComposerTraitsInput } from "./composerProviderState " ;
2625import {
27- renderProviderTraitsMenuContent ,
28- renderProviderTraitsPicker ,
29- } from "./composerProviderState" ;
26+ ComposerEffortColumn ,
27+ ComposerPickerFooter ,
28+ describeComposerEffort ,
29+ } from "./ComposerModelEffort" ;
3030import type { useComposerProviderModel } from "./useComposerProviderModel" ;
3131import { 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.
3839const 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 }
0 commit comments