@@ -172,6 +172,12 @@ const TIMESTAMP_FORMAT_LABELS = {
172172 "24-hour" : "24-hour" ,
173173} as const ;
174174
175+ const COMPOSER_COLLAPSE_TRIGGER_LABELS = {
176+ blur : "On unfocus" ,
177+ scroll : "On scroll" ,
178+ } as const ;
179+ type ComposerCollapseTrigger = keyof typeof COMPOSER_COLLAPSE_TRIGGER_LABELS ;
180+
175181const DIFF_LAYOUT_LABELS : Record < DiffLayout , string > = {
176182 stacked : "Stacked" ,
177183 split : "Split" ,
@@ -542,6 +548,10 @@ export function useSettingsRestore(onRestored?: () => void) {
542548 ...( settings . showSkillsInSlashMenu !== DEFAULT_UNIFIED_SETTINGS . showSkillsInSlashMenu
543549 ? [ "Show skills in slash menu" ]
544550 : [ ] ) ,
551+ ...( settings . composerCollapseOnBlur !== DEFAULT_UNIFIED_SETTINGS . composerCollapseOnBlur ||
552+ settings . composerCollapseOnScroll !== DEFAULT_UNIFIED_SETTINGS . composerCollapseOnScroll
553+ ? [ "Collapse composer" ]
554+ : [ ] ) ,
545555 ...( settings . contextWindowMeterEnabled !== DEFAULT_UNIFIED_SETTINGS . contextWindowMeterEnabled
546556 ? [ "Context window indicator" ]
547557 : [ ] ) ,
@@ -599,6 +609,8 @@ export function useSettingsRestore(onRestored?: () => void) {
599609 settings . confirmThreadArchive ,
600610 settings . confirmThreadDelete ,
601611 settings . confirmThreadUnpin ,
612+ settings . composerCollapseOnBlur ,
613+ settings . composerCollapseOnScroll ,
602614 settings . addProjectBaseDirectory ,
603615 settings . defaultThreadEnvMode ,
604616 settings . newWorktreesStartFromOrigin ,
@@ -703,6 +715,8 @@ export function useSettingsRestore(onRestored?: () => void) {
703715 diffLayout : DEFAULT_UNIFIED_SETTINGS . diffLayout ,
704716 proactivePanelsEnabled : DEFAULT_UNIFIED_SETTINGS . proactivePanelsEnabled ,
705717 showSkillsInSlashMenu : DEFAULT_UNIFIED_SETTINGS . showSkillsInSlashMenu ,
718+ composerCollapseOnBlur : DEFAULT_UNIFIED_SETTINGS . composerCollapseOnBlur ,
719+ composerCollapseOnScroll : DEFAULT_UNIFIED_SETTINGS . composerCollapseOnScroll ,
706720 contextWindowMeterEnabled : DEFAULT_UNIFIED_SETTINGS . contextWindowMeterEnabled ,
707721 environmentIdentificationMode : DEFAULT_UNIFIED_SETTINGS . environmentIdentificationMode ,
708722 glassOpacity : DEFAULT_UNIFIED_SETTINGS . glassOpacity ,
@@ -2010,6 +2024,13 @@ export function GeneralSettingsPanel() {
20102024 const serverProviders = useAtomValue ( primaryServerProvidersAtom ) ;
20112025 const supportsAutoSettlement =
20122026 useAtomValue ( primaryServerConfigAtom ) ?. environment . capabilities . threadAutoSettlement === true ;
2027+ const composerCollapseTriggers = useMemo < ComposerCollapseTrigger [ ] > (
2028+ ( ) => [
2029+ ...( settings . composerCollapseOnBlur ? ( [ "blur" ] as const ) : [ ] ) ,
2030+ ...( settings . composerCollapseOnScroll ? ( [ "scroll" ] as const ) : [ ] ) ,
2031+ ] ,
2032+ [ settings . composerCollapseOnBlur , settings . composerCollapseOnScroll ] ,
2033+ ) ;
20132034 const diagnosticsDescription = formatDiagnosticsDescription ( {
20142035 localTracingEnabled : observability ?. localTracingEnabled ?? false ,
20152036 otlpTracesEnabled : observability ?. otlpTracesEnabled ?? false ,
@@ -2334,6 +2355,56 @@ export function GeneralSettingsPanel() {
23342355 }
23352356 />
23362357
2358+ < SettingsRow
2359+ { ...searchableSetting ( "composer-collapse" ) }
2360+ description = "Rest the composer of an existing thread into a single line when it loses focus, when you scroll the conversation, or both. Pick neither to keep it expanded."
2361+ resetAction = {
2362+ settings . composerCollapseOnBlur !== DEFAULT_UNIFIED_SETTINGS . composerCollapseOnBlur ||
2363+ settings . composerCollapseOnScroll !==
2364+ DEFAULT_UNIFIED_SETTINGS . composerCollapseOnScroll ? (
2365+ < SettingResetButton
2366+ label = "collapse composer"
2367+ onClick = { ( ) =>
2368+ updateSettings ( {
2369+ composerCollapseOnBlur : DEFAULT_UNIFIED_SETTINGS . composerCollapseOnBlur ,
2370+ composerCollapseOnScroll : DEFAULT_UNIFIED_SETTINGS . composerCollapseOnScroll ,
2371+ } )
2372+ }
2373+ />
2374+ ) : null
2375+ }
2376+ control = {
2377+ < Select
2378+ multiple
2379+ value = { composerCollapseTriggers }
2380+ onValueChange = { ( next ) =>
2381+ updateSettings ( {
2382+ composerCollapseOnBlur : next . includes ( "blur" ) ,
2383+ composerCollapseOnScroll : next . includes ( "scroll" ) ,
2384+ } )
2385+ }
2386+ >
2387+ < SelectTrigger size = "sm" className = "w-full sm:w-40" aria-label = "Collapse composer" >
2388+ < SelectValue >
2389+ { composerCollapseTriggers . length === 0
2390+ ? "Never"
2391+ : composerCollapseTriggers
2392+ . map ( ( trigger ) => COMPOSER_COLLAPSE_TRIGGER_LABELS [ trigger ] )
2393+ . join ( ", " ) }
2394+ </ SelectValue >
2395+ </ SelectTrigger >
2396+ < SelectPopup align = "end" alignItemWithTrigger = { false } >
2397+ < SelectItem showCheck value = "blur" >
2398+ { COMPOSER_COLLAPSE_TRIGGER_LABELS . blur }
2399+ </ SelectItem >
2400+ < SelectItem showCheck value = "scroll" >
2401+ { COMPOSER_COLLAPSE_TRIGGER_LABELS . scroll }
2402+ </ SelectItem >
2403+ </ SelectPopup >
2404+ </ Select >
2405+ }
2406+ />
2407+
23372408 < SettingsRow
23382409 serverScoped
23392410 { ...searchableSetting ( "provider-update-checks" ) }
0 commit comments