fix(server): support local-only worktree bases

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!

[frankleng]

Starting a thread from a local-only branch fails when the saved Start from origin preference makes bootstrap resolve a remote-tracking ref that does not exist. The valid local branch is never used, and the user only sees a generic GitVcsDriver.resolveRemoteTrackingCommit error.

After fetching origin, fall back to the selected local base branch when its remote-tracking commit cannot be resolved. Existing behavior is unchanged when the remote branch exists, and fetch failures still abort bootstrap. The server regression test now covers both a missing origin and a branch that exists only locally.

Tests:

• vp test run apps/server/src/server.test.ts -t "bootstraps first-send worktree turns|falls back to the local base branch"
• vp lint apps/server/src/ws.ts apps/server/src/server.test.ts --report-unused-disable-directives
• vp run --filter t3 typecheck
• git diff --check

Model: GPT-5.6 sol (medium)
Harness: T3 Code / Codex

---

Note

Medium Risk
Changes git worktree bootstrap ref selection for threads with startFromOrigin; wrong fallback could create worktrees from an unexpected commit, though scope is limited to the resolve-failure path.

Overview
Fixes bootstrap thread turns that fail when Start from origin is enabled but the chosen base branch has no origin tracking ref (including when origin exists but the branch was never pushed).

In ws.ts, after a successful git fetch origin, resolveRemoteTrackingCommit no longer aborts bootstrap on failure—it recovers to null and keeps the local baseBranch as the worktree base ref. Fetch still runs only when origin exists; missing remotes still skip fetch as before.

The server regression test is parameterized with it.effect.each for origin missing and branch absent on origin (mocked GitCommandError from resolveRemoteTrackingCommit), with assertions that fetch/resolve run only when originExists.

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

Note

Fall back to local base branch in makeWsRpcLayer when remote tracking commit fails to resolve

When startFromOrigin is enabled and the origin remote exists, worktree bootstrap now wraps resolveRemoteTrackingCommit in a recovery path so that a missing remote branch silently falls back to the local base branch instead of propagating an error. The test in server.test.ts is parameterized to cover both scenarios: origin missing entirely, and origin present but the base branch absent on it.

^{Macroscope summarized dab6a79.}

[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: 734a06fb-86af-4156-95a4-76a5171c5748

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

---

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

[Copilot]

Pull request overview

Fixes thread bootstrap when the Start from origin preference is enabled but the selected base branch has no remote-tracking ref (e.g., branch exists only locally). Instead of failing bootstrap with a generic GitVcsDriver.resolveRemoteTrackingCommit error, the server now falls back to using the local base branch after a successful origin fetch.

Changes:

• In worktree bootstrap, treat remote-tracking commit resolution failures as a miss and keep using the local base branch.
• Expand/parameterize the server regression test to cover both: missing origin, and origin present but base branch missing on origin.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
apps/server/src/ws.ts	Adds fallback behavior when resolveRemoteTrackingCommit fails during bootstrap with “Start from origin”.
apps/server/src/server.test.ts	Updates regression test to cover both missing-remote and missing-remote-branch scenarios.

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[macroscopeapp]

Approvability

Verdict: Approved at 3388d31

Macroscope's review found this PR approvable — This is a localized server bug fix that preserves existing remote-based worktree behavior while allowing local-only branches to fall back to the selected local base. The accompanying changes are focused tests with no production impact, and no schema, security, billing, or deployment surfaces are involved.

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

[juliusmarminge]

Closing as a duplicate of #8751, which covers the same local-only base-branch fallback and checks whether the remote branch exists. Keeping the fix and review there. Thanks!