sillyspec 3.25.0 → 3.25.2

package/src/worktree.js

@@ -13,6 +13,11 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync, readdirSync
 import { join, resolve, dirname } from 'path';
 import { createHash } from 'crypto';
 import { provisionDeps, lockfileHash } from './worktree-deps.js';
+import { writeAtomicSync } from './fs-atomic.js';
+
+// meta.json 会被 hook 进程与其它 CLI 进程并发读取（worktree-guard / getMeta / create 幽灵判定），
+// 必须原子写：半截 JSON 会让 getMeta 返回 null → 触发幽灵 worktree 强删（可能丢 gitignored 改动）。
+const writeMetaAtomic = (metaPath, meta) => writeAtomicSync(metaPath, JSON.stringify(meta, null, 2) + '\n');
 
 const WORKTREES_REL = '.sillyspec/.runtime/worktrees';
 const BRANCH_PREFIX = 'sillyspec/';
@@ -162,9 +167,12 @@ function sleepMs(ms) {
   while (Date.now() < end) { /* spin */ }
 }
 
-function computeBaselineHash(cwd) {
-  // 排除 .sillyspec/ 元数据目录，避免 brainstorm/plan 阶段修改的蓝图文件污染 baseline
-  const exclude = '-- . ":(exclude).sillyspec/"';
+export function computeBaselineHash(cwd) {
+  // 排除 execute 流程自身会改的元数据，避免漂移误报（否则每个 execute 收尾都因自身改动 BLOCKED）：
+  //   - .sillyspec/：brainstorm/plan 蓝图 + runtime 产物
+  //   - docs/sillyspec/：工具坑文件（CLAUDE.md 规则要求 execute 期间记录）
+  // 必须和 applyWorktree step 4.5 (worktree-apply.js) 使用相同的排除规则。
+  const exclude = '-- . ":(exclude).sillyspec/" ":(exclude)docs/sillyspec/"';
   const staged = gitQuiet(cwd, `diff --cached ${exclude}`) || '';
   const unstaged = gitQuiet(cwd, `diff ${exclude}`) || '';
   const untracked = gitQuiet(cwd, `ls-files --others --exclude-standard ${exclude}`) || '';
@@ -414,8 +422,12 @@ export class WorktreeManager {
         createdAt: new Date().toISOString(),
         provisioning: true,
       };
-      writeFileSync(join(worktreePath, META_FILE), JSON.stringify(placeholderMeta, null, 2) + '\n');
-    } catch {}
+      writeMetaAtomic(join(worktreePath, META_FILE), placeholderMeta);
+    } catch (e) {
+      // 占位 meta 是「防 create 中断 → 幽灵强删」的守卫。写失败不能静默：否则中断后
+      // getMeta 仍返回 null，下次 create 会把含 gitignored 改动的 worktree 当幽灵删掉。
+      console.warn(`⚠️  占位 meta 写入失败: ${e.message}（若 create 中断，下次可能误判幽灵 worktree）`);
+    }
 
     // 5.5 base 同步检测（只读：不 ff、不改 HEAD；best-effort fetch 失败降级用缓存）。
     // 旧逻辑 fetch + merge --ff-only：分叉时 ff 失败被静默吞（syncStatus=failed），成功时
@@ -468,7 +480,7 @@ export class WorktreeManager {
     };
 
     const metaPath = join(worktreePath, META_FILE);
-    writeFileSync(metaPath, JSON.stringify(meta, null, 2) + '\n');
+    writeMetaAtomic(metaPath, meta);
 
     return { branch, worktreePath, baseHash, mode: meta.mode, syncDiagnostic };
   }
@@ -499,7 +511,7 @@ export class WorktreeManager {
     if (!existsSync(this.worktreeBase)) mkdirSync(this.worktreeBase, { recursive: true })
     const metaDir = join(this.worktreeBase, name)
     if (!existsSync(metaDir)) mkdirSync(metaDir, { recursive: true })
-    writeFileSync(join(metaDir, META_FILE), JSON.stringify(meta, null, 2) + '\n')
+    writeMetaAtomic(join(metaDir, META_FILE), meta)
     console.log(`🔗 native-worktree meta 已恢复: ${metaDir}/meta.json`)
     return { branch: meta.branch, worktreePath, baseHash, mode: meta.mode }
   }
