sillyspec 3.27.6 → 3.27.7

package/src/modules.js

@@ -78,29 +78,27 @@ export async function rebuildModuleMap(cwd, { force = false } = {}) {
   if (existsSync(modulesDir)) {
     const files = readdirSync(modulesDir).filter(f => f.endsWith('.md') && f !== '_module-map.yaml');
     for (const f of files) {
-      const content = readFileSync(join(modulesDir, f), 'utf8');
+      // CRLF 归一：Windows 卡片 \r 会使 parseModuleCardFrontmatter 的 ^---\n 与
+      // extractSection 的 ## <名>\n 失配 → module_id 回退文件名、role 提取恒空
+      const content = readFileSync(join(modulesDir, f), 'utf8').replace(/\r\n/g, '\n');
       const fm = parseModuleCardFrontmatter(content);
       const moduleId = fm.module_id || parseModuleIdFromFilename(f);
       cards.push({ filename: f, moduleId, content });
     }
   }
 
-  // 解析现有 _module-map.yaml 保留已有字段
+  // 解析现有 _module-map.yaml 保留已有字段（复用 parseModuleMapSimple：原内置解析只收模块名、
+  // 从不收集列表项 → existingPaths 恒空 → --force 重建后 core_files 全丢，scan-diff scope 退化
+  // 为全量、module-impact classifyFile 全 unmatched——注释声称的「从已有 map 保留」名存实亡）
   let existingModules = {};
   if (existingMap) {
-    // 简单解析：提取 modules: 下的条目
-    const lines = existingMap.split('\n');
-    let currentModule = null;
-    let inModules = false;
-    for (const line of lines) {
-      if (line.startsWith('modules:')) { inModules = true; continue; }
-      if (!inModules) continue;
-      if (line.startsWith('  ') === false && line.trim() !== '') break;
-      const moduleMatch = line.match(/^  ([a-zA-Z0-9_-]+):/);
-      if (moduleMatch) {
-        currentModule = moduleMatch[1];
-        existingModules[currentModule] = existingModules[currentModule] || { paths: [] };
-      }
+    const parsed = parseModuleMapSimple(existingMap);
+    for (const [id, fields] of Object.entries(parsed || {})) {
+      existingModules[id] = {
+        core_files: Array.isArray(fields.core_files) ? fields.core_files : [],
+        test_files: Array.isArray(fields.test_files) ? fields.test_files : [],
+        entrypoints: Array.isArray(fields.entrypoints) ? fields.entrypoints : [],
+      };
     }
   }
 
@@ -152,11 +150,13 @@ export async function rebuildModuleMap(cwd, { force = false } = {}) {
     yaml += `    review_reasons: []\n`;
     // context index 字段（v2）
     if (role) yaml += `    role: "${escapeYamlString(role)}"\n`;
-    // core_files / test_files / entrypoints 从已有 _module-map 保留，或从卡片文件名推导
-    const existingPaths = existingModules[moduleId]?.paths || [];
-    if (existingPaths.length > 0) {
-      yaml += `    core_files:\n`;
-      for (const p of existingPaths) yaml += `      - ${p}\n`;
+    // core_files / test_files / entrypoints 从已有 _module-map.yaml 全量保留（列表项级保真）
+    const existing = existingModules[moduleId] || {};
+    for (const [field, items] of [['core_files', existing.core_files], ['test_files', existing.test_files], ['entrypoints', existing.entrypoints]]) {
+      if (Array.isArray(items) && items.length > 0) {
+        yaml += `    ${field}:\n`;
+        for (const p of items) yaml += `      - ${p}\n`;
+      }
     }
     if (card) yaml += `    verify_commands: []\n`;
     yaml += `    risk_level: low\n`;
@@ -383,7 +383,9 @@ export function parseModuleMapSimple(content) {
   let currentArray = null;
 
   for (const line of content.split('\n')) {
-    const moduleMatch = line.match(/^  ([a-zA-Z0-9_-]+):$/);
+    // 模块 id 字符集含点（db.engine 等，与 module-impact.js classifyFile 同口径）：
+    // 不含点时带点 id 的条目被静默丢弃，上下文注入/scan-diff 侧与 module-impact 侧给相反结论
+    const moduleMatch = line.match(/^  ([a-zA-Z0-9_.\-]+):$/);
     if (moduleMatch) {
       if (currentArray && currentModule && currentKey) {
         modules[currentModule][currentKey] = currentArray;

package/src/progress/stage-machine.js

@@ -9,6 +9,20 @@ import { writeAtomicSync } from '../fs-atomic.js';
 import { runValidators } from '../stage-contract.js';
 import { VALID_STAGES, STAGE_LABELS, STAGE_ORDER, MAIN_FLOW_ORDER, SPEC_DIR_NAME, CURRENT_VERSION, emptyStage } from './shared.js';
 
+/**
+ * 归一化步骤的已记录等待回答（show 渲染用，跨会话恢复数据源）。
+ * waitAnswers 走 pm.read 时已 JSON.parse，但容错字符串/损坏；单值列 wait_answer（旧路径）并入第 1 轮。
+ */
+function _stepWaitRounds(step) {
+  let arr = step.waitAnswers;
+  if (typeof arr === 'string') { try { arr = JSON.parse(arr); } catch { arr = null; } }
+  const rounds = Array.isArray(arr) ? arr.filter(r => r && typeof r.answer === 'string' && r.answer.trim() !== '') : [];
+  if (rounds.length === 0 && typeof step.waitAnswer === 'string' && step.waitAnswer.trim() !== '') {
+    return [{ round: 1, answer: step.waitAnswer }];
+  }
+  return rounds.map((r, i) => ({ round: typeof r.round === 'number' ? r.round : i + 1, answer: r.answer }));
+}
+
 export class StageMachine {
   constructor(pm) {
     this.pm = pm;
@@ -245,6 +259,15 @@ export class StageMachine {
             if (step.waitOptions) console.log(`       选项：${(() => { try { const p = JSON.parse(step.waitOptions); return Array.isArray(p) ? p.join(', ') : step.waitOptions; } catch { return step.waitOptions; }})()}`);
             if (step.waitedAt) console.log(`       等待时间：${step.waitedAt}`);
           }
+          // 已记录的历史回答（等待中/已完成步骤都可能累积多轮；续跑时由 outputStep 自动回放，
+          // 此处摘要供人工排查「中断后哪些用户回答还在」）。每轮截断 120 字，全文在进度库 wait_answers。
+          const rounds = _stepWaitRounds(step);
+          if (rounds.length > 0) {
+            console.log(`       历史回答（${rounds.length} 轮，续跑自动回放）：`);
+            for (const r of rounds) {
+              console.log(`         第${r.round}轮: ${r.answer.length > 120 ? r.answer.slice(0, 120) + '…' : r.answer}`);
+            }
+          }
         }
       }
 

package/src/progress.js

@@ -25,8 +25,7 @@ import { STAGE_ORDER, MAIN_FLOW_ORDER, VALID_STAGES, STAGE_LABELS, SPEC_DIR_NAME
 // resolveSpecDir 单一真相源在 src/run/shared.js（含 home 拒绝守卫，坑 cwd-correction-home-collision
 // 根治：home 下 .sillyspec 恒不命中，防 smoke/临时目录污染自我延续）。此处 re-export 保持
 // 既有 import 路径兼容；run/shared.js 对 progress.js 只有动态 import，无静态循环。
-import { resolveSpecDir } from './run/shared.js';
-import { checkPlatformManaged, PLATFORM_MANAGED_FILENAME } from './run/shared.js';
+import { resolveSpecDir, checkPlatformManaged, PLATFORM_MANAGED_FILENAME, isSelfReferentialSpecRoot } from './run/shared.js';
 export { resolveSpecDir };
 
 // 默认规范目录名（相对于 cwd）
@@ -145,6 +144,43 @@ export function resolvePlatformSpecDir(cwd, explicitSpecDir = null) {
   return ptr.specRoot;
 }
 
+/**
+ * resolvePlatformSpecDir 的 platformOpts 版本：除 specRoot 外连 runtimeRoot 一起恢复。
+ *
+ * 供 register-stage-review / backfill-reviews 等需要拼 runtime 路径（marker、stage-reviews、
+ * execute-runs）的顶层子命令使用——此前这些 case 只认显式 --spec-dir，平台模式（指针存在）
+ * 下 specRoot 缺失 → 下游回退 join(cwd,'.sillyspec')，在项目本地找 design.md 报「主审查文档
+ * 不存在」，逼 agent 手算 docHash 兜底（2026-08-26 实证）。
+ *
+ * 语义（与 resolvePlatformSpecDir / runCommand 恢复链对齐）：
+ *   - 显式 --spec-dir：{ specRoot: resolve(显式), runtimeRoot: null }（runtimeRoot 走
+ *     resolveRuntimeRoot 默认 specRoot/.runtime）；
+ *   - 无指针：调一次 resolvePlatformSpecDir 保留接管声明 fail-closed（声明存在 →
+ *     PlatformManagedError 上抛），随后返回 null = 纯本地，调用方 platformOpts 保持空；
+ *   - 有指针：specRoot 经 resolvePlatformSpecDir 全量校验（损坏/缺字段/不可达 →
+ *     PointerUnreachableError 上抛），另读指针 runtimeRoot；自指回环（repo-native junction）
+ *     忽略指针返回 null（对齐 run/command.js:326 恢复链免疫）。
+ *
+ * @param {string} cwd 项目根
+ * @param {string|null} [explicitSpecDir] 显式 --spec-dir
+ * @returns {{ specRoot: string, runtimeRoot: string|null } | null} null = 纯本地（不设 specRoot）
+ */
+export function resolvePlatformOpts(cwd, explicitSpecDir = null) {
+  if (explicitSpecDir) return { specRoot: resolve(explicitSpecDir), runtimeRoot: null }
+  const pointerPath = join(resolve(cwd), '.sillyspec-platform.json')
+  const hasPointer = existsSync(pointerPath)
+  // 无指针也先过 resolvePlatformSpecDir：接管声明存在时它负责 fail-closed 上抛
+  const specRoot = resolvePlatformSpecDir(cwd, null)
+  if (!hasPointer) return null
+  if (isSelfReferentialSpecRoot(cwd, specRoot)) return null
+  let runtimeRoot = null
+  try {
+    runtimeRoot = JSON.parse(readFileSync(pointerPath, 'utf8')).runtimeRoot || null
+  } catch { /* specRoot 校验已在 resolvePlatformSpecDir 内做过，此处仅补读字段 */
+  }
+  return { specRoot, runtimeRoot }
+}
+
 const CHANGES_SUBDIR = 'changes';
 // CURRENT_VERSION → ./progress/shared.js（W6 Step9d）
 // VALID_STAGES → ./progress/shared.js（W6 Step9c）

package/src/quicklog.js

@@ -813,7 +813,7 @@ export async function cancelQuickSession({ specBase, gitUser, qlId, sessionId =
       const content = existsSync(p) ? readFileSync(p, 'utf8') : ''
       if (!content.includes(`## ${qlId} |`)) continue
       quicklogFile = p
-      const lines = content.split('\n')
+      const lines = content.split(/\r?\n/)
       const startIdx = lines.findIndex(l => l.startsWith(`## ${qlId} |`))
       let endIdx = lines.length
       for (let i = startIdx + 1; i < lines.length; i++) {
@@ -832,8 +832,10 @@ export async function cancelQuickSession({ specBase, gitUser, qlId, sessionId =
         }
       }
       if (flipped) {
+        // split(/\r?\n/) 吃掉行尾 \r 再按原 eol join：旧写法 split('\n') 保留 \r 又 join('\r\n')
+        // 会产出 \r\r\n 字节级污染（git diff 全文件红）；原子写防 agent/dashboard 轮询读半截
         const eol = content.includes('\r\n') ? '\r\n' : '\n'
-        writeFileSync(p, lines.join(eol === '\r\n' ? '\r\n' : '\n'))
+        await writeAtomic(p, lines.join(eol))
       }
       break
     }
@@ -849,10 +851,10 @@ export async function cancelQuickSession({ specBase, gitUser, qlId, sessionId =
       if (!c.isDirectory() || c.name === 'archive') continue
       const tp = tasksPath(specBase, c.name)
       if (!existsSync(tp)) continue
-      await withFileLock(tasksLockPath(tp), () => {
+      await withFileLock(tasksLockPath(tp), async () => {
         const content = readFileSync(tp, 'utf8')
         if (!content.includes(qlId)) return
-        const lines = content.split('\n')
+        const lines = content.split(/\r?\n/)
         const kept = lines.filter(l => {
           const m = l.match(/^[-*]\s*\[([ xX])\]\s*(\S+)/)
           if (m && m[2] === qlId) {
@@ -864,7 +866,7 @@ export async function cancelQuickSession({ specBase, gitUser, qlId, sessionId =
         })
         if (kept.length !== lines.length) {
           const eol = content.includes('\r\n') ? '\r\n' : '\n'
-          writeFileSync(tp, kept.join(eol === '\r\n' ? '\r\n' : '\n'))
+          await writeAtomic(tp, kept.join(eol))
         }
       })
     }

package/src/run/command.js

@@ -25,7 +25,7 @@ import { randomBytes, randomUUID } from 'node:crypto'
 import { writeAtomicSync } from '../fs-atomic.js'
 import { resolveSpecDir, countAncestorSpecDirs, resolveChangeDir, triggerSync, getStageSteps, formatWaitOptions, checkApproval, warnApprovalUnknown, didYouMean, assertSafeChangeName, detectQuickSessionDrift, detectWorktreeSpecDrift, resolveRuntimeRoot, writePlatformPointer, checkPlatformManaged, isSelfReferentialSpecRoot, PLATFORM_MANAGED_FILENAME } from './shared.js'
 import { resolveQuickLinkedChanges } from './quick-audit.js'
-import { outputStep } from './prompt.js'
+import { outputStep, collectStageWaitHistory } from './prompt.js'
 import { completeStep, skipStep, waitStep, continueStep } from './complete.js'
 import { runStage } from './stage.js'
 import { sanitizeDesc } from '../quicklog.js'
@@ -898,7 +898,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
       const existingSteps = progress.stages?.[stageName]?.steps
       const pendingIdx = existingSteps ? existingSteps.findIndex(s => s.status === 'pending' || s.status === 'in-progress') : -1
       const stepIdx = pendingIdx !== -1 ? pendingIdx : 0
-      await outputStep(stageName, stepIdx, readonlySteps, cwd, readOnlyChange, progress.project || null, platformOpts)
+      await outputStep(stageName, stepIdx, readonlySteps, cwd, readOnlyChange, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, stageName))
     }
     return
   }
@@ -1517,7 +1517,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
         }
       }
     }
-    await outputStep(currentStage, pendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts)
+    await outputStep(currentStage, pendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, currentStage))
     return
   }
 
@@ -1557,7 +1557,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
         }
       }
     }
-    await outputStep(currentStage, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts)
+    await outputStep(currentStage, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, currentStage))
     return
   }
 
@@ -1635,7 +1635,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
         }
       }
     }
-    await outputStep(next, firstPending, nextSteps, cwd, changeName, progress.project || null, platformOpts)
+    await outputStep(next, firstPending, nextSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, next))
   }
 }
 

