@@ -1315,6 +1315,7 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
13151315 isComplete : boolean ;
13161316 } | null ;
13171317 isRunning : boolean ;
1318+ activeTurnIsCompaction : boolean ;
13181319 followUpBehavior : "queue" | "steer" ;
13191320 alternateShortcutLabel : string | null ;
13201321 showPlanFollowUpPrompt : boolean ;
@@ -1351,6 +1352,7 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
13511352 compact = { props . compact }
13521353 pendingAction = { props . pendingAction }
13531354 isRunning = { props . isRunning }
1355+ activeTurnIsCompaction = { props . activeTurnIsCompaction }
13541356 followUpBehavior = { props . followUpBehavior }
13551357 alternateShortcutLabel = { props . alternateShortcutLabel }
13561358 showPlanFollowUpPrompt = { props . showPlanFollowUpPrompt }
@@ -1474,6 +1476,8 @@ export interface ChatComposerProps {
14741476
14751477 // Session phase
14761478 phase : SessionPhase ;
1479+ /** The in-flight turn is context compaction, so follow-ups queue behind it. */
1480+ activeTurnIsCompaction : boolean ;
14771481 isConnecting : boolean ;
14781482 isSendBusy : boolean ;
14791483 isRevertingCheckpoint ?: boolean ;
@@ -1646,6 +1650,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
16461650 forceExpandedOnMobile,
16471651 projectSelectionRequired,
16481652 phase,
1653+ activeTurnIsCompaction,
16491654 isConnecting,
16501655 isSendBusy,
16511656 isRevertingCheckpoint = false ,
@@ -4078,6 +4083,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
40784083 running : phase === "running" ,
40794084 alternateModifier : false ,
40804085 activeTurnDefault : settings . followUpBehavior ,
4086+ activeTurnIsCompaction,
40814087 } ) ,
40824088 submissionIntent ,
40834089 ) ;
@@ -4099,6 +4105,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
40994105 noProviderAvailable ,
41004106 onSend ,
41014107 settings . followUpBehavior ,
4108+ activeTurnIsCompaction ,
41024109 phase ,
41034110 promptRef ,
41044111 shouldBlurMobileComposerOnSubmit ,
@@ -4113,10 +4120,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
41134120 running : phase === "running" ,
41144121 alternateModifier : event . metaKey || event . ctrlKey ,
41154122 activeTurnDefault : settings . followUpBehavior ,
4123+ activeTurnIsCompaction,
41164124 } ) ,
41174125 ) ;
41184126 } ,
4119- [ phase , settings . followUpBehavior , submitComposer ] ,
4127+ [ phase , activeTurnIsCompaction , settings . followUpBehavior , submitComposer ] ,
41204128 ) ;
41214129 const submitCitationAndSend = useCallback ( ( ) => {
41224130 submitComposer (
@@ -4125,9 +4133,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
41254133 running : phase === "running" ,
41264134 alternateModifier : false ,
41274135 activeTurnDefault : settings . followUpBehavior ,
4136+ activeTurnIsCompaction,
41284137 } ) ,
41294138 ) ;
4130- } , [ phase , settings . followUpBehavior , submitComposer ] ) ;
4139+ } , [ phase , activeTurnIsCompaction , settings . followUpBehavior , submitComposer ] ) ;
41314140 const compactThreadContext = useCallback ( ( ) => {
41324141 if (
41334142 compactDisabled ||
@@ -4301,6 +4310,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
43014310 running : phase === "running" ,
43024311 alternateModifier : submissionIntent === "alternate" ,
43034312 activeTurnDefault : settings . followUpBehavior ,
4313+ activeTurnIsCompaction,
43044314 } ) ,
43054315 submissionIntent ,
43064316 ) ;
@@ -7386,6 +7396,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
73867396 activeThreadModelDisplayName = { activeThreadModelDisplayName }
73877397 pendingAction = { pendingPrimaryAction }
73887398 isRunning = { phase === "running" }
7399+ activeTurnIsCompaction = { activeTurnIsCompaction }
73897400 followUpBehavior = { settings . followUpBehavior }
73907401 alternateShortcutLabel = { shortcutLabelForCommand (
73917402 keybindings ,
0 commit comments