pi-git-commit 1.0.4 → 1.0.5

package/README.md

@@ -24,7 +24,7 @@ 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"
 }
 ```
 
@@ -51,9 +51,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
 

package/index.ts

@@ -221,6 +221,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 +251,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,7 +267,7 @@ 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: {} };
@@ -304,7 +315,7 @@ export default function (pi: ExtensionAPI) {
 
         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)`;
         activateGitCommit();
         pi.sendUserMessage(prompt, { deliverAs: "followUp" });
       } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-git-commit",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "description": "Pi extension: block mutative git commands in bash and provide a git_commit tool plus /commit and /toggle-allow-git commands",
   "main": "index.ts",