Skip to content

Commit 40a35ef

Browse files
t3dotggclaude
andcommitted
fix(mobile): don't persist inferred startFromOrigin into drafts
The resolved startFromOrigin (draft ?? server setting ?? true) was written back into the draft's workspaceSelection by setWorkspaceMode and the branch auto-select, freezing the fallback value before the server config had loaded. Only persist the flag the user explicitly set; the resolved value stays derived at render/submit time so it tracks the server setting once the config arrives. Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent 2599e0b commit 40a35ef

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,12 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
350350
const workspaceMode = selectedProjectDraft.workspaceSelection?.mode ?? "local";
351351
const selectedBranchName = selectedProjectDraft.workspaceSelection?.branch ?? null;
352352
const selectedWorktreePath = selectedProjectDraft.workspaceSelection?.worktreePath ?? null;
353+
// Keep the user's explicit choice separate from the resolved display value:
354+
// only the explicit flag is ever written back to the draft, so the resolved
355+
// value keeps tracking the server setting when the config loads late.
356+
const draftStartFromOrigin = selectedProjectDraft.workspaceSelection?.startFromOrigin;
353357
const startFromOrigin =
354-
selectedProjectDraft.workspaceSelection?.startFromOrigin ??
358+
draftStartFromOrigin ??
355359
selectedEnvironmentServerConfig?.settings.newWorktreesStartFromOrigin ??
356360
true;
357361
const runtimeMode = selectedProjectDraft.runtimeMode ?? DEFAULT_RUNTIME_MODE;
@@ -550,11 +554,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
550554
mode,
551555
branch: selectedBranchName,
552556
worktreePath: selectedWorktreePath,
553-
startFromOrigin,
557+
...(draftStartFromOrigin !== undefined ? { startFromOrigin: draftStartFromOrigin } : {}),
554558
},
555559
});
556560
},
557-
[selectedBranchName, selectedProjectDraftKey, selectedWorktreePath, startFromOrigin],
561+
[draftStartFromOrigin, selectedBranchName, selectedProjectDraftKey, selectedWorktreePath],
558562
);
559563

560564
const selectBranch = useCallback(
@@ -567,11 +571,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
567571
mode: workspaceMode,
568572
branch: branch.name,
569573
worktreePath: normalizeSelectedWorktreePath(selectedProject, branch),
570-
startFromOrigin,
574+
...(draftStartFromOrigin !== undefined ? { startFromOrigin: draftStartFromOrigin } : {}),
571575
},
572576
});
573577
},
574-
[selectedProject, selectedProjectDraftKey, startFromOrigin, workspaceMode],
578+
[draftStartFromOrigin, selectedProject, selectedProjectDraftKey, workspaceMode],
575579
);
576580

577581
const setStartFromOrigin = useCallback(

0 commit comments

Comments
 (0)