sillyspec 3.17.2 → 3.17.3

package/package.json

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

package/src/init.js

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync } from 'fs';
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'fs';
 import { join, resolve, dirname, basename } from 'path';
 import { fileURLToPath } from 'url';
 import { checkbox, confirm, input } from '@inquirer/prompts';
@@ -108,6 +108,14 @@ async function doInstall(projectDir, tools, subprojects = [], specDir = null) {
   // projectDir: 源码项目根目录（用于工具检测、指令注入、.gitignore）
   const spec = specDir || join(projectDir, '.sillyspec');
 
+  // 外部 specDir 时清理旧版本残留的 cwd/.sillyspec/（防止源码污染）
+  const legacyDir = join(projectDir, '.sillyspec');
+  if (specDir && existsSync(legacyDir)) {
+    try { rmSync(legacyDir, { recursive: true, force: true }) } catch {}
+    if (!existsSync(legacyDir)) console.log('🧹 已清理旧版本残留的源码 .sillyspec/ 目录');
+    else console.error('⚠️ 清理残留 .sillyspec/ 失败');
+  }
+
   // 创建基础目录
   // spec/projects/    → 项目注册表
   // spec/docs/<name>/ → 统一文档中心

package/src/run.js

@@ -5,7 +5,7 @@
  * 支持多变更并行：每个变更状态存储在 sillyspec.db 中。
  */
 import { basename, join, resolve } from 'path'
-import { existsSync, readdirSync, mkdirSync, writeFileSync, appendFileSync, readFileSync, statSync } from 'fs'
+import { existsSync, readdirSync, mkdirSync, writeFileSync, appendFileSync, readFileSync, rmSync, statSync } from 'fs'
 import { ProgressManager } from './progress.js'
 
 /**
@@ -139,7 +139,9 @@ async function auditQuickCompletion(cwd, guard, options = {}) {
   return result
 }
 
-async function triggerSync(cwd, changeName) {
+async function triggerSync(cwd, changeName, platformOpts = {}) {
+  // 平台模式（SillyHub）走自己的回传链路，不走 CLI 内置 sync
+  if (platformOpts?.specRoot || platformOpts?.runtimeRoot) return
   try {
     if (changeName && !existsSync(join(cwd, '.sillyspec', 'changes', changeName))) return
     const syncMod = await import('./sync.js')
@@ -154,12 +156,13 @@ async function triggerSync(cwd, changeName) {
  * 审批检查辅助函数：execute 阶段启动前检查
  * @returns {{ status: string, reason?: string } | null}
  */
-async function checkApproval(cwd, changeName) {
+async function checkApproval(cwd, changeName, platformOpts = {}) {
+  // 平台模式不需要 CLI 内置审批检查
+  if (platformOpts?.specRoot || platformOpts?.runtimeRoot) return null
   try {
     const syncMod = await import('./sync.js')
     return await syncMod.checkApproval(changeName, cwd)
   } catch (e) {
-    // sync.js 不存在或检查失败，静默跳过
     return null
   }
 }
@@ -474,7 +477,7 @@ export async function runCommand(args, cwd, specDir = null) {
   // 跨 --done 生命周期：从 metadata 文件恢复 platformOpts
   // 首次 scan 时写入，所有后续调用（包括 run、--done、--skip）都读取
   // 优先在 specDir 下查找，否则回退到 cwd/.sillyspec/.runtime/
-  const specRoot = platformOpts.specRoot || resolveSpecDir(cwd)
+  let specRoot = platformOpts.specRoot || resolveSpecDir(cwd)
   // 平台参数恢复策略：
   // 1. 优先检查 cwd/.sillyspec-platform.json（轻量指针文件，不污染 .sillyspec 结构）
   // 2. 然后检查 specRoot/.runtime/platform-scan.json（首次 scan 写入）
@@ -499,6 +502,8 @@ export async function runCommand(args, cwd, specDir = null) {
           console.error('   解决：重新运行首次 scan 并传入 --spec-root')
           process.exit(1)
         }
+        // 恢复成功：更新 specRoot（初始值可能是 cwd/.sillyspec，恢复后应为真实 specDir）
+        specRoot = platformOpts.specRoot || specRoot
       } catch (e) {
         console.error(`❌ 平台模式参数文件读取失败: ${platformOptsFile}`)
         console.error(`   错误: ${e.message}`)
@@ -539,6 +544,14 @@ export async function runCommand(args, cwd, specDir = null) {
   // runCommand 后续所有 .sillyspec/ 操作必须用 specBase
   const specBase = platformOpts.specRoot || join(cwd, '.sillyspec')
 
+  // 平台模式：清理旧版本残留的 cwd/.sillyspec/（防止源码污染）
+  if (platformOpts.specRoot) {
+    const legacyDir = join(cwd, '.sillyspec')
+    if (existsSync(legacyDir)) {
+      try { rmSync(legacyDir, { recursive: true, force: true }) } catch {}
+    }
+  }
+
   // 解析 --output
   let outputText = null
   const outputIdx = flags.indexOf('--output')
@@ -650,7 +663,7 @@ export async function runCommand(args, cwd, specDir = null) {
   const changed = await ensureStageSteps(progress, stageName, cwd, specRoot)
   if (changed && effectiveChange) {
     await pm._write(cwd, progress, effectiveChange)
-    triggerSync(cwd, effectiveChange)
+    triggerSync(cwd, effectiveChange, platformOpts)
     progress = await pm.read(cwd, effectiveChange) || progress
   }
 
@@ -700,7 +713,7 @@ async function runStage(pm, progress, stageName, cwd, changeName, skipApproval =
 
   // execute 阶段启动前检查审批
   if (stageName === 'execute' && !skipApproval) {
-    const approval = await checkApproval(cwd, changeName)
+    const approval = await checkApproval(cwd, changeName, platformOpts)
     if (approval) {
       if (approval.status === 'rejected') {
         console.error(`❌ 变更 ${changeName} 的执行已被拒绝：${approval.reason || '无原因'}`)
@@ -717,7 +730,7 @@ async function runStage(pm, progress, stageName, cwd, changeName, skipApproval =
   if (autoDetectChange(progress, cwd)) {
     progress.lastActive = new Date().toLocaleString('zh-CN', { hour12: false })
     await pm._write(cwd, progress, changeName)
-    triggerSync(cwd, changeName)
+    triggerSync(cwd, changeName, platformOpts)
   }
 
   const stageData = progress.stages[stageName]
@@ -731,7 +744,7 @@ async function runStage(pm, progress, stageName, cwd, changeName, skipApproval =
     progress.currentStage = stageName
     progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
     await pm._write(cwd, progress, changeName)
-    triggerSync(cwd, changeName)
+    triggerSync(cwd, changeName, platformOpts)
   }
 
   const steps = stageData.steps
@@ -747,7 +760,7 @@ async function runStage(pm, progress, stageName, cwd, changeName, skipApproval =
     stageData.startedAt = new Date().toLocaleString('zh-CN', { hour12: false })
     stageData.completedAt = null
     await pm._write(cwd, progress, changeName)
-    triggerSync(cwd, changeName)
+    triggerSync(cwd, changeName, platformOpts)
     currentIdx = 0
     console.log(`🔄 ${stageName} 阶段已自动重置，重新开始。\n`)
   }
@@ -1007,10 +1020,27 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
     // 解析项目列表：从 step 2 输出提取，或回退读取 projects/*.yaml
     let projectNames = []
     if (outputText) {
-      // 匹配 "1. project-name" 格式
-      const matches = outputText.match(/^\s*\d+\.\s+(\S+)/gm)
-      if (matches) {
-        projectNames = matches.map(m => m.replace(/^\s*\d+\.\s+/, '').replace(/[—\-:].*$/, '').trim())
+      // 匹配方式 1: "1. project-name" 编号列表
+      const numbered = outputText.match(/^\s*\d+\.\s+(\S+)/gm)
+      if (numbered) {
+        projectNames = numbered.map(m => m.replace(/^\s*\d+\.\s+/, '').replace(/[—\-:].*$/, '').trim())
+      }
+      // 匹配方式 2: 括号枚举 "子项目frontend/order-service/user-service" 或 "项目: a, b, c"
+      if (projectNames.length === 0) {
+        const parenMatch = outputText.match(/(?:子项目|项目)[\s:：]*(\S+(?:[\/、,，]+\S+)*)/)
+        if (parenMatch) {
+          projectNames = parenMatch[1]
+            .split(/[\/、,，]+/)
+            .map(s => s.trim())
+            .filter(Boolean)
+        }
+      }
+      // 匹配方式 3: 结构化 YAML block "scan_projects:\n  - id: name"
+      if (projectNames.length === 0) {
+        const yamlMatch = outputText.match(/scan_projects:\s*\n((?:\s+-\s+id:\s+\S+\s*\n?)+)/)
+        if (yamlMatch) {
+          projectNames = [...yamlMatch[1].matchAll(/-\s+id:\s*(\S+)/g)].map(m => m[1])
+        }
       }
     }
     if (projectNames.length === 0) {
@@ -1091,7 +1121,7 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
     stageData.completedAt = new Date().toLocaleString('zh-CN',{hour12:false})
     progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
     await pm._write(cwd, progress, changeName)
-    triggerSync(cwd, changeName)
+    triggerSync(cwd, changeName, platformOpts)
 
     // Append to user-inputs.md
     if (outputText) {
@@ -1127,7 +1157,7 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
         }
         // 清理平台参数临时文件
         const { unlinkSync } = await import('fs')
-        const platformOptsFile = join(specRoot, '.runtime', 'platform-scan.json')
+        const platformOptsFile = join(manifestDir, '.runtime', 'platform-scan.json')
         try { unlinkSync(platformOptsFile) } catch {}
 
         // CLI 层 post-check（替代旧的简单检查）
@@ -1269,7 +1299,7 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
 
   progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   await pm._write(cwd, progress, changeName)
-  triggerSync(cwd, changeName)
+  triggerSync(cwd, changeName, platformOpts)
 
   // Append to user-inputs.md
   if (outputText) {
@@ -1389,7 +1419,7 @@ async function skipStep(pm, progress, stageName, cwd, changeName) {
   steps[currentIdx].skippedAt = new Date().toLocaleString('zh-CN',{hour12:false})
   progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   await pm._write(cwd, progress, changeName)
-  triggerSync(cwd, changeName)
+  triggerSync(cwd, changeName, platformOpts)
 
   console.log(`⏭️ Step ${currentIdx + 1}/${steps.length} 已跳过：${steps[currentIdx].name}`)
 
@@ -1452,7 +1482,7 @@ async function resetStage(pm, progress, stageName, cwd, changeName) {
   }
   progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   await pm._write(cwd, progress, changeName)
-  triggerSync(cwd, changeName)
+  triggerSync(cwd, changeName, platformOpts)
   console.log(`🔄 ${stageName} 阶段已重置`)
 }
 
@@ -1478,7 +1508,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName) {
     const changed = await ensureStageSteps(progress, stage, cwd)
     if (stageChanged || changed) {
       await pm._write(cwd, progress, changeName)
-      triggerSync(cwd, changeName)
+      triggerSync(cwd, changeName, platformOpts)
     }
     progress = await pm.read(cwd, changeName)
     return progress
@@ -1529,7 +1559,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName) {
     }
     // execute 阶段启动前检查审批
     if (currentStage === 'execute' && !skipApproval) {
-      const approval = await checkApproval(cwd, changeName)
+      const approval = await checkApproval(cwd, changeName, platformOpts)
       if (approval) {
         if (approval.status === 'rejected') {
           console.error(`❌ 变更 ${changeName} 的执行已被拒绝：${approval.reason || '无原因'}`)
@@ -1559,7 +1589,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName) {
     const defSteps = await getStageSteps(currentStage, cwd, progress)
     // execute 阶段启动前检查审批
     if (currentStage === 'execute' && !skipApproval) {
-      const approval = await checkApproval(cwd, changeName)
+      const approval = await checkApproval(cwd, changeName, platformOpts)
       if (approval) {
         if (approval.status === 'rejected') {
           console.error(`❌ 变更 ${changeName} 的执行已被拒绝：${approval.reason || '无原因'}`)
@@ -1592,7 +1622,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName) {
   progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   await ensureStageSteps(progress, next, cwd)
   await pm._write(cwd, progress, changeName)
-  triggerSync(cwd, changeName)
+  triggerSync(cwd, changeName, platformOpts)
   progress = await pm.read(cwd, changeName)
 
   console.log(`\n${currentStage} complete. Auto advanced to ${next}.`)
@@ -1601,7 +1631,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName) {
   if (firstPending !== -1) {
     // execute 阶段启动前检查审批
     if (next === 'execute' && !skipApproval) {
-      const approval = await checkApproval(cwd, changeName)
+      const approval = await checkApproval(cwd, changeName, platformOpts)
       if (approval) {
         if (approval.status === 'rejected') {
           console.error(`❌ 变更 ${changeName} 的执行已被拒绝：${approval.reason || '无原因'}`)

package/test/platform-recovery.test.mjs

@@ -73,8 +73,26 @@ console.log('\n=== Test 1: platform-scan.json 写入位置 ===')
   clean(cwd, sd)
 }
 
-// ── Test 2: --done 不带 --spec-root 时恢复 ──
-console.log('\n=== Test 2: --done 恢复平台参数 ===')
+// ── Test 2: 残留清理：旧版本创建的 cwd/.sillyspec 会被自动删除 ──
+console.log('\n=== Test 2: 旧版本残留清理 ===')
+{
+  const cwd = setup('t2'), sd = spec('t2')
+  // 模拟旧版本创建的残留
+  mkdirSync(join(cwd, '.sillyspec', '.runtime'), { recursive: true })
+  writeFileSync(join(cwd, '.sillyspec', '.runtime', 'old.db'), 'x')
+  mkdirSync(join(cwd, '.sillyspec', 'changes'), { recursive: true })
+  assert(existsSync(join(cwd, '.sillyspec')), `残留存在`)
+  // init 时应清理
+  run(`node "${binCLI}" init "${cwd}" --spec-dir "${sd}"`)
+  assert(!existsSync(join(cwd, '.sillyspec')), `init 清理了 cwd/.sillyspec/`)
+  // run 时也不应再创建
+  run(`node "${binCLI}" --dir "${cwd}" --spec-dir "${sd}" run scan --spec-root "${sd}" --runtime-root "${sd}/runtime" --workspace-id ws --scan-run-id sr 2>&1`)
+  assert(!existsSync(join(cwd, '.sillyspec')), `run 后 cwd/.sillyspec/ 仍不存在`)
+  clean(cwd, sd)
+}
+
+// ── Test 3: --done 不带 --spec-root 时恢复 ──
+console.log('\n=== Test 3: --done 恢复平台参数 ===')
 {
   const cwd = setup('t2'), sd = spec('t2')
   run(`node "${binCLI}" init "${cwd}" --spec-dir "${sd}"`)
@@ -89,7 +107,7 @@ console.log('\n=== Test 2: --done 恢复平台参数 ===')
 // ── Test 3-6: stage-contract 路径（通过 runValidators） ──
 const { runValidators } = await import(pathToFileURL(join(root, 'src', 'stage-contract.js')).href)
 
-console.log('\n=== Test 3: specDir 有文档 → 校验通过 ===')
+console.log('\n=== Test 5: specDir 有文档 → 校验通过 ===')
 {
   const cwd = setup('t3'), sd = spec('t3')
   const proj = basename(cwd)
@@ -100,7 +118,7 @@ console.log('\n=== Test 3: specDir 有文档 → 校验通过 ===')
   clean(cwd, sd)
 }
 
-console.log('\n=== Test 4: specDir 缺文档 → 校验失败，路径不含 .sillyspec ===')
+console.log('\n=== Test 5: specDir 缺文档 → 校验失败，路径不含 .sillyspec ===')
 {
   const cwd = setup('t4'), sd = spec('t4')
   const proj = basename(cwd)
@@ -114,7 +132,7 @@ console.log('\n=== Test 4: specDir 缺文档 → 校验失败，路径不含 .si
   clean(cwd, sd)
 }
 
-console.log('\n=== Test 5: 非平台模式有文档 → 校验通过 ===')
+console.log('\n=== Test 7: 非平台模式有文档 → 校验通过 ===')
 {
   const cwd = setup('t5')
   const proj = basename(cwd)
@@ -124,7 +142,7 @@ console.log('\n=== Test 5: 非平台模式有文档 → 校验通过 ===')
   clean(cwd)
 }
 
-console.log('\n=== Test 6: 非平台模式缺文档 → 路径含 .sillyspec ===')
+console.log('\n=== Test 7: 非平台模式缺文档 → 路径含 .sillyspec ===')
 {
   const cwd = setup('t6')
   const proj = basename(cwd)