chore(plugin): bump version 1.103.1 -> 1.103.2

Author: github-actions[bot]

.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "H·AI·K·U — universal lifecycle orchestration with hat-based workflows, completion criteria, and automatic context preservation.",
-    "version": "1.103.1"
+    "version": "1.103.2"
   },
   "plugins": [
     {

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.103.2] - 2026-04-15
+
+### Fixed
+
+- Repair tool no longer gets stuck in stale-reference loops and now respects your repository's actual mainline branch instead of hardcoding assumptions.
+
 ## [1.103.0] - 2026-04-15
 
 ```markdown

plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "haiku",
-  "version": "1.103.1",
+  "version": "1.103.2",
   "description": "H·AI·K·U methodology — universal lifecycle orchestration with hat-based workflows, completion criteria, and automatic context preservation.",
   "author": {
     "name": "GigSmart",

plugin/bin/haiku

@@ -64441,7 +64441,7 @@ var MCP_VERSION;
 var init_version3 = __esm({
   "src/version.ts"() {
     "use strict";
-    MCP_VERSION = true ? "1.103.1" : "dev";
+    MCP_VERSION = true ? "1.103.2" : "dev";
   }
 });
 
@@ -74192,6 +74192,16 @@ function branchExists(branch) {
 }
 function getMainlineBranch() {
   if (!isGitRepo()) return "main";
+  const originHead = tryRun([
+    "git",
+    "symbolic-ref",
+    "--short",
+    "refs/remotes/origin/HEAD"
+  ]);
+  if (originHead) {
+    const m2 = originHead.match(/^origin\/(.+)$/);
+    if (m2) return m2[1];
+  }
   for (const candidate of ["main", "master"]) {
     if (tryRun(["git", "rev-parse", "--verify", candidate])) return candidate;
     if (tryRun(["git", "rev-parse", "--verify", `origin/${candidate}`]))
@@ -74200,6 +74210,15 @@ function getMainlineBranch() {
   const configured = tryRun(["git", "config", "--get", "init.defaultBranch"]);
   return configured || "main";
 }
+function fetchOrigin() {
+  if (!isGitRepo()) return false;
+  try {
+    execFileSync("git", ["fetch", "--prune", "origin"], { stdio: "pipe" });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function listIntentBranches() {
   if (!isGitRepo()) return [];
   const slugs = /* @__PURE__ */ new Set();
@@ -74306,14 +74325,21 @@ function isBranchMerged(branch, mainline) {
   }
   return false;
 }
-function addTempWorktree(branch, label = "haiku-repair") {
+function addTempWorktree(branch, label = "haiku-repair", preferRemote = false) {
   if (!isGitRepo()) throw new Error("not a git repo");
   const path = join8(
     "/tmp",
     `${label}-${Date.now()}-${Math.floor(Math.random() * 1e6)}`
   );
-  const localExists = tryRun(["git", "rev-parse", "--verify", branch]);
-  const ref = localExists ? branch : `origin/${branch}`;
+  const localRef = tryRun(["git", "rev-parse", "--verify", branch]);
+  const remoteRef = tryRun(["git", "rev-parse", "--verify", `origin/${branch}`]);
+  let ref;
+  if (preferRemote) {
+    ref = remoteRef ? `origin/${branch}` : localRef ? branch : "";
+  } else {
+    ref = localRef ? branch : remoteRef ? `origin/${branch}` : "";
+  }
+  if (!ref) throw new Error(`branch '${branch}' not found locally or on origin`);
   run(["git", "worktree", "add", "--detach", path, ref]);
   return path;
 }
@@ -74338,20 +74364,43 @@ function commitAndPushFromWorktree(worktreePath, branch, message) {
       pushError: err instanceof Error ? err.message : String(err)
     };
   }
-  try {
-    execFileSync(
-      "git",
-      ["-C", worktreePath, "push", "origin", `HEAD:refs/heads/${branch}`],
-      { stdio: "pipe" }
-    );
-    return { committed: true, pushed: true };
-  } catch (err) {
-    return {
-      committed: true,
-      pushed: false,
-      pushError: err instanceof Error ? err.message : String(err)
-    };
+  const tryPush = () => {
+    try {
+      execFileSync(
+        "git",
+        ["-C", worktreePath, "push", "origin", `HEAD:refs/heads/${branch}`],
+        { stdio: "pipe" }
+      );
+      return { ok: true };
+    } catch (err) {
+      return {
+        ok: false,
+        error: err instanceof Error ? err.message : String(err)
+      };
+    }
+  };
+  const first = tryPush();
+  if (first.ok) return { committed: true, pushed: true };
+  const isNonFastForward = /non-fast-forward|fetch first|behind the remote/i.test(first.error ?? "");
+  if (isNonFastForward) {
+    tryRun(["git", "-C", worktreePath, "fetch", "origin", branch]);
+    try {
+      execFileSync("git", ["-C", worktreePath, "rebase", `origin/${branch}`], {
+        stdio: "pipe"
+      });
+    } catch (err) {
+      tryRun(["git", "-C", worktreePath, "rebase", "--abort"]);
+      return {
+        committed: true,
+        pushed: false,
+        pushError: `non-fast-forward; rebase onto origin/${branch} failed: ${err instanceof Error ? err.message : String(err)}`
+      };
+    }
+    const retry = tryPush();
+    if (retry.ok) return { committed: true, pushed: true };
+    return { committed: true, pushed: false, pushError: retry.error };
   }
+  return { committed: true, pushed: false, pushError: first.error };
 }
 function detectPrTool() {
   if (tryRun(["which", "gh"])) return "gh";
@@ -75895,6 +75944,7 @@ function buildRepairReport(result, headingPrefix = "") {
   return lines.join("\n");
 }
 function repairAllBranches(autoApply) {
+  fetchOrigin();
   const mainline = getMainlineBranch();
   const summaries = [];
   if (autoApply) {
@@ -75968,7 +76018,7 @@ function repairAllBranches(autoApply) {
       merged: false
     };
     try {
-      worktreePath = addTempWorktree(branch, "haiku-repair");
+      worktreePath = addTempWorktree(branch, "haiku-repair", true);
     } catch (err) {
       summary.error = `Failed to create worktree: ${err instanceof Error ? err.message : String(err)}`;
       summaries.push(summary);
@@ -76052,7 +76102,7 @@ function repairArchivedOnMainline(activeBranches, mainline, autoApply) {
   };
   let worktreePath = "";
   try {
-    worktreePath = addTempWorktree(mainline, "haiku-repair-archived");
+    worktreePath = addTempWorktree(mainline, "haiku-repair-archived", true);
   } catch (err) {
     summary.setupError = `Failed to create mainline worktree: ${err instanceof Error ? err.message : String(err)}`;
     return summary;
@@ -77403,7 +77453,7 @@ ${content}
     }
     // ── Review ──
     case "haiku_review": {
-      let base = "main";
+      let base = getMainlineBranch();
       try {
         const upstream = spawnSync(
           "git",