fix(hooks): fix commit-msg validation and add pre-push failure banner (0.13.2)

Author: nolrm

.contextkit/hooks/commit-msg

@@ -8,15 +8,22 @@ echo "🎵 Running ContextKit commit message validation..."
 # Check commit message format
 COMMIT_MSG_FILE=$1
 COMMIT_MSG=$(cat "$COMMIT_MSG_FILE")
+SUBJECT=$(head -n1 "$COMMIT_MSG_FILE")
 
 # Skip validation for auto-generated git commits
 if echo "$COMMIT_MSG" | grep -qE "^(Merge|Revert|fixup!|squash!) "; then
     echo "✅ Auto-generated commit — skipping validation."
     exit 0
 fi
 
+# Check minimum subject length
+if [ ${#SUBJECT} -lt 10 ]; then
+    echo "❌ Commit message subject too short (minimum 10 characters)"
+    exit 1
+fi
+
 # Check if commit message follows conventional format
-if ! echo "$COMMIT_MSG" | grep -qE "^(feat|fix|docs|style|refactor|test|chore|improve)(\(.+\))?: .+"; then
+if ! echo "$SUBJECT" | grep -qE "^(feat|fix|docs|refactor|test|chore|improve)(\(.+\))?: .+"; then
     echo "❌ Commit message must follow conventional format:"
     echo "   <type>(<scope>): <description>"
     echo "   Examples:"
@@ -26,10 +33,4 @@ if ! echo "$COMMIT_MSG" | grep -qE "^(feat|fix|docs|style|refactor|test|chore|im
     exit 1
 fi
 
-# Check minimum length
-if [ ${#COMMIT_MSG} -lt 10 ]; then
-    echo "❌ Commit message too short (minimum 10 characters)"
-    exit 1
-fi
-
 echo "✅ Commit message validation passed!"

.contextkit/hooks/pre-push

@@ -12,6 +12,13 @@ GATE=0
 PASSED=0
 SKIPPED=0
 
+on_gate_failure() {
+  echo ""
+  echo "  ❌ Quality Gates FAILED — push blocked."
+  echo ""
+}
+trap on_gate_failure ERR
+
 run_gate() {
   GATE=$((GATE + 1))
   local label="$1"

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.13.2] - 2026-03-13
+
+### Fixed
+- **`commit-msg` hook** — length check now tests the subject line only (`head -n1`), not the full message including body. A short subject with a long body previously passed incorrectly.
+- **`commit-msg` hook** — length check now runs before the format check (was unreachable dead code — any message passing the format regex was already >10 chars).
+- **`pre-push` hook** — fixed variable-width content inside box borders; `Project type` and success summary lines moved outside the box to prevent broken border alignment.
+
+### Added
+- **`pre-push` hook** — ERR trap prints a clear `❌ Quality Gates FAILED — push blocked.` banner when any gate fails, replacing silent exit.
+
+### Changed
+- **`commit-msg` hook** — removed `style` from allowed commit types (not used in this project; was inconsistent with documented types in `workflows.md` and `ai-guidelines.md`).
+- **README** — commit types list updated to remove `style`, matching the hook and standards files.
+
+---
+
 ## [0.13.1] - 2026-03-07
 
 ### Fixed

README.md

@@ -270,7 +270,7 @@ When the `commit-msg` hook is enabled, all commits must follow this format:
 <type>(<scope>): <description>
 ```
 
-**Types:** `feat`, `fix`, `improve`, `docs`, `style`, `refactor`, `test`, `chore`
+**Types:** `feat`, `fix`, `improve`, `docs`, `refactor`, `test`, `chore`
 
 **Examples:**
 ```bash

__tests__/hooks/commit-msg.test.js

@@ -0,0 +1,225 @@
+const fs = require('fs-extra');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+
+let tmpDir;
+let originalCwd;
+let hookPath;
+
+beforeEach(async () => {
+  tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ck-commit-msg-'));
+  originalCwd = process.cwd();
+  process.chdir(tmpDir);
+
+  // Initialize a real git repo
+  execSync('git init', { stdio: 'pipe' });
+  execSync('git config user.email "test@example.com"', { stdio: 'pipe' });
+  execSync('git config user.name "Test User"', { stdio: 'pipe' });
+
+  // Copy the actual commit-msg hook from the project
+  hookPath = path.join(tmpDir, '.contextkit', 'hooks');
+  await fs.ensureDir(hookPath);
+  const sourceHook = path.join(originalCwd, '.contextkit', 'hooks', 'commit-msg');
+  await fs.copy(sourceHook, path.join(hookPath, 'commit-msg'));
+  await fs.chmod(path.join(hookPath, 'commit-msg'), 0o755);
+
+  // Set the hook path
+  execSync('git config core.hooksPath .contextkit/hooks', { stdio: 'pipe' });
+});
+
+afterEach(async () => {
+  process.chdir(originalCwd);
+  await fs.remove(tmpDir);
+});
+
+function runCommitMsgHook(message) {
+  const msgFile = path.join(tmpDir, '.git', 'COMMIT_EDITMSG');
+  fs.writeFileSync(msgFile, message);
+
+  try {
+    execSync(path.join(hookPath, 'commit-msg') + ` "${msgFile}"`, {
+      stdio: 'pipe',
+      encoding: 'utf8'
+    });
+    return { success: true, output: '' };
+  } catch (error) {
+    return { success: false, output: error.stderr || error.stdout || error.message };
+  }
+}
+
+describe('commit-msg hook', () => {
+  describe('PO Spec: Subject Line Length Check', () => {
+    it('1. accepts subject with exactly 10 characters (boundary test)', () => {
+      const result = runCommitMsgHook('feat: 12345');
+      expect(result.success).toBe(true);
+    });
+
+    it('2. rejects subject with less than 10 characters', () => {
+      const result = runCommitMsgHook('feat: 123');
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('too short');
+    });
+
+    it('3. accepts valid subject with no body', () => {
+      const result = runCommitMsgHook('feat(auth): implement login validation');
+      expect(result.success).toBe(true);
+    });
+
+    it('4. accepts valid subject with a long body (body is not measured)', () => {
+      const message = `feat(core): add new validation logic
+
+This is a much longer body that contains detailed implementation notes.
+It goes over many lines and has lots of extra content.
+The length check should only measure the subject line, not this body.
+So even if the body pushes the total message length to hundreds of characters,
+as long as the subject line is at least 10 characters, it should pass.`;
+      const result = runCommitMsgHook(message);
+      expect(result.success).toBe(true);
+    });
+
+    it('5. rejects short subject with a long body (body does not count toward length)', () => {
+      const message = `fix: bug
+
+This is a long body that would normally count toward the total message length.
+But since we fixed the length check to only measure the subject line,
+this should fail because the subject "fix: bug" is only 8 characters.`;
+      const result = runCommitMsgHook(message);
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('too short');
+    });
+  });
+
+  describe('PO Spec: Check Order (Length Before Format)', () => {
+    it('6. returns length error before format error for short subject', () => {
+      const result = runCommitMsgHook('abc');
+      // Should fail on length check first, not format
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('too short');
+    });
+
+    it('7. returns format error when subject is long enough but malformed', () => {
+      const result = runCommitMsgHook('this is a long subject but no colon');
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('conventional format');
+    });
+  });
+
+  describe('PO Spec: Conventional Format Check (Subject Line Only)', () => {
+    it('8. accepts feat type with scope', () => {
+      const result = runCommitMsgHook('feat(api): add new endpoint');
+      expect(result.success).toBe(true);
+    });
+
+    it('9. accepts fix type with scope', () => {
+      const result = runCommitMsgHook('fix(hooks): skip merge commits');
+      expect(result.success).toBe(true);
+    });
+
+    it('10. accepts docs type without scope', () => {
+      const result = runCommitMsgHook('docs: update README');
+      expect(result.success).toBe(true);
+    });
+
+    it('11. accepts improve type', () => {
+      const result = runCommitMsgHook('improve(cli): better error handling');
+      expect(result.success).toBe(true);
+    });
+
+    it('12. accepts refactor, test, chore types', () => {
+      const validTypes = [
+        'refactor(utils): simplify logic',
+        'test(integration): add new test case',
+        'chore(deps): update dependencies'
+      ];
+      validTypes.forEach(msg => {
+        const result = runCommitMsgHook(msg);
+        expect(result.success).toBe(true);
+      });
+    });
+
+    it('13. rejects style type (not allowed in this project)', () => {
+      const result = runCommitMsgHook('style(format): adjust spacing');
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('conventional format');
+    });
+
+    it('14. rejects unknown type', () => {
+      const result = runCommitMsgHook('random: some change');
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('conventional format');
+    });
+
+    it('15. rejects missing description after colon', () => {
+      const result = runCommitMsgHook('feat(api):');
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('conventional format');
+    });
+
+    it('16. allows body lines that do not match the pattern', () => {
+      // Body line that looks like it could match the pattern should be ignored
+      const message = `feat(api): main implementation
+
+Some random text in the body that says feat: something else.
+This should not cause a format error.`;
+      const result = runCommitMsgHook(message);
+      expect(result.success).toBe(true);
+    });
+  });
+
+  describe('PO Spec: Edge Cases', () => {
+    it('17. skips validation for Merge commits', () => {
+      const result = runCommitMsgHook('Merge branch main into feature');
+      expect(result.success).toBe(true);
+    });
+
+    it('18. skips validation for Revert commits', () => {
+      const result = runCommitMsgHook('Revert "some previous commit"');
+      expect(result.success).toBe(true);
+    });
+
+    it('19. skips validation for fixup commits', () => {
+      const result = runCommitMsgHook('fixup! previous commit message');
+      expect(result.success).toBe(true);
+    });
+
+    it('20. skips validation for squash commits', () => {
+      const result = runCommitMsgHook('squash! previous commit message');
+      expect(result.success).toBe(true);
+    });
+
+    it('21. multi-line message from -m "subject" -m "body" format', () => {
+      // When git writes with multiple -m flags, it creates newlines in the file
+      const message = `feat(core): new feature here
+
+Body content on another line.`;
+      const result = runCommitMsgHook(message);
+      expect(result.success).toBe(true);
+    });
+  });
+
+  describe('Additional Integration Tests', () => {
+    it('22. message with scope containing parentheses passes', () => {
+      const result = runCommitMsgHook('feat(api-v1): add endpoint');
+      expect(result.success).toBe(true);
+    });
+
+    it('23. message with special characters in description passes', () => {
+      const result = runCommitMsgHook('feat: add feature (with notes)');
+      expect(result.success).toBe(true);
+    });
+
+    it('24. exactly 10 character subject with scope and type', () => {
+      // "fix(x): ab" = 10 characters
+      const result = runCommitMsgHook('fix(x): ab');
+      expect(result.success).toBe(true);
+    });
+
+    it('25. exactly 9 character subject should fail', () => {
+      // "fix(x): a" = 9 characters
+      const result = runCommitMsgHook('fix(x): a');
+      expect(result.success).toBe(false);
+      expect(result.output).toContain('too short');
+    });
+  });
+});