@@ -124,6 +124,7 @@ import {
124124import { ComposerStashBadge } from "./ComposerStashBadge" ;
125125import { ComposerStashMenu } from "./ComposerStashMenu" ;
126126import { useComposerMenuState } from "./useComposerMenuState" ;
127+ import { useComposerTriggerState } from "./useComposerTriggerState" ;
127128import { useComposerFocusState } from "./useComposerFocusState" ;
128129import { useComposerMultilinePrompt } from "./useComposerMultilinePrompt" ;
129130import {
@@ -2065,9 +2066,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
20652066 const [ composerCursor , setComposerCursor ] = useState ( ( ) =>
20662067 collapseExpandedComposerCursor ( prompt , prompt . length ) ,
20672068 ) ;
2068- const [ composerTrigger , setComposerTrigger ] = useState < ComposerTrigger | null > ( ( ) =>
2069- detectComposerTrigger ( prompt , prompt . length ) ,
2070- ) ;
2069+ const {
2070+ trigger : composerTrigger ,
2071+ setTrigger : setComposerTrigger ,
2072+ resolveTrigger : resolveComposerTrigger ,
2073+ dismissTrigger : dismissComposerTrigger ,
2074+ resetTrigger : resetComposerTrigger ,
2075+ } = useComposerTriggerState ( ( ) => detectComposerTrigger ( prompt , prompt . length ) ) ;
20712076 const [ composerHighlightedItemId , setComposerHighlightedItemId ] = useState < string | null > ( null ) ;
20722077 // Active ArrowUp recall. Cleared on edit and on thread switch.
20732078 const promptHistoryPositionRef = useRef < ComposerPromptHistoryPosition | null > ( null ) ;
@@ -2586,7 +2591,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
25862591 setComposerTrigger ( detectComposerTrigger ( nextPrompt , nextPrompt . length ) ) ;
25872592 scheduleComposerFocus ( ) ;
25882593 } ,
2589- [ composerDraftTarget , promptRef , scheduleComposerFocus , setComposerDraftPrompt ] ,
2594+ [
2595+ composerDraftTarget ,
2596+ promptRef ,
2597+ scheduleComposerFocus ,
2598+ setComposerDraftPrompt ,
2599+ setComposerTrigger ,
2600+ ] ,
25902601 ) ;
25912602
25922603 const providerTraitsMenuContent = renderProviderTraitsMenuContent ( {
@@ -3090,7 +3101,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
30903101 promptRef . current = prompt ;
30913102 const { cursor, trigger } = composerStateAtPromptEnd ( prompt ) ;
30923103 setComposerCursor ( cursor ) ;
3093- setComposerTrigger ( trigger ) ;
3104+ resetComposerTrigger ( trigger ) ;
30943105 }
30953106 lastSyncedPendingInputRef . current = null ;
30963107 return ;
@@ -3115,14 +3126,15 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
31153126 promptRef . current = nextCustomAnswer ;
31163127 const { cursor, trigger } = composerStateAtPromptEnd ( nextCustomAnswer ) ;
31173128 setComposerCursor ( cursor ) ;
3118- setComposerTrigger ( trigger ) ;
3129+ resetComposerTrigger ( trigger ) ;
31193130 setComposerHighlightedItemId ( null ) ;
31203131 } , [
31213132 activePendingProgress ?. customAnswer ,
31223133 activePendingProgress ?. activeQuestion ?. id ,
31233134 activePendingUserInput ?. requestId ,
31243135 prompt ,
31253136 promptRef ,
3137+ resetComposerTrigger ,
31263138 ] ) ;
31273139
31283140 // ------------------------------------------------------------------
@@ -3133,10 +3145,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
31333145 setComposerSubmissionError ( null ) ;
31343146 setProviderInputSubmissionError ( null ) ;
31353147 setComposerCursor ( collapseExpandedComposerCursor ( promptRef . current , promptRef . current . length ) ) ;
3136- setComposerTrigger ( detectComposerTrigger ( promptRef . current , promptRef . current . length ) ) ;
3148+ resetComposerTrigger ( detectComposerTrigger ( promptRef . current , promptRef . current . length ) ) ;
31373149 setIsDragOverComposer ( false ) ;
31383150 setIsComposerScrollCollapsed ( false ) ;
3139- } , [ draftId , activeThreadId , promptRef , setIsComposerScrollCollapsed ] ) ;
3151+ } , [ draftId , activeThreadId , promptRef , resetComposerTrigger , setIsComposerScrollCollapsed ] ) ;
31403152
31413153 // ------------------------------------------------------------------
31423154 // Footer compact layout observation
@@ -3419,6 +3431,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
34193431 onChangeActivePendingUserInputCustomAnswer ,
34203432 promptRef ,
34213433 setPrompt ,
3434+ setComposerTrigger ,
34223435 composerDraftTarget ,
34233436 composerTerminalContexts ,
34243437 setComposerDraftTerminalContexts ,
@@ -3514,6 +3527,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
35143527 onChangeActivePendingUserInputCustomAnswer ,
35153528 promptRef ,
35163529 setPrompt ,
3530+ setComposerTrigger ,
35173531 ] ,
35183532 ) ;
35193533
@@ -3542,9 +3556,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
35423556 const snapshot = readComposerSnapshot ( ) ;
35433557 return {
35443558 snapshot,
3545- trigger : detectComposerTrigger ( snapshot . value , snapshot . expandedCursor ) ,
3559+ trigger : resolveComposerTrigger (
3560+ detectComposerTrigger ( snapshot . value , snapshot . expandedCursor ) ,
3561+ ) ,
35463562 } ;
3547- } , [ readComposerSnapshot ] ) ;
3563+ } , [ readComposerSnapshot , resolveComposerTrigger ] ) ;
35483564
35493565 const { onUsageLimitsCommand } = props ;
35503566 const onSelectComposerItem = useCallback (
@@ -3897,7 +3913,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
38973913 setComposerTrigger ( null ) ;
38983914 setComposerHighlightedItemId ( null ) ;
38993915 } ,
3900- [ composerDraftTarget , promptRef , setComposerDraftPrompt ] ,
3916+ [ composerDraftTarget , promptRef , setComposerDraftPrompt , setComposerTrigger ] ,
39013917 ) ;
39023918
39033919 const navigatePromptHistory = useCallback (
@@ -3956,7 +3972,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
39563972 // Callbacks: command key
39573973 // ------------------------------------------------------------------
39583974 const onComposerCommandKey = (
3959- key : "ArrowDown" | "ArrowUp" | "Enter" | "Tab" ,
3975+ key : "ArrowDown" | "ArrowUp" | "Enter" | "Tab" | "Escape" ,
39603976 event : KeyboardEvent ,
39613977 isTaskItem = false ,
39623978 ) => {
@@ -3967,6 +3983,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
39673983 }
39683984 const { trigger } = resolveActiveComposerTrigger ( ) ;
39693985 const menuIsActive = composerMenuOpenRef . current || trigger !== null ;
3986+ if ( key === "Escape" ) {
3987+ if ( ! menuIsActive || event . isComposing || event . keyCode === 229 ) return false ;
3988+ dismissComposerTrigger ( trigger ) ;
3989+ composerMenuOpenRef . current = false ;
3990+ return true ;
3991+ }
39703992 if ( menuIsActive ) {
39713993 const currentItems = composerMenuItemsRef . current ;
39723994 const selectedItem = activeComposerMenuItemRef . current ?? currentItems [ 0 ] ;
@@ -4356,6 +4378,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
43564378 environmentId ,
43574379 promptRef ,
43584380 setComposerDraftPrompt ,
4381+ setComposerTrigger ,
43594382 takeStashEntry ,
43604383 importContextRecords ,
43614384 ] ,
@@ -4619,6 +4642,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
46194642 clearComposerDraftPromptAndImages ,
46204643 clearComposerDraftTerminalContexts ,
46214644 setComposerDraftPrompt ,
4645+ setComposerTrigger ,
46224646 composerDraftTarget ,
46234647 composerFilesRef ,
46244648 composerImagesRef ,
@@ -5932,7 +5956,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
59325956 const cursor = clampCollapsedComposerCursor ( promptForState , options ?. cursor ?? 0 ) ;
59335957 setComposerHighlightedItemId ( null ) ;
59345958 setComposerCursor ( cursor ) ;
5935- setComposerTrigger (
5959+ resetComposerTrigger (
59365960 options ?. detectTrigger
59375961 ? detectComposerTrigger (
59385962 promptForState ,
@@ -6041,6 +6065,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
60416065 isComposerModelPickerOpen ,
60426066 openModelPicker ,
60436067 readComposerSnapshot ,
6068+ resetComposerTrigger ,
6069+ setComposerTrigger ,
60446070 selectedModel ,
60456071 selectedModelOptionsForDispatch ,
60466072 selectedModelSelection ,
0 commit comments