Commit a6cb1dd2054c96c5be41980e63594ea51554a552 | the-knife

author	Dara Adedeji <76637177+SunkenInTime@users.noreply.github.com> 2026-09-21 00:09:06-04:00
committer	GitHub <noreply@github.com> 2026-09-20 21:09:06-07:00
log	a6cb1dd2054c96c5be41980e63594ea51554a552
tree	e5c9de69918a704d50d9dd489311e6528a30adda
parent	a4bc7deb992cc3d48dd4a40ee1f84254f190f318
signature	Signed by PGP key B5690EEEBB952194

fix(mobile): keep the source worktree when starting a thread on a branch (#12623)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

1 files changed, 9 insertions(+), 0 deletions(-)

apps
- mobile
  - src
    features
    threads
    new-task-flow-provider.tsx

apps/mobile/src/features/threads/new-task-flow-provider.tsx+9

 @@ -873,12 +873,20 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
   useEffect(() => {
     if (
+      !selectedProjectDraftKey ||
       !defaultWorkspaceModeSettled ||
       workspaceMode !== "worktree" ||
       selectedBranchName !== null
     ) {
       return;
     }
+    // The draft screen writes a thread's branch and worktree into the draft in
+    // the same commit this effect runs, so the rendered selection above can be
+    // stale. Re-read the draft before replacing it.
+    const live = getComposerDraftSnapshot(selectedProjectDraftKey).workspaceSelection;
+    if (live && (live.mode !== "worktree" || live.branch !== null)) {
+      return;
+    }
     // The default may only exist as origin/<default> (isRemote), which
     // availableBranches filters out — search the unfiltered refs for it.
     const preferredBranch =
 @@ -894,6 +902,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
     defaultWorkspaceModeSettled,
     selectBranch,
     selectedBranchName,
+    selectedProjectDraftKey,
     workspaceMode,
   ]);