fix(agent-manager): preserve explicit branch names and expose naming settings - #13860
Merged
Merged
Conversation
Contributor
Code Review SummaryStatus: 1 Issue Found | Recommendation: Address before merge Overview
Issue Details (click to expand)WARNING
Files Reviewed (2 files)
Fix these issues in Kilo Cloud Previous Review Summaries (2 snapshots, latest commit a2d40c6)Current summary above is authoritative. Previous snapshots are kept for context only. Previous review (commit a2d40c6)Status: 1 Issue Found | Recommendation: Address before merge Overview
Issue Details (click to expand)WARNING
Files Reviewed (28 files)
Fix these issues in Kilo Cloud Previous review (commit 18e1ac4)Status: No Issues Found | Recommendation: Merge Files Reviewed (33 files)
Reviewed by grok-4.6 · Input: 145.6K · Output: 5.9K · Cached: 137.6K Review guidance: REVIEW.md from base branch |
![kilo-code-bot[bot]](https://avatars.githubusercontent.com/in/2193792?s=60&v=4){kind=small}
marius-kilocode
enabled auto-merge
September 7, 2026 11:13
eshurakov
approved these changes
Sep 7, 2026
This was referenced Sep 8, 2026
This was referenced Sep 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Problem This Solves
Agent Manager rewrites explicit Git branch names, including slash-separated names such as
feature/task. The existing automatic branch naming settings are available in VS Code settings but missing from the Agent Manager settings page.Addresses the branch naming request in #13833. Existing-worktree targeting and ephemeral worktrees are outside this PR.
Why This Change Was Made
Keep the Git ref separate from its filesystem directory name. Validate explicit refs with Git, preserve valid names, and derive a safe directory name only where needed. A stable hash distinguishes refs that produce the same shortened slug. Automatic naming and collision/version suffix behavior remain unchanged.
User Impact
Explicit names retain slashes, case, and punctuation. Invalid names are rejected before the dialog clears the draft. Display names still produce automatic slugs, and existing-branch directory collisions preserve unrelated worktrees and uncommitted files. Agent Manager settings now expose the existing automatic naming toggle and branch prefix through the normal Save/Discard flow. No new setting keys or defaults are introduced.
Evidence
Real-Git regression tests cover exact names, unsafe directory characters, invalid refs, and collisions. The full extension unit suite passed (5,049 passed, one skipped). Build, typechecks, lint, and Knip passed. In isolated VS Code, Save wrote the existing application settings, Discard restored the previous value, and saved values survived a window reload.