@@ -552,7 +564,7 @@ export class WorktreeManager {
       if (!existsSync(this.worktreeBase)) mkdirSync(this.worktreeBase, { recursive: true })
       const metaDir = join(this.worktreeBase, name)
       if (!existsSync(metaDir)) mkdirSync(metaDir, { recursive: true })
-      writeFileSync(join(metaDir, META_FILE), JSON.stringify(meta, null, 2) + '\n')
+      writeMetaAtomic(join(metaDir, META_FILE), meta)
       return { branch: meta.branch, worktreePath, baseHash, mode: meta.mode }
     }
 
@@ -596,7 +608,7 @@ export class WorktreeManager {
     if (!existsSync(metaDir)) {
       mkdirSync(metaDir, { recursive: true });
     }
-    writeFileSync(metaPath, JSON.stringify(meta, null, 2) + '\n');
+    writeMetaAtomic(metaPath, meta);
 
     return { branch: meta.branch, worktreePath, baseHash, mode: meta.mode };
   }
@@ -817,7 +829,7 @@ export class WorktreeManager {
       const deps = provisionDeps(wtPath, this.cwd, { specBase: join(this.cwd, '.sillyspec') }) || {};
       const metaPath = join(this.getWorktreePath(name), META_FILE);
       const meta = this.getMeta(name) || {};
-      writeFileSync(metaPath, JSON.stringify({ ...meta, ...deps }, null, 2) + '\n');
+      writeMetaAtomic(metaPath, { ...meta, ...deps });
       return { ok: true, msg: `re-provisioned ${name}: depsStatus=${deps.depsStatus}` };
     } catch (e) {
       return { ok: false, msg: `re-provision failed for ${name}: ${e.message}` };
@@ -1094,7 +1106,7 @@ export class WorktreeManager {
           const dst = join(worktreePath, f);
           if (existsSync(src)) {
             mkdirSync(dirname(dst), { recursive: true });
-            try { writeFileSync(dst, readFileSync(src)); files.push(f); } catch {}
+            try { writeFileSync(dst, readFileSync(src)); files.push(f); } catch (e) { errors.push(`untracked ${f}: ${e.message}`); }
           }
         }
       }

package/src/brainstorm-postcheck.js

