pi-git-commit 1.0.6 → 1.0.8

package/README.md

@@ -5,8 +5,8 @@ Keeps mutative git operations out of the agent's bash and provides a safe, revie
 ## What you get
 
 - **Bash git guard.** Mutative git commands are blocked in the agent's bash tool — `add`, `stage`, `commit`, `push`, `pull`, `merge`, `rebase`, `reset`, `clean`, `rm`, `restore`, `switch`, `cherry-pick`, `revert`, `mv`, `init`, `clone`, index/object plumbing (`read-tree`, `checkout-index`, `merge-file`, `prune-packed`), plus mutative forms of `branch` (including creation, `-u`, `-f`, `-c`/`-C`/`--copy`, `-D`/`-M`, `--force`, `-t`/`--track`), `tag` (including creation), `checkout` (including whole-tree restores like `checkout -- .`), `stash`, `submodule`, `worktree`, `config`, `remote`, `apply`, `notes`, `update-ref`, `gc` and more. Read-only commands (`status`, `diff`, `log`, `fetch`, `branch`, `tag`, `stash list`, ...) stay allowed.
-- **`git_commit` tool.** The agent stages everything and commits with a `FIX` / `IMPROVE` / `NEW` type prefix. Inactive by default: `/commit` activates it for the commit flow and it is disabled again after use, so the agent cannot commit on its own at other times.
-- **`/commit` command.** Waits for queued messages to finish, stages all changes, shows the staged diff, activates the `git_commit` tool, and asks the agent to review it and commit via `git_commit` — never via bash. Run `/stop-commit` at any point to abort the flow.
+- **`git_commit` tool.** The agent stages everything and commits with a `FIX` / `IMPROVE` / `NEW` type prefix. Inactive by default: `/commit` activates it for the commit flow and it is disabled again after a successful commit, so the agent cannot commit on its own at other times.
+- **`/commit` command.** Waits for queued messages to finish, stages all changes, shows a collapsed summary of the staged diff (a `git diff --stat` line; press `ctrl+o` to expand the full diff), activates the `git_commit` tool, and asks the agent to review the changes and commit via `git_commit` — never via bash. Run `/stop-commit` at any point to abort the flow.
 - **`/stop-commit` command.** Aborts a pending commit flow: deactivates the `git_commit` tool and cancels a `/commit` that is still waiting for queued messages, so no commit is made.
 - **`/toggle-allow-git` command.** Temporarily allows mutative git commands in bash for the current session. The guard re-arms on the next session.
 
@@ -18,7 +18,7 @@ Keeps mutative git operations out of the agent's bash and provides a safe, revie
 /commit
 ```
 
-2. The extension stages the working tree and hands the staged diff to the agent with instructions to review it.
+2. The extension stages the working tree and shows a collapsed summary of the staged diff — press `ctrl+o` to expand it. The full diff is handed to the agent with instructions to review it.
 
 3. The agent commits using the `git_commit` tool:
 
@@ -56,7 +56,7 @@ pi install /path/to/pi-git-commit
 | `type` | `FIX` (bug fix), `IMPROVE` (improvement), or `NEW` (new feature). |
 | `message` | Commit message in imperative mood, without the type prefix (it is added automatically). A leading type word matching the chosen type is stripped (with `:`, whitespace, or `-`/`—` separators, any casing, repeats included) so the type is never duplicated. Multi-line allowed for detailed changes. |
 
-The tool runs `git add .` followed by `git commit -m "<TYPE>: <message>"` and reports staging or commit failures as tool errors. A leading type word in the message is stripped whenever it repeats the chosen type — with `:`, whitespace, or `-`/`—` separators, at any casing, repeated prefixes included — so the type never ends up duplicated: `FIX: Fix: ...`, `FIX: Fix ...`, and `fix - ...` all become `FIX: ...`. The tool is inactive by default and only becomes available when you run `/commit`; it is deactivated again after a single use (success or failure), so the agent cannot commit at arbitrary points in the conversation. If a commit fails, run `/commit` again to retry.
+The tool runs `git add .` followed by `git commit -m "<TYPE>: <message>"` and reports staging or commit failures as tool errors. A leading type word in the message is stripped whenever it repeats the chosen type — with `:`, whitespace, or `-`/`—` separators, at any casing, repeated prefixes included — so the type never ends up duplicated: `FIX: Fix: ...`, `FIX: Fix ...`, and `fix - ...` all become `FIX: ...`. The tool is inactive by default and only becomes available when you run `/commit`; it is deactivated again after a successful commit, so the agent cannot commit at arbitrary points in the conversation. If a commit fails, the tool stays active and the agent can retry immediately without re-running `/commit`.
 
 ## The bash guard
 
@@ -67,7 +67,7 @@ The guard parses the command into segments (pipelines, `&&`, `||`, `;`, `&`, com
 A blocked command returns:
 
 ```text
