@gong-ym/ai-spec-auto 0.2.13 → 0.2.15

package/src/executor/executor-runner.js

@@ -1,141 +1,141 @@
-const { ExecutorRegistry } = require('./executor-registry');
-const { normalizeExecutionResult } = require('./executor-result-parser');
-const { ExecutorSelector } = require('./executor-selector');
-const { withExecutorTimeout } = require('./executor-timeout');
-const {
-  DEFAULT_EXECUTOR_TIMEOUT_MS,
-  ExecutorStatus,
-  createExecutorErrorResult,
-} = require('./types');
-
-class ExecutorRunner {
-  constructor(options = {}) {
-    this.registry = options.registry || new ExecutorRegistry();
-    this.selector = options.selector || new ExecutorSelector();
-  }
-
-  async run(input = {}) {
-    let selection;
-    let prepareResult = null;
-    try {
-      selection = await this.selector.select({
-        cliExecutor: input.cliExecutor || null,
-        agentProfile: input.agentProfile || null,
-        policy: input.policy || null,
-        mode: input.mode || 'local-assisted',
-        registry: input.registry || this.registry,
-        projectRoot: input.projectRoot,
-        worktreePath: input.worktreePath || null,
-        env: input.env || process.env,
-        dryRun: input.dryRun === true,
-      });
-    } catch (error) {
-      const result = createExecutorErrorResult(
-        error.code || 'EXECUTOR_SELECT_FAILED',
-        error.message,
-        error.suggestion || '请执行 ai-spec-auto executor check 查看可用执行器。'
-      );
-      result.selection = null;
-      result.prepare = null;
-      persistExecutorResult(input, result);
-      return result;
-    }
-
-    try {
-      if (input.dryRun !== true) {
-        const availability = await selection.provider.checkAvailability({
-          projectRoot: input.projectRoot,
-          worktreePath: input.worktreePath || null,
-          env: input.env || process.env,
-        });
-        if (!availability.available) {
-          const result = createExecutorErrorResult(
-            'EXECUTOR_NOT_AVAILABLE',
-            availability.reason || '执行器不可用。',
-            availability.fixSuggestion || '请切换执行器后重试。'
-          );
-          result.selection = selection;
-          result.prepare = null;
-          return result;
-        }
-      }
-
-      prepareResult = await selection.provider.prepare({
-        run: input.run,
-        contextBundle: input.contextBundle,
-        projectRoot: input.projectRoot,
-        worktreePath: input.worktreePath || null,
-        requirement: input.requirement,
-        stage: input.stage || 'implementation',
-      });
-      if (!prepareResult || prepareResult.prepared !== true || (prepareResult.errors || []).length > 0) {
-        const message = prepareResult && prepareResult.errors && prepareResult.errors[0]
-          ? prepareResult.errors[0].message
-          : '执行器 prepare 阶段失败。';
-        const result = createExecutorErrorResult('EXECUTOR_PREPARE_FAILED', message, '请检查执行器任务文件写入权限和项目初始化状态。');
-        result.selection = selection;
-        result.prepare = prepareResult;
-        return result;
-      }
-
-      const rawResult = await withExecutorTimeout(() => selection.provider.execute({
-        run: input.run,
-        projectRoot: input.projectRoot,
-        worktreePath: input.worktreePath || null,
-        instructionFilePath: prepareResult.instructionFilePath,
-        executorInputPath: prepareResult.executorInputPath,
-        timeoutMs: input.timeoutMs || DEFAULT_EXECUTOR_TIMEOUT_MS,
-        dryRun: input.dryRun === true,
-        env: input.env || process.env,
-      }), input.timeoutMs || DEFAULT_EXECUTOR_TIMEOUT_MS);
-
-      const result = normalizeExecutionResult(rawResult);
-      result.selection = selection;
-      result.prepare = prepareResult;
-      persistExecutorResult(input, result);
-      return result;
-    } catch (error) {
-      const isTimeout = error.code === 'EXECUTOR_TIMEOUT';
-      const result = createExecutorErrorResult(
-        error.code || 'EXECUTOR_RUN_FAILED',
-        error.message || '执行器执行失败。',
-        error.suggestion || '请查看 run.json 事件和执行器输出摘要。',
-        isTimeout ? ExecutorStatus.TIMEOUT : ExecutorStatus.FAILED
-      );
-      result.selection = selection;
-      result.prepare = prepareResult;
-      persistExecutorResult(input, result);
-      return result;
-    }
-  }
-}
-
-function persistExecutorResult(input, result) {
-  if (!input.runService || !input.run || !input.run.runId || !input.projectRoot) return;
-  input.runService.updateExecutor(input.projectRoot, input.run.runId, {
-    type: result.selection ? result.selection.executor : null,
-    status: result.status,
-    selectionReason: result.selection ? result.selection.reason : '',
-    fallbackTried: result.selection ? result.selection.fallbackTried : [],
-    warnings: [
-      ...((result.selection && result.selection.warnings) || []),
-      ...((result.prepare && result.prepare.warnings) || []),
-    ],
-    prepared: result.prepare ? {
-      executorInputPath: result.prepare.executorInputPath,
-      instructionFilePath: result.prepare.instructionFilePath,
-    } : null,
-    lastResult: {
-      success: result.success,
-      status: result.status,
-      summary: result.summary,
-      error: result.error,
-      changedFiles: result.changedFiles || [],
-      tokenUsage: result.tokenUsage || null,
-    },
-  });
-}
-
-module.exports = {
-  ExecutorRunner,
-};
+const { ExecutorRegistry } = require('./executor-registry');
+const { normalizeExecutionResult } = require('./executor-result-parser');
+const { ExecutorSelector } = require('./executor-selector');
+const { withExecutorTimeout } = require('./executor-timeout');
+const {
+  DEFAULT_EXECUTOR_TIMEOUT_MS,
+  ExecutorStatus,
+  createExecutorErrorResult,
+} = require('./types');
+
+class ExecutorRunner {
+  constructor(options = {}) {
+    this.registry = options.registry || new ExecutorRegistry();
+    this.selector = options.selector || new ExecutorSelector();
+  }
+
+  async run(input = {}) {
+    let selection;
+    let prepareResult = null;
+    try {
+      selection = await this.selector.select({
+        cliExecutor: input.cliExecutor || null,
+        agentProfile: input.agentProfile || null,
+        policy: input.policy || null,
+        mode: input.mode || 'local-assisted',
+        registry: input.registry || this.registry,
+        projectRoot: input.projectRoot,
+        worktreePath: input.worktreePath || null,
+        env: input.env || process.env,
+        dryRun: input.dryRun === true,
+      });
+    } catch (error) {
+      const result = createExecutorErrorResult(
+        error.code || 'EXECUTOR_SELECT_FAILED',
+        error.message,
+        error.suggestion || '请执行 ai-spec-auto executor check 查看可用执行器。'
+      );
+      result.selection = null;
+      result.prepare = null;
+      persistExecutorResult(input, result);
+      return result;
+    }
+
+    try {
+      if (input.dryRun !== true) {
+        const availability = await selection.provider.checkAvailability({
+          projectRoot: input.projectRoot,
+          worktreePath: input.worktreePath || null,
+          env: input.env || process.env,
+        });
+        if (!availability.available) {
+          const result = createExecutorErrorResult(
+            'EXECUTOR_NOT_AVAILABLE',
+            availability.reason || '执行器不可用。',
+            availability.fixSuggestion || '请切换执行器后重试。'
+          );
+          result.selection = selection;
+          result.prepare = null;
+          return result;
+        }
+      }
+
+      prepareResult = await selection.provider.prepare({
+        run: input.run,
+        contextBundle: input.contextBundle,
+        projectRoot: input.projectRoot,
+        worktreePath: input.worktreePath || null,
+        requirement: input.requirement,
+        stage: input.stage || 'implementation',
+      });
+      if (!prepareResult || prepareResult.prepared !== true || (prepareResult.errors || []).length > 0) {
+        const message = prepareResult && prepareResult.errors && prepareResult.errors[0]
+          ? prepareResult.errors[0].message
+          : '执行器 prepare 阶段失败。';
+        const result = createExecutorErrorResult('EXECUTOR_PREPARE_FAILED', message, '请检查执行器任务文件写入权限和项目初始化状态。');
+        result.selection = selection;
+        result.prepare = prepareResult;
+        return result;
+      }
+
+      const rawResult = await withExecutorTimeout(() => selection.provider.execute({
+        run: input.run,
+        projectRoot: input.projectRoot,
+        worktreePath: input.worktreePath || null,
+        instructionFilePath: prepareResult.instructionFilePath,
+        executorInputPath: prepareResult.executorInputPath,
+        timeoutMs: input.timeoutMs || DEFAULT_EXECUTOR_TIMEOUT_MS,
+        dryRun: input.dryRun === true,
+        env: input.env || process.env,
+      }), input.timeoutMs || DEFAULT_EXECUTOR_TIMEOUT_MS);
+
+      const result = normalizeExecutionResult(rawResult);
+      result.selection = selection;
+      result.prepare = prepareResult;
+      persistExecutorResult(input, result);
+      return result;
+    } catch (error) {
+      const isTimeout = error.code === 'EXECUTOR_TIMEOUT';
+      const result = createExecutorErrorResult(
+        error.code || 'EXECUTOR_RUN_FAILED',
+        error.message || '执行器执行失败。',
+        error.suggestion || '请查看 run.json 事件和执行器输出摘要。',
+        isTimeout ? ExecutorStatus.TIMEOUT : ExecutorStatus.FAILED
+      );
+      result.selection = selection;
+      result.prepare = prepareResult;
+      persistExecutorResult(input, result);
+      return result;
+    }
+  }
+}
+
+function persistExecutorResult(input, result) {
+  if (!input.runService || !input.run || !input.run.runId || !input.projectRoot) return;
+  input.runService.updateExecutor(input.projectRoot, input.run.runId, {
+    type: result.selection ? result.selection.executor : null,
+    status: result.status,
+    selectionReason: result.selection ? result.selection.reason : '',
+    fallbackTried: result.selection ? result.selection.fallbackTried : [],
+    warnings: [
+      ...((result.selection && result.selection.warnings) || []),
+      ...((result.prepare && result.prepare.warnings) || []),
+    ],
+    prepared: result.prepare ? {
+      executorInputPath: result.prepare.executorInputPath,
+      instructionFilePath: result.prepare.instructionFilePath,
+    } : null,
+    lastResult: {
+      success: result.success,
+      status: result.status,
+      summary: result.summary,
+      error: result.error,
+      changedFiles: result.changedFiles || [],
+      tokenUsage: result.tokenUsage || null,
+    },
+  });
+}
+
+module.exports = {
+  ExecutorRunner,
+};

