opencode-commit-guard 1.0.0 → 1.0.1

package/dist/index.js

@@ -525,6 +525,7 @@ function extractInvocation(words, commandStart) {
   let hasSignoffFlag = false;
   let isAmend = false;
   let hasNoEdit = false;
+  let isFixup = false;
   let isHelp = false;
   const collectMessage = (word) => {
     if (word === undefined)
@@ -540,6 +541,8 @@ function extractInvocation(words, commandStart) {
     const argument = words[index];
     if (argument === undefined)
       break;
+    const equalsIndex = argument.indexOf("=");
+    const longOptionName = equalsIndex > 0 ? argument.slice(0, equalsIndex) : argument;
     if (argument === "--")
       break;
     if (argument === "-h" || argument === "--help") {
@@ -564,8 +567,13 @@ function extractInvocation(words, commandStart) {
       collectFile(words[index]);
     } else if (argument.startsWith("--file=")) {
       collectFile(argument.slice("--file=".length));
-    } else if (commitLongOptionsWithArg.has(argument)) {
-      index++;
+    } else if (argument === "--fixup" || argument.startsWith("--fixup=")) {
+      isFixup = true;
+      if (equalsIndex < 0)
+        index++;
+    } else if (commitLongOptionsWithArg.has(longOptionName)) {
+      if (equalsIndex < 0)
+        index++;
     } else if (argument.startsWith("-") && !argument.startsWith("--") && argument.length > 1) {
       for (let characterIndex = 1;characterIndex < argument.length; characterIndex++) {
         const option = argument[characterIndex];
@@ -601,6 +609,7 @@ function extractInvocation(words, commandStart) {
     hasSignoffFlag,
     isAmend,
     hasNoEdit,
+    isFixup,
     isHelp,
     directoryChanges
   };
@@ -624,6 +633,7 @@ function extractGitCommits(command) {
 }
 
 // src/validator.ts
+import { spawnSync } from "child_process";
 import { closeSync, constants, existsSync, fstatSync, openSync, readSync, statSync } from "fs";
 import { resolve } from "path";
 var scopePattern = /^([a-zA-Z0-9_\-./]+(?:\([a-zA-Z0-9_\-./]+\))?):\s+(.+)$/;
@@ -670,14 +680,34 @@ function validateGitCommits(invocations, config, originalCommand, workingDirecto
     if (invocation.isHelp) {
       continue;
     }
-    if (invocation.isAmend && invocation.hasNoEdit === true && invocation.messages.length === 0 && invocation.filePaths.length === 0) {
-      continue;
-    }
     const collectedMessages = [...invocation.messages];
     let messageDirectory = workingDirectory ?? process.cwd();
     for (const directoryChange of invocation.directoryChanges ?? []) {
       messageDirectory = resolve(messageDirectory, directoryChange);
     }
+    if (invocation.isAmend && invocation.hasNoEdit === true && invocation.messages.length === 0 && invocation.filePaths.length === 0) {
+      const result = spawnSync("git", ["log", "-1", "--format=%B", "HEAD"], {
+        cwd: messageDirectory,
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      if (result.error !== undefined) {
+        allViolations.push(`Failed to read the existing HEAD commit message: ${result.error.message}`);
+        continue;
+      }
+      if (result.status !== 0) {
+        const detail = result.stderr.trim();
+        const suffix = detail.length > 0 ? `: ${detail}` : ".";
+        allViolations.push(`Failed to read the existing HEAD commit message${suffix}`);
+        continue;
+      }
+      const existingMessage = result.stdout.replace(/[\r\n]+$/, "");
+      if (existingMessage.trim().length === 0) {
+        allViolations.push("The existing HEAD commit message is empty.");
+        continue;
+      }
+      collectedMessages.push(existingMessage);
+    }
     const filePath = invocation.filePaths.at(-1);
     if (filePath !== undefined) {
       if (filePath === "-") {
@@ -722,6 +752,9 @@ function validateGitCommits(invocations, config, originalCommand, workingDirecto
       }
     }
     if (collectedMessages.length === 0) {
+      if (invocation.isFixup === true) {
+        continue;
+      }
       if (invocation.filePaths.length === 0) {
         allViolations.push('No commit message provided. Commits in OpenCode must provide a commit message via -m "<scope>: <subject>" or -F <file>.');
       }
@@ -733,21 +766,24 @@ function validateGitCommits(invocations, config, originalCommand, workingDirecto
     const lines = fullMessage.split(/\r?\n/);
     const firstLine = lines[0] ?? "";
     const subjectLine = firstLine.trim();
-    const scopeMatch = subjectLine.match(scopePattern);
+    const effectiveSubject = subjectLine.replace(/^(?:(?:fixup|squash)!\s+)+/, "");
+    const scopeMatch = effectiveSubject.match(scopePattern);
     if (scopeMatch?.[1] !== undefined && config.allowedScopes !== undefined && config.allowedScopes.length > 0) {
       const scopeViolation = validateAllowedScope(scopeMatch[1], config.allowedScopes);
-      if (scopeViolation !== undefined)
-        allViolations.push(scopeViolation);
+      if (scopeViolation !== undefined) {
+        const fullSubjectDetail = effectiveSubject === subjectLine ? "" : ` Subject line: "${subjectLine}".`;
+        allViolations.push(`${scopeViolation}${fullSubjectDetail}`);
+      }
     }
     if (config.requireScope) {
       if (subjectLine.length === 0) {
         allViolations.push('Subject line is empty. The commit message must begin with "<scope>: <subject>".');
       } else if (scopeMatch === null) {
-        if (/^:\s*/.test(subjectLine)) {
+        if (/^:\s*/.test(effectiveSubject)) {
           allViolations.push(`Missing scope before colon in subject line "${subjectLine}". Expected format: "<scope>: <subject>".`);
-        } else if (/^[^:]+:\S/.test(subjectLine)) {
+        } else if (/^[^:]+:\S/.test(effectiveSubject)) {
           allViolations.push(`Missing space after colon in subject line "${subjectLine}". Expected format: "<scope>: <subject>".`);
-        } else if (/^[^:]+:\s*$/.test(subjectLine)) {
+        } else if (/^[^:]+:\s*$/.test(effectiveSubject)) {
           allViolations.push(`Subject text after colon is empty in "${subjectLine}". Expected format: "<scope>: <subject>".`);
         } else {
           allViolations.push(`Missing scope in subject line "${subjectLine}". First line must follow "<scope>: <subject>" format (e.g., "kernel: add support for foo" or "feat(parser): add subshell support").`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-commit-guard",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "OpenCode V2 plugin enforcing git commit format rules",
   "type": "module",
   "main": "./dist/index.js",

package/src/shell.ts

@@ -563,6 +563,7 @@ function extractInvocation(
   let hasSignoffFlag = false
   let isAmend = false
   let hasNoEdit = false
+  let isFixup = false
   let isHelp = false
 
   const collectMessage = (word: string | undefined): void => {
@@ -580,6 +581,9 @@ function extractInvocation(
 
     if (argument === undefined) break
 
+    const equalsIndex = argument.indexOf("=")
+    const longOptionName = equalsIndex > 0 ? argument.slice(0, equalsIndex) : argument
+
     if (argument === "--") break
 
     if (argument === "-h" || argument === "--help") {
@@ -604,8 +608,12 @@ function extractInvocation(
       collectFile(words[index])
     } else if (argument.startsWith("--file=")) {
       collectFile(argument.slice("--file=".length))
-    } else if (commitLongOptionsWithArg.has(argument)) {
-      index++
+    } else if (argument === "--fixup" || argument.startsWith("--fixup=")) {
+      isFixup = true
+
+      if (equalsIndex < 0) index++
+    } else if (commitLongOptionsWithArg.has(longOptionName)) {
+      if (equalsIndex < 0) index++
     } else if (argument.startsWith("-") && !argument.startsWith("--") && argument.length > 1) {
       for (let characterIndex = 1; characterIndex < argument.length; characterIndex++) {
         const option = argument[characterIndex]
@@ -644,6 +652,7 @@ function extractInvocation(
     hasSignoffFlag,
     isAmend,
     hasNoEdit,
+    isFixup,
     isHelp,
     directoryChanges,
   }

package/src/types.ts

@@ -49,6 +49,7 @@ export interface GitCommitInvocation {
   readonly hasSignoffFlag: boolean
   readonly isAmend: boolean
   readonly hasNoEdit?: boolean
+  readonly isFixup?: boolean
   readonly isHelp: boolean
   readonly directoryChanges?: readonly string[]
 }

package/src/validator.ts

@@ -1,3 +1,4 @@
+import { spawnSync } from "node:child_process"
 import { closeSync, constants, existsSync, fstatSync, openSync, readSync, statSync } from "node:fs"
 import { resolve } from "node:path"
 import type {
@@ -68,10 +69,6 @@ export function validateGitCommits(
       continue
     }
 
-    if (invocation.isAmend && invocation.hasNoEdit === true && invocation.messages.length === 0 && invocation.filePaths.length === 0) {
-      continue
-    }
-
     const collectedMessages: string[] = [...invocation.messages]
     let messageDirectory = workingDirectory ?? process.cwd()
 
@@ -79,6 +76,40 @@ export function validateGitCommits(
       messageDirectory = resolve(messageDirectory, directoryChange)
     }
 
+    if (
+      invocation.isAmend &&
+      invocation.hasNoEdit === true &&
+      invocation.messages.length === 0 &&
+      invocation.filePaths.length === 0
+    ) {
+      const result = spawnSync("git", ["log", "-1", "--format=%B", "HEAD"], {
+        cwd: messageDirectory,
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "pipe"],
+      })
+
+      if (result.error !== undefined) {
+        allViolations.push(`Failed to read the existing HEAD commit message: ${result.error.message}`)
+        continue
+      }
+
+      if (result.status !== 0) {
+        const detail = result.stderr.trim()
+        const suffix = detail.length > 0 ? `: ${detail}` : "."
+        allViolations.push(`Failed to read the existing HEAD commit message${suffix}`)
+        continue
+      }
+
+      const existingMessage = result.stdout.replace(/[\r\n]+$/, "")
+
+      if (existingMessage.trim().length === 0) {
+        allViolations.push("The existing HEAD commit message is empty.")
+        continue
+      }
+
+      collectedMessages.push(existingMessage)
+    }
+
     const filePath = invocation.filePaths.at(-1)
 
     if (filePath !== undefined) {
@@ -136,6 +167,10 @@ export function validateGitCommits(
     }
 
     if (collectedMessages.length === 0) {
+      if (invocation.isFixup === true) {
+        continue
+      }
+
       if (invocation.filePaths.length === 0) {
         allViolations.push(
           'No commit message provided. Commits in OpenCode must provide a commit message via -m "<scope>: <subject>" or -F <file>.',
@@ -149,7 +184,8 @@ export function validateGitCommits(
     const lines = fullMessage.split(/\r?\n/)
     const firstLine = lines[0] ?? ""
     const subjectLine = firstLine.trim()
-    const scopeMatch = subjectLine.match(scopePattern)
+    const effectiveSubject = subjectLine.replace(/^(?:(?:fixup|squash)!\s+)+/, "")
+    const scopeMatch = effectiveSubject.match(scopePattern)
 
     if (
       scopeMatch?.[1] !== undefined &&
@@ -158,22 +194,28 @@ export function validateGitCommits(
     ) {
       const scopeViolation = validateAllowedScope(scopeMatch[1], config.allowedScopes)
 
-      if (scopeViolation !== undefined) allViolations.push(scopeViolation)
+      if (scopeViolation !== undefined) {
+        const fullSubjectDetail = effectiveSubject === subjectLine
+          ? ""
+          : ` Subject line: "${subjectLine}".`
+
+        allViolations.push(`${scopeViolation}${fullSubjectDetail}`)
+      }
     }
 
     if (config.requireScope) {
       if (subjectLine.length === 0) {
         allViolations.push('Subject line is empty. The commit message must begin with "<scope>: <subject>".')
       } else if (scopeMatch === null) {
-        if (/^:\s*/.test(subjectLine)) {
+        if (/^:\s*/.test(effectiveSubject)) {
           allViolations.push(
             `Missing scope before colon in subject line "${subjectLine}". Expected format: "<scope>: <subject>".`,
           )
-        } else if (/^[^:]+:\S/.test(subjectLine)) {
+        } else if (/^[^:]+:\S/.test(effectiveSubject)) {
           allViolations.push(
             `Missing space after colon in subject line "${subjectLine}". Expected format: "<scope>: <subject>".`,
           )
-        } else if (/^[^:]+:\s*$/.test(subjectLine)) {
+        } else if (/^[^:]+:\s*$/.test(effectiveSubject)) {
           allViolations.push(
             `Subject text after colon is empty in "${subjectLine}". Expected format: "<scope>: <subject>".`,
           )