-Mutative git commands are blocked. Use /toggle-allow-git to allow for this session.
+Mutative git commands are blocked. Ask the user to run /toggle-allow-git to allow them for this session.
 ```
 
 ## Troubleshooting

package/index.ts

@@ -1,7 +1,9 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { keyHint, renderDiff, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Box, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 
 const COMMIT_TYPES = ["FIX", "IMPROVE", "NEW"] as const;
+const DIFF_CUSTOM_TYPE = "git-commit-diff";
 
 export default function (pi: ExtensionAPI) {
   let gitBlocked = true;
@@ -13,10 +15,12 @@ export default function (pi: ExtensionAPI) {
   const GIT_META_OPTS = new Set(["--help", "-h", "--version"]);
   const GIT_OPTS_BARE = new Set(["--bare", "-p", "--paginate", "--no-pager", "--no-replace-objects", "--literal-pathspecs", "--glob-pathspecs", "--noglob-pathspecs", "--icase-pathspecs", "--no-optional-locks", "--html-path", "--man-path", "--info-path"]);
   const GIT_OPTS_WITH_ARG = new Set(["-c", "--git-dir", "--work-tree", "--namespace", "--exec-path", "--super-prefix", "--shallow-file", "--template", "--upload-pack"]);
+  const GIT_TAG_VALUE_FLAGS = new Set(["--sort", "--format", "-v"]);
+  const GIT_TAG_LIST_FORCING = new Set(["--contains", "--no-contains", "--merged", "--no-merged", "--points-at"]);
 
   const blockAll = () => true;
   const hasAny = (args: string[], values: string[]) => values.some((value) => args.includes(value));
-  const allowOnly = (values: string[]) => (args: string[]) => !hasAny(args, values);
+  const blockUnlessAny = (values: string[]) => (args: string[]) => !hasAny(args, values);
   const hasShortFlag = (args: string[], flags: string) => args.some((arg) => arg.startsWith("-") && !arg.startsWith("--") && arg.length > 1 && [...arg.slice(1)].some((flag) => flags.includes(flag)));
 
   const GIT_RULES: Record<string, (args: string[]) => boolean> = {
@@ -62,15 +66,15 @@ export default function (pi: ExtensionAPI) {
       if (hasAny(args, ["--add", "--unset", "--unset-all", "--replace-all", "--remove-section", "--rename-section", "--edit", "-e"])) return true;
       return !hasAny(args, ["--list", "-l", "--get", "--get-all", "--get-regexp", "--show-origin", "--show-scope"]);
     },
-    remote: (args) => !(args.length === 0 || args.includes("-v") || hasAny(args, ["show", "get-url"])),
-    apply: allowOnly(["--check", "--stat"]),
-    notes: allowOnly(["list", "show"]),
-    lfs: allowOnly(["ls-files", "status"]),
-    "sparse-checkout": allowOnly(["list"]),
-    stash: allowOnly(["list", "show"]),
-    submodule: allowOnly(["status", "init", "summary"]),
-    worktree: allowOnly(["list"]),
-    reflog: (args) => !(args.length === 0 || hasAny(args, ["show"])),
+    remote: (args) => args.length > 0 && blockUnlessAny(["-v", "show", "get-url"])(args),
+    apply: blockUnlessAny(["--check", "--stat"]),
+    notes: blockUnlessAny(["list", "show"]),
+    lfs: blockUnlessAny(["ls-files", "status"]),
+    "sparse-checkout": blockUnlessAny(["list"]),
+    stash: blockUnlessAny(["list", "show"]),
+    submodule: blockUnlessAny(["status", "init", "summary"]),
+    worktree: blockUnlessAny(["list"]),
+    reflog: (args) => args.length > 0 && blockUnlessAny(["show"])(args),
     branch: (args) => {
       if (args.includes("--")) return true;
       if (hasAny(args, ["--delete", "--move", "--copy", "--force", "--track", "--prune", "--unset-upstream", "--edit-description"]) || args.some((arg) => arg.startsWith("--set-upstream-to"))) return true;
@@ -80,9 +84,13 @@ export default function (pi: ExtensionAPI) {
     },
     tag: (args) => {
       if (args.length === 0) return false;
+      if (hasAny(args, ["--delete", "--annotate", "--force", "--sign", "--edit", "--cleanup"]) || hasShortFlag(args, "damfsueF")) return true;
       const first = args[0];
       if (first === "-l" || first === "--list" || first.startsWith("-n")) return false;
-      return !["--contains", "--merged", "--no-merged", "--points-at", "--sort", "--format", "--column", "--no-column", "--color", "--ignore-case", "--verbose", "-v"].some((flag) => first.startsWith(flag));
+      const readOnlyFlags = ["--contains", "--no-contains", "--merged", "--no-merged", "--points-at", "--sort", "--format", "--column", "--no-column", "--color", "--ignore-case", "--verbose", "-i", "-v"];
+      if (!readOnlyFlags.some((flag) => first.startsWith(flag))) return true;
+      if ([...GIT_TAG_LIST_FORCING].some((flag) => args.some((arg) => arg === flag || arg.startsWith(`${flag}=`)))) return false;
+      return args.some((arg, index) => index > 0 && !arg.startsWith("-") && !GIT_TAG_VALUE_FLAGS.has(args[index - 1]));
     },
     checkout: (args) => {
       if (args[0] !== "--") return true;
@@ -96,7 +104,7 @@ export default function (pi: ExtensionAPI) {
   const maskHeredocBodies = (command: string): string => {
     let masked = "";
     let cursor = 0;
-    const heredocRe = /<<-?\s*['"]?([A-Za-z_][A-Za-z0-9_]*)['"]?/g;
+    const heredocRe = /<<-?\s*\\?['"]?([A-Za-z_][A-Za-z0-9_]*)['"]?/g;
     let match: RegExpExecArray | null;
     while ((match = heredocRe.exec(command)) !== null) {
       const current = match;
@@ -159,6 +167,7 @@ export default function (pi: ExtensionAPI) {
     let subcommandIndex = -1;
     for (let i = 0; i < tokens.length; i++) {
       const token = tokens[i];
+      if (token === "git" || token === "git.exe") continue;
       if (GIT_META_OPTS.has(token)) return false;
       if (GIT_OPTS_BARE.has(token)) continue;
       if (GIT_OPTS_WITH_ARG.has(token)) {
@@ -203,7 +212,7 @@ export default function (pi: ExtensionAPI) {
     if (typeof command !== "string") return undefined;
     const trimmed = command.trim();
     if (gitBlocked && containsBlockedGitCommand(trimmed)) {
-      return { block: true, reason: "Mutative git commands are blocked. Use /toggle-allow-git to allow for this session." };
+      return { block: true, reason: "Mutative git commands are blocked. Ask the user to run /toggle-allow-git to allow them for this session." };
     }
     return undefined;
   });
@@ -233,6 +242,8 @@ export default function (pi: ExtensionAPI) {
     return rest;
   };
 
+  const toolError = (text: string) => ({ content: [{ type: "text" as const, text }], details: {}, isError: true });
+
   pi.registerTool({
     name: "git_commit",
     label: "Git Commit",
@@ -250,31 +261,34 @@ export default function (pi: ExtensionAPI) {
       }),
     }),
     async execute(_toolCallId, params, signal, _onUpdate, _ctx) {
+      let committed = false;
       try {
         const { type, message } = params;
         const description = stripLeadingCommitType(type, message);
         if (!description) {
-          return { content: [{ type: "text", text: "Commit message must not be empty." }], details: {}, isError: true };
+          return toolError("Commit message must not be empty.");
         }
         const fullMessage = `${type}: ${description}`;
         const addResult = await pi.exec("git", ["add", "."], { signal });
         if (addResult.code !== 0) {
-          return { content: [{ type: "text", text: `Staging failed: ${addResult.stderr}` }], details: {}, isError: true };
+          return toolError(`Staging failed: ${addResult.stderr}`);
         }
 
         const result = await pi.exec("git", ["commit", "-m", fullMessage], { signal });
         if (result.code !== 0) {
-          return { content: [{ type: "text", text: `Commit failed: ${result.stderr}` }], details: {}, isError: true };
+          return toolError(`Commit failed: ${result.stderr}`);
         }
-
+        committed = true;
         pi.sendMessage(
-          { customType: "git-commit-deactivated", content: "The git_commit tool is now deactivated and cannot be used again until the user runs /commit to re-enable it. Do not mention this deactivation in your response.", display: false },
+          { customType: "git-commit-flow-complete", content: "The commit flow is complete.", display: false },
           { deliverAs: "steer" },
         );
         return { content: [{ type: "text", text: `✓ Committed: ${fullMessage}` }], details: {} };
       } finally {
-        commitFlowActive = false;
-        deactivateGitCommit();
+        if (committed) {
+          commitFlowActive = false;
+          deactivateGitCommit();
+        }
       }
     },
   });
@@ -285,6 +299,23 @@ export default function (pi: ExtensionAPI) {
     deactivateGitCommit();
   });
 
+  pi.registerMessageRenderer(DIFF_CUSTOM_TYPE, (message, { expanded, outputPad }, theme) => {
+    const details = message.details as { diff?: string; stat?: string } | undefined;
+    const box = new Box(outputPad, 1, (text) => theme.bg("customMessageBg", text));
+    box.addChild(new Text(theme.fg("accent", "Staged changes"), 0, 0));
+    if (expanded) {
+      if (details?.diff) {
+        box.addChild(new Text(renderDiff(details.diff), 0, 0));
+      }
+    } else {
+      if (details?.stat) {
+        box.addChild(new Text(details.stat, 0, 0));
+      }
+      box.addChild(new Text(theme.fg("dim", `(${keyHint("app.tools.expand", "to expand")})`), 0, 0));
+    }
+    return box;
+  });
+
   pi.registerCommand("commit", {
     description: "Stage files and show diff for commit",
     handler: async (_args, ctx) => {
@@ -294,26 +325,28 @@ export default function (pi: ExtensionAPI) {
       }
       commitFlowActive = true;
 
+      const execGit = async (label: string, args: string[]) => {
+        const result = await pi.exec("git", args);
+        if (result.code !== 0) {
+          ctx.ui.notify(`${label} failed: ${result.stderr}`, "error");
+          commitFlowActive = false;
+          return undefined;
+        }
+        return result;
+      };
+
       try {
         await ctx.ui.setWorkingMessage("Waiting for queued messages to complete...");
         await ctx.waitForIdle();
         if (!commitFlowActive) return;
 
         await ctx.ui.setWorkingMessage("Staging files...");
-        const addResult = await pi.exec("git", ["add", "."]);
-        if (addResult.code !== 0) {
-          ctx.ui.notify(`git add failed: ${addResult.stderr}`, "error");
-          commitFlowActive = false;
-          return;
-        }
+        const addResult = await execGit("git add", ["add", "."]);
+        if (!addResult || !commitFlowActive) return;
 
         await ctx.ui.setWorkingMessage("Getting diff...");
-        const diffResult = await pi.exec("git", ["diff", "--staged"]);
-        if (diffResult.code !== 0) {
-          ctx.ui.notify(`git diff failed: ${diffResult.stderr}`, "error");
-          commitFlowActive = false;
-          return;
-        }
+        const diffResult = await execGit("git diff", ["diff", "--staged"]);
+        if (!diffResult || !commitFlowActive) return;
 
         if (!diffResult.stdout.trim()) {
           ctx.ui.notify("Nothing to commit (empty diff). Stage files first.", "warning");
@@ -321,12 +354,19 @@ export default function (pi: ExtensionAPI) {
           return;
         }
 
-        const diff = diffResult.stdout || "(no changes staged)";
+        const diff = diffResult.stdout;
+
+        const statResult = await pi.exec("git", ["diff", "--staged", "--stat"]);
+        if (!commitFlowActive) return;
+        const stat = statResult.code === 0 ? statResult.stdout.trim().split("\n").pop() ?? "" : "";
 
         const prompt = `DO NOT use bash for git. Use ONLY the \`git_commit\` tool.\n\nReview staged changes:\n\`\`\`diff\n${diff}\`\`\`\n\nUse \`git_commit\` tool with:\n- type: FIX, IMPROVE, or NEW\n- message: brief description (imperative mood)`;
         if (!commitFlowActive) return;
         activateGitCommit();
