pumuki-ast-hooks 5.3.20 → 5.3.21

package/scripts/hooks-system/application/services/guard/GuardConfig.js

@@ -1,25 +1,22 @@
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
+const envHelper = require('../../../config/env');
 
 class GuardConfig {
-    constructor(env = process.env) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_config',
-            operation: 'constructor'
-        });
+    constructor(env = envHelper) {
+        const getNumber = (name, def) =>
+            typeof env.getNumber === 'function' ? env.getNumber(name, def) : Number(env[name] || def);
+        const getBool = (name, def) =>
+            typeof env.getBool === 'function' ? env.getBool(name, def) : (env[name] !== 'false');
 
-        m_constructor.started();
-        this.healthyReminderIntervalMs = Number(env.GUARD_AUTOSTART_HEALTHY_INTERVAL || 0);
-        this.heartbeatNotifyCooldownMs = Number(env.GUARD_AUTOSTART_NOTIFY_COOLDOWN || 60000);
-        this.healthyReminderCooldownMs = Number(
-            env.GUARD_AUTOSTART_HEALTHY_COOLDOWN || (this.healthyReminderIntervalMs > 0 ? this.healthyReminderIntervalMs : 0)
+        this.healthyReminderIntervalMs = getNumber('GUARD_AUTOSTART_HEALTHY_INTERVAL', 0);
+        this.heartbeatNotifyCooldownMs = getNumber('GUARD_AUTOSTART_NOTIFY_COOLDOWN', 60000);
+        this.healthyReminderCooldownMs = getNumber(
+            'GUARD_AUTOSTART_HEALTHY_COOLDOWN',
+            this.healthyReminderIntervalMs > 0 ? this.healthyReminderIntervalMs : 0
         );
-        this.heartbeatRestartCooldownMs = Number(env.GUARD_AUTOSTART_HEARTBEAT_COOLDOWN || 60000);
-        this.monitorIntervalMs = Number(env.GUARD_AUTOSTART_MONITOR_INTERVAL || 5000);
-        this.restartCooldownMs = Number(env.GUARD_AUTOSTART_RESTART_COOLDOWN || 2000);
-        this.stopSupervisorOnExit = env.GUARD_AUTOSTART_STOP_SUPERVISOR_ON_EXIT !== 'false';
-        m_constructor.success();
+        this.heartbeatRestartCooldownMs = getNumber('GUARD_AUTOSTART_HEARTBEAT_COOLDOWN', 60000);
+        this.monitorIntervalMs = getNumber('GUARD_AUTOSTART_MONITOR_INTERVAL', 5000);
+        this.restartCooldownMs = getNumber('GUARD_AUTOSTART_RESTART_COOLDOWN', 2000);
+        this.stopSupervisorOnExit = getBool('GUARD_AUTOSTART_STOP_SUPERVISOR_ON_EXIT', true);
     }
 }
 

package/scripts/hooks-system/application/services/guard/GuardEventLogger.js

@@ -1,22 +1,12 @@
 const fs = require('fs');
 const path = require('path');
 
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardEventLogger {
     constructor({
         repoRoot = process.cwd(),
         logger = console,
         fsModule = fs
     } = {}) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_event_logger',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.repoRoot = repoRoot;
         this.logger = logger;
         this.fs = fsModule;
@@ -36,7 +26,6 @@ class GuardEventLogger {
                 this.logger.debug('GUARD_EVENT_LOGGER_INIT_ERROR', { error: error.message });
             }
         }
