@senomas/pi-git-hat 0.2.1 → 0.2.3

package/git-hat.ts

@@ -60,7 +60,7 @@ interface RolesConfig {
   defaultRole?: string;
   fileDir?: string;
   caseInsensitive?: boolean;
-  redetectOnInput?: boolean;
+
   postSwitchLog?: boolean;
 }
 
@@ -68,7 +68,7 @@ interface MergedConfig {
   roles: Record<string, RoleDef>;
   fileDir: string;
   caseInsensitive: boolean;
-  redetectOnInput: boolean;
+
   postSwitchLog: boolean;
   configFile: string;
 }
@@ -229,7 +229,7 @@ function loadConfig(): MergedConfig {
     roles: {},
     fileDir: ".pi",
     caseInsensitive: true,
-    redetectOnInput: true,
+
     postSwitchLog: true,
   };
 
@@ -252,7 +252,7 @@ function loadConfig(): MergedConfig {
         }
         if (raw.fileDir) merged.fileDir = raw.fileDir;
         if (raw.caseInsensitive !== undefined) merged.caseInsensitive = raw.caseInsensitive;
-        if (raw.redetectOnInput !== undefined) merged.redetectOnInput = raw.redetectOnInput;
+
         if (raw.postSwitchLog !== undefined) merged.postSwitchLog = raw.postSwitchLog;
       } catch {
         // ignore parse errors
@@ -497,6 +497,22 @@ You are **ADMIN**. Switching branch does not switch your role.
 - Edit \`README.md\` and \`AGENTS.md\`
 - Explore the codebase (read-only)
 
+## What you do NOT do
+- Edit source code
+- Create or modify \`todo/\`, \`plan/\`, \`report/\` files
+- Switch branches (the user handles that)
+`,
+
+  researcher: `
+
+## Your Role: Researcher
+
+You are **RESEARCHER**. Switching branch does not switch your role.
+
+## What you do
+- Research with \`find\` / \`grep\` / \`ls\` / \`web_search\` / \`read\`
+- Write findings to \`docs/*.md\` and root \`*.md\` files
+
 ## What you do NOT do
 - Edit source code
 - Create or modify \`todo/\`, \`plan/\`, \`report/\` files
@@ -723,6 +739,7 @@ function roleIcon(role: string): string {
   if (lower === "implementor") return "\uD83D\uDEE0";
   if (lower === "reviewer") return "\uD83D\uDD0D";
   if (lower === "admin") return "\u2699";
+  if (lower === "researcher") return "\uD83D\uDD2C";
   return "\uD83E\uDDE2";
 }
 
@@ -1124,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
@@ -1200,18 +1322,14 @@ export default function (pi: ExtensionAPI) {
   });
 
   pi.on("input", async (event, ctx) => {
-    if (config.redetectOnInput) {
-      await updateRole(ctx);
-    }
+    await updateRole(ctx);
     return { action: "continue" };
   });
 
   // -- Re-detect after every turn (catches git checkout/switch) --
 
   pi.on("turn_end", async (_event, ctx) => {
-    if (config.redetectOnInput) {
-      await updateRole(ctx);
-    }
+    await updateRole(ctx);
   });
 
   // -- System prompt injection ----------------------------------
@@ -1415,6 +1533,15 @@ If the user asks you to make changes, tell them to switch to an appropriate bran
       };
     }
 
+    // Researcher: docs/ and root *.md only
+    if (lowerRole === "researcher") {
+      if (isInside(path, ["docs"]) || (path.endsWith(".md") && !path.includes("/"))) return;
+      return {
+        block: true,
+        reason: `\uD83D\uDD2C Researcher: can only write to docs/ and root *.md. Blocked: ${rawPath}`,
+      };
+    }
+
     // Custom roles: no hard write restrictions (base-enforce handles it)
     return;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@senomas/pi-git-hat",
-	"version": "0.2.1",
+	"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"],

package/roles/planner.md

@@ -6,10 +6,11 @@ You are **PLANNER**. Your sole responsibility is to research (just collecting da
 ## What you do
 1. Research with `read` / `grep` / `find` / `ls`
 2. Create `todo/NN-name.md` with sequenced, actionable items
-3. Present the plan to the user
+3. Write to `docs/*.md` files (design docs, research notes, architecture decisions)
+4. Present the plan to the user
 
 ## What you do NOT do
-- `edit`/`write` any file outside `todo/`
+- `edit`/`write` any file outside `todo/` or `docs/*.md`
 - Switch branches (the user handles that)
 - Implement anything (that's the implementor)
 - Write reports (that's the implementor)

package/roles/researcher.md

@@ -0,0 +1,12 @@
+# Researcher
+
+You are **RESEARCHER**. Switching branch does not switch your role.
+
+## What you do
+- Research with `find` / `grep` / `ls` / `web_search` / `read`
+- Write findings to `docs/*.md` and root `*.md` files
+
+## What you do NOT do
+- Edit source code
+- Create or modify `todo/`, `plan/`, `report/` files
+- Switch branches (the user handles that)

package/roles/roles.json

@@ -3,6 +3,7 @@
     "planner":      { "pattern": "^plan(-|/|$)", "description": "Plan work by creating todo/plan files" },
     "implementor":  { "pattern": "^(implementor$|feature|feat|impl$|work$)(-|/|$)", "description": "Feature/impl/work branches" },
     "reviewer":     { "pattern": "^review(-|/|$)", "description": "Review implementations against todos" },
-    "admin":        { "pattern": "^(main|master)$", "description": "Project configuration and docs" }
+    "admin":        { "pattern": "^(main|master)$", "description": "Project configuration and docs" },
+    "researcher":   { "pattern": "^research(-|/|$)", "description": "Research topics and document findings" }
   }
 }