@senomas/pi-git-hat 0.2.0 → 0.2.1

package/git-hat.ts

@@ -1312,13 +1312,19 @@ If the user asks you to make changes, tell them to switch to an appropriate bran
         if (isBash) {
           const cmd = ((event.input as { command?: string }).command ?? "").trim();
 
-          // Always allow rebase master/main (required to fix ancestry)
-          if (/^git\s+rebase\s+(master|main)\b/.test(cmd)) {
+          // Require confirmation for git rebase (any target)
+          if (/\bgit\s+rebase\b/.test(cmd)) {
+            const confirmed = await ctx.ui.confirm(
+              `Rebase onto master? Running: \`${cmd}\``,
+            );
+            if (!confirmed) {
+              return { block: true, reason: "Rebase cancelled by user." };
+            }
             return;
           }
 
           // Require confirmation for git switch/checkout
-          if (/^git\s+(switch|checkout)\b/.test(cmd)) {
+          if (/\bgit\s+(switch|checkout)\b/.test(cmd)) {
             const confirmed = await ctx.ui.confirm(
               `Switch branches? Running: \`${cmd}\``,
             );
@@ -1336,15 +1342,16 @@ If the user asks you to make changes, tell them to switch to an appropriate bran
       }
     }
 
-    // For known roles: require confirmation for git branch switching
+    // For known roles: require confirmation for git rebase/switch/checkout
     if (isBash) {
       const cmd = ((event.input as { command?: string }).command ?? "").trim();
-      if (/^git\s+(switch|checkout)\b/.test(cmd)) {
+      if (/\bgit\s+(rebase|switch|checkout)\b/.test(cmd)) {
+        const action = /rebase/.test(cmd) ? "Rebase" : "Switch";
         const confirmed = await ctx.ui.confirm(
-          `Switch branches? Running: \`${cmd}\``,
+          `${action} branches? Running: \`${cmd}\``,
         );
         if (!confirmed) {
-          return { block: true, reason: "Branch switch cancelled by user." };
+          return { block: true, reason: `${action} cancelled by user.` };
         }
         return;
       }

package/package.json

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