-        m_constructor.success();
     }
 
     log(message, data = {}) {

package/scripts/hooks-system/application/services/guard/GuardHealthReminder.js

@@ -1,35 +1,17 @@
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardHealthReminder {
     constructor(timers, notificationHandler, config) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_health_reminder',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.timers = timers;
         this.notificationHandler = notificationHandler;
         this.config = config;
         this.timer = null;
         this.lastReminderAt = 0;
-        m_constructor.success();
     }
 
     start(checkHealthCallback) {
-        const m_start = createMetricScope({
-            hook: 'guard_health_reminder',
-            operation: 'start'
-        });
-
-        m_start.started();
         this.stop();
 
         const { healthyReminderIntervalMs } = this.config;
         if (!Number.isFinite(healthyReminderIntervalMs) || healthyReminderIntervalMs <= 0) {
-            m_start.success();
             return;
         }
 
@@ -40,21 +22,13 @@ class GuardHealthReminder {
         if (this.timer && typeof this.timer.unref === 'function') {
             this.timer.unref();
         }
-        m_start.success();
     }
 
     stop() {
-        const m_stop = createMetricScope({
-            hook: 'guard_health_reminder',
-            operation: 'stop'
-        });
-
-        m_stop.started();
         if (this.timer) {
             this.timers.clearInterval(this.timer);
             this.timer = null;
         }
-        m_stop.success();
     }
 
     _tick(checkHealthCallback) {

package/scripts/hooks-system/application/services/guard/GuardHeartbeatMonitor.js

@@ -1,44 +1,30 @@
 const fs = require('fs');
 const path = require('path');
-
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
+const env = require('../../../config/env');
 
 class GuardHeartbeatMonitor {
     constructor({
         repoRoot = process.cwd(),
         logger = console,
-        fsModule = fs,
-        env = process.env
+        fsModule = fs
     } = {}) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_heartbeat_monitor',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.repoRoot = repoRoot;
         this.logger = logger;
         this.fs = fsModule;
-        this.env = env;
-
-        const heartbeatRelative = env.HOOK_GUARD_HEARTBEAT_PATH || path.join('.audit_tmp', 'guard-heartbeat.json');
+        const heartbeatRelative = env.get('HOOK_GUARD_HEARTBEAT_PATH', path.join('.audit_tmp', 'guard-heartbeat.json'));
         this.heartbeatPath = path.isAbsolute(heartbeatRelative)
             ? heartbeatRelative
             : path.join(this.repoRoot, heartbeatRelative);
 
-        this.heartbeatMaxAgeMs = Number(
-            env.GUARD_AUTOSTART_HEARTBEAT_MAX_AGE || env.HOOK_GUARD_HEARTBEAT_MAX_AGE || 60000
-        );
+        this.heartbeatMaxAgeMs = env.getNumber('GUARD_AUTOSTART_HEARTBEAT_MAX_AGE',
+            env.getNumber('HOOK_GUARD_HEARTBEAT_MAX_AGE', 60000));
 
         this.heartbeatRestartReasons = new Set(
-            (env.GUARD_AUTOSTART_HEARTBEAT_RESTART || 'missing,stale,invalid,degraded')
+            (env.get('GUARD_AUTOSTART_HEARTBEAT_RESTART', 'missing,stale,invalid,degraded'))
                 .split(',')
                 .map(entry => entry.trim().toLowerCase())
                 .filter(Boolean)
         );
-        m_constructor.success();
     }
 
     evaluate() {

package/scripts/hooks-system/application/services/guard/GuardLockManager.js

@@ -1,22 +1,12 @@
 const fs = require('fs');
 const path = require('path');
 
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardLockManager {
     constructor({
         repoRoot = process.cwd(),
         logger = console,
         fsModule = fs
     } = {}) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_lock_manager',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.repoRoot = repoRoot;
         this.logger = logger;
         this.fs = fsModule;
@@ -36,7 +26,6 @@ class GuardLockManager {
                 this.logger.debug('GUARD_LOCK_MANAGER_INIT_DEBUG', { error: error.message });
             }
         }
-        m_constructor.success();
     }
 
     acquireLock() {

package/scripts/hooks-system/application/services/guard/GuardMonitorLoop.js

@@ -1,30 +1,13 @@
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardMonitorLoop {
     constructor(timers, intervalMs, tickCallback, logger) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_monitor_loop',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.timers = timers;
         this.intervalMs = intervalMs;
         this.tickCallback = tickCallback;
         this.logger = logger;
         this.timer = null;
-        m_constructor.success();
     }
 
     start() {
-        const m_start = createMetricScope({
-            hook: 'guard_monitor_loop',
-            operation: 'start'
-        });
-
-        m_start.started();
         this.stop();
         this.timer = this.timers.setInterval(() => {
             try {
@@ -33,21 +16,13 @@ class GuardMonitorLoop {
                 this.logger.log(`Monitor error: ${error.message}`);
             }
         }, this.intervalMs);
-        m_start.success();
     }
 
     stop() {
-        const m_stop = createMetricScope({
-            hook: 'guard_monitor_loop',
-            operation: 'stop'
-        });
-
-        m_stop.started();
         if (this.timer) {
             this.timers.clearInterval(this.timer);
             this.timer = null;
         }
-        m_stop.success();
     }
 }
 

package/scripts/hooks-system/application/services/guard/GuardNotificationHandler.js

@@ -1,20 +1,9 @@
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardNotificationHandler {
     constructor(notificationCenter, eventLogger, config) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_notification_handler',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.notificationCenter = notificationCenter;
         this.eventLogger = eventLogger;
         this.config = config;
         this.lastNotificationState = { reason: null, at: 0 };
-        m_constructor.success();
     }
 
     notify(message, level = 'info', options = {}) {

package/scripts/hooks-system/application/services/guard/GuardProcessManager.js

@@ -1,10 +1,6 @@
 const path = require('path');
 const { spawnSync } = require('child_process');
 
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardProcessManager {
     constructor({
         repoRoot = process.cwd(),
@@ -12,12 +8,6 @@ class GuardProcessManager {
         fsModule = require('fs'),
         childProcess = { spawnSync }
     } = {}) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_process_manager',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.repoRoot = repoRoot;
         this.logger = logger;
         this.fs = fsModule;
@@ -25,7 +15,7 @@ class GuardProcessManager {
 
         this.supervisorPidFile = path.join(this.repoRoot, '.guard-supervisor.pid');
         this.startScript = path.join(this.repoRoot, 'bin', 'start-guards.sh');
-        m_constructor.success();
+        this.busy = false;
     }
 
     isSupervisorRunning() {
@@ -69,6 +59,15 @@ class GuardProcessManager {
     }
 
     startSupervisor() {
+        if (this.busy) {
+            return {
+                success: false,
+                error: new Error('bulkhead_busy'),
+                stdout: '',
+                stderr: 'bulkhead_busy'
+            };
+        }
+        this.busy = true;
         try {
             const result = this.childProcess.spawnSync(this.startScript, ['start'], {
                 cwd: this.repoRoot,
@@ -91,10 +90,21 @@ class GuardProcessManager {
                 stdout: '',
                 stderr: error.message
             };
+        } finally {
+            this.busy = false;
         }
     }
 
     stopSupervisor() {
+        if (this.busy) {
+            return {
+                success: false,
+                error: new Error('bulkhead_busy'),
+                stdout: '',
+                stderr: 'bulkhead_busy'
+            };
+        }
+        this.busy = true;
         try {
             const result = this.childProcess.spawnSync(this.startScript, ['stop'], {
                 cwd: this.repoRoot,
@@ -117,6 +127,8 @@ class GuardProcessManager {
                 stdout: '',
                 stderr: error.message
             };
+        } finally {
+            this.busy = false;
         }
     }
 }

package/scripts/hooks-system/application/services/guard/GuardRecoveryService.js

@@ -1,7 +1,3 @@
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class GuardRecoveryService {
     constructor({
         repoRoot,
@@ -10,19 +6,12 @@ class GuardRecoveryService {
         notificationHandler,
         restartCooldownMs = 2000
     }) {
-        const m_constructor = createMetricScope({
-            hook: 'guard_recovery_service',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.repoRoot = repoRoot;
         this.logger = logger;
         this.startScript = startScript;
         this.notificationHandler = notificationHandler;
         this.restartCooldownMs = restartCooldownMs;
         this.lastEnsure = 0;
-        m_constructor.success();
     }
 
     ensureSupervisor(reason, eventLogger) {

package/scripts/hooks-system/application/services/installation/ConfigurationGeneratorService.js

@@ -1,10 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 const COLORS = {
     reset: '\x1b[0m',
     green: '\x1b[32m',
@@ -14,24 +10,11 @@ const COLORS = {
 
 class ConfigurationGeneratorService {
     constructor(targetRoot, hookSystemRoot) {
-        const m_constructor = createMetricScope({
-            hook: 'configuration_generator_service',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.targetRoot = targetRoot || process.cwd();
         this.hookSystemRoot = hookSystemRoot;
-        m_constructor.success();
     }
 
     createProjectConfig(platforms) {
-        const m_create_project_config = createMetricScope({
-            hook: 'configuration_generator_service',
-            operation: 'create_project_config'
-        });
-
-        m_create_project_config.started();
         const config = {
             version: '3.1.0',
             project: {
@@ -90,7 +73,6 @@ class ConfigurationGeneratorService {
 
         fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
         this.logSuccess('Configuration created');
-        m_create_project_config.success();
     }
 
     installESLintConfigs() {

package/scripts/hooks-system/application/services/installation/FileSystemInstallerService.js

@@ -1,10 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 const COLORS = {
     reset: '\x1b[0m',
     green: '\x1b[32m',
@@ -13,25 +9,12 @@ const COLORS = {
 
 class FileSystemInstallerService {
     constructor(targetRoot, hookSystemRoot, logger = null) {
-        const m_constructor = createMetricScope({
-            hook: 'file_system_installer_service',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.targetRoot = targetRoot || process.cwd();
         this.hookSystemRoot = hookSystemRoot;
         this.logger = logger;
-        m_constructor.success();
     }
 
     createDirectoryStructure() {
-        const m_create_directory_structure = createMetricScope({
-            hook: 'file_system_installer_service',
-            operation: 'create_directory_structure'
-        });
-
-        m_create_directory_structure.started();
         const dirs = [
             'scripts/hooks-system',
             'scripts/hooks-system/docs',
@@ -46,7 +29,6 @@ class FileSystemInstallerService {
             }
         });
         this.logSuccess('Directory structure created');
-        m_create_directory_structure.success();
     }
 
     copySystemFiles() {

package/scripts/hooks-system/application/services/installation/GitEnvironmentService.js

@@ -2,10 +2,6 @@ const fs = require('fs');
 const path = require('path');
 const { execSync, spawnSync } = require('child_process');
 
-const {
-  createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 const COLORS = {
   reset: '\x1b[0m',
   blue: '\x1b[34m',
@@ -17,15 +13,8 @@ const COLORS = {
 
 class GitEnvironmentService {
   constructor(targetRoot, version = 'unknown') {
-    const m_constructor = createMetricScope({
-      hook: 'git_environment_service',
-      operation: 'constructor'
-    });
-
-    m_constructor.started();
     this.targetRoot = targetRoot || process.cwd();
     this.version = version;
-    m_constructor.success();
   }
 
   checkGitRepository() {
@@ -99,13 +88,6 @@ class GitEnvironmentService {
   }
 
   getPreCommitHookContent() {
-    const m_get_pre_commit_hook_content = createMetricScope({
-      hook: 'git_environment_service',
-      operation: 'get_pre_commit_hook_content'
-    });
-
-    m_get_pre_commit_hook_content.started();
-    m_get_pre_commit_hook_content.success();
     return `#!/bin/bash
 # AST Intelligence Hooks - Pre-commit
 # Auto-generated by pumuki-ast-hooks v${this.version}
@@ -128,7 +110,7 @@ fi
 
 # Try node_modules/.bin first (works with npm install)
 if [ -f "node_modules/.bin/ast-hooks" ]; then
-  OUTPUT=$(node_modules/.bin/ast-hooks ast 2>&1)
+  OUTPUT=$(node_modules/.bin/ast-hooks ast --staged 2>&1)
   EXIT_CODE=$?
   echo "$OUTPUT"
   if [ $EXIT_CODE -ne 0 ]; then

package/scripts/hooks-system/application/services/installation/HookInstaller.js

@@ -1,18 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 
-const {
-    createMetricScope: createMetricScope
-} = require('../../../infrastructure/telemetry/metric-scope');
-
 class HookInstaller {
     constructor(targetRoot, hookSystemRoot, logger = null) {
-        const m_constructor = createMetricScope({
-            hook: 'hook_installer',
-            operation: 'constructor'
-        });
-
-        m_constructor.started();
         this.targetRoot = targetRoot;
         this.hookSystemRoot = hookSystemRoot;
         this.logger = logger;
@@ -22,7 +12,50 @@ class HookInstaller {
             yellow: '\x1b[33m',
             cyan: '\x1b[36m'
         };
-        m_constructor.success();
+    }
+
+    getPackageRoot() {
+        let dir = this.hookSystemRoot;
+        for (let i = 0; i < 8; i++) {
+            const pkgJson = path.join(dir, 'package.json');
+            try {
+                if (fs.existsSync(pkgJson) && fs.statSync(pkgJson).isFile()) {
+                    return dir;
+                }
+            } catch (error) {
+                const msg = error && error.message ? error.message : String(error);
+                this.logger?.debug?.('HOOK_INSTALLER_PACKAGE_ROOT_PROBE_ERROR', {
+                    pkgJson,
+                    error: msg
+                });
+            }
+
+            const parent = path.dirname(dir);
+            if (parent === dir) {
+                break;
+            }
+            dir = parent;
+        }
+
+        return path.resolve(this.hookSystemRoot, '..', '..', '..');
+    }
+
+    resolveFirstExistingDir(candidates) {
+        for (const candidate of candidates) {
+            if (!candidate) continue;
+            try {
+                if (fs.existsSync(candidate) && fs.statSync(candidate).isDirectory()) {
+                    return candidate;
+                }
+            } catch (error) {
+                const msg = error && error.message ? error.message : String(error);
+                this.logger?.debug?.('HOOK_INSTALLER_DIR_PROBE_ERROR', {
+                    candidate,
+                    error: msg
+                });
+            }
+        }
+        return null;
     }
 
     install(platforms) {
@@ -42,12 +75,20 @@ class HookInstaller {
     }
 
     installSkills(claudeSkillsDir, platforms) {
-        const librarySkillsDir = path.join(this.hookSystemRoot, 'skills');
+        const packageRoot = this.getPackageRoot();
+        const librarySkillsDir = this.resolveFirstExistingDir([
+            path.join(this.hookSystemRoot, 'skills'),
+            path.join(packageRoot, 'skills')
+        ]);
 
-        if (!fs.existsSync(librarySkillsDir)) {
+        if (!librarySkillsDir) {
             return;
         }
 
+        if (!fs.existsSync(claudeSkillsDir)) {
+            fs.mkdirSync(claudeSkillsDir, { recursive: true });
+        }
+
         const relevantSkills = this.getRelevantSkills(platforms);
 
         relevantSkills.forEach(skillName => {
@@ -69,9 +110,13 @@ class HookInstaller {
     }
 
     installHooks(claudeHooksDir) {
-        const libraryHooksDir = path.join(this.hookSystemRoot, 'hooks');
+        const packageRoot = this.getPackageRoot();
+        const libraryHooksDir = this.resolveFirstExistingDir([
+            path.join(this.hookSystemRoot, 'hooks'),
+            path.join(packageRoot, 'hooks')
+        ]);
 
-        if (!fs.existsSync(libraryHooksDir)) {
+        if (!libraryHooksDir) {
             return;
         }
 
@@ -111,7 +156,8 @@ class HookInstaller {
     }
 
     copyIDERules() {
-        const sourceRulesDir = path.join(this.hookSystemRoot, '.cursor', 'rules');
+        const packageRoot = this.getPackageRoot();
+        const sourceRulesDir = path.join(packageRoot, '.cursor', 'rules');
 
         if (!fs.existsSync(sourceRulesDir)) {
             return;
@@ -139,12 +185,6 @@ class HookInstaller {
     }
 
     getRelevantSkills(platforms) {
-        const m_get_relevant_skills = createMetricScope({
-            hook: 'hook_installer',
-            operation: 'get_relevant_skills'
-        });
-
-        m_get_relevant_skills.started();
         const allSkills = ['backend-guidelines', 'frontend-guidelines', 'ios-guidelines', 'android-guidelines'];
         const relevantSkills = [];
 
@@ -153,8 +193,6 @@ class HookInstaller {
         if (platforms.includes('ios')) relevantSkills.push('ios-guidelines');
         if (platforms.includes('android')) relevantSkills.push('android-guidelines');
 
-        m_get_relevant_skills.success();
-
         return relevantSkills.length > 0 ? relevantSkills : allSkills;
     }