fix(server): start-from-origin worktrees no longer wait on a full git fetch

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[gsimone]

Summary

• Creating a worktree with Start from origin ran git fetch origin (every remote branch) under the default 30s timeout. A slow full fetch aborted the new thread even when origin/<branch> was already on disk.
• Bootstrap now uses the local remote-tracking commit when it exists, and only then fetches that one branch (fetchRemoteTrackingBranch). A failed narrow fetch still fails the dispatch and rolls the provisional thread back — it does not silently fall back to local main.
• Related: fix(web): retry failed thread bootstraps with a fresh id #7664 already rotates the draft ID after cleanup; this does not change that order. Distinct from fix(server): fall back to local worktree base when origin fails #7667, which degrades to the local branch after any origin error.

Test plan

• New thread, Start from origin, local origin/main present: worktree is created without waiting on a full git fetch origin
• Same, with origin/main missing locally: only that branch is fetched, then the worktree is created
• Narrow fetch failure: dispatch errors, thread is removed, retry is not stuck on "already exists" (Nightly with fix(web): retry failed thread bootstraps with a fresh id #7664)
• Repo with no origin remote still uses the local base branch

Focused: vp test run apps/server/src/server.test.ts -t "bases a start-from-origin|fetches only the requested origin|fails start-from-origin|falls back to the local base|bootstraps first-send worktree"

Generated with Cursor Grok 4.6.

Made with Cursor

Note

Avoid full git fetch for start-from-origin worktree bootstrap

• Adds fetchRemoteTrackingBranch to GitWorkflowService so callers can fetch a single remote branch on demand
• In the bootstrap worktree path, when startFromOrigin is true, the server now resolves the local origin/<base> commit first; if missing, it fetches only that branch via fetchRemoteTrackingBranch and resolves the commit, instead of doing an unconditional full remote fetch
• Worktree base ref is set to the resolved commit SHA rather than a remote-tracking ref name
• Tests in server.test.ts cover the local-commit fast path, targeted branch fetch across base branch formats, and bootstrap failure when the origin branch cannot be fetched (thread created then deleted, no worktree)
• Behavioral Change: bootstrap no longer fetches all remote refs; if the local origin/<base> ref is stale, the worktree is based on that stale commit rather than refreshing the entire remote

^{Macroscope summarized e084b1a.}

[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: 1372661c-54bf-4406-beed-a0237b3a3dcb

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.}

[macroscopeapp]

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that replaces the unconditional full origin fetch with local tracking-commit resolution and a targeted fallback fetch, with focused bootstrap tests. The supplied high-severity finding concerns remote-qualified refs; the head includes normalization and coverage for that case, though the finding remains an independent threshold blocker.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}