@vibe-validate/cli 0.18.3-rc.1 → 0.18.4-rc.1

package/dist/utils/validation-lock-wrapper.js

@@ -0,0 +1,186 @@
+/**
+ * Validation Lock Wrapper
+ *
+ * Provides a reusable locking mechanism for validation workflows.
+ * Extracts the locking logic from validate.ts to enable consistent
+ * lock management across commands (validate, pre-commit, etc.).
+ */
+import { getGitTreeHash } from '@vibe-validate/git';
+import chalk from 'chalk';
+import { displayConfigErrors } from './config-error-reporter.js';
+import { loadConfigWithErrors, loadConfigWithDir } from './config-loader.js';
+import { detectContext } from './context-detector.js';
+import { acquireLock, checkLock, waitForLock, } from './pid-lock.js';
+import { detectProjectId } from './project-id.js';
+/**
+ * Display the result of waiting for validation lock
+ *
+ * @param timedOut - Whether the wait timed out
+ * @param yamlMode - Whether in YAML output mode
+ */
+function displayWaitResult(timedOut, yamlMode) {
+    if (yamlMode)
+        return; // No output in YAML mode
+    if (timedOut) {
+        console.log(chalk.yellow('⏱️  Wait timed out, proceeding with validation'));
+    }
+    else {
+        console.log(chalk.green('✓ Background validation completed'));
+    }
+}
+/**
+ * Display information about existing validation lock
+ *
+ * @param existingLock - The existing lock information
+ * @param currentTreeHash - Current git tree hash
+ * @param yamlMode - Whether in YAML output mode
+ */
+function displayExistingLockInfo(existingLock, currentTreeHash, yamlMode) {
+    if (yamlMode)
+        return; // No output in YAML mode
+    const isCurrentHash = existingLock.treeHash === currentTreeHash;
+    const hashStatus = isCurrentHash
+        ? 'same as current'
+        : `stale - current is ${currentTreeHash.substring(0, 7)}`;
+    const elapsed = Math.floor((Date.now() - new Date(existingLock.startTime).getTime()) / 1000);
+    const elapsedStr = elapsed < 60
+        ? `${elapsed} seconds ago`
+        : `${Math.floor(elapsed / 60)} minutes ago`;
+    console.log(chalk.yellow('⚠️  Validation already running'));
+    console.log(`  Directory: ${existingLock.directory}`);
+    console.log(`  Tree Hash: ${existingLock.treeHash.substring(0, 7)} (${hashStatus})`);
+    console.log(`  PID: ${existingLock.pid}`);
+    console.log(`  Started: ${elapsedStr}`);
+}
+/**
+ * Execute a callback with validation lock management
+ *
+ * This function handles the complete locking workflow:
+ * 1. Load configuration with directory detection
+ * 2. Detect agent context
+ * 3. Determine lock options from config
+ * 4. Wait for existing locks (if enabled)
+ * 5. Acquire lock (if enabled)
+ * 6. Execute callback with context
+ * 7. Release lock in finally block
+ *
+ * @param options - Lock options
+ * @param callback - Function to execute with lock held
+ * @returns Result from callback
+ *
+ * @example
+ * ```typescript
+ * await withValidationLock(
+ *   { lockEnabled: true, waitEnabled: true },
+ *   async ({ config, configDir, context }) => {
+ *     // Run validation workflow
+ *     return runValidateWorkflow(config, options);
+ *   }
+ * );
+ * ```
+ */
+// eslint-disable-next-line sonarjs/cognitive-complexity -- Complexity 26 acceptable for validation lock wrapper (orchestrates config, context, locking, wait, and acquire logic)
+export async function withValidationLock(options, callback) {
+    let lockRelease = null;
+    try {
+        // Load configuration first (needed for lock config)
+        // Use loadConfigWithDir to get config directory for locking
+        const configResult = await loadConfigWithDir();
+        if (!configResult) {
+            // Get detailed error information to distinguish between missing file and validation errors
+            const configWithErrors = await loadConfigWithErrors();
+            if (configWithErrors.errors && configWithErrors.filePath) {
+                // Config file exists but has validation errors
+                const fileName = configWithErrors.filePath.split('/').pop() ?? 'vibe-validate.config.yaml';
+                displayConfigErrors({
+                    fileName,
+                    errors: configWithErrors.errors
+                });
+            }
+            else {
+                // Config file doesn't exist
+                console.error(chalk.red('❌ No configuration found'));
+            }
+            process.exit(1);
+        }
+        const { config, configDir } = configResult;
+        // Detect context (Claude Code, CI, etc.)
+        const context = detectContext();
+        // Determine lock options from config
+        const lockConfig = config.locking ?? { enabled: true, concurrencyScope: 'directory' };
+        // Determine if locking should be enabled
+        let shouldLock = options.lockEnabled ?? true;
+        // If config disables locking, override CLI flag
+        if (!lockConfig.enabled) {
+            shouldLock = false;
+        }
+        let lockOptions = {};
+        if (lockConfig.concurrencyScope === 'project') {
+            // Project-scoped locking - need projectId
+            const projectId = lockConfig.projectId ?? detectProjectId();
+            if (!projectId) {
+                console.error(chalk.red('❌ ERROR: concurrencyScope=project but projectId cannot be detected'));
+                console.error(chalk.yellow('Solutions:'));
+                console.error('  1. Add locking.projectId to vibe-validate.config.yaml');
+                console.error('  2. Ensure git remote is configured');
+                console.error('  3. Ensure package.json has name field');
+                process.exit(1);
+            }
+            lockOptions = { scope: 'project', projectId };
+        }
+        else {
+            // Directory-scoped locking (default)
+            lockOptions = { scope: 'directory' };
+        }
+        // Default behavior: wait is enabled (wait for running validation)
+        // Users can opt out with waitEnabled: false for background hooks
+        const shouldWait = options.waitEnabled !== false;
+        const yamlMode = options.yaml ?? false;
+        // Handle wait mode (default: wait for running validation to complete)
+        if (shouldWait) {
+            // Use config directory for lock (not process.cwd()) - ensures same lock regardless of invocation directory
+            const existingLock = await checkLock(configDir, lockOptions);
+            if (existingLock) {
+                const waitTimeout = options.waitTimeout ?? 300;
+                if (!yamlMode) {
+                    console.log(chalk.yellow('⏳ Waiting for running validation to complete...'));
+                    console.log(`  PID: ${existingLock.pid}`);
+                    console.log(`  Started: ${new Date(existingLock.startTime).toLocaleTimeString()}`);
+                    console.log(`  Timeout: ${waitTimeout}s`);
+                }
+                const waitResult = await waitForLock(configDir, waitTimeout, 1000, lockOptions);
+                displayWaitResult(waitResult.timedOut, yamlMode);
+            }
+            // If no lock exists, proceed normally
+        }
+        // Handle lock mode (single-instance execution)
+        if (shouldLock) {
+            // Use config directory for lock (not process.cwd()) - ensures same lock regardless of invocation directory
+            const treeHash = await getGitTreeHash();
+            const lockResult = await acquireLock(configDir, treeHash, lockOptions);
+            if (!lockResult.acquired && lockResult.existingLock) {
+                // Another validation is already running
+                // If --no-wait specified, exit immediately (for background hooks)
+                if (!shouldWait) {
+                    displayExistingLockInfo(lockResult.existingLock, treeHash, yamlMode);
+                    process.exit(0); // Exit 0 to not trigger errors in hooks
+                }
+                // If wait is enabled (default), the wait logic above already handled it
+                // Just don't try to acquire lock again
+            }
+            else if (lockResult.release) {
+                // Lock acquired successfully - store release function
+                lockRelease = lockResult.release;
+            }
+        }
+        // Execute callback with context
+        return await callback({ config, configDir, context });
+    }
+    finally {
+        // Always release lock when done
+        if (lockRelease) {
+            await lockRelease();
+        }
+    }
+}
+//# sourceMappingURL=validation-lock-wrapper.js.map

