@@ -325,7 +325,7 @@ import {
325325 clearBackgroundDraftSubmissionByRef ,
326326 finalizePromotedDraftThreadByRef ,
327327 markPromotedDraftThreadByRef ,
328- restoreFailedBackgroundDraftThread ,
328+ restoreFailedDraftThread ,
329329 composerDraftHasUserContent ,
330330 type ComposerFileAttachment ,
331331 type ComposerImageAttachment ,
@@ -6845,6 +6845,11 @@ export default function ChatView(props: ChatViewProps) {
68456845 } ) ,
68466846 ) ;
68476847 }
6848+ const sentDraftThreadRef = isLocalDraftThread
6849+ ? scopeThreadRef ( environmentId , threadIdForSend )
6850+ : null ;
6851+ // Keep new-thread flows from reusing this draft while attachments and worktree setup settle.
6852+ if ( sentDraftThreadRef ) markPromotedDraftThreadByRef ( sentDraftThreadRef ) ;
68486853 promptRef . current = "" ;
68496854 clearComposerDraftContent ( composerDraftTarget ) ;
68506855 composerRef . current ?. resetCursorState ( ) ;
@@ -6998,7 +7003,6 @@ export default function ChatView(props: ChatViewProps) {
69987003 } ,
69997004 } ) ;
70007005 if ( backgroundThreadRef ) {
7001- markPromotedDraftThreadByRef ( backgroundThreadRef ) ;
70027006 try {
70037007 backgroundDraftOpened = Boolean (
70047008 await handleNewThread (
@@ -7032,12 +7036,15 @@ export default function ChatView(props: ChatViewProps) {
70327036 releaseDraftAttachments ( composerAttachmentsSnapshot ) ;
70337037 }
70347038 acknowledgeActiveThreadWoke ( ) ;
7035- if ( backgroundThreadRef ) {
7039+ // A draft still on screen finalizes once its thread route takes over.
7040+ if ( sentDraftThreadRef ) {
70367041 if ( backgroundDraftOpened || currentRouteThreadKeyRef . current !== routeThreadKey ) {
7037- finalizePromotedDraftThreadByRef ( backgroundThreadRef ) ;
7042+ finalizePromotedDraftThreadByRef ( sentDraftThreadRef ) ;
70387043 } else {
7039- clearBackgroundDraftSubmissionByRef ( backgroundThreadRef ) ;
7044+ clearBackgroundDraftSubmissionByRef ( sentDraftThreadRef ) ;
70407045 }
7046+ }
7047+ if ( backgroundThreadRef ) {
70417048 if ( backgroundDraftOpened ) {
70427049 toastManager . add (
70437050 stackedThreadToast ( {
@@ -7066,8 +7073,8 @@ export default function ChatView(props: ChatViewProps) {
70667073 }
70677074
70687075 if ( failure !== null ) {
7069- if ( submissionIntent === "background" && draftId && draftThread ) {
7070- restoreFailedBackgroundDraftThread (
7076+ if ( isLocalDraftThread && draftId && draftThread ) {
7077+ restoreFailedDraftThread (
70717078 draftId ,
70727079 draftThread ,
70737080 wasBootstrapThreadDeleted ( squashAtomCommandFailure ( failure ) )
@@ -7077,20 +7084,9 @@ export default function ChatView(props: ChatViewProps) {
70777084 clearBackgroundDraftSubmissionByRef ( scopeThreadRef ( environmentId , threadIdForSend ) ) ;
70787085 }
70797086 if (
7080- backgroundDraftOpened
7081- ? ! composerDraftHasUserContent (
7082- useComposerDraftStore . getState ( ) . getComposerDraft ( composerDraftTarget ) ,
7083- )
7084- : promptRef . current . length === 0 &&
7085- composerImagesRef . current . length === 0 &&
7086- composerFilesRef . current . length === 0 &&
7087- composerTerminalContextsRef . current . length === 0 &&
7088- ( useComposerDraftStore . getState ( ) . getComposerDraft ( composerDraftTarget )
7089- ?. previewAnnotations . length ?? 0 ) === 0 &&
7090- ( useComposerDraftStore . getState ( ) . getComposerDraft ( composerDraftTarget ) ?. reviewComments
7091- . length ?? 0 ) === 0 &&
7092- ( useComposerDraftStore . getState ( ) . getComposerDraft ( composerDraftTarget ) ?. threadContexts
7093- . length ?? 0 ) === 0
7087+ ! composerDraftHasUserContent (
7088+ useComposerDraftStore . getState ( ) . getComposerDraft ( composerDraftTarget ) ,
7089+ )
70947090 ) {
70957091 setOptimisticUserMessages ( ( existing ) => {
70967092 const removed = existing . filter ( ( message ) => message . id === messageIdForSend ) ;
@@ -7100,35 +7096,43 @@ export default function ChatView(props: ChatViewProps) {
71007096 const next = existing . filter ( ( message ) => message . id !== messageIdForSend ) ;
71017097 return next . length === existing . length ? existing : next ;
71027098 } ) ;
7103- promptRef . current = messageTextForSend ;
71047099 const retryComposerImages = composerImagesSnapshot . map ( cloneComposerImageForRetry ) ;
7105- composerImagesRef . current = retryComposerImages ;
7106- composerFilesRef . current = composerFilesSnapshot ;
7107- composerTerminalContextsRef . current = composerTerminalContextsSnapshot ;
71087100 setComposerDraftPrompt ( composerDraftTarget , messageTextForSend ) ;
71097101 addComposerDraftImages ( composerDraftTarget , retryComposerImages ) ;
71107102 addComposerDraftFiles ( composerDraftTarget , composerFilesSnapshot ) ;
71117103 setComposerDraftTerminalContexts ( composerDraftTarget , composerTerminalContextsSnapshot ) ;
71127104 setComposerDraftPreviewAnnotations ( composerDraftTarget , composerPreviewAnnotationsSnapshot ) ;
71137105 setComposerDraftReviewComments ( composerDraftTarget , composerReviewCommentsSnapshot ) ;
71147106 setComposerDraftThreadContexts ( composerDraftTarget , composerThreadContextsSnapshot ) ;
7115- composerRef . current ?. resetCursorState ( {
7116- cursor : collapseExpandedComposerCursor ( messageTextForSend , messageTextForSend . length ) ,
7117- prompt : messageTextForSend ,
7118- detectTrigger : true ,
7119- } ) ;
7107+ if ( currentRouteThreadKeyRef . current === routeThreadKey ) {
7108+ promptRef . current = messageTextForSend ;
7109+ composerImagesRef . current = retryComposerImages ;
7110+ composerFilesRef . current = composerFilesSnapshot ;
7111+ composerTerminalContextsRef . current = composerTerminalContextsSnapshot ;
7112+ composerRef . current ?. resetCursorState ( {
7113+ cursor : collapseExpandedComposerCursor ( messageTextForSend , messageTextForSend . length ) ,
7114+ prompt : messageTextForSend ,
7115+ detectTrigger : true ,
7116+ } ) ;
7117+ }
71207118 }
71217119 if ( ! isAtomCommandInterrupted ( failure ) ) {
71227120 const error = squashAtomCommandFailure ( failure ) ;
71237121 setThreadError (
71247122 threadIdForSend ,
71257123 error instanceof Error ? error . message : "Failed to send message." ,
71267124 ) ;
7127- if ( backgroundDraftOpened && draftId ) {
7125+ if (
7126+ draftId &&
7127+ ( backgroundDraftOpened || currentRouteThreadKeyRef . current !== routeThreadKey )
7128+ ) {
71287129 toastManager . add (
71297130 stackedThreadToast ( {
71307131 type : "error" ,
7131- title : "Background task failed" ,
7132+ title :
7133+ submissionIntent === "background"
7134+ ? "Background task failed"
7135+ : "Could not start thread" ,
71327136 description : error instanceof Error ? error . message : "Failed to send message." ,
71337137 actionProps : {
71347138 children : "Open draft" ,
0 commit comments