@senomas/pi-git-hat 0.2.6 → 0.2.9

package/git-hat.ts

@@ -46,7 +46,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import { readFile, readdir, mkdir, copyFile } from "node:fs/promises";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import {
   Container,
@@ -62,7 +62,7 @@ import {
 import type { MergedConfig } from "./lib/types.js";
 import { loadConfig, detectRole } from "./lib/config.js";
 import { recordBranchUsage, listBranchesByRole } from "./lib/branch-history.js";
-import { loadRoleFile, BUILTIN_INSTRUCTIONS, EXTENSION_DIR } from "./lib/role-file.js";
+import { getRoleFileSource, loadRoleFile, BUILTIN_INSTRUCTIONS, EXTENSION_DIR } from "./lib/role-file.js";
 import { normalisePath, stripCdPrefix, isInside, isWritablePath } from "./lib/paths.js";
 import { extractNN, findMaxNN, verifyAncestry, isMasterOrMainAncestor, handleTodo } from "./lib/todo-utils.js";
 import { roleIcon, showGitLog, showGitStatus, colorizeLog } from "./lib/git-ui.js";
@@ -154,11 +154,11 @@ export default function (pi: ExtensionAPI) {
       // /hat info: show role status
       if (sub === "info") {
         const desc = currentRole ? config.roles[currentRole]?.description ?? "" : "";
-        const roleFile = currentRole ? await loadRoleFile(ctx.cwd, currentRole, config) : null;
-        const usingFile = roleFile ? ` | using ${config.fileDir}/${currentRole}.md` : "";
+        const roleSource = currentRole ? getRoleFileSource(ctx.cwd, currentRole, config) : null;
+        const sourceStr = roleSource ? ` | ${roleSource}` : " | (none)";
 
         const roleDisplay = currentRole
-          ? `${roleIcon(currentRole)} ${currentRole}${usingFile}`
+          ? `${roleIcon(currentRole)} ${currentRole}${sourceStr}`
           : "\u2753 No matching role (read-only mode)";
 
         const defaultInfo = [];
@@ -399,16 +399,16 @@ export default function (pi: ExtensionAPI) {
         return;
       }
 
-      // Filter to role-matched branches, excluding current
+      // All branches except current
       const candidates: string[] = [];
       for (const b of allBranches) {
         if (b === currentBranch) continue;
-        if (detectRole(b, config)) candidates.push(b);
+        candidates.push(b);
       }
 
-      // Edge case: no other role-matched branches
+      // Edge case: no other branches
       if (candidates.length === 0) {
-        ctx.ui.notify("No other role-matched branches to rebase onto.", "info");
+        ctx.ui.notify("No other branches to rebase onto.", "info");
         return;
       }
 
@@ -423,7 +423,7 @@ export default function (pi: ExtensionAPI) {
       for (const b of candidates) {
         try {
           const result = await pi.exec("git", [
-            "log", "--format=%ct %h %s", "-1", b,
+            "log", "--format=%ct %h %s", "-1", b, "--",
           ]);
           const line = result.stdout.trim();
           if (!line) continue;
@@ -440,7 +440,7 @@ export default function (pi: ExtensionAPI) {
       }
 
       if (infos.length === 0) {
-        ctx.ui.notify("Could not determine latest commits for candidates.", "error");
+        ctx.ui.notify("No other branches to rebase onto.", "info");
         return;
       }
 
@@ -615,14 +615,16 @@ export default function (pi: ExtensionAPI) {
     await updateRole(ctx);
 
     // Print startup info (same as /hat info, plus config file path)
+    const pkg = JSON.parse(readFileSync(resolve(EXTENSION_DIR, "package.json"), "utf-8"));
+    const version = pkg.version ?? "unknown";
     const desc = currentRole ? config.roles[currentRole]?.description ?? "" : "";
-    const roleFile = currentRole
-      ? await loadRoleFile(ctx.cwd, currentRole, config)
+    const roleSource = currentRole
+      ? getRoleFileSource(ctx.cwd, currentRole, config)
       : null;
-    const usingFile = roleFile ? ` | using ${config.fileDir}/${currentRole}.md` : "";
+    const sourceStr = roleSource ? ` | ${roleSource}` : " | (none)";
 
     const roleDisplay = currentRole
-      ? `${roleIcon(currentRole)} ${currentRole}${usingFile}`
+      ? `${roleIcon(currentRole)} ${currentRole}${sourceStr}`
       : "\u2753 No matching role (read-only mode)";
 
     const defaultInfo = [];
@@ -633,6 +635,7 @@ export default function (pi: ExtensionAPI) {
     ctx.ui.notify(
       `${roleDisplay}\n` +
         `branch: ${currentBranch ?? "not a git repo"}\n` +
+        `hat: v${version}\n` +
         `${desc ? `desc: ${desc}\n` : ""}` +
         `${defaultLine}` +
         `roles: ${config.configFile}`,
@@ -965,12 +968,27 @@ If the user asks you to make changes, tell them to switch to an appropriate bran
 
     // Planner NN sequence validation (architectural guard — always applies)
     if (lowerRole === "planner" && path.startsWith("todo/")) {
-      const nn = extractNN(path.replace("todo/", ""));
-      if (nn !== null && nn <= (await findMaxNN(ctx.cwd))) {
-        return {
-          block: true,
-          reason: `\uD83D\uDCCB Planner: NN must be > max in todo/ and report/. You used ${String(nn).padStart(2, "0")}. Use ${String((await findMaxNN(ctx.cwd)) + 1).padStart(2, "0")} or higher.`,
-        };
+      const fullPath = resolve(ctx.cwd, path);
+
+      if (existsSync(fullPath)) {
+        // File exists — block editing if any items are already marked done (`- [x]`)
+        const content = readFileSync(fullPath, "utf-8");
+        if (/^- \[x\]/im.test(content)) {
+          return {
+            block: true,
+            reason: `\uD83D\uDCCB Planner: cannot edit todo/${path.replace("todo/", "")} — it contains completed items (- [x]). Create a new todo file instead.`,
+          };
+        }
+        // File exists with no completed items: editing is allowed.
+      } else {
+        // File does not exist — enforce NN > maxNN for new files.
+        const nn = extractNN(path.replace("todo/", ""));
+        if (nn !== null && nn <= (await findMaxNN(ctx.cwd))) {
+          return {
+            block: true,
+            reason: `\uD83D\uDCCB Planner: NN must be > max in todo/ and report/. You used ${String(nn).padStart(2, "0")}. Use ${String((await findMaxNN(ctx.cwd)) + 1).padStart(2, "0")} or higher.`,
+          };
+        }
       }
     }
 

package/lib/role-file.ts

@@ -6,6 +6,7 @@
  * instruction constants used as fallback when no .md file exists.
  */
 
+import { existsSync } from "node:fs";
 import { readFile, readdir } from "node:fs/promises";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -13,7 +14,43 @@ import { fileURLToPath } from "node:url";
 import type { MergedConfig } from "./types.js";
 
 /** Directory containing this extension file. Used to resolve bundled roles/ directory. */
-export const EXTENSION_DIR = dirname(fileURLToPath(import.meta.url));
+export const EXTENSION_DIR = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+
+/**
+ * Determine the source of a role file without loading its content.
+ * Returns a human-readable string describing where the file comes from,
+ * or null if no source is found.
+ *
+ * Search order (same as loadRoleFile):
+ *   1. {cwd}/{fileDir}/{role}.md (project-local)
+ *   2. {extensionDir}/roles/{role}.md (extension-bundled)
+ *   3. built-in instructions (hardcoded in BUILTIN_INSTRUCTIONS)
+ */
+export function getRoleFileSource(
+  cwd: string,
+  role: string,
+  config: MergedConfig,
+): string | null {
+  // 1. Project-local: {cwd}/{fileDir}/{role}.md
+  const roleDir = resolve(cwd, config.fileDir);
+  if (existsSync(resolve(roleDir, `${role}.md`))) {
+    return `${config.fileDir}/${role}.md`;
+  }
+
+  // 2. Extension-bundled: {extensionDir}/roles/{role}.md
+  const bundledRoleDir = resolve(EXTENSION_DIR, "roles");
+  if (existsSync(resolve(bundledRoleDir, `${role}.md`))) {
+    return `roles/${role}.md (bundled)`;
+  }
+
+  // 3. Built-in instructions
+  const lower = role.toLowerCase();
+  if (BUILTIN_INSTRUCTIONS[lower]) {
+    return `built-in instructions`;
+  }
+
+  return null;
+}
 
 /**
  * Load a role's .md file from the project's fileDir directory.

package/package.json

@@ -1,9 +1,15 @@
 {
 	"name": "@senomas/pi-git-hat",
-	"version": "0.2.6",
+	"version": "0.2.9",
 	"description": "Pi extension for role-based Git branch workflows — wear different hats by switching branches",
 	"type": "module",
-	"keywords": ["pi-package", "git", "workflow", "branching", "roles"],
+	"keywords": [
+		"pi-package",
+		"git",
+		"workflow",
+		"branching",
+		"roles"
+	],
 	"license": "MIT",
 	"files": [
 		"git-hat.ts",
@@ -14,7 +20,9 @@
 		"README.md"
 	],
 	"pi": {
-		"extensions": ["./git-hat.ts"]
+		"extensions": [
+			"./git-hat.ts"
+		]
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*",

package/roles/planner.md

@@ -22,5 +22,5 @@ You are **PLANNER**. Your sole responsibility is to research (just collecting da
 - Blank lines separate items
 
 ## NN sequence rule
-Every `todo/NN-name.md` must use NN **higher** than the highest NN in both
-`todo/` **and** `report/`.
+- When creating new `todo/NN-name.md` file, must use NN **higher** than the highest NN in both `todo/` **and** `report/`.
+- You are allowed to edit/remove entry from `todo/NN-name/md` only if that entry is un-done