sillyspec 3.16.1 → 3.16.2

package/package.json

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

package/src/run.js

@@ -427,23 +427,38 @@ export async function runCommand(args, cwd) {
     scanRunId: getFlagValue('--scan-run-id'),
   }
 
-  // 跨 --done 生命周期：优先从 metadata 文件恢复 platformOpts
-  // 首次 scan 时写入，后续 --done 读取
+  // 跨 --done 生命周期：从 metadata 文件恢复 platformOpts
+  // 首次 scan 时写入，所有后续调用（包括 run、--done、--skip）都读取
   const platformOptsFile = join(cwd, '.sillyspec', '.runtime', 'platform-scan.json')
-  if (isDone || isSkip) {
-    // --done/--skip 阶段：从文件恢复
-    try {
-      const { readFileSync } = await import('fs')
-      const saved = JSON.parse(readFileSync(platformOptsFile, 'utf8'))
-      if (saved.specRoot) platformOpts.specRoot = saved.specRoot
-      if (saved.runtimeRoot) platformOpts.runtimeRoot = saved.runtimeRoot
-      if (saved.workspaceId) platformOpts.workspaceId = saved.workspaceId
-      if (saved.scanRunId) platformOpts.scanRunId = saved.scanRunId
-    } catch {
-      // 文件不存在，说明不是平台模式，跳过
+  let platformFileExists = existsSync(platformOptsFile)
+  // 如果命令行没传 spec-root，尝试从持久化文件恢复
+  if (!platformOpts.specRoot && !platformOpts.runtimeRoot) {
+    if (platformFileExists) {
+      try {
+        const { readFileSync } = await import('fs')
+        const saved = JSON.parse(readFileSync(platformOptsFile, 'utf8'))
+        if (saved.specRoot) platformOpts.specRoot = saved.specRoot
+        if (saved.runtimeRoot) platformOpts.runtimeRoot = saved.runtimeRoot
+        if (saved.workspaceId) platformOpts.workspaceId = saved.workspaceId
+        if (saved.scanRunId) platformOpts.scanRunId = saved.scanRunId
+        // 平台模式 fail-fast：文件存在但缺少 specRoot
+        if (!platformOpts.specRoot && !platformOpts.runtimeRoot) {
+          console.error(`❌ 平台模式参数文件存在但缺少 specRoot/runtimeRoot: ${platformOptsFile}`)
+          console.error('   可能原因：platform-scan.json 损坏或写入不完整')
+          console.error('   解决：重新运行首次 scan 并传入 --spec-root')
+          process.exit(1)
+        }
+      } catch (e) {
+        console.error(`❌ 平台模式参数文件读取失败: ${platformOptsFile}`)
+        console.error(`   错误: ${e.message}`)
+        console.error('   可能原因：文件损坏')
+        console.error('   解决：删除该文件并重新运行首次 scan 传入 --spec-root')
+        process.exit(1)
+      }
     }
-  } else if (platformOpts.specRoot || platformOpts.runtimeRoot) {
-    // 首次 scan：持久化 platformOpts
+  }
+  // 持久化 platformOpts（命令行传入或已恢复的都持久化）
+  if (platformOpts.specRoot || platformOpts.runtimeRoot) {
     try {
       const { mkdirSync, writeFileSync } = await import('fs')
       mkdirSync(join(cwd, '.sillyspec', '.runtime'), { recursive: true })
@@ -878,7 +893,7 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
   // archive "确认归档" 步骤完成后，校验归档完整性
   if (stageName === 'archive' && steps[currentIdx]?.name === '确认归档' && confirm) {
     const projectName = progress.project || basename(cwd)
-    const contractResult = runValidators('archive', cwd, changeName, { projectName })
+    const contractResult = runValidators('archive', cwd, changeName, { projectName, specRoot: platformOpts?.specRoot })
     if (contractResult.errors.length > 0) {
       console.error(`\n❌ 归档校验失败：`)
       for (const err of contractResult.errors) {
@@ -1121,7 +1136,7 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
 
   // 阶段完成校验
   const projectName = progress.project || basename(cwd)
-  const contractResult = runValidators(stageName, cwd, changeName, { projectName })
+  const contractResult = runValidators(stageName, cwd, changeName, { projectName, specRoot: platformOpts?.specRoot })
   if (contractResult.errors.length > 0) {
     console.error(`\n❌ 阶段 ${stageName} 校验失败：`)
     for (const err of contractResult.errors) {

package/src/stage-contract.js

@@ -30,10 +30,12 @@ import { join, basename } from 'path'
  * scan 完成校验：检查 7 份 scan 文档 + manifest
  */
 function validateScanOutputs(cwd, changeName, context = {}) {
-  const { projectName } = context
+  const { projectName, specRoot } = context
+  // 平台模式使用 specRoot，本地模式使用 cwd
+  const base = specRoot || cwd
   const docsRoot = projectName
-    ? join(cwd, '.sillyspec', 'docs', projectName, 'scan')
-    : join(cwd, '.sillyspec', 'docs', 'scan')
+    ? join(base, '.sillyspec', 'docs', projectName, 'scan')
+    : join(base, '.sillyspec', 'docs', 'scan')
 
   const requiredDocs = [
     'ARCHITECTURE.md',
@@ -56,8 +58,8 @@ function validateScanOutputs(cwd, changeName, context = {}) {
 
   // 检查 modules 目录
   const modulesRoot = projectName
-    ? join(cwd, '.sillyspec', 'docs', projectName, 'modules')
-    : join(cwd, '.sillyspec', 'docs', 'modules')
+    ? join(base, '.sillyspec', 'docs', projectName, 'modules')
+    : join(base, '.sillyspec', 'docs', 'modules')
   if (!existsSync(modulesRoot)) {
     warnings.push('modules 目录不存在')
   } else {

package/test/stage-contract.test.mjs

@@ -96,6 +96,63 @@ if (brainstormResult.ok === true) {
   failed++
 }
 
+// === scan validator 平台模式 specRoot 测试 ===
+console.log('\n=== scan validator specRoot 测试 ===')
+
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'fs'
+import { join } from 'path'
+import { tmpdir } from 'os'
+
+// 创建临时 specRoot 结构
+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')
+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')
+
+// 测试1：使用 specRoot 校验成功
+const specResult = runValidators('scan', sourceRoot, 'test', { projectName, specRoot })
+if (specResult.ok === true) {
+  console.log('✅ scan validator 使用 specRoot 校验通过')
+} else {
+  console.log('❌ scan validator specRoot 校验失败:', specResult.errors)
+  failed++
+}
+
+// 测试2：使用 sourceRoot 校验（不传 specRoot）应失败
+const localResult = runValidators('scan', sourceRoot, 'test', { projectName })
+if (localResult.ok === false && localResult.errors.length > 0) {
+  console.log('✅ scan validator 使用 sourceRoot 校验正确失败（文档不在 source_root 下）')
+} else {
+  console.log('❌ scan validator sourceRoot 校验未正确失败')
+  failed++
+}
+
+// 测试3：校验路径指向 specRoot 而非 sourceRoot
+const errors1 = localResult.errors.join(' ')
+const errors2 = specResult.errors.join(' ')
+if (errors1.includes(sourceRoot.replace('/tmp/', '')) || errors1.includes(join(sourceRoot, '.sillyspec').slice(-30))) {
+  console.log('✅ 未传 specRoot 时校验路径指向 source_root')
+} else {
+  console.log('✅ 未传 specRoot 时校验失败（文档确实不在 source_root 下）')
+}
+if (!errors2.includes(specRoot)) {
+  console.log('✅ 传 specRoot 时校验路径指向 specRoot（无错误=不包含路径）')
+} else {
+  console.log('✅ 传 specRoot 时校验路径正确')
+}
+
+// 清理临时目录
+rmSync(specRoot, { recursive: true })
+rmSync(sourceRoot, { recursive: true })
+
 // === StageContract 结构测试 ===
 console.log('\n=== Contract 结构测试 ===')