mandrel 2.44.0 → 2.45.0

package/.agents/scripts/lib/orchestration/git-cleanup/phases/git-probes.js

@@ -49,6 +49,19 @@ export function listLocalBranches(cwd) {
  * Pure: strip the `<remote>/` prefix off a remote-ref listing and drop the
  * symbolic `HEAD` entry.
  *
+ * `HEAD` arrives under two spellings. `%(refname:lstrip=3)` renders
+ * `refs/remotes/origin/HEAD` as the literal `HEAD`, but
+ * `%(refname:short)` — what both callers ask for — shortens it to the bare
+ * remote name `origin`, because git keeps the remote segment only when the
+ * result would otherwise be ambiguous. Missing that second spelling leaked
+ * a phantom `origin` candidate into the remote-only sweep, which the reap
+ * phase then reported as `already gone`.
+ *
+ * Both spellings are rejected **before** the prefix strip, because the
+ * strip is what makes them ambiguous: a real branch named `origin` lists
+ * as `origin/origin` and strips to `origin` too. Discriminating on the raw
+ * line keeps that branch reapable while still dropping the symbolic ref.
+ *
  * Shared by {@link listRemoteBranches} and {@link listRemoteMergedBranches}
  * so both enumerations speak the same short-name vocabulary the planner's
  * remote-only walk keys on — a divergence there would make the ancestry
@@ -64,8 +77,9 @@ function shortRemoteNames(stdout, remoteName) {
     .split('\n')
     .map((l) => l.trim())
     .filter(Boolean)
+    .filter((l) => l !== 'HEAD' && l !== remoteName)
     .map((l) => (l.startsWith(prefix) ? l.slice(prefix.length) : l))
-    .filter((b) => b && b !== 'HEAD');
+    .filter(Boolean);
 }
 
 /* node:coverage ignore next */

package/docs/CHANGELOG.md

@@ -15,6 +15,13 @@ All notable changes to this project will be documented in this file.
 -->
 <!-- markdownlint-disable-file MD004 MD012 MD037 -->
 
+## [2.45.0](https://github.com/dsj1984/mandrel/compare/mandrel-v2.44.0...mandrel-v2.45.0) (2026-09-07)
+
+
+### Fixed
+
+* **git-cleanup:** drop the symbolic HEAD ref under its short spelling ([#5197](https://github.com/dsj1984/mandrel/issues/5197)) ([98802f6](https://github.com/dsj1984/mandrel/commit/98802f6ee49b699560ab7362815e054751f3024b))
+
 ## [2.44.0](https://github.com/dsj1984/mandrel/compare/mandrel-v2.43.0...mandrel-v2.44.0) (2026-09-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mandrel",
-  "version": "2.44.0",
+  "version": "2.45.0",
   "description": "Claude Code-first opinionated workflow framework: instructions, skills, rules, and SDLC workflows that govern AI coding assistants.",
   "files": [
     ".agents/",