package/src/executor/executor-selector.js

@@ -1,139 +1,139 @@
-const { ExecutorError } = require('./types');
-
-const MODE_DEFAULTS = {
-  'local-assisted': 'cursor',
-  'local-auto': 'codex',
-  'remote-orchestrated': 'codex',
-};
-
-const DEFAULT_FALLBACK_EXECUTORS = ['claude-code', 'codex', 'cursor'];
-
-function normalizeExecutorName(name) {
-  return String(name || '').trim();
-}
-
-function pushCandidate(candidates, name, source, reason) {
-  const executor = normalizeExecutorName(name);
-  if (!executor) return;
-  candidates.push({ executor, source, reason });
-}
-
-function uniqueCandidates(candidates) {
-  const seen = new Set();
-  const result = [];
-  for (const item of candidates) {
-    if (seen.has(item.executor)) continue;
-    seen.add(item.executor);
-    result.push(item);
-  }
-  return result;
-}
-
-class ExecutorSelector {
-  async select(input = {}) {
-    const registry = input.registry;
-    if (!registry) {
-      throw new ExecutorError('EXECUTOR_REGISTRY_REQUIRED', '缺少 ExecutorRegistry，无法选择执行器。');
-    }
-
-    const warnings = [];
-    const fallbackTried = [];
-    const candidates = [];
-    const mode = input.mode || 'local-assisted';
-    const policyExecution = input.policy && input.policy.execution ? input.policy.execution : {};
-    const agentProfile = input.agentProfile || {};
-
-    pushCandidate(candidates, input.cliExecutor, 'cli', 'CLI 显式指定 executor');
-    pushCandidate(candidates, agentProfile.defaultExecutor || agentProfile.executor, 'agent-profile', 'Agent Profile 指定 defaultExecutor');
-    pushCandidate(candidates, policyExecution.defaultExecutor, 'policy', 'policy.execution.defaultExecutor 指定执行器');
-    pushCandidate(candidates, MODE_DEFAULTS[mode] || MODE_DEFAULTS['local-assisted'], 'mode', `${mode} 模式默认执行器`);
-
-    const fallbackExecutors = agentProfile.fallbackExecutors ||
-      policyExecution.fallbackExecutors ||
-      DEFAULT_FALLBACK_EXECUTORS;
-    for (const fallback of fallbackExecutors) {
-      pushCandidate(candidates, fallback, 'fallback', 'fallbackExecutors 候选执行器');
-    }
-
-    for (const candidate of uniqueCandidates(candidates)) {
-      const provider = registry.get(candidate.executor);
-      if (!provider) {
-        fallbackTried.push(candidate.executor);
-        warnings.push({
-          code: 'EXECUTOR_NOT_REGISTERED',
-          message: `执行器 ${candidate.executor} 未注册，已尝试下一个候选。`,
-        });
-        continue;
-      }
-
-      if (input.dryRun === true) {
-        return {
-          executor: candidate.executor,
-          provider,
-          reason: `${candidate.reason}（dry-run 仅验证选择和 prepare）`,
-          availability: {
-            available: true,
-            reason: null,
-            fixSuggestion: null,
-            version: 'dry-run',
-          },
-          fallbackTried,
-          warnings,
-        };
-      }
-
-      let availability;
-      try {
-        availability = await provider.checkAvailability({
-          projectRoot: input.projectRoot,
-          worktreePath: input.worktreePath || null,
-          env: input.env || process.env,
-        });
-      } catch (error) {
-        availability = {
-          available: false,
-          reason: `执行器可用性检查失败：${error.message}`,
-          fixSuggestion: '请检查执行器安装状态，或切换其他执行器。',
-          version: null,
-        };
-      }
-
-      if (availability.available) {
-        if (fallbackTried.length > 0 && input.cliExecutor) {
-          warnings.push({
-            code: 'CLI_EXECUTOR_FALLBACK',
-            message: 'CLI 指定的执行器不可用，已尝试 fallback 执行器。',
-          });
-        }
-        return {
-          executor: candidate.executor,
-          provider,
-          reason: candidate.reason,
-          availability,
-          fallbackTried,
-          warnings,
-        };
-      }
-
-      fallbackTried.push(candidate.executor);
-      if (candidate.source === 'cli') {
-        warnings.push({
-          code: 'CLI_EXECUTOR_UNAVAILABLE',
-          message: `CLI 指定的执行器不可用：${availability.reason || candidate.executor}`,
-        });
-      }
-    }
-
-    throw new ExecutorError(
-      'EXECUTOR_NOT_AVAILABLE',
-      '没有可用执行器，请安装 Codex / Cursor / Claude Code，或调整 policy.execution.defaultExecutor。',
-      '请执行 ai-spec-auto executor check 查看修复建议。'
-    );
-  }
-}
-
-module.exports = {
-  DEFAULT_FALLBACK_EXECUTORS,
-  ExecutorSelector,
-  MODE_DEFAULTS,
-};
+const { ExecutorError } = require('./types');
+
+const MODE_DEFAULTS = {
+  'local-assisted': 'cursor',
+  'local-auto': 'codex',
+  'remote-orchestrated': 'codex',
+};
+
+const DEFAULT_FALLBACK_EXECUTORS = ['claude-code', 'codex', 'cursor'];
+
+function normalizeExecutorName(name) {
+  return String(name || '').trim();
+}
+
+function pushCandidate(candidates, name, source, reason) {
+  const executor = normalizeExecutorName(name);
+  if (!executor) return;
+  candidates.push({ executor, source, reason });
+}
+
+function uniqueCandidates(candidates) {
+  const seen = new Set();
+  const result = [];
+  for (const item of candidates) {
+    if (seen.has(item.executor)) continue;
+    seen.add(item.executor);
+    result.push(item);
+  }
+  return result;
+}
+
+class ExecutorSelector {
+  async select(input = {}) {
+    const registry = input.registry;
+    if (!registry) {
+      throw new ExecutorError('EXECUTOR_REGISTRY_REQUIRED', '缺少 ExecutorRegistry，无法选择执行器。');
+    }
+
+    const warnings = [];
+    const fallbackTried = [];
+    const candidates = [];
+    const mode = input.mode || 'local-assisted';
+    const policyExecution = input.policy && input.policy.execution ? input.policy.execution : {};
+    const agentProfile = input.agentProfile || {};
+
+    pushCandidate(candidates, input.cliExecutor, 'cli', 'CLI 显式指定 executor');
+    pushCandidate(candidates, agentProfile.defaultExecutor || agentProfile.executor, 'agent-profile', 'Agent Profile 指定 defaultExecutor');
+    pushCandidate(candidates, policyExecution.defaultExecutor, 'policy', 'policy.execution.defaultExecutor 指定执行器');
+    pushCandidate(candidates, MODE_DEFAULTS[mode] || MODE_DEFAULTS['local-assisted'], 'mode', `${mode} 模式默认执行器`);
+
+    const fallbackExecutors = agentProfile.fallbackExecutors ||
+      policyExecution.fallbackExecutors ||
+      DEFAULT_FALLBACK_EXECUTORS;
+    for (const fallback of fallbackExecutors) {
+      pushCandidate(candidates, fallback, 'fallback', 'fallbackExecutors 候选执行器');
+    }
+
+    for (const candidate of uniqueCandidates(candidates)) {
+      const provider = registry.get(candidate.executor);
+      if (!provider) {
+        fallbackTried.push(candidate.executor);
+        warnings.push({
+          code: 'EXECUTOR_NOT_REGISTERED',
+          message: `执行器 ${candidate.executor} 未注册，已尝试下一个候选。`,
+        });
+        continue;
+      }
+
+      if (input.dryRun === true) {
+        return {
+          executor: candidate.executor,
+          provider,
+          reason: `${candidate.reason}（dry-run 仅验证选择和 prepare）`,
+          availability: {
+            available: true,
+            reason: null,
+            fixSuggestion: null,
+            version: 'dry-run',
+          },
+          fallbackTried,
+          warnings,
+        };
+      }
+
+      let availability;
+      try {
+        availability = await provider.checkAvailability({
+          projectRoot: input.projectRoot,
+          worktreePath: input.worktreePath || null,
+          env: input.env || process.env,
+        });
+      } catch (error) {
+        availability = {
+          available: false,
+          reason: `执行器可用性检查失败：${error.message}`,
+          fixSuggestion: '请检查执行器安装状态，或切换其他执行器。',
+          version: null,
+        };
+      }
+
+      if (availability.available) {
+        if (fallbackTried.length > 0 && input.cliExecutor) {
+          warnings.push({
+            code: 'CLI_EXECUTOR_FALLBACK',
+            message: 'CLI 指定的执行器不可用，已尝试 fallback 执行器。',
+          });
+        }
+        return {
+          executor: candidate.executor,
+          provider,
+          reason: candidate.reason,
+          availability,
+          fallbackTried,
+          warnings,
+        };
+      }
+
+      fallbackTried.push(candidate.executor);
+      if (candidate.source === 'cli') {
+        warnings.push({
+          code: 'CLI_EXECUTOR_UNAVAILABLE',
+          message: `CLI 指定的执行器不可用：${availability.reason || candidate.executor}`,
+        });
+      }
+    }
+
+    throw new ExecutorError(
+      'EXECUTOR_NOT_AVAILABLE',
+      '没有可用执行器，请安装 Codex / Cursor / Claude Code，或调整 policy.execution.defaultExecutor。',
+      '请执行 ai-spec-auto executor check 查看修复建议。'
+    );
+  }
+}
+
+module.exports = {
+  DEFAULT_FALLBACK_EXECUTORS,
+  ExecutorSelector,
+  MODE_DEFAULTS,
+};