package/dist/utils/validation-lock-wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation-lock-wrapper.js","sourceRoot":"","sources":["../../src/utils/validation-lock-wrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-validate/cli",
-  "version": "0.18.3-rc.1",
+  "version": "0.18.4-rc.1",
   "description": "Command-line interface for vibe-validate validation framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -59,23 +59,25 @@
     "chalk": "^5.6.2",
     "commander": "^12.1.0",
     "prompts": "^2.4.2",
+    "proper-lockfile": "^4.1.2",
     "semver": "^7.7.3",
     "yaml": "^2.8.2",
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.25.0",
-    "@vibe-validate/config": "0.18.3-rc.1",
-    "@vibe-validate/core": "0.18.3-rc.1",
-    "@vibe-validate/git": "0.18.3-rc.1",
-    "@vibe-validate/extractors": "0.18.3-rc.1",
-    "@vibe-validate/history": "0.18.3-rc.1"
+    "@vibe-validate/config": "0.18.4-rc.1",
+    "@vibe-validate/core": "0.18.4-rc.1",
+    "@vibe-validate/extractors": "0.18.4-rc.1",
+    "@vibe-validate/history": "0.18.4-rc.1",
+    "@vibe-validate/git": "0.18.4-rc.1"
   },
   "devDependencies": {
     "@types/node": "^20.19.26",
     "@types/prompts": "^2.4.9",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/semver": "^7.7.1",
     "typescript": "^5.9.3",
     "vitest": "^2.1.9",
-    "@vibe-validate/utils": "0.18.3-rc.1"
+    "@vibe-validate/utils": "0.18.4-rc.1"
   },
   "scripts": {
     "build": "tsc && node scripts/prepare-bin.js && node dist/scripts/generate-watch-pr-schema.js && node dist/scripts/generate-run-result-schema.js",