Skip to content

fix(agent-manager): preserve new worktree base branch - #13262

Merged
marius-kilocode merged 1 commit into
mainfrom
investigate-worktree-base-branch-regression
Aug 20, 2026
Merged

fix(agent-manager): preserve new worktree base branch#13262
marius-kilocode merged 1 commit into
mainfrom
investigate-worktree-base-branch-regression

Conversation

@marius-kilocode

Copy link
Copy Markdown
Collaborator

The New Worktree dialog can display the current checkout branch while omitting it from the creation request. The backend then selects the repository default branch, usually main, which makes the dialog misleading and can create worktrees from the wrong commit. Always pass the effective branch shown by the dialog as the worktree base, while preserving explicit Advanced options selections. Add regression coverage and a patch changeset.

@kilo-code-bot

kilo-code-bot Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (3 files)
  • .changeset/fix-worktree-base-branch.md
  • packages/kilo-vscode/tests/unit/new-worktree-dialog-sandbox.test.ts
  • packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx

Reviewed by grok-4.6 · Input: 172.9K · Output: 9.3K · Cached: 215K

Review guidance: REVIEW.md from base branch main

@marius-kilocode
marius-kilocode merged commit 9af7b5e into main Aug 20, 2026
24 checks passed
@marius-kilocode
marius-kilocode deleted the investigate-worktree-base-branch-regression branch August 20, 2026 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants