@senomas/pi-git-hat 0.2.2 → 0.2.3

package/git-hat.ts

@@ -1141,9 +1141,114 @@ export default function (pi: ExtensionAPI) {
     },
   });
 
+  // -- /hatr command: rebase onto most recent role-matched branch --
+
+  pi.registerCommand("hatr", {
+    description: "Rebase current branch onto the most recent role-matched branch",
+    handler: async (_args, ctx) => {
+      // Edge case: detached HEAD or non-git directory
+      const branch = await detectBranch();
+      if (!branch) {
+        ctx.ui.notify("Not on a branch (detached HEAD or not a git repo). Aborting.", "warning");
+        return;
+      }
+      const currentBranch = branch;
+
+      // List all local branches
+      let allBranches: string[] = [];
+      try {
+        const result = await pi.exec("git", ["branch", "--format", "%(refname:short)"]);
+        allBranches = result.stdout.trim().split("\n").filter(Boolean);
+      } catch {
+        ctx.ui.notify("Failed to list git branches.", "error");
+        return;
+      }
+
+      // Filter to role-matched branches, excluding current
+      const candidates: string[] = [];
+      for (const b of allBranches) {
+        if (b === currentBranch) continue;
+        if (detectRole(b, config)) candidates.push(b);
+      }
+
+      // Edge case: no other role-matched branches
+      if (candidates.length === 0) {
+        ctx.ui.notify("No other role-matched branches to rebase onto.", "info");
+        return;
+      }
+
+      // Get latest commit info for each candidate
+      interface CandidateInfo {
+        branch: string;
+        timestamp: number;
+        abbrev: string;
+        subject: string;
+      }
+      const infos: CandidateInfo[] = [];
+      for (const b of candidates) {
+        try {
+          const result = await pi.exec("git", [
+            "log", "--format=%ct %h %s", "-1", b,
+          ]);
+          const line = result.stdout.trim();
+          if (!line) continue;
+          const space1 = line.indexOf(" ");
+          const space2 = line.indexOf(" ", space1 + 1);
+          if (space1 === -1 || space2 === -1) continue;
+          const timestamp = parseInt(line.slice(0, space1), 10);
+          const abbrev = line.slice(space1 + 1, space2);
+          const subject = line.slice(space2 + 1);
+          infos.push({ branch: b, timestamp, abbrev, subject });
+        } catch {
+          // skip branches we can't read
+        }
+      }
+
+      if (infos.length === 0) {
+        ctx.ui.notify("Could not determine latest commits for candidates.", "error");
+        return;
+      }
+
+      // Pick the most recent
+      infos.sort((a, b) => b.timestamp - a.timestamp);
+      const target = infos[0];
+
+      // Show and confirm
+      const confirmed = await ctx.ui.confirm(
+        `Rebase ${currentBranch} onto ${target.branch}? (latest commit: ${target.abbrev} ${target.subject})`,
+      );
+      if (!confirmed) {
+        ctx.ui.notify("Rebase cancelled.", "info");
+        return;
+      }
+
+      // Run the rebase
+      try {
+        const result = await pi.exec("git", ["rebase", target.branch]);
+        if (result.code === 0) {
+          ctx.ui.notify(
+            `Rebase onto ${target.branch} succeeded. Updated commit tree:`,
+            "info",
+          );
+          await showGitLog(ctx, 10);
+        } else {
+          ctx.ui.notify(
+            `Rebase onto ${target.branch} failed:\n${result.stderr}\n\nResolve conflicts manually, then run \`git rebase --continue\`.`,
+            "error",
+          );
+        }
+      } catch (e) {
+        ctx.ui.notify(
+          `Rebase onto ${target.branch} failed: ${(e as Error).message}\n\nResolve conflicts manually, then run \`git rebase --continue\`.`,
+          "error",
+        );
+      }
+    },
+  });
+
   // -- Session lifecycle ----------------------------------------
 
-  pi.on("session_start", async (event, ctx) => {
+  pi.on("session_start", async (event, ctx) => {"}]}
     cwdAbsolute = ctx.cwd;
 
     // Seed bundled roles/ files to project .pi/ before loading config

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@senomas/pi-git-hat",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"description": "Pi extension for role-based Git branch workflows — wear different hats by switching branches",
 	"type": "module",
 	"keywords": ["pi-package", "git", "workflow", "branching", "roles"],