pi-git-commit 1.0.4 → 1.0.6

package/README.md

@@ -1,12 +1,13 @@
 # pi-git-commit
 
-Keeps mutative git operations out of the agent's bash and provides a safe, reviewable commit flow in [pi-coding-agent](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent): a bash guard, a `git_commit` tool, and `/commit` + `/toggle-allow-git` commands.
+Keeps mutative git operations out of the agent's bash and provides a safe, reviewable commit flow in [pi-coding-agent](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent): a bash guard, a `git_commit` tool, and `/commit`, `/stop-commit` and `/toggle-allow-git` commands.
 
 ## 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.
+- **`/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.
+- **`/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.
 
 ## Quick start
@@ -24,11 +25,13 @@ Keeps mutative git operations out of the agent's bash and provides a safe, revie
 ```json
 {
   "type": "FIX",
-  "message": "Fix off-by-one in the retry loop"
+  "message": "Correct the off-by-one in the retry loop"
 }
 ```
 
-4. If you need to run mutative git yourself, allow it for the session:
+4. Changed your mind? Run `/stop-commit` to abort the flow before the agent commits.
+
+5. If you need to run mutative git yourself, allow it for the session:
 
 ```text
 /toggle-allow-git
@@ -51,9 +54,9 @@ pi install /path/to/pi-git-commit
 | Field | Description |
 | --- | --- |
 | `type` | `FIX` (bug fix), `IMPROVE` (improvement), or `NEW` (new feature). |
-| `message` | Commit message in imperative mood. Multi-line allowed for detailed changes. |
+| `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. 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 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 bash guard
 
@@ -70,6 +73,7 @@ Mutative git commands are blocked. Use /toggle-allow-git to allow for this sessi
 ## Troubleshooting
 
 - **The agent refuses to commit.** The guard blocks `git commit` in bash by design. Run `/commit` and let the agent use the `git_commit` tool.
+- **The agent stopped committing.** You ran `/stop-commit`, which aborted the pending flow. Run `/commit` again to start a new one.
 - **"Nothing to commit (empty diff)."** There are no staged changes — make edits first, then run `/commit` again.
 - **I need git in bash right now.** Run `/toggle-allow-git`; the guard re-arms automatically on the next session start.
 

package/index.ts

@@ -5,6 +5,7 @@ const COMMIT_TYPES = ["FIX", "IMPROVE", "NEW"] as const;
 
 export default function (pi: ExtensionAPI) {
   let gitBlocked = true;
+  let commitFlowActive = false;
 
   const PREFIXES = new Set(["sudo", "env", "command", "nohup", "nice", "time", "exec", "builtin", "doas", "eval", "timeout", "runuser", "pkexec"]);
   const CONTROL_KEYWORDS = new Set(["if", "then", "else", "elif", "while", "until", "do", "case", "select"]);
@@ -221,6 +222,17 @@ export default function (pi: ExtensionAPI) {
     }
   };
 
+  const stripLeadingCommitType = (type: string, message: string): string => {
+    const typePrefixRe = new RegExp(`^${type}(?!\\p{L})\\s*[:–—\\-]?\\s*`, "iu");
+    let rest = message.trim();
+    let next = rest.replace(typePrefixRe, "").trim();
+    while (next !== rest) {
+      rest = next;
+      next = rest.replace(typePrefixRe, "").trim();
+    }
+    return rest;
+  };
+
   pi.registerTool({
     name: "git_commit",
     label: "Git Commit",
@@ -240,11 +252,11 @@ export default function (pi: ExtensionAPI) {
     async execute(_toolCallId, params, signal, _onUpdate, _ctx) {
       try {
         const { type, message } = params;
-        const trimmedMessage = message.trim();
-        if (!trimmedMessage) {
+        const description = stripLeadingCommitType(type, message);
+        if (!description) {
           return { content: [{ type: "text", text: "Commit message must not be empty." }], details: {}, isError: true };
         }
-        const fullMessage = `${type}: ${trimmedMessage}`;
+        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 };
@@ -256,11 +268,12 @@ export default function (pi: ExtensionAPI) {
         }
 
         pi.sendMessage(
-          { customType: "git-commit-deactivated", content: "The git_commit tool is now deactivated. It cannot be used again until the user runs /commit to re-enable it.", display: false },
+          { 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 },
           { deliverAs: "steer" },
         );
         return { content: [{ type: "text", text: `✓ Committed: ${fullMessage}` }], details: {} };
       } finally {
+        commitFlowActive = false;
         deactivateGitCommit();
       }
     },
@@ -268,6 +281,7 @@ export default function (pi: ExtensionAPI) {
 
   pi.on("session_start", () => {
     gitBlocked = true;
+    commitFlowActive = false;
     deactivateGitCommit();
   });
 
@@ -278,15 +292,18 @@ export default function (pi: ExtensionAPI) {
         ctx.ui.notify("commit requires interactive mode", "error");
         return;
       }
+      commitFlowActive = true;
 
       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;
         }
 
@@ -294,17 +311,20 @@ export default function (pi: ExtensionAPI) {
         const diffResult = await pi.exec("git", ["diff", "--staged"]);
         if (diffResult.code !== 0) {
           ctx.ui.notify(`git diff failed: ${diffResult.stderr}`, "error");
+          commitFlowActive = false;
           return;
         }
 
         if (!diffResult.stdout.trim()) {
           ctx.ui.notify("Nothing to commit (empty diff). Stage files first.", "warning");
+          commitFlowActive = false;
           return;
         }
 
         const diff = diffResult.stdout || "(no changes staged)";
 
-        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 (bug fix), IMPROVE (improvement), or NEW (new feature)\n- message: brief description (imperative mood). Multi-line allowed for detailed changes.`;
+        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" });
       } finally {
@@ -312,6 +332,32 @@ export default function (pi: ExtensionAPI) {
       }
     },
   });
+
+  pi.registerCommand("stop-commit", {
+    description: "Stop the pending commit flow started by /commit",
+    handler: async (_args, ctx) => {
+      if (!ctx.hasUI) {
+        ctx.ui.notify("stop-commit requires interactive mode", "error");
+        return;
+      }
+      const toolWasActive = pi.getActiveTools().includes("git_commit");
+      const flowWasActive = commitFlowActive;
+      commitFlowActive = false;
+      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 },
+          { deliverAs: "steer" },
+        );
+        ctx.ui.notify("Commit flow stopped. The git_commit tool is deactivated.", "info");
+      } else if (flowWasActive) {
+        ctx.ui.notify("Commit flow stopped.", "info");
+      } else {
+        ctx.ui.notify("No commit flow in progress.", "info");
+      }
+    },
+  });
+
   pi.registerCommand("toggle-allow-git", {
     description: "Toggle whether mutative git commands are allowed in bash for this session",
     handler: async (_args, ctx) => {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "pi-git-commit",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
-  "description": "Pi extension: block mutative git commands in bash and provide a git_commit tool plus /commit and /toggle-allow-git commands",
+  "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",
   "repository": {
     "type": "git",