kld-sdd 2.7.8 → 2.8.0

package/skywalk-sdd/index.cjs

@@ -1313,28 +1313,32 @@ function acquireEventWriteLock(dataDir, changeName, options = {}) {
       created_at: nowISO(),
       change: safeChangeName(changeName),
     };
-    let descriptor;
+    const candidatePath = `${lockPath}.${token}.tmp`;
     try {
-      descriptor = fs.openSync(lockPath, 'wx');
-      fs.writeFileSync(descriptor, JSON.stringify(payload), 'utf8');
-      fs.closeSync(descriptor);
+      fs.writeFileSync(candidatePath, JSON.stringify(payload), { encoding: 'utf8', flag: 'wx', mode: 0o600 });
+      // Publish a complete payload atomically. A contender must never observe an
+      // empty lock and remove it while its owner is still initializing it.
+      fs.linkSync(candidatePath, lockPath);
       return { ...payload, path: lockPath };
     } catch (error) {
-      if (descriptor !== undefined) fs.closeSync(descriptor);
       if (error?.code !== 'EEXIST') throw error;
       let existing = null;
       try {
         existing = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
       } catch {}
       const createdAt = Date.parse(existing?.created_at || '');
-      const stale = !Number.isFinite(createdAt)
-        || Date.now() - createdAt > staleMs
-        || !isProcessAlive(Number(existing?.pid));
+      let age = 0;
+      try { age = Date.now() - fs.statSync(lockPath).mtimeMs; } catch {}
+      const stale = existing && Number.isFinite(createdAt)
+        ? !isProcessAlive(Number(existing.pid))
+        : age > staleMs;
       if (stale) {
         try { fs.rmSync(lockPath, { force: true }); } catch {}
         continue;
       }
       Atomics.wait(EVENT_LOCK_WAIT_BUFFER, 0, 0, 10);
+    } finally {
+      try { fs.unlinkSync(candidatePath); } catch {}
     }
   }
   const error = new Error(`EVENT_WRITE_LOCK_TIMEOUT: 等待 change "${changeName}" 的事件写锁超时`);
