sillyspec 3.17.0 → 3.17.1

package/package.json

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

package/src/run.js

@@ -299,7 +299,9 @@ async function outputStep(stageName, stepIndex, steps, cwd, changeName, dbProjec
   console.log(`project: ${projectName}`)
   if (changeName) {
     console.log(`change: ${changeName}`)
-    const changeDir = join('.sillyspec', 'changes', changeName)
+    const isPlatform = platformOpts?.specRoot || platformOpts?.runtimeRoot
+    const changeDirBase = isPlatform ? platformOpts.specRoot : '.sillyspec'
+    const changeDir = join(changeDirBase, 'changes', changeName)
     console.log(`changeDir: ${changeDir}`)
   }
   console.log(`---\n`)
@@ -418,7 +420,9 @@ async function outputStep(stageName, stepIndex, steps, cwd, changeName, dbProjec
   }
   // 路径安全规则：防止 AI 拼错变更目录
   if (changeName) {
-    const changeDir = join('.sillyspec', 'changes', changeName)
+    const isPlatform = platformOpts?.specRoot || platformOpts?.runtimeRoot
+    const changeDirBase = isPlatform ? platformOpts.specRoot : '.sillyspec'
+    const changeDir = join(changeDirBase, 'changes', changeName)
     console.log(`- **文件路径规则：所有变更文件必须写入 \`${changeDir}/\` 目录下。不要自己拼接路径，直接使用 changeDir 值。示例：\`${changeDir}/proposal.md\`**`)
   }
   const changeFlag = changeName ? ` --change ${changeName}` : ''
@@ -471,7 +475,19 @@ export async function runCommand(args, cwd, specDir = null) {
   // 首次 scan 时写入，所有后续调用（包括 run、--done、--skip）都读取
   // 优先在 specDir 下查找，否则回退到 cwd/.sillyspec/.runtime/
   const specRoot = platformOpts.specRoot || resolveSpecDir(cwd)
-  const platformOptsFile = join(specRoot, '.runtime', 'platform-scan.json')
+  // platform-scan.json 搜索策略（多路径兼容）：
+  // 平台模式首次 scan 写入 specRoot/.runtime/，但后续 --done 可能不带 --spec-root
+  // 需要在多个候选位置搜索
+  const candidatePaths = []
+  if (platformOpts.specRoot) {
+    candidatePaths.push(join(platformOpts.specRoot, '.runtime', 'platform-scan.json'))
+  }
+  if (resolvedSpecDir) {
+    candidatePaths.push(join(resolve(resolvedSpecDir), '.runtime', 'platform-scan.json'))
+  }
+  candidatePaths.push(join(specRoot, '.runtime', 'platform-scan.json')) // cwd/.sillyspec/.runtime/
+
+  let platformOptsFile = candidatePaths.find(p => existsSync(p)) || candidatePaths[0]
   let platformFileExists = existsSync(platformOptsFile)
   // 如果命令行没传 spec-root，尝试从持久化文件恢复
   if (!platformOpts.specRoot && !platformOpts.runtimeRoot) {
@@ -499,7 +515,8 @@ export async function runCommand(args, cwd, specDir = null) {
       }
     }
   }
-  // 持久化 platformOpts（命令行传入或已恢复的都持久化）
+  // 持久化 platformOpts
+  // 在 specRoot/.runtime/ 写主文件，同时在 cwd/.sillyspec/.runtime/ 写恢复指针
   if (platformOpts.specRoot || platformOpts.runtimeRoot) {
     try {
       const { mkdirSync, writeFileSync } = await import('fs')
@@ -511,6 +528,16 @@ export async function runCommand(args, cwd, specDir = null) {
         scanRunId: platformOpts.scanRunId,
         savedAt: new Date().toISOString(),
       }, null, 2) + '\n')
+      // 恢复指针：在 cwd/.sillyspec/.runtime/ 也写一份，供后续 --done（不带 --spec-root）找到
+      const cwdRuntimeDir = join(cwd, '.sillyspec', '.runtime')
+      mkdirSync(cwdRuntimeDir, { recursive: true })
+      writeFileSync(join(cwdRuntimeDir, 'platform-scan.json'), JSON.stringify({
+        specRoot: platformOpts.specRoot,
+        runtimeRoot: platformOpts.runtimeRoot,
+        workspaceId: platformOpts.workspaceId,
+        scanRunId: platformOpts.scanRunId,
+        savedAt: new Date().toISOString(),
+      }, null, 2) + '\n')
     } catch {
       // 静默失败，不影响主流程
     }

