branch-agent + create-issue fixes

branch-agent/SKILL.md · create-issue/SKILL.md 6 fixes

@@ branch-agent — stash pop conflict recovery @@
	> 1. `git stash list` — confirm the stash entry is present
	> 2. Resolve any conflicts in the listed files
-	> 3. `git stash drop` once resolved
-	> Do not retry. Do not drop the stash automatically.
+	> 3. `git add <resolved-files>` — stage resolved files first
+	> 4. `git stash drop` to remove the stash entry
+	> Do not retry. Do not drop the stash before staging resolved files.
@@ create-issue/SKILL.md — host detection (Phase 1) @@
	- URL contains `github.com` → host is GitHub, CLI is `gh`
-	- URL contains `gitlab.com` or any non-GitHub host → GitLab, CLI is `glab`
-	- If absent or unrecognizable → AskUserQuestion (GitHub / GitLab)
+	- URL contains `gitlab.com` or `gitlab.` → GitLab, CLI is `glab`
+	- Any other host (Bitbucket, Azure DevOps, Gitea) → AskUserQuestion

+12 -11

3 files · 6 review fixes · stash recovery + host detection

Ran /code-review --fix on yesterday's changes and caught 6 issues across 3 files. Worth sharing the interesting ones.

Missing git add in stash recovery. When git stash pop conflicts, my recovery instructions said "resolve files → git stash drop." But without git add <resolved-files> first, the index stays in an unmerged state. A commit after that silently excludes the resolved changes. One missing step, real data-loss potential.

Missing "Do not force." The stash-needed checkout failure handler said "Do not retry." but forgot "Do not force." Without it, a model recovering from a failed checkout could reach for git checkout -B or -f — silently overwriting stash contents.

Non-GitHub = GitLab assumption. The new issue-agent plugin detected hosts as binary: github.com → gh, anything else → glab. Bitbucket, Azure DevOps, and Gitea users would get "run glab auth login" as an error message. Fixed to three-way: GitHub → gh, GitLab → glab, anything else → ask.

Plus three smaller fixes: bash process substitution portability wrapper, glab --per-page alignment, and a hardcoded element label.

All 6 found and applied in a single /code-review --fix pass.

#ClaudeCode #CodeReview #DeveloperTools #AIAgents

Twitter/X

/code-review --fix caught 6 issues: missing git add in stash recovery, missing "Do not force", and a non-GitHub=GitLab assumption routing Bitbucket users to the wrong CLI. All fixed in one pass across 3 files.

Bluesky

/code-review --fix caught a good one: issue-agent was routing any non-GitHub remote to glab — Bitbucket, Azure DevOps, Gitea users would get "run glab auth login" as an error. Fixed to three-way detection. Plus 5 more fixes in branch-agent and the rendering pipeline.