pumuki-ast-hooks 5.3.2 → 5.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumuki-ast-hooks",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "Enterprise-grade AST Intelligence System with multi-platform support (iOS, Android, Backend, Frontend) and Feature-First + DDD + Clean Architecture enforcement. Includes dynamic violations API for intelligent querying.",
   "main": "index.js",
   "bin": {

package/scripts/hooks-system/.AI_TOKEN_STATUS.txt

@@ -12,5 +12,5 @@ Source: file
 
 ℹ️  Data is stale. Ensure guards are running and refreshing token usage.
 
-Last updated: 2025-12-29T14:00:39.437Z
+Last updated: 2025-12-29T14:33:40.651Z
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

package/scripts/hooks-system/.audit-reports/notifications.log

@@ -481,3 +481,14 @@
 {"timestamp":"2025-12-29T13:54:39.211Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"7e2ce29d-3424-4af6-b835-c22cd6e493f1","type":"token_ok"},"context":{}}
 {"timestamp":"2025-12-29T13:57:39.324Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"6d7c9c64-81ca-4e79-b063-24bcc30eee7d","type":"token_ok"},"context":{}}
 {"timestamp":"2025-12-29T14:00:39.438Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"c7c94007-deae-40d7-bea1-479394e06bb2","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:03:39.550Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"1e2e518f-08c1-481e-87c8-8c8bc7ae41af","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:06:39.659Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"10803c2c-c480-4a97-b9fd-a3aa62024da2","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:09:39.755Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"4ef7cd3a-8698-4f92-8a2b-7fed6186850f","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:12:39.863Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"5b8049b8-709c-4a78-8b86-1626fc33ec6b","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:15:39.971Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"dae0457b-df54-4e9c-bf3a-d56c3adb562d","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:18:40.089Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"b1d5d23f-4a73-4886-8ec7-4f3adb5a65bc","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:21:40.200Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"da584244-c009-40c6-b353-5ce27b4bd134","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:24:40.314Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"af92a572-3663-49c3-b220-f95d1d996055","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:27:40.425Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"377d5821-ea01-4d97-909f-54b6a16b16b9","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:30:40.543Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"67147292-fe08-44c1-80e7-cfab39ed1f72","type":"token_ok"},"context":{}}
+{"timestamp":"2025-12-29T14:33:40.651Z","level":"debug","component":"NotificationCenter","event":"Notification enqueued","data":{"id":"7f800d7b-29ca-474c-bd11-d2408767ce77","type":"token_ok"},"context":{}}

package/scripts/hooks-system/.audit-reports/token-monitor.log

@@ -1447,3 +1447,36 @@
 {"timestamp":"2025-12-29T14:00:39.428Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
 {"timestamp":"2025-12-29T14:00:39.429Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
 {"timestamp":"2025-12-29T14:00:39.438Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:03:39.541Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:03:39.542Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:03:39.551Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:06:39.649Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:06:39.650Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:06:39.659Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:09:39.744Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:09:39.745Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:09:39.755Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:12:39.852Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:12:39.853Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:12:39.864Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:15:39.960Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:15:39.961Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:15:39.972Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:18:40.079Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:18:40.080Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:18:40.089Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:21:40.190Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:21:40.191Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:21:40.201Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:24:40.304Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:24:40.305Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:24:40.314Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:27:40.415Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:27:40.416Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:27:40.425Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:30:40.533Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:30:40.534Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:30:40.543Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}
+{"timestamp":"2025-12-29T14:33:40.642Z","level":"debug","component":"TokenMonitor","event":"CURSOR_SERVICE_USING_FILE","data":{"usage":{"tokensUsed":0,"maxTokens":1000000,"percentUsed":55.519975,"timestamp":"2025-12-25T22:29:39.685Z","source":"file","untrusted":false}},"context":{}}
+{"timestamp":"2025-12-29T14:33:40.643Z","level":"debug","component":"TokenMonitor","event":"TOKEN_MONITOR_METRICS","data":{"timestamp":"2025-12-25T22:29:39.685Z","tokensUsed":0,"maxTokens":1000000,"percentUsed":0,"remainingTokens":1000000,"level":"ok","source":"file","stale":true,"untrusted":false},"context":{}}
+{"timestamp":"2025-12-29T14:33:40.652Z","level":"info","component":"TokenMonitor","event":"TOKEN_MONITOR_RESULT","data":{"level":"ok","percentUsed":0,"tokensUsed":0,"maxTokens":1000000,"source":"file","stale":true,"untrusted":false},"context":{"message":"Result level=ok percent=0% used=0/1000000 source=file (stale)"}}

package/scripts/hooks-system/infrastructure/mcp/ast-intelligence-automation.js

@@ -27,11 +27,18 @@ const { execSync } = require('child_process');
 
 const MCP_VERSION = '2024-11-05';
 
-// Configuration
-const CompositionRoot = require('../../application/CompositionRoot');
-
+// Configuration - LAZY LOADING to avoid blocking MCP initialization
 const REPO_ROOT = process.env.REPO_ROOT || process.cwd();
-const compositionRoot = CompositionRoot.createForProduction(REPO_ROOT);
+
+// Lazy-loaded CompositionRoot - only initialized when first needed
+let _compositionRoot = null;
+function getCompositionRoot() {
+    if (!_compositionRoot) {
+        const CompositionRoot = require('../../application/CompositionRoot');
+        _compositionRoot = CompositionRoot.createForProduction(REPO_ROOT);
+    }
+    return _compositionRoot;
+}
 
 const EVIDENCE_FILE = path.join(REPO_ROOT, '.AI_EVIDENCE.json');
 const GITFLOW_STATE_FILE = path.join(REPO_ROOT, '.git', 'gitflow-state.json');
@@ -154,15 +161,15 @@ function resolveUpdateEvidenceScript() {
 
 // Lazy Loading Services
 function getContextEngine() {
-    return compositionRoot.getContextDetectionEngine();
+    return getCompositionRoot().getContextDetectionEngine();
 }
 
 function getOrchestrator() {
-    return compositionRoot.getOrchestrator();
+    return getCompositionRoot().getOrchestrator();
 }
 
 function getNotificationAdapter() {
-    return compositionRoot.getNotificationService();
+    return getCompositionRoot().getNotificationService();
 }
 
 // Polling state
@@ -183,7 +190,7 @@ const AUTO_PR_ENABLED = process.env.AUTO_PR_ENABLED === 'true';
  * Helper: Send macOS notification via centralized adapter
  */
 function sendNotification(title, message, sound = 'Hero') {
-    compositionRoot.getNotificationService().notify({
+    getCompositionRoot().getNotificationService().notify({
         type: 'mcp_automation',
         level: 'info',
         title,
@@ -196,9 +203,9 @@ function sendNotification(title, message, sound = 'Hero') {
  * Check evidence status
  */
 function checkEvidence() {
-    const monitor = compositionRoot.getEvidenceMonitor();
+    const monitor = getCompositionRoot().getEvidenceMonitor();
     const isStale = monitor.isStale();
-    const gitFlow = compositionRoot.getGitFlowService();
+    const gitFlow = getCompositionRoot().getGitFlowService();
     const currentBranch = gitFlow.getCurrentBranch();
 
     if (isStale) {
@@ -217,7 +224,7 @@ function checkEvidence() {
  * Auto-complete Git Flow cycle
  */
 async function autoCompleteGitFlow(params) {
-    const gitFlowService = compositionRoot.getGitFlowService();
+    const gitFlowService = getCompositionRoot().getGitFlowService();
     const results = [];
     const currentBranch = gitFlowService.getCurrentBranch();
     const baseBranch = process.env.AST_BASE_BRANCH || 'develop';
@@ -235,7 +242,7 @@ async function autoCompleteGitFlow(params) {
 
         if (!gitFlowService.isClean()) {
             results.push('⚠️  Uncommitted changes detected, committing...');
-            const gitCommand = compositionRoot.getGitCommandAdapter();
+            const gitCommand = getCompositionRoot().getGitCommandAdapter();
             gitCommand.addAll();
             const message = params.commitMessage || `chore: auto-commit changes on ${currentBranch}`;
             gitCommand.commit(message);
@@ -245,7 +252,7 @@ async function autoCompleteGitFlow(params) {
         }
 
         results.push('Pushing to origin...');
-        const gitCommand = compositionRoot.getGitCommandAdapter();
+        const gitCommand = getCompositionRoot().getGitCommandAdapter();
         gitCommand.push('origin', currentBranch, { setUpstream: true });
         results.push('✅ Pushed to origin');
 
@@ -260,7 +267,7 @@ async function autoCompleteGitFlow(params) {
 
                 if (params.autoMerge) {
                     results.push('Auto-merging PR...');
-                    const github = compositionRoot.getGitHubAdapter();
+                    const github = getCompositionRoot().getGitHubAdapter();
                     github.mergePullRequest(prUrl);
                     results.push(`✅ PR merged and branch deleted`);
 
@@ -295,7 +302,7 @@ async function autoCompleteGitFlow(params) {
  * Sync branches (develop ↔ main)
  */
 function syncBranches(params) {
-    const gitFlowService = compositionRoot.getGitFlowService();
+    const gitFlowService = getCompositionRoot().getGitFlowService();
     const result = gitFlowService.syncBranches();
 
     return {
@@ -309,11 +316,11 @@ function syncBranches(params) {
  * Cleanup stale branches (local + remote)
  */
 function cleanupStaleBranches(params) {
-    const gitFlowService = compositionRoot.getGitFlowService();
+    const gitFlowService = getCompositionRoot().getGitFlowService();
     const baseBranch = process.env.AST_BASE_BRANCH || 'develop';
-    const gitQuery = compositionRoot.getGitQueryAdapter();
-    const gitCommand = compositionRoot.getGitCommandAdapter();
-    const github = compositionRoot.getGitHubAdapter();
+    const gitQuery = getCompositionRoot().getGitQueryAdapter();
+    const gitCommand = getCompositionRoot().getGitCommandAdapter();
+    const github = getCompositionRoot().getGitHubAdapter();
 
     const results = [];
 
@@ -367,7 +374,7 @@ function cleanupStaleBranches(params) {
  * Auto-execute ai-start when code files detected
  */
 async function autoExecuteAIStart(params) {
-    const useCase = compositionRoot.getAutoExecuteAIStartUseCase();
+    const useCase = getCompositionRoot().getAutoExecuteAIStartUseCase();
 
     try {
         const result = await useCase.execute({
@@ -503,8 +510,8 @@ function checkBranchChangesCoherence(branchName, uncommittedChanges) {
  * Returns BLOCKED or ALLOWED status with auto-fixes applied
  */
 async function aiGateCheck() {
-    const gitFlowService = compositionRoot.getGitFlowService();
-    const gitQuery = compositionRoot.getGitQueryAdapter();
+    const gitFlowService = getCompositionRoot().getGitFlowService();
+    const gitQuery = getCompositionRoot().getGitQueryAdapter();
     const currentBranch = getCurrentGitBranch(REPO_ROOT);
     const isProtectedBranch = ['main', 'master', 'develop'].includes(currentBranch);
 
@@ -516,7 +523,7 @@ async function aiGateCheck() {
     const autoFixes = [];
 
     // 1. Evidence Freshness Check (Auto-fix included)
-    const evidenceMonitor = compositionRoot.getEvidenceMonitor();
+    const evidenceMonitor = getCompositionRoot().getEvidenceMonitor();
     if (evidenceMonitor.isStale()) {
         try {
             await evidenceMonitor.refresh();
@@ -541,8 +548,8 @@ async function aiGateCheck() {
     }
 
     // 3. Block Commit Use Case Integration
-    const blockCommitUseCase = compositionRoot.getBlockCommitUseCase();
-    const astAdapter = compositionRoot.getAstAdapter();
+    const blockCommitUseCase = getCompositionRoot().getBlockCommitUseCase();
+    const astAdapter = getCompositionRoot().getAstAdapter();
 
     try {
         const auditResult = await astAdapter.analyzeStagedFiles();
@@ -581,10 +588,10 @@ async function aiGateCheck() {
 async function validateAndFix(params) {
     const results = [];
     const issues = [];
-    const gitFlowService = compositionRoot.getGitFlowService();
-    const gitQuery = compositionRoot.getGitQueryAdapter();
-    const gitCommand = compositionRoot.getGitCommandAdapter();
-    const evidenceMonitor = compositionRoot.getEvidenceMonitor();
+    const gitFlowService = getCompositionRoot().getGitFlowService();
+    const gitQuery = getCompositionRoot().getGitQueryAdapter();
+    const gitCommand = getCompositionRoot().getGitCommandAdapter();
+    const evidenceMonitor = getCompositionRoot().getEvidenceMonitor();
 
     try {
         if (evidenceMonitor.isStale()) {
@@ -633,9 +640,10 @@ async function validateAndFix(params) {
 }
 
 /**
- * MCP Protocol Handler
+ * MCP Protocol Handler - Direct instantiation to avoid blocking on CompositionRoot
  */
-const protocolHandler = compositionRoot.getMcpProtocolHandler(process.stdin, process.stdout);
+const McpProtocolHandler = require('./services/McpProtocolHandler');
+const protocolHandler = new McpProtocolHandler(process.stdin, process.stdout);
 
 async function handleMcpMessage(message) {
     try {
@@ -749,8 +757,8 @@ async function handleMcpMessage(message) {
             }
 
             if (uri === 'gitflow://state') {
-                const gitFlow = compositionRoot.getGitFlowService();
-                const gitQuery = compositionRoot.getGitQueryAdapter();
+                const gitFlow = getCompositionRoot().getGitFlowService();
+                const gitQuery = getCompositionRoot().getGitQueryAdapter();
                 const currentBranch = getCurrentGitBranch(REPO_ROOT);
                 const branchState = getBranchStateSafe(gitQuery, REPO_ROOT, currentBranch);
 
@@ -776,7 +784,7 @@ async function handleMcpMessage(message) {
             }
 
             if (uri === 'context://active') {
-                const orchestrator = compositionRoot.getOrchestrator();
+                const orchestrator = getCompositionRoot().getOrchestrator();
                 try {
                     const decision = await orchestrator.analyzeContext();
                     return {
@@ -938,10 +946,10 @@ protocolHandler.start(handleMcpMessage);
 setInterval(async () => {
     try {
         const now = Date.now();
-        const gitFlowService = compositionRoot.getGitFlowService();
-        const gitQuery = compositionRoot.getGitQueryAdapter();
-        const evidenceMonitor = compositionRoot.getEvidenceMonitor();
-        const orchestrator = compositionRoot.getOrchestrator();
+        const gitFlowService = getCompositionRoot().getGitFlowService();
+        const gitQuery = getCompositionRoot().getGitQueryAdapter();
+        const evidenceMonitor = getCompositionRoot().getEvidenceMonitor();
+        const orchestrator = getCompositionRoot().getOrchestrator();
 
         const currentBranch = gitFlowService.getCurrentBranch();
         const baseBranch = process.env.AST_BASE_BRANCH || 'develop';
@@ -1002,9 +1010,9 @@ setInterval(async () => {
     if (now - lastAutoCommitTime < AUTO_COMMIT_INTERVAL) return;
 
     try {
-        const gitFlowService = compositionRoot.getGitFlowService();
-        const gitQuery = compositionRoot.getGitQueryAdapter();
-        const gitCommand = compositionRoot.getGitCommandAdapter();
+        const gitFlowService = getCompositionRoot().getGitFlowService();
+        const gitQuery = getCompositionRoot().getGitQueryAdapter();
+        const gitCommand = getCompositionRoot().getGitCommandAdapter();
 
         const currentBranch = gitFlowService.getCurrentBranch();
         const isFeatureBranch = currentBranch.match(/^(feature|fix|hotfix)\//);