@chongyan/autospec 1.0.1 → 1.0.2

package/plugins/hooks/layer1-validator.js

@@ -33,12 +33,19 @@ import {
   incrementTotalMetric,
   incrementStageMetric,
   addErrorEntry,
+  getCurrentStageSubsystems,
+  updateSubsystemState,
+  detectSubsystemFromCommand,
 } from './lib/hook-state-manager.js';
 import { getTraceId, recordEvent } from './lib/trace-context.js';
 import { analyzeFailures, requiresHumanConfirmation } from './lib/test-failure-analyzer.js';
+import { autoFixLoop, analyzeErrorType, REPAIR_ZONES, MAX_RETRY_COUNT } from './lib/auto-fix-loop.js';
 
 const logger = createHookLogger('layer1-validator');
 
+// 重试计数缓存（内存中，用于追踪同一问题的重试次数）
+const retryCountCache = new Map();
+
 /**
  * 分析测试失败
  */
@@ -135,7 +142,7 @@ async function handlePreToolUse(input, projectRoot) {
             `Attempting to mark Stage ${stageNum} as completed without Layer 1 validation.\n\n` +
             `Constitution DP6 requires: "Layer 1 must be real execution"\n` +
             `Required steps before completion:\n` +
-            `  - /autospec:validate (runs build, test, lint)\n` +
+            `  - /autospec:test (runs build, test, lint)\n` +
             `  - Or: Bash commands for build/test with real execution\n\n` +
             `Layer 1 results not found in state.json for this stage.\n` +
             `Run validation first, then mark complete.`
@@ -181,6 +188,31 @@ async function handlePostToolUse(input, projectRoot) {
       const exitCode = response.exitCode ?? (response.error ? 1 : 0);
       const passed = exitCode === 0;
 
+      // ========== 子系统级别验证追踪 ==========
+      const subsystems = getCurrentStageSubsystems(projectRoot);
+      const targetSubsystem = detectSubsystemFromCommand(command, subsystems);
+
+      if (targetSubsystem) {
+        // 更新子系统状态
+        const subsystemUpdates = {
+          layer1: passed ? 'pass' : 'fail',
+          layer1LastCommand: command.substring(0, 100),
+          layer1LastResult: passed ? 'pass' : 'fail',
+          layer1LastCheckedAt: new Date().toISOString()
+        };
+
+        if (passed && subsystemUpdates.status !== 'completed') {
+          subsystemUpdates.status = 'layer1_pass';
+        }
+
+        updateSubsystemState(projectRoot, targetSubsystem, subsystemUpdates);
+        logger.debug('Subsystem Layer 1 status updated', {
+          subsystem: targetSubsystem,
+          result: passed ? 'pass' : 'fail'
+        });
+      }
+      // ==========================================
+
       // 检查是否为该阶段的首次 Layer 1 尝试
       const metrics = getMetrics(projectRoot, true);
       const stageMetrics = metrics?.stages?.[currentStage] || {};
@@ -218,6 +250,90 @@ async function handlePostToolUse(input, projectRoot) {
 
         logger.info('Layer 1 validation failed', { stage: currentStage, exitCode });
 
+        // ========== 自主修复循环入口 ==========
+        // 分析错误类型
+        const errorType = analyzeErrorType({
+          errorMessage: response.stderr || response.stdout,
+          errorOutput: response.stdout || response.stderr,
+          command
+        });
+
+        // 生成重试缓存键
+        const cacheKey = `${currentStage}:${command.substring(0, 50)}`;
+        const currentRetryCount = retryCountCache.get(cacheKey) || 0;
+
+        // 构建错误上下文
+        const errorContext = {
+          errorType,
+          errorMessage: response.stderr || response.stdout,
+          errorOutput: response.stdout || response.stderr,
+          command,
+          retryCount: currentRetryCount
+        };
+
+        // 定义重新执行命令的函数
+        const reexecuteCommand = async () => {
+          try {
+            const { execSync } = await import('child_process');
+            const result = execSync(command, {
+              cwd: projectRoot,
+              encoding: 'utf-8',
+              stdio: ['pipe', 'pipe', 'pipe']
+            });
+            return { success: true, output: result };
+          } catch (e) {
+            return { success: false, error: e.message, stdout: e.stdout, stderr: e.stderr };
+          }
+        };
+
+        // 执行自主修复循环
+        const fixResult = await autoFixLoop(errorContext, projectRoot, reexecuteCommand);
+
+        // 处理修复结果
+        if (fixResult.status === 'fixed') {
+          logger.info('Auto-fix successful', { fixResult });
+
+          // 更新重试计数
+          retryCountCache.set(cacheKey, fixResult.retryCount + 1);
+
+          // 记录修复指标
+          incrementTotalMetric(projectRoot, 'autoFixSuccess');
+          if (currentStage) incrementStageMetric(projectRoot, currentStage, 'autoFixSuccess');
+
+          // 重新验证
+          const verifyResult = await reexecuteCommand();
+          if (verifyResult.success) {
+            logger.info('Auto-fix verified, continuing execution');
+            // 修复成功且验证通过，清除缓存
+            retryCountCache.delete(cacheKey);
+          } else {
+            logger.warn('Auto-fix verified but command still fails, continuing analysis');
+          }
+        } else if (fixResult.status === 'needs_human') {
+          logger.info('Auto-fix requires human confirmation', { reason: fixResult.reason });
+
+          incrementTotalMetric(projectRoot, 'autoFixHumanIntervention');
+
+          // 添加到上下文消息
+          contextMessage = (contextMessage ? contextMessage + '\n\n' : '') +
+            `[AutoSpec Auto-Fix] 需要人工确认\n` +
+            `原因：${fixResult.message}\n` +
+            `错误类型：${errorType}\n` +
+            `建议：请人工审查并修复此问题`;
+        } else if (fixResult.status === 'blocked') {
+          logger.warn('Auto-fix blocked', { reason: fixResult.reason, retryCount: fixResult.retryCount });
+
+          incrementTotalMetric(projectRoot, 'autoFixBlocked');
+
+          // 添加到上下文消息
+          contextMessage = (contextMessage ? contextMessage + '\n\n' : '') +
+            `[AutoSpec Auto-Fix] BLOCKED\n` +
+            `原因：${fixResult.message}\n` +
+            `已尝试修复次数：${fixResult.retryCount}/${MAX_RETRY_COUNT}\n` +
+            `请人工介入处理此问题`;
+        }
+        // ==========================================
+
         // 使用 test 模块分析测试失败原因
         if (validationType === 'test') {
           const testOutput = response.stdout || response.stderr || '';