@@ -1539,7 +1543,15 @@ function readAllEvents(dataDir) {
 /**
  * 计算单个 change 的四维指标
  */
+function normalizeLifecycleEvents(events) {
+  // Older clients stored run notifications as stage_end with a different event ID.
+  // Preserve the event and its wire kind without counting it as another stage.
+  return events.map(event => event.type === 'stage_end' && event.event_kind === 'run_ended'
+    ? { ...event, type: 'run_end' } : event);
+}
+
 function computeChangeMetrics(changeName, events) {
+  events = normalizeLifecycleEvents(events);
   const changeEvents = events.filter(e => e.change === changeName && !e.orphan);
   if (changeEvents.length === 0) return null;
 
@@ -1868,6 +1880,7 @@ function createReworkBucket(command, capability) {
 }
 
 function summarizeStageExecutions(events) {
+  events = normalizeLifecycleEvents(events);
   const stageEvents = events.filter(e => !e.orphan && (e.type === 'stage_start' || e.type === 'stage_end'));
   const starts = stageEvents
     .filter(e => e.type === 'stage_start')
@@ -3329,6 +3342,7 @@ function computeTelemetryHealthMetrics(events, options = {}) {
 }
 
 function computePdfMvpMetrics(events, options = {}) {
+  events = normalizeLifecycleEvents(events);
   if (options.level === 'capability' || options.capability) {
     return computeCapabilityMetrics(options.capability, events, options);
   }
@@ -4856,6 +4870,7 @@ function tddPairFinding(pair) {
 }
 
 function buildReport(projectRoot, events, options = {}) {
+  events = normalizeLifecycleEvents(events);
   const scopedReport = scopeEventsForChangeReport(events, options.change);
   events = scopedReport.events;
   const archiveEvent = latestByTimestamp(events.filter(e => {
@@ -5208,6 +5223,7 @@ function filterEventsByDate(events, dateFrom, dateTo) {
 }
 
 function computeDoctorReport(events, options = {}) {
+  events = normalizeLifecycleEvents(events);
   const scopedEvents = options.change
     ? events.filter(e => e.change === options.change)
     : events;
@@ -5418,12 +5434,12 @@ function cmdStart(args) {
 
 const ONTOLOGY_AUTHORING_STAGES = new Set(['propose', 'spec', 'design', 'task', 'check']);
 
-function syncWorkingOntologyForStage(projectRoot, changeName, command, result) {
+function syncWorkingOntologyForStage(projectRoot, changeName, command, result, verifiedReconciliation = null) {
   if (!ONTOLOGY_AUTHORING_STAGES.has(command) || result === 'failure') return null;
   if (!changeName || changeName === 'general') return null;
   const changeDir = getChangeDir(projectRoot, changeName);
   if (!fs.existsSync(changeDir)) return null;
-  const reconciled = require('./ontology/runtime.cjs').reconcileChange(
+  const reconciled = verifiedReconciliation || require('./ontology/runtime.cjs').reconcileChange(
     projectRoot,
     changeName,
     {
@@ -5592,7 +5608,8 @@ function cmdEnd(args, options = {}) {
 
   let semanticState = null;
   try {
-    semanticState = syncWorkingOntologyForStage(projectRoot, change, command, result);
+    semanticState = syncWorkingOntologyForStage(projectRoot, change, command, result,
+      command === 'check' ? options.verifiedReconciliation : null);
     if (semanticState) {
       details = {
         ...details,
@@ -5779,7 +5796,7 @@ function cmdEnd(args, options = {}) {
       appendEvent(dataDir, event.change, cleanOptionalFields({
         schema_version: SCHEMA_VERSION,
         event_id: generateEventId(),
-        type: 'stage_end',
+        type: 'run_end',
         event_kind: 'run_ended',
         source: event.source,
         command: 'archive',
@@ -6434,8 +6451,10 @@ function normalizeStrictTestResult(args, details) {
     failure_type: failureType,
     expected_failure: expectedFailure,
     evidence_tier: 'strict',
+    ...(input.execution ? { execution: input.execution } : {}),
     valid_red: tddPhase === 'red'
       ? expectedFailure && exitCode !== 0 && ['assertion', 'contract'].includes(failureType)
+        && (!input.execution || (input.counts_known && Number(input.failed) > 0))
       : false,
   };
   if (input.counts_known) {
@@ -6453,6 +6472,7 @@ function isValidCompletionTestResults(testResults) {
   if (!testResults || typeof testResults !== 'object') return false;
   if (!['green', 'refactor', 'regression'].includes(testResults.tdd_phase)) return false;
   if (testResults.exit_code !== 0 || testResults.failure_type !== 'none') return false;
+  if (testResults.execution && (!testResults.counts_known || !(testResults.passed > 0))) return false;
   if (testResults.counts_known === true && Number(testResults.failed) !== 0) return false;
   return true;
 }
@@ -7348,18 +7368,6 @@ function cmdRecord(args) {
   try {
     details = parseJsonOption(args, 'details-json', 'details-file', projectRoot, {});
     detailsFilePath = args['details-file'] || args.details_file || null;
-    // 默认清理 details-file，避免项目根目录被临时 JSON 污染；--keep-details 保留调试用
-    if (detailsFilePath && !args['keep-details'] && !args.keep_details) {
-      try {
-        const fileToRemove = normalizeDetailsFilePath(detailsFilePath, projectRoot);
-        if (fs.existsSync(fileToRemove)) {
-          fs.unlinkSync(fileToRemove);
-        }
-      } catch (cleanupErr) {
-        // 清理失败不阻塞主流程
-        try { console.error(`[telemetry] details-file 清理失败（不阻塞）: ${cleanupErr.message}`); } catch {}
-      }
-    }
   } catch (err) {
     fail(`details JSON 解析失败: ${err.message}`);
   }
@@ -7467,6 +7475,9 @@ function cmdRecord(args) {
     };
   }
   if (strict && type === 'test_result') {
+    if (details?.test_results?.execution) {
+      require('./lib/test-execution.cjs').verifyCapture(details.test_results, projectRoot);
+    }
     const testResults = normalizeStrictTestResult(args, details);
     strictRunId = testResults.run_id;
     strictTaskId = testResults.task_id;
@@ -7560,6 +7571,7 @@ function cmdRecord(args) {
       const taskId = strictTaskId || details?.task_id || null;
       if (taskId) runCheckTaskSync(projectRoot, change, taskId);
     } catch (taskErr) {
+      if (args['require-projection']) throw taskErr;
       try { console.error(`[telemetry] tasks.md 主任务状态自动同步失败（不阻塞）: ${taskErr.message}`); } catch {}
     }
   };
@@ -7636,6 +7648,89 @@ function cmdRecord(args) {
   } catch (error) {
     fail(error.message || String(error));
   }
+  // Keep retry input until validation, persistence and task projection all succeed.
+  if (detailsFilePath && !args['keep-details'] && !args.keep_details) {
+    try { fs.unlinkSync(normalizeDetailsFilePath(detailsFilePath, projectRoot)); }
+    catch (error) {
+      if (error.code !== 'ENOENT') console.error(`[telemetry] details-file 清理失败（不阻塞）: ${error.message}`);
+    }
+  }
+  if (!args.quiet) console.log(JSON.stringify(output, null, 2));
+  return output;
+}
+
+function cmdTestRun(args) {
+  const projectRoot = normalizeProjectRoot(args.project || process.cwd());
+  requireValidChangeName(args.change);
+  requireStrictString(args['session-id'], 'TEST_SESSION_REQUIRED', 'session-id');
+  const completion = args['completion-file']
+    ? JSON.parse(fs.readFileSync(path.resolve(args['completion-file']), 'utf8')) : [];
+  const declared = String(args['task-ids'] || args['task-id'] || '').split(',').map(x => x.trim());
+  if (!Array.isArray(completion) || completion.some(item => !declared.includes(item.task_id)
+      || typeof item.tdd_required !== 'boolean'
+      || (!Array.isArray(item.files) && !item.no_file_change_reason))) {
+    throw new Error('TEST_COMPLETION_INVALID: 完成信息须关联本轮明确任务，并包含实际文件及 tdd_required');
+  }
+  for (const item of completion) {
+    normalizeRepositoryRelativeFiles(item.files || []);
+    runCheckTaskSync(projectRoot, args.change, item.task_id, true);
+  }
+  const captured = require('./lib/test-execution.cjs').captureTest(args, projectRoot, args.change);
+  const record = cmdRecord({ ...args, quiet: true, strict: true, type: 'test_result',
+    command: 'test', project: projectRoot, change: args.change, 'run-id': captured.runId,
+    source: args.source || 'test-run', summary: args.summary || `执行测试：${captured.testResults.command}`,
+    result: captured.testResults.result, details: undefined,
+    'details-file': captured.receipt, 'keep-details': true,
+  });
+  const completed = [];
+  if (isValidCompletionTestResults(captured.testResults)) {
+    for (const item of completion) {
+      const updated = cmdRecord({ ...args, quiet: true, strict: true, type: 'task_update', command: 'apply',
+        'require-projection': true,
+        project: projectRoot, 'run-id': `${captured.runId}:${item.task_id}`, 'task-id': item.task_id,
+        status: 'completed', result: 'success', source: args.source || 'test-run', summary: `${item.task_id} 通过本轮测试`,
+        'details-json': JSON.stringify({ task_update: { ...item, test_event_id: record.event_id } }),
+      });
+      completed.push({ task_id: item.task_id, event_id: updated.event_id, test_event_id: record.event_id });
+    }
+  }
+  const output = { ...record, test_results: captured.testResults, receipt: captured.receipt, completed_tasks: completed };
+  console.log(JSON.stringify(output, null, 2));
+  process.exitCode = captured.testResults.exit_code;
+  return output;
+}
+
+function cmdCheckRecord(args) {
+  const projectRoot = normalizeProjectRoot(args.project || process.cwd());
+  requireValidChangeName(args.change);
+  const preflight = JSON.parse(fs.readFileSync(path.resolve(args['preflight-file']), 'utf8'));
+  const review = JSON.parse(fs.readFileSync(path.resolve(args['review-file']), 'utf8'));
+  const state = require('./ontology/runtime.cjs').reconcileChange(projectRoot, args.change, { profile: preflight.profile || 'auto', markPending: true });
+  const { splitCheckDiagnostics } = require('./ontology/spec-ontology.cjs');
+  const preflightBlocked = preflight.product_valid === false
+    || (preflight.product_valid == null && !splitCheckDiagnostics(preflight.diagnostics).product_valid);
+  const stateBlocked = !splitCheckDiagnostics(state.diagnostics).product_valid;
+  if (preflightBlocked || stateBlocked || preflight.revision !== state.revision
+      || preflight.review_inputs?.identity_history_hash !== state.state.identity_history_hash
+      || JSON.stringify(preflight.review_inputs?.files) !== JSON.stringify(state.state.files)) {
+    throw new Error('CHECK_REVIEW_STALE: 文档或历史身份已变化，重新预检并评审受影响内容');
+  }
+  const events = readEvents(getDataDir(projectRoot), args.change);
+  const beforeApply = !events.some(e => (e.type === 'stage_start' && ['apply', 'test', 'archive'].includes(e.command)) || ['test_result', 'task_update', 'build_result'].includes(e.type));
+  const previous = events.filter(e => e.type === 'check_result').slice(-1)[0]?.details?.check_results;
+  const assembled = require('./lib/check-review.cjs').assembleReview(review, scanTaskCompletion(projectRoot, args.change), {
+    beforeApply, previousBeforeApply: previous?.fixed_before_apply, revision: preflight.revision,
+  });
+  const record = cmdRecord({ ...args, quiet: true, strict: true, type: 'check_result', command: 'check',
+    project: projectRoot, result: assembled.result, 'run-id': args['run-id'] || generateEventId(),
+    source: args.source || 'opsx-command', summary: args.summary || '按实际评审项生成 Check 结果',
+    'session-id': args['session-id'] || review.reviewer?.parent_session_id || review.reviewer?.review_session_id,
+    'details-json': JSON.stringify(assembled.details),
+  });
+  const ended = args['end-event-id'] ? cmdEnd({ ...args, 'event-id': args['end-event-id'], command: 'check',
+    project: projectRoot, result: assembled.result, summary: args.summary || 'Check 已记录，复核文档状态',
+  }, { silent: true, verifiedReconciliation: state }) : null;
+  const output = { ...record, result: assembled.result, check_results: assembled.details.check_results, stage_end: ended };
   console.log(JSON.stringify(output, null, 2));
   return output;
 }
@@ -8148,16 +8243,20 @@ function cmdSemanticIdentity(args) {
 }
 
 function semanticResultPayload(result) {
+  const split = require('./ontology/spec-ontology.cjs').splitCheckDiagnostics(result.diagnostics);
   return {
     change: result.state.change,
     profile: result.profile,
     valid: result.valid,
+    product_valid: split.product_valid,
     review_status: result.state.review_status,
     revision: result.revision,
     changed: Boolean(result.changed),
     counts: result.counts,
     paths: result.paths,
     diagnostics: result.diagnostics,
+    tool_diagnostics: split.tool_diagnostics,
+    product_diagnostics: split.product_diagnostics,
   };
 }
 
@@ -8199,13 +8298,32 @@ function cmdSemanticReconcile(args, options = {}) {
       total: Number(finished - started) / 1e6,
     };
   }
+  if (options.productGate && payload.tool_diagnostics.length > 0) {
+    try {
+      const repair = require('./ontology/spec-ontology.cjs').materializeChangeSpecOntology(
+        context.projectRoot,
+        context.changeName,
+      );
+      payload.tool_repair = {
+        repaired: repair.validation.valid,
+        output_path: repair.output_path,
+        mapping_path: repair.mapping_path,
+      };
+    } catch (error) {
+      payload.tool_repair = { repaired: false };
+    }
+  }
   console.log(JSON.stringify(payload, null, 2));
-  if (!result.valid) process.exitCode = 1;
+  if (options.productGate) {
+    if (!payload.product_valid) process.exitCode = 1;
+  } else if (!result.valid) {
+    process.exitCode = 1;
+  }
   return result;
 }
 
 function cmdSemanticCheck(args) {
-  return cmdSemanticReconcile(args, { markPending: true, includeTasks: Boolean(args['include-tasks']) });
+  return cmdSemanticReconcile(args, { markPending: true, includeTasks: Boolean(args['include-tasks']), productGate: true });
 }
 
 function cmdSemanticStatus(args) {
@@ -8424,6 +8542,12 @@ function main() {
     case 'record':
       cmdRecord(flags);
       break;
+    case 'test-run':
+      cmdTestRun(flags);
+      break;
+    case 'check-record':
+      cmdCheckRecord(flags);
+      break;
     case 'metrics':
       cmdMetrics(flags);
       break;
@@ -8504,6 +8628,8 @@ SDD Telemetry CLI - 流程度量采集工具
   start    记录 SDD 阶段开始，返回 event_id
   end      记录 SDD 阶段结束，关联 event_id
   record   记录 task_update/check_result/test_result 等结构化事件
+  test-run 执行 --command-json 参数数组，采集退出码、测试计数、原始输出与任务关联
+  check-record 从 --review-file 与 --preflight-file 计算并记录 Check 结果
   metrics  查询度量指标（四维分析）
   report   生成只读度量报告（不写入事件）
   doctor   诊断 Telemetry 数据质量
@@ -8511,7 +8637,7 @@ SDD Telemetry CLI - 流程度量采集工具
   check-task 扫描变更目录 tasks.md 并勾选指定 task_id
   archive-docs 将 Simple/Full spec 变更真实移动到 openspec/changes/archive/，并可结束 archive 阶段生成报告
   kb-upload 知识库上传（文件夹自动打包 / zip 直传），支持随时入库
-  semantic-identity 生成或复用实体/版本 ID（8 位十六进制）；无需网络和中央 ID 服务
+  semantic-identity 生成或复用实体/版本 ID（完整 UUID，界面可显示短标识）；无需网络和中央 ID 服务
   semantic-scan 只读解析并校验当前 Change
   semantic-reconcile 全量对账文件与本地工作态本体实例
   semantic-check 全量对账并在通过时标记 pending；--include-tasks 同时返回任务状态、评审输入清单和程序耗时