sillyspec 3.19.1 → 3.19.2

package/.npmrc-tmp

@@ -0,0 +1 @@
+//registry.npmjs.org/:_authToken=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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillyspec",
-  "version": "3.19.1",
+  "version": "3.19.2",
   "description": "SillySpec CLI — 流程状态机，让 AI 严格按步骤来",
   "icon": "logo.jpg",
   "homepage": "https://sillyspec.ppdmq.top/",

package/src/stage-contract.js

@@ -143,14 +143,13 @@ function warnMissingIds(warnings, ids, targetContent, targetName, sourceName) {
  */
 function validateScanOutputs(cwd, changeName, context = {}) {
   const { projectName, specRoot } = context
-  // 平台模式使用 specRoot，本地模式使用 cwd
-  const base = specRoot || cwd
-  // 如果 base 已经是 specDir（有 docs/ 子目录），直接用 base/docs/
-  // 否则按传统模式拼接 .sillyspec/docs/
-  const isSpecDir = existsSync(join(base, 'docs'))
+  // 平台模式：specRoot 直接是规范目录（含 docs/）
+  // 本地模式：规范目录是 cwd/.sillyspec
+  // 不用 isSpecDir 启发式猜测——很多项目根目录有自己的 docs/，会误判
+  const specBase = specRoot || join(cwd, '.sillyspec')
   const docsRoot = projectName
-    ? join(base, isSpecDir ? 'docs' : '.sillyspec/docs', projectName, 'scan')
-    : join(base, isSpecDir ? 'docs' : '.sillyspec/docs', 'scan')
+    ? join(specBase, 'docs', projectName, 'scan')
+    : join(specBase, 'docs', 'scan')
 
   const requiredDocs = [
     'ARCHITECTURE.md',
@@ -173,8 +172,8 @@ function validateScanOutputs(cwd, changeName, context = {}) {
 
   // 检查 modules 目录
   const modulesRoot = projectName
-    ? join(base, isSpecDir ? 'docs' : '.sillyspec/docs', projectName, 'modules')
-    : join(base, isSpecDir ? 'docs' : '.sillyspec/docs', 'modules')
+    ? join(specBase, 'docs', projectName, 'modules')
+    : join(specBase, 'docs', 'modules')
   if (!existsSync(modulesRoot)) {
     warnings.push('modules 目录不存在')
   } else {

package/src/workflow.js

@@ -154,7 +154,12 @@ function checkOutput(outputDef, projectName, cwd, specBase) {
   // 未传时回退 join(cwd, '.sillyspec')，等价于旧行为 resolve(cwd, '.sillyspec/...')
   const effectiveBase = specBase || join(cwd, '.sillyspec')
   // 将 <project> 替换为实际项目名
-  const rawPath = (outputDef.path || '').replace(/<project>/g, projectName)
+  let rawPath = (outputDef.path || '').replace(/<project>/g, projectName)
+  // 旧版兼容：如果 path 以 .sillyspec/ 开头（相对路径），strip 前缀避免双拼接
+  // 新版 yaml 用 {SPEC_ROOT} 已在 runPostCheck 中替换为绝对路径，不会走这里
+  if (rawPath.startsWith('.sillyspec/')) {
+    rawPath = rawPath.slice('.sillyspec/'.length)
+  }
   const fullPath = resolve(effectiveBase, rawPath)
   const checks = outputDef.checks || []
   const results = []
@@ -204,7 +209,7 @@ function checkOutput(outputDef, projectName, cwd, specBase) {
           const patterns = check.patterns || ['待补充', 'TODO', 'TBD', '未分析', '根据项目情况', '根据实际情况', '按需填写']
           // 只匹配独立成行的占位文本，不匹配行内引用
           const lineMatches = patterns.filter(p => {
-            const regex = new RegExp(`^\s*[-*]?\s*${p}\s*$`, 'm')
+            const regex = new RegExp(`^\\s*[-*]?\\s*${p}\\s*$`, 'm')
             return regex.test(content)
           })
           results.push({ passed: lineMatches.length === 0, check: 'no_placeholder', detail: lineMatches.length > 0 ? `包含占位文本: ${lineMatches.map(m => `"${m}"`).join(', ')} — ${rawPath}` : '' })
@@ -246,13 +251,20 @@ function checkOutput(outputDef, projectName, cwd, specBase) {
  */
 export function runPostCheck(wf, cwd, projectName, placeholders = {}, specBase) {
   let resolved = replaceProjectPlaceholder(wf, projectName)
-  if (Object.keys(placeholders).length > 0) {
-    let json = JSON.stringify(resolved)
-    for (const [key, value] of Object.entries(placeholders)) {
-      json = json.replace(new RegExp(`<${key}>`, 'g'), value)
-    }
-    resolved = JSON.parse(json)
+
+  // 自动注入 {SPEC_ROOT} 占位符（yaml 模板用 {SPEC_ROOT} 表示规范根目录）
+  // effectiveBase 与 _checkWorkflow 内部一致：specBase || join(cwd, '.sillyspec')
+  const effectiveBase = specBase || join(cwd, '.sillyspec')
+  const allPlaceholders = { SPEC_ROOT: effectiveBase, ...placeholders }
+
+  let json = JSON.stringify(resolved)
+  for (const [key, value] of Object.entries(allPlaceholders)) {
+    // 支持 {key} 和 <key> 两种占位符语法
+    json = json.replace(new RegExp(`\{${key}\}`, 'g'), value)
+    json = json.replace(new RegExp(`<${key}>`, 'g'), value)
   }
+  resolved = JSON.parse(json)
+
   return _checkWorkflow(resolved, cwd, projectName, specBase)
 }
 
@@ -261,6 +273,7 @@ function _checkWorkflow(wf, cwd, projectName, specBase) {
   const workflowName = wf.name || 'unknown'
   const specVersion = wf.spec_version || wf.version || 0
   const workflowChecks = wf.checks?.workflow_level || []
+  const roleLevelChecks = wf.checks?.role_level || []
   const roles = []
   const failures = []
   const workflowCheckResults = []
@@ -274,7 +287,11 @@ function _checkWorkflow(wf, cwd, projectName, specBase) {
 
     for (const outputDef of outputDefs) {
       const rawPath = (outputDef.path || '').replace(/<project>/g, projectName)
-      const checkResults = checkOutput(outputDef, projectName, cwd, effectiveBase)
+      // role_level checks: 全局施加到每个 output（与 output 自身的 checks 合并）
+      const mergedOutputDef = roleLevelChecks.length > 0
+        ? { ...outputDef, checks: [...(outputDef.checks || []), ...roleLevelChecks] }
+        : outputDef
+      const checkResults = checkOutput(mergedOutputDef, projectName, cwd, effectiveBase)
       const outputPassed = checkResults.every(c => c.passed)
 
       outputs.push({
@@ -355,8 +372,97 @@ function _checkWorkflow(wf, cwd, projectName, specBase) {
         }
         break
       }
+      case 'file_exists': {
+        // workflow_level file_exists: check.path 可以是目录或文件，相对 effectiveBase
+        let checkPath = check.path || ''
+        // 兼容 .sillyspec/ 前缀
+        if (checkPath.startsWith('.sillyspec/')) checkPath = checkPath.slice('.sillyspec/'.length)
+        // 替换 <change-name> 占位符（archive-impact 用）
+        checkPath = checkPath.replace(/<change-name>/g, wf._changeName || '')
+        const fullPath = join(effectiveBase, checkPath)
+        if (!existsSync(fullPath)) {
+          const detail = `文件不存在: ${checkPath}`
+          workflowCheckResults.push({ type: 'file_exists', status: 'fail', detail })
+          failures.push({ level: 'workflow', check: 'file_exists', message: detail })
+        } else {
+          workflowCheckResults.push({ type: 'file_exists', status: 'pass', detail: '' })
+        }
+        break
+      }
+      case 'min_lines': {
+        let checkPath = check.path || ''
+        if (checkPath.startsWith('.sillyspec/')) checkPath = checkPath.slice('.sillyspec/'.length)
+        checkPath = checkPath.replace(/<change-name>/g, wf._changeName || '')
+        const fullPath = join(effectiveBase, checkPath)
+        if (existsSync(fullPath)) {
+          const content = readFileSync(fullPath, 'utf8')
+          const lines = content.split('\n').length
+          const min = check.min || 1
+          if (lines < min) {
+            const detail = `文件只有 ${lines} 行，要求至少 ${min} 行: ${checkPath}`
+            workflowCheckResults.push({ type: 'min_lines', status: 'fail', detail })
+            failures.push({ level: 'workflow', check: 'min_lines', message: detail })
+          } else {
+            workflowCheckResults.push({ type: 'min_lines', status: 'pass', detail: '' })
+          }
+        } else {
+          const detail = `文件不存在: ${checkPath}`
+          workflowCheckResults.push({ type: 'min_lines', status: 'fail', detail })
+          failures.push({ level: 'workflow', check: 'min_lines', message: detail })
+        }
+        break
+      }
+      case 'contains_sections': {
+        let checkPath = check.path || ''
+        if (checkPath.startsWith('.sillyspec/')) checkPath = checkPath.slice('.sillyspec/'.length)
+        checkPath = checkPath.replace(/<change-name>/g, wf._changeName || '')
+        const fullPath = join(effectiveBase, checkPath)
+        if (existsSync(fullPath)) {
+          const content = readFileSync(fullPath, 'utf8')
+          const sections = check.sections || []
+          const missing = sections.filter(s => !content.includes(`## ${s}`))
+          if (missing.length > 0) {
+            const detail = `缺少章节: ${missing.join(', ')} — ${checkPath}`
+            workflowCheckResults.push({ type: 'contains_sections', status: 'fail', detail })
+            failures.push({ level: 'workflow', check: 'contains_sections', message: detail })
+          } else {
+            workflowCheckResults.push({ type: 'contains_sections', status: 'pass', detail: '' })
+          }
+        } else {
+          const detail = `文件不存在: ${checkPath}`
+          workflowCheckResults.push({ type: 'contains_sections', status: 'fail', detail })
+          failures.push({ level: 'workflow', check: 'contains_sections', message: detail })
+        }
+        break
+      }
+      case 'no_placeholder': {
+        let checkPath = check.path || ''
+        if (checkPath.startsWith('.sillyspec/')) checkPath = checkPath.slice('.sillyspec/'.length)
+        checkPath = checkPath.replace(/<change-name>/g, wf._changeName || '')
+        const fullPath = join(effectiveBase, checkPath)
+        if (existsSync(fullPath)) {
+          const content = readFileSync(fullPath, 'utf8')
+          const patterns = check.patterns || ['待补充', 'TODO', 'TBD', '未分析', '根据项目情况', '根据实际情况', '按需填写']
+          const lineMatches = patterns.filter(p => {
+            const regex = new RegExp(`^\\s*[-*]?\\s*${p}\\s*$`, 'm')
+            return regex.test(content)
+          })
+          if (lineMatches.length > 0) {
+            const detail = `包含占位文本: ${lineMatches.map(m => `"${m}"`).join(', ')} — ${checkPath}`
+            workflowCheckResults.push({ type: 'no_placeholder', status: 'fail', detail })
+            failures.push({ level: 'workflow', check: 'no_placeholder', message: detail })
+          } else {
+            workflowCheckResults.push({ type: 'no_placeholder', status: 'pass', detail: '' })
+          }
+        } else {
+          const detail = `文件不存在: ${checkPath}`
+          workflowCheckResults.push({ type: 'no_placeholder', status: 'fail', detail })
+          failures.push({ level: 'workflow', check: 'no_placeholder', message: detail })
+        }
+        break
+      }
       default:
-        workflowCheckResults.push({ type: check.type, status: 'pass', detail: '' })
+        workflowCheckResults.push({ type: check.type, status: 'pass', detail: `未知检查类型，跳过: ${check.type}` })
     }
   }
 

package/test/stage-contract.test.mjs

@@ -108,14 +108,15 @@ const specRoot = mkdtempSync(join(tmpdir(), 'sillyspec-test-'))
 const sourceRoot = mkdtempSync(join(tmpdir(), 'sillyspec-source-'))
 const projectName = 'myaaa'
 
-// 在 specRoot 下创建正确的 scan 文档
-const specDocsDir = join(specRoot, '.sillyspec', 'docs', projectName, 'scan')
+// specRoot 在实际代码中等价于 .sillyspec 目录本身（run.js: join(specRoot, 'docs', ...)）
+// 所以 scan 文档路径为 specRoot/docs/<project>/scan/，不需要额外的 .sillyspec/ 前缀
+const specDocsDir = join(specRoot, 'docs', projectName, 'scan')
 mkdirSync(specDocsDir, { recursive: true })
 for (const doc of ['ARCHITECTURE.md', 'CONVENTIONS.md', 'STRUCTURE.md', 'INTEGRATIONS.md', 'TESTING.md', 'CONCERNS.md', 'PROJECT.md']) {
   writeFileSync(join(specDocsDir, doc), '# ' + doc)
 }
-mkdirSync(join(specRoot, '.sillyspec', 'docs', projectName, 'modules'), { recursive: true })
-writeFileSync(join(specRoot, '.sillyspec', 'docs', projectName, 'modules', 'app.md'), '# app')
+mkdirSync(join(specRoot, 'docs', projectName, 'modules'), { recursive: true })
+writeFileSync(join(specRoot, 'docs', projectName, 'modules', 'app.md'), '# app')
 
 // 测试1：使用 specRoot 校验成功
 const specResult = runValidators('scan', sourceRoot, 'test', { projectName, specRoot })