package/src/run/complete-handlers.js

@@ -25,6 +25,7 @@
 import { basename, join, resolve, relative, isAbsolute } from 'node:path'
 import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync, unlinkSync, rmSync } from 'node:fs'
 import { renameSyncRetry, writeAtomicSync } from '../fs-atomic.js'
+import { gitQuiet } from '../git-helper.js'
 import { resolveChangeDir, resolveQuickSessionsDir, safeGit, auditQuickCompletion, triggerSync, isQuickMetadata, resolveRuntimeRoot, collectOtherQuickSessionDeclarations } from './shared.js'
 import { detectConcurrentChanges, formatConcurrentWarning, resolveConcurrentAnchor } from './concurrent-detect.js'
 import { stageRegistry } from '../stages/index.js'
@@ -1213,7 +1214,7 @@ export async function closeQuickLinkedChanges({ pm, cwd, specBase, linkedChanges
  * ctx：stageName/steps/currentIdx/changeName/specBase/cwd。extractArtifactsForChange ← 动态 ../contract-matrix.js，
  * WorktreeManager ← 动态 ../worktree.js（真环依赖保留动态）。
  */
-export async function handleExecuteWaveArtifact({ stageName, steps, currentIdx, changeName, specBase, cwd }) {
+export async function handleExecuteWaveArtifact({ stageName, steps, currentIdx, changeName, specBase, cwd, platformOpts }) {
   if (stageName === 'execute' && /^Wave \d+ 执行$/.test(steps[currentIdx]?.name || '')) {
     try {
       const { extractArtifactsForChange } = await import('../contract-matrix.js')
@@ -1223,7 +1224,10 @@ export async function handleExecuteWaveArtifact({ stageName, steps, currentIdx,
         const meta = new WorktreeManager({ cwd }).getMeta(changeName)
         if (meta?.worktreePath && existsSync(meta.worktreePath)) worktreePath = meta.worktreePath
       } catch {}
-      const msg = extractArtifactsForChange({ changeDir: join(specBase, 'changes', changeName), specBase, changeName, worktreePath })
+      // 写侧与读侧（gates.js verify parity / prompt.js consumer 注入）同走 resolveRuntimeRoot：
+      // 平台模式 runtimeRoot ≠ specBase/.runtime，分裂时 artifact 写一处读另一处恒空
+      const runtimeRoot = resolveRuntimeRoot(platformOpts || {}, specBase)
+      const msg = extractArtifactsForChange({ changeDir: join(specBase, 'changes', changeName), specBase, changeName, worktreePath, runtimeRoot })
       if (msg) console.log(msg)
     } catch (e) { console.warn(`⚠️ 契约 artifact 提取跳过: ${e?.message || e}`) }
   }

package/src/run/complete.js

@@ -23,7 +23,7 @@ import { withFileLock } from '../quicklog.js'
 import { triggerSync, WAIT_MARKER_RE, getStageSteps, formatWaitOptions, resolveRuntimeRoot, getOrCreateMultiRepoContext, resolveChangeDir } from './shared.js'
 import { executeScanPreflight, executeScanPostcheck, computeScanProfile } from './scan-profile.js'
 import { executePlanPostcheck as runPlanPostcheckLib } from '../stages/plan-postcheck.js'
-import { outputStep } from './prompt.js'
+import { outputStep, collectStageWaitHistory } from './prompt.js'
 import { enforceDepsGate, enforceReviewJsonGate, enforceSymbolImpactGate, warnMissingUiPrototype, completeStageGates, readDesignScale } from './gates.js'
 import { handleArchiveConfirmStep, handlePlanGeneratePlanStep, handleScanProjectListStep, handleWorkflowPostCheck, handleQuickStageCompletion, handleExecuteWaveArtifact } from './complete-handlers.js'
 import { formatExecuteSummary } from '../worktree-apply.js'
@@ -80,7 +80,10 @@ export function resolveWaitingStepWithAnswer(steps, doneAnswer, nowStr) {
 
 export async function completeStep(pm, progress, stageName, cwd, outputText, inputText = null, options = {}) {
   const { printNext = true, confirm = false, changeName, platformOpts = {}, nonInteractive = false, isForceBaseline = false, isAllowNew = false, isAllowDelete = false } = options
-  const specBase = platformOpts.specRoot || join(cwd, '.sillyspec')
+  // specRoot(平台) > specDriftAnchor(worktree 漂移锚定主仓) > cwd/.sillyspec(本地)——
+  // 与 prompt.js resolvePromptSpecBase 同序：--done 收尾的 user-inputs.md/超长 artifact 落盘
+  // 必须与 prompt 渲染同一根，否则写进 worktree 副本目录、随 cleanup 整目录删除。
+  const specBase = platformOpts.specRoot || platformOpts.specDriftAnchor || join(cwd, '.sillyspec')
   const stageData = progress.stages[stageName]
 
   // ── WAIT MARKER 硬校验 ──
@@ -177,9 +180,10 @@ export async function completeStep(pm, progress, stageName, cwd, outputText, inp
       try {
         const { ensureStageSteps } = await import('./command.js')
         const reseeded = await ensureStageSteps(progress, stageName, cwd, platformOpts?.specRoot || null)
-        if (reseeded && effectiveChange) {
-          pm._write(cwd, progress, effectiveChange)
-          progress = pm.read(cwd, effectiveChange) || progress
+        const reseedChange = changeName || progress.currentChange
+        if (reseeded && reseedChange) {
+          pm._write(cwd, progress, reseedChange)
+          progress = pm.read(cwd, reseedChange) || progress
         }
         const freshSteps = progress?.stages?.[stageName]?.steps || []
         const freshPending = freshSteps.findIndex(s => s.status === 'pending' || s.status === 'in-progress')
@@ -324,7 +328,7 @@ export async function completeStep(pm, progress, stageName, cwd, outputText, inp
   await handleScanProjectListStep({ stageName, steps, currentIdx, outputText, stageData, specBase, cwd, platformOpts })
 
   // execute Wave artifact（W6 Step6c 抽至 complete-handlers.js handleExecuteWaveArtifact）
-  await handleExecuteWaveArtifact({ stageName, steps, currentIdx, changeName, specBase, cwd })
+  await handleExecuteWaveArtifact({ stageName, steps, currentIdx, changeName, specBase, cwd, platformOpts })
 
   // execute 批量完成检测：plan 全勾 + 代码客观核验通过 → 剩余 step 一次性标 completed，
   // 使本次 --done 直接进入阶段完成分支（治"3 Wave 做完仍逐次 +1、需重走 7 次 --done"）。
@@ -337,7 +341,7 @@ export async function completeStep(pm, progress, stageName, cwd, outputText, inp
     if (_ac.skippedCount > 0) {
       console.warn(`   ⚠️ ${_ac.skippedCount} 个 task 未勾（review.json 缺失/fail）→ 批量完成条件不满足，仍按单步推进`)
     }
-    const _bf = await detectExecuteBatchFinish({ pm, stageName, changeName, cwd, specBase, steps })
+    const _bf = await detectExecuteBatchFinish({ pm, stageName, changeName, cwd, specBase, platformOpts, steps })
     if (_bf.batched && _bf.aligned > 0) {
       console.log(`\n🚀 execute 批量完成：plan 全勾 + 代码核验通过，一次性补完 ${_bf.aligned} 个剩余 step → 进入阶段完成分支`)
     }
@@ -556,7 +560,7 @@ export async function completeStep(pm, progress, stageName, cwd, outputText, inp
   if (_wfResult) return _wfResult
 
   if (printNext) {
-    await outputStep(stageName, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts)
+    await outputStep(stageName, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, stageName))
     // task-08：底部锚定行——outputStep 渲染的长 prompt 易被 tail 截断，末尾再打一行推进位置，
     // 让 agent 只看末几行也能知道「推进到第几步」。仅单步推进分支（阶段完成分支已有 ✅ 阶段已完成）。
     // defSteps 越界防御：平台模式 buildPlanSteps 长度漂移时 nextPendingIdx 可能越界
@@ -785,7 +789,7 @@ async function autoCheckPlanFromReviews({ stageName, changeName, cwd, platformOp
  * 安全门：注册表零 checkbox / 未全勾 / 代码零变更（unchanged）均不批量——信任声明但用代码核验兜底。
  * @returns {Promise<{batched:boolean, aligned:number, reason?:string, blockedTasks?:string[]}>}
  */
-async function detectExecuteBatchFinish({ pm, stageName, changeName, cwd, specBase, steps }) {
+async function detectExecuteBatchFinish({ pm, stageName, changeName, cwd, specBase, platformOpts, steps }) {
   if (stageName !== 'execute' || !changeName) return { batched: false, aligned: 0 }
   try {
     const changeDir = join(specBase, 'changes', changeName)
@@ -815,20 +819,27 @@ async function detectExecuteBatchFinish({ pm, stageName, changeName, cwd, specBa
 
     // 构造 ctx 供草稿零 diff 校验用（与 task-04 同源）
     const ctx = prefetchDiffFileSet(await buildDraftContext(cwd, changeName))
-    const runtimeRoot = resolveRuntimeRoot({ specRoot: specBase }, specBase)
+    // runtimeRoot 走 platformOpts 感知解析（与 autoCheckPlanFromReviews 同口径）：
+    // 平台模式 runtimeRoot / worktree 漂移 specDriftAnchor 不透传时 marker 恒读不到
+    // → 每个 task 进 blockedTasks → 批量完成静默失效
+    const runtimeRoot = resolveRuntimeRoot(platformOpts, specBase)
     const runIdFile = join(runtimeRoot, `current-execute-run-id-${changeName}`)
     const blockedTasks = []
+    const { readReview, isValidExecuteRunId } = await import('../task-review.js')
+    // runId marker 对全部 task 恒定：循环外一次读盘（原实现逐 task 重复 readFileSync 同一文件）
+    let executeRunId = null
+    try {
+      const c = readFileSync(runIdFile, 'utf8').trim()
+      if (c && isValidExecuteRunId(c)) executeRunId = c
+    } catch {}
 
     for (const taskId of taskIds) {
       let review = null
+      if (!executeRunId) {
+        blockedTasks.push(taskId)
+        continue
+      }
       try {
-        const { readReview, isValidExecuteRunId } = await import('../task-review.js')
-        const c = readFileSync(runIdFile, 'utf8').trim()
-        if (!c || !isValidExecuteRunId(c)) {
-          blockedTasks.push(taskId)
-          continue
-        }
-        const executeRunId = c
         const reviewPath = join(runtimeRoot, 'execute-runs', executeRunId, 'tasks', taskId, 'review.json')
         const r = readReview(reviewPath)
         if (!r?.ok) {
@@ -1132,7 +1143,9 @@ export async function continueStep(pm, progress, stageName, cwd, answer, options
         changeName,
         progress.project || null,
         platformOpts,
-        formatWaitHistory(currentStep)
+        formatWaitHistory(currentStep),
+        // 跨会话 --continue（新会话直接带回答恢复 waiting 步）时，其他步骤的历史回答同样要回放
+        collectStageWaitHistory(progress, stageName)
       )
     }
     return { stageCompleted: false, currentIdx, nextPendingIdx: currentIdx }
@@ -1195,7 +1208,7 @@ export async function continueStep(pm, progress, stageName, cwd, answer, options
   // 输出下一步
     if (nextPendingIdx !== -1 && defSteps) {
       console.log('')
-    await outputStep(stageName, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, answer)
+    await outputStep(stageName, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, answer, collectStageWaitHistory(progress, stageName))
   } else if (nextWaitingIdx !== -1 && defSteps) {
     // 下一个步骤也在等待状态
     const ws = stageData.steps[nextWaitingIdx]
@@ -1246,7 +1259,7 @@ export async function skipStep(pm, progress, stageName, cwd, changeName, platfor
   const nextPendingIdx = steps.findIndex(s => s.status === 'pending' || s.status === 'in-progress')
   if (nextPendingIdx !== -1 && defSteps) {
     console.log('')
-    await outputStep(stageName, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts)
+    await outputStep(stageName, nextPendingIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, stageName))
   } else {
     const wsIdx = steps.findIndex(s => s.status === 'waiting')
     if (wsIdx !== -1) {

package/src/run/gates.js

@@ -71,7 +71,14 @@ export function validateSymbolImpactReport({ reportContent, planContent }) {
   //（generateSymbolImpactSkeleton），占位未替换即拦——骨架消灭的是「从零手写/漏 task」错误面，
   // 不是把「逐 task 结论」本身变成走过场。
   const report = String(reportContent)
-  const todoPending = taskIds.filter(id => new RegExp(`^[-*]\\s*${id}[^\\n]*<!--TODO-->`, 'm').test(report))
+  // 单遍扫描替代逐 task new RegExp（N 个 task 原实现编译 N 个正则 + 全文扫 N 次）
+  // 捕获 token 排除冒号/逗号：骨架行格式「- task-01: <!--TODO-->」，\S+ 会连冒号一起捕获导致永不命中
+  const idSet = new Set(taskIds)
+  const todoHitIds = new Set()
+  for (const m of report.matchAll(/^[-*][ \t]*([^\s:：,，]+)[^\n]*<!--TODO-->/gm)) {
+    if (idSet.has(m[1])) todoHitIds.add(m[1])
+  }
+  const todoPending = taskIds.filter(id => todoHitIds.has(id))
   for (const id of todoPending) {
     errors.push(`${id} 的结论仍是骨架 <!--TODO--> 占位——替换为真实结论（无签名级变更也显式写「无」）`)
   }
@@ -470,7 +477,7 @@ export async function runStageCompletionGates({ stageName, cwd, changeName, plat
   if (['brainstorm', 'plan', 'verify'].includes(stageName) && changeName) {
     try {
       const { ensureDecisionDocHeader } = await import('../stage-contract.js')
-      ensureDecisionDocHeader(resolveChangeDir(cwd, changeName, platformOpts?.specRoot))
+      ensureDecisionDocHeader(resolveChangeDir(cwd, { currentChange: changeName }, platformOpts?.specRoot))
     } catch { /* 补齐失败不阻断 gate */ }
   }
   // TaskCard 骨架幂等预生成（坑 taskcard-parallel-cli-lock，2026-08-25 用户实证：并行 batch
@@ -490,7 +497,10 @@ export async function runStageCompletionGates({ stageName, cwd, changeName, plat
       console.warn(`⚠️ TaskCard 骨架预生成失败（不阻断 gate，仍可逐卡手动 sillyspec taskcard 生成）: ${e.message}`)
     }
   }
-  const contractResult = runValidators(stageName, cwd, changeName, { projectName, specRoot: platformOpts?.specRoot })
+  // runtimeRoot 进 context（坑 verify-receipt-runtime-split）：verify 回执写入方
+  // reapVerifyServices 落 resolveRuntimeRoot(platformOpts, specBase)，校验器读侧不透传时
+  // 平台/漂移模式恒读不到回执 → 证据门退回纯字面匹配（回执机制正是为消灭它而生）
+  const contractResult = runValidators(stageName, cwd, changeName, { projectName, specRoot: platformOpts?.specRoot, runtimeRoot: resolveRuntimeRoot(platformOpts, specBase) })
   if (contractResult.errors.length > 0) {
     console.error(`\n❌ 阶段 ${stageName} 校验失败：`)
     for (const err of contractResult.errors) {
@@ -530,7 +540,7 @@ export async function runStageCompletionGates({ stageName, cwd, changeName, plat
       try {
         const { collectForeignDeclaredFiles } = await import('../verify-postcheck.js')
         const { gitQuiet } = await import('../git-helper.js')
-        const foreignMap = collectForeignDeclaredFiles(cwd, changeName)
+        const foreignMap = collectForeignDeclaredFiles(cwd, changeName, { specBase, runtimeRoot: resolveRuntimeRoot(platformOpts, specBase) })
         if (foreignMap.size > 0) {
           const dirty = (gitQuiet(cwd, ['diff', '--name-only', 'HEAD']) || '')
             .split('\n').filter(Boolean).map(f => f.replace(/\\/g, '/'))

package/src/run/next.js

@@ -41,9 +41,10 @@ function countTasks(tasksPath) {
 /**
  * 单个活跃变更的产物推断：返回 { state, next, evidence }
  */
-function inferChange(changeDir, name) {
+function inferChange(changeDir, name, specBase) {
   const has = (f) => existsSync(join(changeDir, f))
-  const ev = (f) => join('.sillyspec', 'changes', name, f)
+  // evidence 用真实 spec 根（平台模式=specRoot 绝对路径，此前硬编码 .sillyspec/ 前缀误导）
+  const ev = (f) => join(specBase, 'changes', name, f)
   const t = countTasks(join(changeDir, 'tasks.md'))
 
   if (!has('proposal.md') && !has('design.md') && !has('tasks.md') && !has('plan.md')) {
@@ -98,7 +99,7 @@ export function detectNextStep({ cwd, specDir = null }) {
   } catch { /* 无 changes/ 目录 */ }
   if (active.length > 0) {
     // 多活跃时逐个推断全报告，next 取第一个（字典序最前）的；调用方输出含全部状态行
-    const inferences = active.map(name => inferChange(join(changesRoot, name), name))
+    const inferences = active.map(name => inferChange(join(changesRoot, name), name, specBase))
     const progress = active.map((name, i) => {
       const t = countTasks(join(changesRoot, name, 'tasks.md'))
       return { name, checked: t.checked, total: t.total, state: inferences[i].state }

package/src/run/prompt.js

@@ -19,7 +19,8 @@
  *   - loadModuleContextIndex/buildModuleContextInjection 内 require('fs'/'path') 改顶部静态 import
  */
 import { basename, join } from 'node:path'
-import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, mkdirSync } from 'node:fs'
+import { writeAtomicSync } from '../fs-atomic.js'
 import { stageRegistry } from '../stages/index.js'
 import { resolvePromptIncludes, resolveRuntimeRoot, safeGit, WAIT_MARKER_RE, QUICK_SID_RE } from './shared.js'
 import { renderStageContract } from '../stage-contract-spec.js'
@@ -131,10 +132,53 @@ export function resolvePromptSpecBase(platformOpts, cwd) {
   return platformOpts?.specRoot || platformOpts?.specDriftAnchor || join(cwd, '.sillyspec')
 }
 
+/**
+ * 收集某阶段全部步骤已记录的用户等待回答（跨会话恢复回放数据源）。
+ *
+ * 背景（坑 stage-wait-history-not-replayed）：waitAnswers 从 --continue / --done --answer 起就
+ * 持久化在进度库（steps.wait_answers），但 outputStep 此前只在 --continue 即时路径注入
+ * 「📩 上一步用户回答」（prevStepAnswer）——新会话 `run <stage>` 续跑时历史回答不回放，
+ * agent 只能重问已答过的问题、用户描述随旧会话丢失。此助手把整阶段（含当前步骤多轮）
+ * 的回答按步骤聚合，供 outputStep 恢复渲染；与 complete.js 的 formatWaitHistory（单步、
+ * 带追问指引）分工：本助手面向跨会话恢复语境，只做数据聚合不含指引。
+ *
+ * @param {object|null} progress - ProgressManager.read() 的进度对象
+ * @param {string} stageName - 阶段名
+ * @returns {Array<{stepName: string, rounds: Array<{round: number, answer: string, question: string|null, answeredAt: string|null}>}>|null}
+ *          无进度/无任何回答记录时返回 null（调用方零输出）
+ */
+export function collectStageWaitHistory(progress, stageName) {
+  const steps = progress?.stages?.[stageName]?.steps
+  if (!Array.isArray(steps)) return null
+  const entries = []
+  for (const step of steps) {
+    if (!step || typeof step.name !== 'string') continue
+    const rounds = []
+    if (Array.isArray(step.waitAnswers)) {
+      for (const item of step.waitAnswers) {
+        if (item && typeof item.answer === 'string' && item.answer.trim() !== '') {
+          rounds.push({
+            round: typeof item.round === 'number' ? item.round : rounds.length + 1,
+            answer: item.answer,
+            question: typeof item.question === 'string' && item.question.trim() !== '' ? item.question : null,
+            answeredAt: typeof item.answeredAt === 'string' ? item.answeredAt : null,
+          })
+        }
+      }
+    }
+    // 旧进度/部分路径只写单值列 wait_answer（--done --answer 坑1 路径）：并入为第 1 轮，避免丢
+    if (rounds.length === 0 && typeof step.waitAnswer === 'string' && step.waitAnswer.trim() !== '') {
+      rounds.push({ round: 1, answer: step.waitAnswer, question: null, answeredAt: null })
+    }
+    if (rounds.length > 0) entries.push({ stepName: step.name, rounds })
+  }
+  return entries.length > 0 ? entries : null
+}
+
 /**
  * 输出当前步骤的 prompt
  */
-export async function outputStep(stageName, stepIndex, steps, cwd, changeName, dbProjectName, platformOpts = {}, prevStepAnswer = null) {
+export async function outputStep(stageName, stepIndex, steps, cwd, changeName, dbProjectName, platformOpts = {}, prevStepAnswer = null, waitHistory = null) {
   const step = steps[stepIndex]
   const total = steps.length
   // ── 越界防御 ──
@@ -456,7 +500,7 @@ export async function outputStep(stageName, stepIndex, steps, cwd, changeName, d
       // 注入结果同步落 runtime JSON（与既有 KNOWLEDGE_HIT_REPORT 落盘口径一致）
       const decRuntimeDir = join(decSpecBase, '.runtime')
       mkdirSync(decRuntimeDir, { recursive: true })
-      writeFileSync(join(decRuntimeDir, 'decision-hits.json'), JSON.stringify({ matched: decResult.matched, decisionHits: decResult.decisionHits || [] }, null, 2) + '\n')
+      writeAtomicSync(join(decRuntimeDir, 'decision-hits.json'), JSON.stringify({ matched: decResult.matched, decisionHits: decResult.decisionHits || [] }, null, 2) + '\n')
     } catch (e) {
       promptText = promptText.replace(/\{DECISION_HITS\}/g, `[decisions] 决策命中检测异常（${e.message}），跳过`)
     }
@@ -488,7 +532,7 @@ export async function outputStep(stageName, stepIndex, steps, cwd, changeName, d
       // 写入 runtime JSON
       const runtimeDir = join(effectiveSpecBase, '.runtime')
       mkdirSync(runtimeDir, { recursive: true })
-      writeFileSync(join(runtimeDir, 'knowledge-hit-report.json'), JSON.stringify(knowledgeResult.json, null, 2) + '\n')
+      writeAtomicSync(join(runtimeDir, 'knowledge-hit-report.json'), JSON.stringify(knowledgeResult.json, null, 2) + '\n')
     } catch (e) {
       promptText = promptText.replace(/\{KNOWLEDGE_HIT_REPORT\}/g, 'Status: no matches (error: ' + e.message + ')')
     }
@@ -567,7 +611,7 @@ export async function outputStep(stageName, stepIndex, steps, cwd, changeName, d
       // 目录由下游 review 写入 / 其他写入点补齐）。
       try {
         mkdirSync(join(runtimeRoot, 'execute-runs', runId, 'tasks'), { recursive: true })
-        writeFileSync(runIdFile, runId + '\n')
+        writeAtomicSync(runIdFile, runId + '\n')
       } catch (e) {
         console.error(`[sillyspec] execute run marker/目录写入失败（降级继续，ID ${runId} 仍注入 prompt）: ${e.message}`)
       }
@@ -609,7 +653,7 @@ export async function outputStep(stageName, stepIndex, steps, cwd, changeName, d
         reviewRunId = generateStageReviewRunId()
         try {
           mkdirSync(tierRuntimeRoot, { recursive: true })
-          writeFileSync(reviewRunIdMarker, reviewRunId + '\n')
+          writeAtomicSync(reviewRunIdMarker, reviewRunId + '\n')
           // plan-c: echo 完整 review 目录路径，避免 agent 拿裸 runId 给子代理时漏连字符拼错路径
           const reviewDir = `${tierRuntimeRoot}/stage-reviews/${stageName}-${reviewRunId}`
           console.log(`  📁 Stage Review 写入目录（直接复制给 review 子代理，勿手拼 runId）：${reviewDir}/`)
@@ -745,6 +789,22 @@ export async function outputStep(stageName, stepIndex, steps, cwd, changeName, d
     }
   }
 
+  // ── 跨会话恢复回放（坑 stage-wait-history-not-replayed）──
+  // 整阶段历史等待回答：数据由调用方从进度库 collectStageWaitHistory 聚合传入。与下方
+  // 「📩 上一步用户回答」分工：本块是恢复语境（跨步骤、含多轮），那块是刚收到的最新回答
+  // （更贴近 prompt 末尾）。同一轮内容可能短暂重复出现，属预期——两块框架语义不同。
+  if (waitHistory && waitHistory.length > 0) {
+    console.log(`\n### 📜 本阶段历史用户回答（进度库回放，跨会话恢复用）`)
+    console.log(`以下问答已由用户确认并记录在进度库，续跑时据此恢复上下文——已回答过的问题不要重复追问：`)
+    for (const entry of waitHistory) {
+      console.log(`\n**「${entry.stepName}」**（${entry.rounds.length} 轮）`)
+      for (const r of entry.rounds) {
+        if (r.question) console.log(`   问：${r.question}`)
+        console.log(`   第${r.round}轮答：${r.answer}`)
+      }
+    }
+  }
+
   if (prevStepAnswer) {
     console.log(`\n### 📩 上一步用户回答`)
     console.log(prevStepAnswer)

package/src/run/scan-profile.js

@@ -224,6 +224,7 @@ export async function executeScanPostcheck(cwd, platformOpts, scanProfile) {
   const result = runScanPostCheck({
     cwd,
     specDir,
+    scanProfile: scanProfile || null,
     scanMeta: {
       projectListParsed: true,
       manifestWritten: undefined,