claude-git-hooks 2.61.2 → 2.67.3

package/lib/utils/version-manager.js

@@ -247,14 +247,21 @@ export function discoverVersionFiles(options = {}) {
             for (const fileType of fileTypes) {
                 const registry = VERSION_FILE_TYPES[fileType];
                 if (registry && entry.name === registry.filename) {
-                    const version = registry.readVersion(fullPath);
+                    const rawVersion = registry.readVersion(fullPath);
+                    const version = rawVersion !== null && validateVersionFormat(rawVersion) ? rawVersion : null;
+                    if (rawVersion !== null && version === null) {
+                        logger.debug('version-manager - discoverVersionFiles', 'Non-semver version skipped', {
+                            relativePath: path.relative(repoRoot, fullPath),
+                            rawVersion
+                        });
+                    }
                     const descriptor = {
                         path: fullPath,
                         relativePath: path.relative(repoRoot, fullPath),
                         type: fileType,
                         projectLabel: registry.projectLabel,
                         version,
-                        selected: true
+                        selected: version !== null
                     };
                     discoveredFiles.push(descriptor);
                     logger.debug('version-manager - discoverVersionFiles', 'Found version file', {
@@ -285,19 +292,19 @@ export function discoverVersionFiles(options = {}) {
         return a.relativePath.localeCompare(b.relativePath);
     });
 
-    // Determine resolved version (prefer root-level file, then first found)
+    // Determine resolved version from semver files only (prefer root-level, then first found)
     let resolvedVersion = null;
-    const rootFile = discoveredFiles.find((f) => !f.relativePath.includes(path.sep));
+    const semverFiles = discoveredFiles.filter((f) => f.selected);
+    const rootFile = semverFiles.find((f) => !f.relativePath.includes(path.sep));
     if (rootFile && rootFile.version) {
         resolvedVersion = rootFile.version;
-    } else if (discoveredFiles.length > 0) {
-        // Use first file's version as fallback
-        const firstWithVersion = discoveredFiles.find((f) => f.version !== null);
+    } else if (semverFiles.length > 0) {
+        const firstWithVersion = semverFiles.find((f) => f.version !== null);
         resolvedVersion = firstWithVersion ? firstWithVersion.version : null;
     }
 
-    // Check for version mismatch
-    const versions = discoveredFiles.filter((f) => f.version !== null).map((f) => f.version);
+    // Check for version mismatch (only among semver files)
+    const versions = semverFiles.filter((f) => f.version !== null).map((f) => f.version);
     const uniqueVersions = [...new Set(versions)];
     const mismatch = uniqueVersions.length > 1;
 
@@ -1149,24 +1156,36 @@ export function compareVersions(version1, version2) {
  *
  * @returns {Promise<Object>} Validation result with alignment status and issues
  */
-export async function validateVersionAlignment() {
-    logger.debug('version-manager - validateVersionAlignment', 'Validating version alignment');
+export async function validateVersionAlignment(baseBranch = null) {
+    logger.debug('version-manager - validateVersionAlignment', 'Validating version alignment', {
+        baseBranch
+    });
 
     try {
         // Discover all version files
         const discovery = discoverVersionFiles();
 
-        // Get git tag version (parseTagVersion returns null for non-semver tags)
-        const { getLatestLocalTag, parseTagVersion } = await import('./git-tag-manager.js');
-        const latestTag = getLatestLocalTag();
+        // Get git tag version scoped to HEAD when baseBranch is provided
+        const {
+            getLatestLocalTag, getLatestLocalTagOnBranch,
+            parseTagVersion,
+            getLatestRemoteTag, getLatestRemoteTagOnBranch
+        } = await import('./git-tag-manager.js');
+        const latestTag = baseBranch ? getLatestLocalTagOnBranch(baseBranch) : getLatestLocalTag();
         const tagVersion = latestTag ? parseTagVersion(latestTag) : null;
 
         // Get CHANGELOG version
         const changelogVersion = readChangelogVersion();
-
-        // Get remote tag version (parseTagVersion returns null for non-semver tags)
-        const { getLatestRemoteTag } = await import('./git-tag-manager.js');
-        const latestRemoteTag = await getLatestRemoteTag();
+        let latestRemoteTag;
+        if (baseBranch) {
+            latestRemoteTag = getLatestRemoteTagOnBranch(baseBranch);
+            // Fall back to global if branch-scoped lookup returns nothing
+            if (!latestRemoteTag) {
+                latestRemoteTag = await getLatestRemoteTag();
+            }
+        } else {
+            latestRemoteTag = await getLatestRemoteTag();
+        }
         const remoteVersion = latestRemoteTag ? parseTagVersion(latestRemoteTag) : null;
 
         // Collect all local versions

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-git-hooks",
-    "version": "2.61.2",
+    "version": "2.67.3",
     "description": "Git hooks with Claude CLI for code analysis and automatic commit messages",
     "type": "module",
     "bin": {
@@ -16,6 +16,7 @@
         "test:changed": "node --experimental-vm-modules node_modules/jest/bin/jest.js test/unit --changedSince=main --forceExit",
         "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
         "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
+        "test:e2e": "bash test/manual/sdlc-stability-check.sh",
         "lint": "eslint lib/ bin/claude-hooks .library/librarian/",
         "lint:fix": "eslint lib/ bin/claude-hooks .library/librarian/ --fix",
         "format": "prettier --write \"lib/**/*.js\" \"bin/**\" \"test/**/*.js\"",

package/templates/CLAUDE_ANALYSIS_PROMPT.md

@@ -30,7 +30,7 @@ OUTPUT_SCHEMA:
     "line":int,
     "method":"name",
     "message":"desc",
-    "rule":"optional"
+    "rule":"JBE-NNN|UIK-NNN|STR-NNN|...|empty"
   }],
   "blockingIssues":[{
     "description":"text",
@@ -53,5 +53,6 @@ RULES:
 - ratings:A(0issues),B(1-2minor),C(1major|3-5minor),D(2+major|1critical),E(1+blocker|2+critical)
 - IMPORTANT: @Autowired usage in Spring is NOT a BLOCKER/CRITICAL issue (max severity: MAJOR)
 - Spring dependency injection patterns (@Autowired) should NOT block commits
+- RULE CATALOGUE: if a `=== PLATFORM ANTIPATTERN CATALOGUE ===` section is present in this prompt, classify each finding against it. When a finding matches a catalogue entry, populate `details[].rule` with the rule ID exactly (e.g. "JBE-001", "UIK-002"). The catalogue's severity is the MINIMUM to assign — don't downgrade. Findings that don't match any catalogue entry leave `rule` empty (those become candidate skill-gaps for the team to review separately).
 
 ANALYZE_BELOW:

package/templates/config.advanced.example.json

@@ -33,6 +33,12 @@
             "model": "opus"
         },
 
+        "skillRegistry": {
+            "enabled": true,
+            "blockOn": "never",
+            "resumeOnCreatePr": true
+        },
+
         "prAnalysis": {
             "model": "sonnet",
             "timeout": 300000,
@@ -90,6 +96,25 @@
             "use_case": "Override the default sonnet model for judge passes"
         },
 
+        "skillRegistry.enabled": {
+            "description": "Enable/disable the mscope automation-skills integration: deterministic rule checks in pre-commit, antipattern catalogue injection into the analysis prompt, and the skill-gap writer. NOTE the cross-repo side effect: when the sibling automation-skills repo is found, unclassified AI findings are appended as [skill-gap] candidates to that repo's skill-feedback.md (reviewed via `automation-skills retro`; never auto-merged into the registry).",
+            "default": "true",
+            "use_case": "Set to false to fully disable the skill-registry integration (it auto-skips anyway when the skill repo isn't found)"
+        },
+
+        "skillRegistry.blockOn": {
+            "description": "Severity threshold at which deterministic skill-registry findings block the commit",
+            "default": "never",
+            "examples": ["never", "critical", "high", "medium", "low"],
+            "use_case": "Set to 'critical' or 'high' once the team is ready to enforce the mscope rule catalogue"
+        },
+
+        "skillRegistry.resumeOnCreatePr": {
+            "description": "Run `automation-skills resume` (interactive lessons-learned capture to the skill repo's implementation-history.md) during create-pr, before tags are pushed. Skipped automatically in headless mode or when the automation-skills CLI is not installed.",
+            "default": "true",
+            "use_case": "Set to false if your team captures lessons through another channel"
+        },
+
         "prAnalysis.model": {
             "description": "Claude model for PR analysis",
             "default": "sonnet",