-        pi.sendUserMessage(prompt, { deliverAs: "followUp" });
+        pi.sendMessage(
+          { customType: DIFF_CUSTOM_TYPE, content: prompt, display: true, details: { diff, stat } },
+          { deliverAs: "followUp", triggerTurn: true },
+        );
       } finally {
         ctx.ui.setWorkingMessage();
       }
@@ -346,7 +386,7 @@ export default function (pi: ExtensionAPI) {
       deactivateGitCommit();
       if (toolWasActive) {
         pi.sendMessage(
-          { customType: "git-commit-stopped", content: "The user stopped the commit flow with /stop-commit. Do not attempt to commit. Do not mention this in your response.", display: false },
+          { customType: "git-commit-stopped", content: "The user stopped the commit flow with /stop-commit. Do not attempt to commit.", display: false },
           { deliverAs: "steer" },
         );
         ctx.ui.notify("Commit flow stopped. The git_commit tool is deactivated.", "info");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-git-commit",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "description": "Pi extension: block mutative git commands in bash and provide a git_commit tool plus /commit, /stop-commit and /toggle-allow-git commands",
   "main": "index.ts",
@@ -31,6 +31,7 @@
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
   "engines": {
@@ -42,6 +43,7 @@
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.0",
+    "@earendil-works/pi-tui": "^0.84.1",
     "@types/node": "^24.0.0",
     "typescript": "~5.9.3",
     "vitest": "^4.1.9",