fix(server): unpushed branch no longer breaks thread creation

[DraftProducts]

What Changed

dispatchBootstrapTurnStart now treats the remote-tracking lookup as optional.
When resolveRemoteTrackingCommit fails, the worktree is cut from the local base
branch instead of taking down the whole bootstrap. Repos with no origin remote
already behave this way; this extends the same fallback to a base branch that has
no remote-tracking ref.

Tests: new bootstrap case in server.test.ts for a base branch with no
remote-tracking ref, asserting the worktree is cut from the local branch and that
no thread.delete is dispatched — the rollback is what burns the thread id. Full
apps/server suite (2611 passing) plus every other package, typecheck, lint, and
format pass. The two failures in the repo (ProviderRegistry codex re-probe and
Net.findAvailablePort) reproduce on main and are untouched by this change.

Why

Creating a thread on a local-only branch with "start from origin" enabled fails,
and every retry then fails differently:

Orchestration command invariant failed (thread.create):
Thread '<id>' already exists and cannot be created twice.

That invariant error is a red herring. Bootstrap runs git fetch origin and then
resolves refs/remotes/origin/<baseBranch>. A branch that was never pushed has no
remote-tracking ref, so git rev-parse --verify exits non-zero and the whole
bootstrap fails. The rollback dispatches thread.delete, which soft-deletes the
thread but leaves its event stream in place, so requireThreadAbsent rejects the
retry. Each retry carries a fresh commandId, so receipt idempotency never dedupes
it either. The thread id is burned for good, and the git failure that started it
never reaches the user.

Falling back is the right call rather than surfacing the git error: "start from
origin" is a stored default rather than something chosen per thread, so honoring
it only when a remote base exists matches what the no-remote path already does.

Not addressed: any other bootstrap failure still rolls back into the same
unusable state. Making a soft-deleted thread id reusable is a decision about the
event-sourcing invariant, not this fix.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes — N/A, server-only
• I included a video for animation/interaction changes — N/A, server-only

Changes by Claude Opus 5 running in Claude Code.

---

Note

Medium Risk
Changes bootstrap git/worktree resolution for thread creation; wrong fallback could point worktrees at unexpected refs, though scope is limited to the optional remote-tracking path.

Overview
Fixes thread bootstrap failing (and burning the thread id on retry) when start from origin is enabled but the chosen base branch has no origin tracking ref.

In dispatchBootstrapTurnStart, after fetchRemote, resolveRemoteTrackingCommit is now wrapped in Effect.option. On success, the worktree still bases off the remote commit SHA; on failure, worktreeBaseRef stays on the local baseBranch (same behavior as repos without origin).

Adds a server.test case that stubs a failed remote-tracking resolve and asserts createWorktree is called with the local branch as refName while bootstrap commands complete without rollback.

^{Reviewed by Cursor Bugbot for commit 490657a. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Fix thread creation when base branch has no remote-tracking ref

When startFromOrigin=true and the base branch has no remote-tracking ref, resolveRemoteTrackingCommit now uses Effect.option so a failure returns None instead of aborting. If no remote-tracking commit is found, worktreeBaseRef is left unchanged and createWorktree falls back to the local base branch.

^{Macroscope summarized 490657a.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: b89fc06d-91b1-4672-9bbe-49318b46c93a

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[macroscopeapp]

Approvability

Verdict: Approved at 490657a

Macroscope's review found this PR approvable — This is a straightforward bug fix that adds graceful fallback handling when a branch hasn't been pushed to remote. The production code change is minimal (~9 lines), with clear intent documented in comments, and includes a comprehensive test covering the scenario.

^{You can add or adjust custom eligibility rules. Learn more.}