package/src/stage-contract.js

@@ -33,9 +33,12 @@ 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'))
   const docsRoot = projectName
-    ? join(base, '.sillyspec', 'docs', projectName, 'scan')
-    : join(base, '.sillyspec', 'docs', 'scan')
+    ? join(base, isSpecDir ? 'docs' : '.sillyspec/docs', projectName, 'scan')
+    : join(base, isSpecDir ? 'docs' : '.sillyspec/docs', 'scan')
 
   const requiredDocs = [
     'ARCHITECTURE.md',
@@ -58,8 +61,8 @@ function validateScanOutputs(cwd, changeName, context = {}) {
 
   // 检查 modules 目录
   const modulesRoot = projectName
-    ? join(base, '.sillyspec', 'docs', projectName, 'modules')
-    : join(base, '.sillyspec', 'docs', 'modules')
+    ? join(base, isSpecDir ? 'docs' : '.sillyspec/docs', projectName, 'modules')
+    : join(base, isSpecDir ? 'docs' : '.sillyspec/docs', 'modules')
   if (!existsSync(modulesRoot)) {
     warnings.push('modules 目录不存在')
   } else {

package/test/platform-recovery.test.mjs

@@ -0,0 +1,139 @@
+/**
+ * platform-recovery.test.mjs — 平台模式参数恢复 + stage-contract 路径测试
+ */
+
+import { join, resolve, dirname, basename } from 'path'
+import { existsSync, mkdirSync, writeFileSync, rmSync, readFileSync } from 'fs'
+import { fileURLToPath, pathToFileURL } from 'url'
+import { execSync } from 'child_process'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+const root = resolve(__dirname, '..')
+const binCLI = join(root, 'bin', 'sillyspec.js')
+
+let passed = 0, failed = 0
+
+function assert(cond, msg) {
+  if (cond) { console.log(`  ✅ PASS: ${msg}`); passed++ }
+  else { console.log(`  ❌ FAIL: ${msg}`); failed++ }
+}
+
+const P = 'recover'
+function setup(name) {
+  const d = join('/tmp', `${P}-${name}`)
+  mkdirSync(d, { recursive: true })
+  return d
+}
+function spec(name) {
+  const d = join('/tmp', `${P}-${name}-spec`)
+  mkdirSync(d, { recursive: true })
+  return d
+}
+function clean(...dirs) { for (const d of dirs) try { rmSync(d, { recursive: true, force: true }) } catch {} }
+
+function run(cmd) {
+  return execSync(cmd, { encoding: 'utf8', timeout: 15000, stdio: ['pipe', 'pipe', 'pipe'] })
+}
+
+const DOCS = ['ARCHITECTURE.md','CONVENTIONS.md','STRUCTURE.md','INTEGRATIONS.md','TESTING.md','CONCERNS.md','PROJECT.md']
+function writeSpecDocs(dir) {
+  for (const d of DOCS) {
+    const p = join(dir, 'scan', d)
+    mkdirSync(dirname(p), { recursive: true })
+    writeFileSync(p, 'author: bot\ncreated_at: now\n# doc\n')
+  }
+}
+function writeLocalDocs(cwd) {
+  for (const d of DOCS) {
+    const p = join(cwd, '.sillyspec', 'docs', basename(cwd), 'scan', d)
+    mkdirSync(dirname(p), { recursive: true })
+    writeFileSync(p, 'author: bot\ncreated_at: now\n# doc\n')
+  }
+}
+
+// ── Test 1: platform-scan.json 写入位置 ──
+console.log('\n=== Test 1: platform-scan.json 写入位置 ===')
+{
+  const cwd = setup('t1'), sd = spec('t1')
+  run(`node "${binCLI}" init "${cwd}" --spec-dir "${sd}"`)
+  run(`node "${binCLI}" --dir "${cwd}" --spec-dir "${sd}" run scan --spec-root "${sd}" --runtime-root "${sd}/runtime" --workspace-id ws1 --scan-run-id sr1`)
+
+  const inSpecDir = join(sd, '.runtime', 'platform-scan.json')
+  const inCwd = join(cwd, '.sillyspec', '.runtime', 'platform-scan.json')
+  assert(existsSync(inSpecDir), `platform-scan.json 在 specDir/.runtime/`)
+  assert(existsSync(inCwd), `恢复指针也写入 cwd/.sillyspec/.runtime/`)
+
+  const content = JSON.parse(readFileSync(inSpecDir, 'utf8'))
+  assert(content.specRoot === sd, `specRoot 指向 specDir`)
+  assert(content.workspaceId === 'ws1', `workspaceId 保存正确`)
+  assert(content.scanRunId === 'sr1', `scanRunId 保存正确`)
+  clean(cwd, sd)
+}
+
+// ── Test 2: --done 不带 --spec-root 时恢复 ──
+console.log('\n=== Test 2: --done 恢复平台参数 ===')
+{
+  const cwd = setup('t2'), sd = spec('t2')
+  run(`node "${binCLI}" init "${cwd}" --spec-dir "${sd}"`)
+  run(`node "${binCLI}" --dir "${cwd}" --spec-dir "${sd}" run scan --spec-root "${sd}" --runtime-root "${sd}/runtime" --workspace-id ws2 --scan-run-id sr2`)
+  // --done 不带任何平台参数
+  const output = run(`node "${binCLI}" --dir "${cwd}" run scan --done --change default --dir "${cwd}" --input "test" --output "test done" 2>&1`)
+  assert(output.includes('平台模式'), `恢复成功：包含平台模式指令`)
+  assert(output.includes(sd), `恢复成功：包含 specDir 路径`)
+  clean(cwd, sd)
+}
+
+// ── Test 3-6: stage-contract 路径（通过 runValidators） ──
+const { runValidators } = await import(pathToFileURL(join(root, 'src', 'stage-contract.js')).href)
+
+console.log('\n=== Test 3: specDir 有文档 → 校验通过 ===')
+{
+  const cwd = setup('t3'), sd = spec('t3')
+  const proj = basename(cwd)
+  const scanDir = join(sd, 'docs', proj)
+  writeSpecDocs(scanDir)
+  const result = runValidators('scan', cwd, 'default', { projectName: proj, specRoot: sd })
+  assert(result.ok, `specDir 有文档: ok=${result.ok}, errors=${JSON.stringify(result.errors)}`)
+  clean(cwd, sd)
+}
+
+console.log('\n=== Test 4: specDir 缺文档 → 校验失败，路径不含 .sillyspec ===')
+{
+  const cwd = setup('t4'), sd = spec('t4')
+  const proj = basename(cwd)
+  mkdirSync(join(sd, 'docs'), { recursive: true })
+  const result = runValidators('scan', cwd, 'default', { projectName: proj, specRoot: sd })
+  assert(!result.ok, `specDir 缺文档: ok=${result.ok}`)
+  assert(result.errors.length > 0, `有 errors`)
+  const errMsg = result.errors[0]
+  assert(!errMsg.includes('.sillyspec/docs'), `路径不含 .sillyspec: ${errMsg}`)
+  assert(errMsg.includes('/docs/'), `路径含 /docs/: ${errMsg}`)
+  clean(cwd, sd)
+}
+
+console.log('\n=== Test 5: 非平台模式有文档 → 校验通过 ===')
+{
+  const cwd = setup('t5')
+  const proj = basename(cwd)
+  writeLocalDocs(cwd)
+  const result = runValidators('scan', cwd, 'default', { projectName: proj })
+  assert(result.ok, `非平台有文档: ok=${result.ok}`)
+  clean(cwd)
+}
+
+console.log('\n=== Test 6: 非平台模式缺文档 → 路径含 .sillyspec ===')
+{
+  const cwd = setup('t6')
+  const proj = basename(cwd)
+  const result = runValidators('scan', cwd, 'default', { projectName: proj })
+  assert(!result.ok, `非平台缺文档: ok=${result.ok}`)
+  const errMsg = result.errors[0]
+  assert(errMsg.includes('.sillyspec/docs'), `路径含 .sillyspec/docs/: ${errMsg}`)
+  clean(cwd)
+}
+
+console.log(`\n${'='.repeat(50)}`)
+console.log(`✅ 通过: ${passed}  ❌ 失败: ${failed}`)
+console.log(`${'='.repeat(50)}`)
+process.exit(failed > 0 ? 1 : 0)