package/src/executor/executor-timeout.js

@@ -1,36 +1,36 @@
-const { ExecutorError } = require('./types');
-
-function withExecutorTimeout(taskFactory, timeoutMs) {
-  const effectiveTimeout = Number(timeoutMs) > 0 ? Number(timeoutMs) : 10 * 60 * 1000;
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    const timer = setTimeout(() => {
-      if (settled) return;
-      settled = true;
-      reject(new ExecutorError(
-        'EXECUTOR_TIMEOUT',
-        `执行器执行超时，已超过 ${effectiveTimeout}ms。`,
-        '请缩小任务范围，或提高 timeoutMs 后重试。'
-      ));
-    }, effectiveTimeout);
-
-    Promise.resolve()
-      .then(taskFactory)
-      .then((result) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        resolve(result);
-      })
-      .catch((error) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        reject(error);
-      });
-  });
-}
-
-module.exports = {
-  withExecutorTimeout,
-};
+const { ExecutorError } = require('./types');
+
+function withExecutorTimeout(taskFactory, timeoutMs) {
+  const effectiveTimeout = Number(timeoutMs) > 0 ? Number(timeoutMs) : 10 * 60 * 1000;
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      reject(new ExecutorError(
+        'EXECUTOR_TIMEOUT',
+        `执行器执行超时，已超过 ${effectiveTimeout}ms。`,
+        '请缩小任务范围，或提高 timeoutMs 后重试。'
+      ));
+    }, effectiveTimeout);
+
+    Promise.resolve()
+      .then(taskFactory)
+      .then((result) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        resolve(result);
+      })
+      .catch((error) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        reject(error);
+      });
+  });
+}
+
+module.exports = {
+  withExecutorTimeout,
+};