sillyspec 3.17.15 → 3.18.1

package/src/scan-postcheck.js

@@ -7,6 +7,7 @@
 
 import { existsSync, readdirSync, readFileSync, mkdirSync, writeFileSync } from 'fs'
 import { join, basename } from 'path'
+import { SCAN_STATUS, CHECK_SEVERITY } from './constants.js'
 
 const REQUIRED_SCAN_DOCS = [
   'ARCHITECTURE.md',
@@ -41,7 +42,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
     // 检查 7 份文档是否存在
     const missing = REQUIRED_SCAN_DOCS.filter(f => !existsSync(join(scanDir, f)))
     if (missing.length > 0) {
-      checks.push({ name: 'missing_docs', severity: 'warning', detail: `缺少 ${missing.length} 份 scan 文档: ${missing.join(', ')}` })
+      checks.push({ name: 'missing_docs', severity: CHECK_SEVERITY.WARNING, detail: `缺少 ${missing.length} 份 scan 文档: ${missing.join(', ')}` })
     }
 
     const hasWarning = checks.some(c => c.severity === 'warning')
@@ -62,8 +63,8 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
         const leaked = readdirSync(localSub, { recursive: true }).filter(e => String(e).endsWith('.md') || String(e).endsWith('.yaml') || String(e).endsWith('.json'))
         if (leaked.length > 0) {
           checks.push({
-            name: 'source_root_leak',
-            severity: 'failed',
+            name: sub === 'docs' ? 'source_root_docs_leak' : 'source_root_leak',
+            severity: CHECK_SEVERITY.FAILED,
             detail: `source_root/.sillyspec/${sub}/ 下存在 ${leaked.length} 个文件（${localSub}/），agent 写入到了错误路径`
           })
         }
@@ -75,7 +76,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
     if (existsSync(filePath)) {
       checks.push({
         name: 'source_root_leak',
-        severity: 'failed',
+        severity: CHECK_SEVERITY.FAILED,
         detail: `source_root/.sillyspec/${file} 存在，agent 写入到了错误路径（${filePath}）`
       })
     }
@@ -87,7 +88,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
   if (missingDocs.length > 0) {
     checks.push({
       name: missingDocs.length === REQUIRED_SCAN_DOCS.length ? 'all_docs_missing' : 'partial_docs_missing',
-      severity: 'failed',
+      severity: CHECK_SEVERITY.FAILED,
       detail: missingDocs.length === REQUIRED_SCAN_DOCS.length
         ? `spec_root 下无任何 scan 文档（${specScanDir}/），扫描可能未执行`
         : `spec_root 缺少必需文档: ${missingDocs.join(', ')}（7 份 scan 文档均为 required）`
@@ -106,7 +107,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
   if (docsMissingHeader.length > 0) {
     checks.push({
       name: 'docs_missing_header',
-      severity: 'warning',
+      severity: CHECK_SEVERITY.WARNING,
       detail: `${docsMissingHeader.length} 份文档缺少 author/created_at: ${docsMissingHeader.join(', ')}`
     })
   }
@@ -143,7 +144,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
     if (invalidCommands.length > 0) {
       checks.push({
         name: 'local_config_invalid',
-        severity: 'warning',
+        severity: CHECK_SEVERITY.WARNING,
         detail: `local.yaml 引用不存在的命令: ${invalidCommands.join('; ')}`
       })
     }
@@ -159,7 +160,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
     ]
     for (const ep of errorPatterns) {
       if (ep.pattern.test(outputText)) {
-        checks.push({ name: ep.name, severity: 'warning', detail: ep.detail })
+        checks.push({ name: ep.name, severity: CHECK_SEVERITY.WARNING, detail: ep.detail })
       }
     }
   }
@@ -168,7 +169,7 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
   if (scanMeta.manifestWritten === false) {
     checks.push({
       name: 'manifest_write_failed',
-      severity: 'failed',
+      severity: CHECK_SEVERITY.FAILED,
       detail: 'manifest.json 写入失败，平台无法消费 scan 结果'
     })
   }
@@ -177,22 +178,22 @@ export function runScanPostCheck({ cwd, specDir, outputText = '', scanMeta = {}
   if (scanMeta.projectListParsed === false) {
     checks.push({
       name: 'project_list_parse_failed',
-      severity: 'warning',
+      severity: CHECK_SEVERITY.WARNING,
       detail: 'Step 2 项目列表解析失败，回退到注册项目列表，可能遗漏子项目'
     })
   }
 
   // 8. 计算 finalStatus
-  const hasFailed = checks.some(c => c.severity === 'failed')
-  const hasWarning = checks.some(c => c.severity === 'warning')
+  const hasFailed = checks.some(c => c.severity === CHECK_SEVERITY.FAILED)
+  const hasWarning = checks.some(c => c.severity === CHECK_SEVERITY.WARNING)
 
   let status
   if (hasFailed) {
-    status = 'failed_post_check'
+    status = SCAN_STATUS.FAILED_POST_CHECK
   } else if (hasWarning) {
-    status = 'completed_with_warnings'
+    status = SCAN_STATUS.COMPLETED_WITH_WARNINGS
   } else {
-    status = 'success'
+    status = SCAN_STATUS.SUCCESS
   }
 
   return { status, checks }
@@ -254,7 +255,7 @@ export function formatStructuredResult(result, meta = {}) {
     const entry = { name: check.name, detail: check.detail, severity }
 
     // 路径污染类
-    if (check.name === 'source_root_leak') {
+    if (check.name === 'source_root_leak' || check.name === 'source_root_docs_leak') {
       structured.failure_categories.path_pollution.push(entry)
       structured.failure_categories.violations.push(entry)
     }

package/src/stage-contract.js

@@ -5,7 +5,7 @@
  * CLI 不再相信 prompt 完成，completeStep 后必须过 validator。
  */
 
-import { existsSync, readdirSync } from 'fs'
+import { existsSync, readdirSync, readFileSync } from 'fs'
 import { join, basename } from 'path'
 
 /**
@@ -26,6 +26,117 @@ import { join, basename } from 'path'
 
 // ============ Validators ============
 
+function resolveChangeDir(cwd, changeName, specRoot = null) {
+  const changesRoot = specRoot ? join(specRoot, 'changes') : join(cwd, '.sillyspec', 'changes')
+  return join(changesRoot, changeName)
+}
+
+function collectIdsFromLine(line, re, ids) {
+  for (const match of line.matchAll(re)) {
+    ids.add(match[0].toUpperCase())
+  }
+}
+
+function extractIds(content, prefix) {
+  if (!content) return []
+  const ids = new Set()
+  const idRe = new RegExp(`\\b${prefix}-\\d+(?:@v\\d+)?\\b`, 'gi')
+  const headingLineRe = /^\s{0,3}#{1,6}\s+/i
+  const fieldLineRe = /^\s*(?:[-*]\s*)?(?:id|decision[-_ ]?ids?|requirement[-_ ]?ids?|covers?|coverage|references?|impacts?|覆盖(?:来源|决策|需求)?)\s*[:：]/i
+  const tableLineRe = /^\s*\|/
+  const listStartsWithIdRe = new RegExp(`^\\s*(?:[-*]|\\d+\\.)\\s*(?:\\[[ xX]\\]\\s*)?${prefix}-\\d+(?:@v\\d+)?\\b`, 'i')
+
+  for (const line of content.split(/\r?\n/)) {
+    if (!headingLineRe.test(line) && !fieldLineRe.test(line) && !tableLineRe.test(line) && !listStartsWithIdRe.test(line)) continue
+    collectIdsFromLine(line, idRe, ids)
+  }
+  return [...ids].sort()
+}
+
+function readDecisionField(body, fieldPattern, fallback = '') {
+  const re = new RegExp(`^\\s*(?:[-*]\\s*)?(?:${fieldPattern})\\s*[:：]\\s*([^\\n]+)`, 'im')
+  return (body.match(re)?.[1] || fallback).trim()
+}
+
+function buildDecisionRecord(id, body) {
+  const status = readDecisionField(body, 'status', 'accepted').toLowerCase()
+  const blockerValue = readDecisionField(body, 'blocker', 'false').toLowerCase()
+  const blocker = ['true', 'yes', '1'].includes(blockerValue)
+  const priorityValue = readDecisionField(body, 'priority|level|severity')
+  const priorityMissing = priorityValue.length === 0
+  const fallbackPriority = (['unresolved', 'blocking'].includes(status) || blocker) ? 'P1' : 'P2'
+  const priority = (priorityValue.match(/P[0-2]/i)?.[0] || fallbackPriority).toUpperCase()
+  return { id: id.toUpperCase(), body, status, priority, blocker, priorityMissing }
+}
+
+function findNextDecisionBoundary(content, startIndex) {
+  const boundaryRe = /^(\s{0,3}#{2,6}\s+D-\d+(?:@v\d+)?\b|\s*(?:[-*]\s*)?(?:id|decision[-_ ]?id|decision)\s*[:：]\s*D-\d+(?:@v\d+)?\b)/gmi
+  boundaryRe.lastIndex = startIndex
+  const next = boundaryRe.exec(content)
+  return next ? next.index : content.length
+}
+
+function isInsideRange(index, ranges) {
+  return ranges.some(range => index >= range.start && index < range.end)
+}
+
+function parseDecisionRecords(content) {
+  if (!content) return []
+  const records = []
+  const ranges = []
+  const headingRe = /^\s{0,3}#{2,6}\s+(D-\d+(?:@v\d+)?)(?:\b|:)[^\n]*$/gmi
+  const headings = []
+  let match
+  while ((match = headingRe.exec(content)) !== null) {
+    headings.push({ id: match[1].toUpperCase(), index: match.index, end: headingRe.lastIndex })
+  }
+  for (let i = 0; i < headings.length; i++) {
+    const current = headings[i]
+    const next = headings[i + 1]
+    const body = content.slice(current.end, next ? next.index : content.length)
+    const end = next ? next.index : content.length
+    ranges.push({ start: current.index, end })
+    records.push(buildDecisionRecord(current.id, body))
+  }
+
+  const idLineRe = /^\s*(?:[-*]\s*)?(?:id|decision[-_ ]?id|decision)\s*[:：]\s*(D-\d+(?:@v\d+)?)(?:\b|$)/gmi
+  while ((match = idLineRe.exec(content)) !== null) {
+    if (isInsideRange(match.index, ranges)) continue
+    const bodyEnd = findNextDecisionBoundary(content, idLineRe.lastIndex)
+    const body = content.slice(match.index, bodyEnd)
+    records.push(buildDecisionRecord(match[1], body))
+  }
+
+  return records
+}
+
+function extractCurrentDecisionIds(content) {
+  const records = parseDecisionRecords(content)
+  if (records.length === 0) return extractIds(content, 'D')
+  return records
+    .filter(r => !['superseded', 'rejected'].includes(r.status))
+    .map(r => r.id)
+    .sort()
+}
+
+function findBlockingDecisionIssues(content) {
+  return parseDecisionRecords(content)
+    .filter(r => (r.blocker || ['unresolved', 'blocking'].includes(r.status)) && ['P0', 'P1'].includes(r.priority))
+    .map(r => `${r.id} (${r.priority}${r.priorityMissing ? ', priority=missing->P1' : ''}, status=${r.status})`)
+}
+
+function readIfExists(file) {
+  return existsSync(file) ? readFileSync(file, 'utf8') : ''
+}
+
+function warnMissingIds(warnings, ids, targetContent, targetName, sourceName) {
+  for (const id of ids) {
+    if (!targetContent.toUpperCase().includes(id)) {
+      warnings.push(`${targetName} 未引用 ${sourceName} 中的 ${id}`)
+    }
+  }
+}
+
 /**
  * scan 完成校验：检查 7 份 scan 文档 + manifest
  */
@@ -55,7 +166,7 @@ function validateScanOutputs(cwd, changeName, context = {}) {
 
   for (const doc of requiredDocs) {
     if (!existsSync(join(docsRoot, doc))) {
-      errors.push(`scan 文档缺失: ${docsRoot}/${doc}`)
+      errors.push(`scan 文档缺失: ${join(docsRoot, doc)}`)
     }
   }
 
@@ -75,12 +186,93 @@ function validateScanOutputs(cwd, changeName, context = {}) {
   return { ok: errors.length === 0, errors, warnings }
 }
 
+/**
+ * brainstorm 完成校验：检查四件套规范文件是否生成
+ */
+function validateBrainstormOutputs(cwd, changeName, context = {}) {
+  const { specRoot } = context
+  const changesRoot = specRoot ? join(specRoot, 'changes') : join(cwd, '.sillyspec', 'changes')
+  if (specRoot && !existsSync(changesRoot)) {
+    return { ok: false, errors: [`平台模式 specRoot 缺少 changes 目录: ${changesRoot}`], warnings: [] }
+  }
+  const changeDir = resolveChangeDir(cwd, changeName, specRoot)
+  const errors = []
+  const warnings = []
+
+  const requiredFiles = ['design.md', 'proposal.md', 'requirements.md', 'tasks.md']
+
+  for (const file of requiredFiles) {
+    if (!existsSync(join(changeDir, file))) {
+      errors.push(`brainstorm 产物缺失: ${join(changeDir, file)}`)
+    }
+  }
+
+  // 内容校验（文件存在时检查关键章节）
+  if (existsSync(join(changeDir, 'proposal.md'))) {
+    const content = readFileSync(join(changeDir, 'proposal.md'), 'utf8')
+    if (!content.includes('不在范围内') && !content.includes('Non-Goals') && !content.includes('非目标')) {
+      warnings.push('proposal.md 缺少「不在范围内/Non-Goals」章节')
+    }
+  }
+
+  if (existsSync(join(changeDir, 'requirements.md'))) {
+    const content = readFileSync(join(changeDir, 'requirements.md'), 'utf8')
+    if (!/FR-\d+/i.test(content)) {
+      warnings.push('requirements.md 缺少 FR 编号的需求项')
+    }
+  }
+
+  if (existsSync(join(changeDir, 'design.md'))) {
+    const content = readFileSync(join(changeDir, 'design.md'), 'utf8')
+    if (!content.includes('文件变更清单') && !content.includes('File Changes') && !content.includes('文件清单')) {
+      warnings.push('design.md 缺少「文件变更清单」章节')
+    }
+    if (!content.includes('风险登记') && !content.includes('Risk') && !content.includes('风险')) {
+      warnings.push('design.md 缺少「风险登记」章节')
+    }
+    if (!content.includes('自审') && !content.includes('Self-Review') && !content.includes('Self-review')) {
+      warnings.push('design.md 缺少「自审」章节')
+    }
+  }
+
+  if (existsSync(join(changeDir, 'tasks.md'))) {
+    const content = readFileSync(join(changeDir, 'tasks.md'), 'utf8')
+    const lines = content.split('\n').filter(l => l.trim().startsWith('-') || l.trim().startsWith('*') || /^\d+\./.test(l.trim()))
+    if (lines.length === 0) {
+      warnings.push('tasks.md 没有任务列表项')
+    }
+  }
+
+  const decisionsFile = join(changeDir, 'decisions.md')
+  if (existsSync(decisionsFile)) {
+    const decisions = readFileSync(decisionsFile, 'utf8')
+    const blockers = findBlockingDecisionIssues(decisions)
+    for (const issue of blockers) {
+      errors.push(`decisions.md 存在 P0/P1 未决阻塞: ${issue}`)
+    }
+    const decisionIds = extractCurrentDecisionIds(decisions)
+    if (decisionIds.length === 0) {
+      warnings.push('decisions.md 存在但没有当前版本 D-xxx@vN 决策 ID')
+    } else {
+      const design = readIfExists(join(changeDir, 'design.md'))
+      const requirements = readIfExists(join(changeDir, 'requirements.md'))
+      const tasks = readIfExists(join(changeDir, 'tasks.md'))
+      warnMissingIds(warnings, decisionIds, design, 'design.md', 'decisions.md')
+      warnMissingIds(warnings, decisionIds, requirements, 'requirements.md', 'decisions.md')
+      warnMissingIds(warnings, decisionIds, tasks, 'tasks.md', 'decisions.md')
+    }
+  }
+
+  return { ok: errors.length === 0, errors, warnings }
+}
+
 /**
  * plan 完成校验：检查 plan.md 生成
  */
-function validatePlanOutputs(cwd, changeName) {
-  const planDir = join(cwd, '.sillyspec', 'changes', changeName)
-  const planFile = join(planDir, 'plan.md')
+function validatePlanOutputs(cwd, changeName, context = {}) {
+  const { specRoot } = context
+  const changeDir = resolveChangeDir(cwd, changeName, specRoot)
+  const planFile = join(changeDir, 'plan.md')
   const errors = []
 
   if (!existsSync(planFile)) {
@@ -88,20 +280,60 @@ function validatePlanOutputs(cwd, changeName) {
   }
 
   const warnings = []
+  if (existsSync(planFile)) {
+    const plan = readFileSync(planFile, 'utf8')
+    const requirements = readIfExists(join(changeDir, 'requirements.md'))
+    const requirementIds = extractIds(requirements, 'FR')
+    warnMissingIds(warnings, requirementIds, plan, 'plan.md', 'requirements.md')
+
+    const decisions = readIfExists(join(changeDir, 'decisions.md'))
+    const blockers = findBlockingDecisionIssues(decisions)
+    for (const issue of blockers) {
+      errors.push(`decisions.md 存在 P0/P1 未决阻塞: ${issue}`)
+    }
+    const decisionIds = extractCurrentDecisionIds(decisions)
+    warnMissingIds(warnings, decisionIds, plan, 'plan.md', 'decisions.md')
+  }
   return { ok: errors.length === 0, errors, warnings }
 }
 
 /**
- * verify 完成校验：检查 verify 报告存在
+ * verify 完成校验：检查变更目录和 verify 产物
  */
-function validateVerifyOutputs(cwd, changeName) {
-  const planDir = join(cwd, '.sillyspec', 'changes', changeName)
+function validateVerifyOutputs(cwd, changeName, context = {}) {
+  const { specRoot } = context
+  const changeDir = resolveChangeDir(cwd, changeName, specRoot)
   const errors = []
   const warnings = []
 
-  // verify 至少应该有 run 记录
-  if (!existsSync(join(planDir, 'plan.md'))) {
-    errors.push(`变更目录缺失: ${planDir}`)
+  if (!existsSync(changeDir)) {
+    errors.push(`变更目录缺失: ${changeDir}`)
+    return { ok: false, errors, warnings }
+  }
+
+  // verify 阶段应该产出 verify-result.md（或类似报告）
+  const verifyResult = join(changeDir, 'verify-result.md')
+  if (!existsSync(verifyResult)) {
+    warnings.push('verify-result.md 不存在（verify 阶段建议产出验证报告）')
+  }
+
+  // 确保核心规范文件仍然存在
+  const requiredDocs = ['design.md', 'plan.md']
+  for (const doc of requiredDocs) {
+    if (!existsSync(join(changeDir, doc))) {
+      errors.push(`核心文档缺失: ${join(changeDir, doc)}`)
+    }
+  }
+
+  if (existsSync(verifyResult)) {
+    const verify = readFileSync(verifyResult, 'utf8')
+    const decisions = readIfExists(join(changeDir, 'decisions.md'))
+    const blockers = findBlockingDecisionIssues(decisions)
+    for (const issue of blockers) {
+      errors.push(`decisions.md 存在 P0/P1 未决阻塞: ${issue}`)
+    }
+    const decisionIds = extractCurrentDecisionIds(decisions)
+    warnMissingIds(warnings, decisionIds, verify, 'verify-result.md', 'decisions.md')
   }
 
   return { ok: errors.length === 0, errors, warnings }
@@ -187,7 +419,7 @@ const contracts = {
     description: '需求分析与设计',
     allowedFrom: [],           // 任何变更的起始阶段
     allowedTo: ['plan'],
-    validators: [],
+    validators: [validateBrainstormOutputs],
   },
   plan: {
     stage: 'plan',