@@ -43,11 +43,14 @@ import { useEnvironmentQuery } from "../../state/query";
4343import {
4444 appendComposerDraftAttachments ,
4545 clearComposerDraft ,
46- copyComposerDraftContentIfEmpty ,
46+ composerDraftsAtom ,
47+ createNewTaskDraft ,
4748 getComposerDraftSnapshot ,
4849 isComposerDraftEmpty ,
50+ isNewTaskDraftKey ,
4951 removeComposerDraftAttachment ,
5052 replaceComposerDraftAttachments ,
53+ retargetNewTaskDraft ,
5154 scheduleUnusedComposerAttachmentCleanup ,
5255 setComposerDraftText ,
5356 setStickyComposerModelSelection ,
@@ -169,6 +172,12 @@ type NewTaskFlowContextValue = {
169172 readonly filteredBranches : ReadonlyArray < VcsRef > ;
170173 readonly reset : ( ) => void ;
171174 readonly setProject : ( project : EnvironmentProject ) => void ;
175+ /**
176+ * Binds the composer to an existing new-task draft (a row in the thread
177+ * list). Returns false when the draft is gone, so the caller can fall back
178+ * to a fresh one.
179+ */
180+ readonly openDraft : ( draftKey : string ) => boolean ;
172181 readonly selectEnvironment : ( environmentId : EnvironmentId ) => void ;
173182 readonly setSelectedModelKey : (
174183 key : string | null ,
@@ -232,6 +241,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
232241 ? selectedEnvironmentIdOverride
233242 : ( projects [ 0 ] ?. environmentId ?? null ) ;
234243 const [ selectedProjectKey , setSelectedProjectKey ] = useState < string | null > ( null ) ;
244+ // The new-task draft the composer is bound to. Null until a project is
245+ // chosen; each New Task entry mints its own, so a project can hold several.
246+ const [ activeDraftKey , setActiveDraftKey ] = useState < string | null > ( null ) ;
235247 const [ submitting , setSubmitting ] = useState ( false ) ;
236248 const [ branchQuery , setBranchQuery ] = useState ( "" ) ;
237249 const [ expandedProvider , setExpandedProvider ] = useState < string | null > ( null ) ;
@@ -247,6 +259,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
247259 const reset = useCallback ( ( ) => {
248260 setSelectedEnvironmentId ( null ) ;
249261 setSelectedProjectKey ( null ) ;
262+ setActiveDraftKey ( null ) ;
250263 setSubmitting ( false ) ;
251264 setBranchQuery ( "" ) ;
252265 setExpandedProvider ( null ) ;
@@ -367,12 +380,28 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
367380 selectedProject ?. environmentId ?? null ,
368381 ) ;
369382 // While a queued pending task is being edited its draft lives under a key
370- // scoped to the queued message, so per-project new-task drafts stay intact.
383+ // scoped to the queued message, so new-task drafts stay intact.
371384 const selectedProjectDraftKey = editingPendingTask
372385 ? pendingTaskDraftKey ( editingPendingTask . messageId )
373386 : selectedProject
374- ? `new-task: ${ scopedProjectKey ( selectedProject . environmentId , selectedProject . id ) } `
387+ ? activeDraftKey
375388 : null ;
389+ // selectedProject can resolve without setProject ever running (the
390+ // environment's first project is the fallback, and the draft screen skips
391+ // setProject when the route's project already matches it). The composer
392+ // still needs a draft to write into, so bind one the moment a project is
393+ // in view and nothing else owns the key.
394+ useEffect ( ( ) => {
395+ if ( activeDraftKey !== null || editingPendingTask !== null || selectedProject === null ) {
396+ return ;
397+ }
398+ setActiveDraftKey (
399+ createNewTaskDraft ( {
400+ environmentId : selectedProject . environmentId ,
401+ projectId : selectedProject . id ,
402+ } ) ,
403+ ) ;
404+ } , [ activeDraftKey , editingPendingTask , selectedProject ] ) ;
376405 const selectedProjectDraft = useComposerDraft ( selectedProjectDraftKey ) ;
377406 const prompt = selectedProjectDraft . text ;
378407 const attachments = selectedProjectDraft . attachments ;
@@ -625,20 +654,19 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
625654 ) ;
626655 } , [ availableBranches , branchQuery ] ) ;
627656
628- // New-task drafts are keyed per (environment, project), so retargeting the
629- // composer would otherwise show the target's empty draft and strand what the
630- // user typed under the old key.
657+ // The composer's draft follows the project it will be sent to: switching
658+ // mid-compose keeps the same draft and moves it, so typed text follows the
659+ // user. A pending-task edit owns its own key and is untouched here .
631660 const carryDraftContentTo = useCallback (
632661 ( project : EnvironmentProject ) => {
633- const nextDraftKey = `new-task:${ scopedProjectKey ( project . environmentId , project . id ) } ` ;
634- if (
635- selectedProjectDraftKey ?. startsWith ( "new-task:" ) &&
636- selectedProjectDraftKey !== nextDraftKey
637- ) {
638- void copyComposerDraftContentIfEmpty ( selectedProjectDraftKey , nextDraftKey ) ;
662+ const target = { environmentId : project . environmentId , projectId : project . id } ;
663+ if ( activeDraftKey !== null && isNewTaskDraftKey ( activeDraftKey ) ) {
664+ retargetNewTaskDraft ( activeDraftKey , target ) ;
665+ } else if ( ! editingPendingTaskRef . current ) {
666+ setActiveDraftKey ( createNewTaskDraft ( target ) ) ;
639667 }
640668 } ,
641- [ selectedProjectDraftKey ] ,
669+ [ activeDraftKey ] ,
642670 ) ;
643671
644672 const setProject = useCallback (
@@ -650,6 +678,31 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
650678 [ carryDraftContentTo ] ,
651679 ) ;
652680
681+ const openDraft = useCallback (
682+ ( draftKey : string ) : boolean => {
683+ const draft = appAtomRegistry . get ( composerDraftsAtom ) [ draftKey ] ;
684+ const stamp = draft ?. project ;
685+ if ( ! isNewTaskDraftKey ( draftKey ) || ! stamp ) {
686+ return false ;
687+ }
688+ // The stamped project must be loaded: selectedProject falls back to
689+ // the environment's first project otherwise, and the draft would be
690+ // sent somewhere the user never chose.
691+ const projectLoaded = projects . some (
692+ ( project ) =>
693+ project . environmentId === stamp . environmentId && project . id === stamp . projectId ,
694+ ) ;
695+ if ( ! projectLoaded ) {
696+ return false ;
697+ }
698+ setActiveDraftKey ( draftKey ) ;
699+ setSelectedEnvironmentId ( stamp . environmentId ) ;
700+ setSelectedProjectKey ( scopedProjectKey ( stamp . environmentId , stamp . projectId ) ) ;
701+ return true ;
702+ } ,
703+ [ projects ] ,
704+ ) ;
705+
653706 const selectEnvironment = useCallback (
654707 ( environmentId : EnvironmentId ) => {
655708 const match = resolveEnvironmentProjectMatch (
@@ -1085,6 +1138,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
10851138 filteredBranches,
10861139 reset,
10871140 setProject,
1141+ openDraft,
10881142 selectEnvironment,
10891143 setSelectedModelKey,
10901144 setWorkspaceMode,
@@ -1148,6 +1202,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
11481202 selectedProjectKey ,
11491203 selectedWorktreePath ,
11501204 setProject ,
1205+ openDraft ,
11511206 selectBranch ,
11521207 selectEnvironment ,
11531208 setInteractionMode ,
0 commit comments