@@ -1,158 +0,0 @@
-/**
- * brainstorm-postcheck.js — plan 阶段对 brainstorm 产物的校验
- *
- * 在 brainstorm → plan 之间执行，校验 brainstorm 产物完整性。
- * PASS → 继续 plan
- * WARN → 继续 plan，记录警告并分配补齐任务
- * FAIL → 回退到 brainstorm 补齐（最多 2 次重试）
- */
-
-import { existsSync, readFileSync } from 'fs'
-import { join } from 'path'
-
-/**
- * 校验 brainstorm 产物完整性
- * @param {string} changeDir - 变更目录路径（.sillyspec/changes/<change>）
- * @returns {{ ok: boolean, level: 'PASS'|'WARN'|'FAIL', errors: string[], warnings: string[] }}
- */
-export function checkBrainstormArtifacts(changeDir) {
-  const errors = []
-  const warnings = []
-  const brainstormDir = join(changeDir, 'brainstorm')
-
-  // ── 1. 产物完整性检查 ──
-  const requiredFiles = ['design.md', 'decisions.md', 'gaps.md', 'assumptions.md', 'next-action.json']
-  for (const file of requiredFiles) {
-    if (!existsSync(join(brainstormDir, file))) {
-      errors.push(`brainstorm/${file} 不存在`)
-    }
-  }
-
-  // ── 2. next-action.json 有效性检查 ──
-  const nextActionFile = join(brainstormDir, 'next-action.json')
-  if (existsSync(nextActionFile)) {
-    try {
-      const nextAction = JSON.parse(readFileSync(nextActionFile, 'utf8'))
-
-      // 必填字段
-      if (!['ready_for_plan', 'waiting_for_user'].includes(nextAction.status)) {
-        errors.push(`next-action.json.status 无效值: ${nextAction.status}`)
-      }
-      if (typeof nextAction.has_blocking_questions !== 'boolean') {
-        errors.push(`next-action.json.has_blocking_questions 不是布尔值`)
-      }
-      if (!['high', 'medium', 'low'].includes(nextAction.decision_level)) {
-        warnings.push(`next-action.json.decision_level 无效值: ${nextAction.decision_level}`)
-      }
-
-      // 状态一致性
-      if (nextAction.status === 'waiting_for_user' && nextAction.has_blocking_questions !== true) {
-        errors.push(`next-action.json status=waiting_for_user 但 has_blocking_questions !== true`)
-      }
-      if (nextAction.status === 'ready_for_plan' && nextAction.has_blocking_questions === true) {
-        errors.push(`next-action.json status=ready_for_plan 但 has_blocking_questions === true`)
-      }
-    } catch (e) {
-      errors.push(`next-action.json 解析失败: ${e.message}`)
-    }
-  }
-
-  // ── 3. design.md 覆盖度检查 ──
-  const designFile = join(brainstormDir, 'design.md')
-  if (existsSync(designFile)) {
-    const designContent = readFileSync(designFile, 'utf8')
-
-    // 必须覆盖的维度
-    if (!/(?:目标|goal|objective|背景|background|问题|problem)/i.test(designContent)) {
-      warnings.push('design.md 缺少设计目标/背景描述')
-    }
-    if (!/(?:范围|scope|总体方案|方案|approach)/i.test(designContent)) {
-      warnings.push('design.md 缺少总体方案描述')
-    }
-
-    // 弱覆盖检测
-    if (/影响模块.*TBD|文件变更.*TBD|待定/i.test(designContent)) {
-      warnings.push('design.md 包含 TBD/待定内容')
-    }
-    if (!/(?:验收|acceptance|完成标准)/i.test(designContent)) {
-      warnings.push('design.md 缺少验收标准')
-    }
-  }
-
-  // ── 4. gaps.md 覆盖度检查 ──
-  const gapsFile = join(brainstormDir, 'gaps.md')
-  if (existsSync(gapsFile)) {
-    const gapsContent = readFileSync(gapsFile, 'utf8')
-    const hasBlocker = /BLOCKER/i.test(gapsContent)
-    if (hasBlocker) {
-      errors.push('gaps.md 包含 BLOCKER 级缺口，需要先解决')
-    }
-    // 检查是否为空
-    const nonEmpty = gapsContent.split('\n').filter(l => l.trim() && !l.startsWith('#')).length
-    if (nonEmpty === 0) {
-      warnings.push('gaps.md 为空（brainstorm 可能遗漏了缺口分析）')
-    }
-  }
-
-  // ── 5. assumptions.md 风险检查 ──
-  const assumptionsFile = join(brainstormDir, 'assumptions.md')
-  if (existsSync(assumptionsFile)) {
-    const assumptionsContent = readFileSync(assumptionsFile, 'utf8')
-    if (/假设现有数据格式不变|假设.*API.*不变|假设.*性能.*可接受/i.test(assumptionsContent)) {
-      warnings.push('assumptions.md 包含高风险假设，需在 verify 阶段验证')
-    }
-  }
-
-  // ── 6. decisions.md 一致性检查 ──
-  const decisionsFile = join(brainstormDir, 'decisions.md')
-  if (existsSync(decisionsFile)) {
-    const decisionsContent = readFileSync(decisionsFile, 'utf8')
-    const autoDecided = (decisionsContent.match(/AUTO_DECIDED/g) || []).length
-    const autoDecidedWithReason = (decisionsContent.match(/AUTO_DECIDED[\s\S]*?checklist/i) || []).length
-    if (autoDecided > 0 && autoDecidedWithReason < autoDecided) {
-      errors.push(`${autoDecided - autoDecidedWithReason} 个 AUTO_DECIDED 决策缺少 checklist 依据`)
-    }
-  }
-
-  // ── 判定结果 ──
-  let level
-  if (errors.length > 0) {
-    level = 'FAIL'
-  } else if (warnings.length > 0) {
-    level = 'WARN'
-  } else {
-    level = 'PASS'
-  }
-
-  return { ok: level !== 'FAIL', level, errors, warnings }
-}
-
-/**
- * 执行 brainstorm postcheck（供 run.js 调用）
- */
-export async function executeBrainstormPostcheck(cwd, platformOpts, changeName) {
-  const specBase = platformOpts?.specRoot || join(cwd, '.sillyspec')
-  const changeDir = join(specBase, 'changes', changeName)
-  if (!existsSync(changeDir)) {
-    console.log('⚠️  brainstorm postcheck: 变更目录不存在，跳过')
-    return
-  }
-
-  const result = checkBrainstormArtifacts(changeDir)
-
-  if (result.level === 'PASS') {
-    console.log('✅ brainstorm postcheck: PASS')
-  } else if (result.level === 'WARN') {
-    console.log('⚠️  brainstorm postcheck: WARN')
-    for (const w of result.warnings) {
-      console.log(`   - ${w}`)
-    }
-  } else {
-    console.error('❌ brainstorm postcheck: FAIL')
-    for (const e of result.errors) {
-      console.error(`   - ${e}`)
-    }
-    console.error('\\n   请修复以上问题后重试，或使用 --skip-approval 跳过。')
-    process.exit(1)
-  }
-}