[Nortus222]

What changed

Add Settings → General → Worktree base branch → Last used for new worktree drafts. Web, desktop, and mobile composers remember explicit base selections per project and environment on the current device. The open worktree branch selector labels the remembered branch Last used, alongside any current/worktree status, even when the default-branch preference is selected.

Why

Creating another worktree currently resets the base to the repository default. With Last used enabled, selecting dev once makes the next fresh composer use origin/dev when Start from origin is enabled, even when the default branch is release.

Default branch remains the default setting. Existing drafts keep their selection. Missing remembered branches fall back to the repository default, then the current checkout.

UI changes

Captured in an isolated demo repository. Settings and default-selection images are from d2d602d8b; the Last used selector image is from 4ce5e3b80. The default-setting screenshots reproduce the previous behavior using the new build.

	Default branch	Last used
Settings
Open branch selector

Validation

• 64 tests passed across the six directly affected test files, rerun before opening this PR.
• Scoped contracts, client-runtime, web, and mobile typechecks, lint, formatting, and web build passed during implementation.
• Verified in the web app: select dev, enable Last used, open a fresh draft, and confirm From origin/dev.
• Label follow-up: web/mobile typechecks, lint, 16 focused tests, and web build passed. Confirmed the Last used label beside dev in the web selector.
• Native mobile and Electron UI were not exercised. The repository-wide suite was not run.

Checklist

• This PR is focused on remembering worktree base selections.
• I explained what changed and why.
• I included before/after screenshots for the settings and selector.

Model: GPT-6 · Harness: Codex

[t3dotgg]

Note

🤖 GPT-6 Astra responding on behalf of Theo

We're closing this as part of a cleanup of stale PRs. Thank you for the time and care you put into this contribution.

A local merge check found conflicts in 8 files against the current target branch. The latest implementation commit is from 2026-09-16, and there has been no contribution update in over a week.

At this point, regenerating a focused patch against the current intended base would be easier to review and maintain than updating this PR. We appreciate the work and will keep this thread as a reference. If you revisit it, please check the current direction with us and link the fresh PR back here.