sillyspec 3.27.5 → 3.27.7

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'
@@ -723,6 +723,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
     '--json', '--dir', '--help',
     '--reopen', '--from-step', '--mode',
     '--deep', '--quick', '--standard', // scan profile 三档显式选择（scan-profile.js 从 argv 读；互斥见下方 PROFILE_FLAGS 检测）
+    '--adopt-branch', // execute 显式收编既有 sillyspec/<change> 分支为 worktree 工作分支（坑 worktree-user-branch-conflict）
     '--diff', '--base', '--full', '--report', // scan diff（D-001：command.js 只补 flag，裸 token 解析归 index.js 子命令拦截）
     '-h',
   ])
@@ -897,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
   }
@@ -1241,7 +1242,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   }
 
   // 默认：输出当前步骤
-  return await runStage(pm, progress, stageName, cwd, effectiveChange, isSkipApproval, platformOpts, { quickFiles, isAllowNew, isAllowDelete, isForceBaseline, isForceRescan, linkedChanges, taskDescription: inputText })
+  return await runStage(pm, progress, stageName, cwd, effectiveChange, isSkipApproval, platformOpts, { quickFiles, isAllowNew, isAllowDelete, isForceBaseline, isForceRescan, linkedChanges, taskDescription: inputText, adoptBranch: stageName === 'execute' && flags.includes('--adopt-branch') })
 }
 
 /**
@@ -1516,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
   }
 
@@ -1556,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
   }
 
@@ -1634,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,10 +477,30 @@ 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 */ }
   }
-  const contractResult = runValidators(stageName, cwd, changeName, { projectName, specRoot: platformOpts?.specRoot })
+  // TaskCard 骨架幂等预生成（坑 taskcard-parallel-cli-lock，2026-08-25 用户实证：并行 batch
+  // 子代理各自起 sillyspec taskcard CLI 撞进度库 SQLite 锁，改主代理预生成+子代理只 Edit 才稳）。
+  // gate 前主流程单进程补齐缺卡骨架（已存在跳过），与 ensureDecisionDocHeader 同层同范式——
+  // 补的是 CLI 可自证的机械骨架，占位符硬拦（plan-postcheck）仍逼子代理 Edit 填语义。
+  if (stageName === 'plan' && changeName) {
+    try {
+      const { ensureTaskcardSkeletons } = await import('../taskcard.js')
+      const r = ensureTaskcardSkeletons(changeName, { cwd, specDir: platformOpts?.specRoot })
+      if (r.created.length > 0) {
+        console.log(`📌 已预生成 ${r.created.length} 张 TaskCard 骨架（主流程单进程生成，子代理只 Edit 填充，勿并行跑 taskcard CLI）:`)
+        for (const f of r.created.slice(0, 8)) console.log(`   + ${f}`)
+        if (r.created.length > 8) console.log(`   … 共 ${r.created.length} 张`)
+      }
+    } catch (e) {
+      console.warn(`⚠️ TaskCard 骨架预生成失败（不阻断 gate，仍可逐卡手动 sillyspec taskcard 生成）: ${e.message}`)
+    }
+  }
+  // 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) {
@@ -513,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,

package/src/run/shared.js

@@ -515,7 +515,9 @@ export function isSelfReferentialSpecRoot(cwd, specRoot) {
  *
  * 语义：(specRoot || runtimeRoot) 存在且非自指 → 平台模式；自指回环（repo-native
  * junction）按本地模式处理。本模块内平台模式门禁统一经本函数，裸表达式仅此一处
- * （grep 验证：triggerSync/triggerPull/triggerPullActiveChange/checkApproval 四处收敛）。
+ * （grep 验证：triggerPull/triggerPullActiveChange/checkApproval 三处收敛；triggerSync
+ * 已放行——平台模式上行回传经 env 凭据通道（sync.js _getPlatform），下行 pull 与审批
+ * 检查仍跳过，daemon 是权威数据面）。
  * runtimeRoot 落在 specRoot 内，自指判定以 specRoot 为准即可覆盖；runtimeRoot-only
  * 组合无 specRoot 可判，不触发自指豁免（保持平台模式）。
  *
@@ -549,7 +551,7 @@ export function resolveChangeDir(cwd, progress, specDir = null) {
 }
 
 /**
- * 触发 sync（平台模式走自己的链路，跳过；否则 await import sync.js）。
+ * 触发 sync（本地/平台模式都执行：平台模式凭据经 env 通道，见函数头注释）。
  */
 // sync 总超时熔断：sync.js 是 best-effort 后台回传（每请求已有 10s 超时），但 sync() 可能串行多次
 // fetchJson 累积等待、阻塞 --done。给 8s 总超时，超时放弃（best-effort，失败不影响正确性，下次 --done 重试）。
@@ -583,13 +585,17 @@ async function raceWithAbort(op, timeoutMs = SYNC_TOTAL_TIMEOUT_MS) {
 export const QUICK_SID_RE = /^quick-[0-9a-f]{8}$/
 
 export async function triggerSync(cwd, changeName, platformOpts = {}, opts = {}) {
-  // 平台模式（SillyHub）走自己的回传链路，不走 CLI 内置 sync；自指回环（repo-native junction）按本地模式处理
-  if (isPlatformMode(platformOpts, cwd)) return
+  // 平台模式不再整体跳过（2026-08-26 用户决策）：上行回传（进度 + 四件套 + spec 树）
+  // 在平台模式同样执行，凭据经 env SILLYHUB_PLATFORM_URL/TOKEN（daemon 注入通道，
+  // sync.js _getPlatform，链路 D 同款）；未注入 env 且 local.yaml 无 platform 段时
+  // sync() 内部静默跳过（合法状态）。下行 pull / 审批检查仍走平台自有链路（见各自门禁）。
   try {
     // ql-20260818-011：quick 会话按设计无实体变更目录（progress.js initChange 同款
     // 跳过建目录），progress/四件套上行对它是孤儿数据；但 spec 树增量（QUICKLOG/
     // 模块文档的上行通道）以服务器清单为锚，与变更目录无关——降级只推 spec 树。
-    if (changeName && QUICK_SID_RE.test(changeName) && !existsSync(join(cwd, '.sillyspec', 'changes', changeName))) {
+    // 存在性检查按平台 specRoot（A4 同族）：平台模式下实体目录在 specRoot/changes。
+    const tsSpecBase = platformOpts?.specRoot || join(cwd, '.sillyspec')
+    if (changeName && QUICK_SID_RE.test(changeName) && !existsSync(join(tsSpecBase, 'changes', changeName))) {
       // shared.js 在 src/run/，sync.js 在 src/ → 退一层
       const syncMod = await import('../sync.js')
       await raceWithAbort((sig) => syncMod.syncSpecTreeOnly(changeName, cwd, sig), opts.timeoutMs)

package/src/run/stage.js

@@ -21,7 +21,7 @@ import { existsSync, readdirSync, readFileSync, mkdirSync } from 'node:fs'
 import { writeAtomicSync } from '../fs-atomic.js'
 import { resolveSpecDir, resolveChangeDir, resolveRuntimeRoot, resolveQuickSessionsDir, triggerSync, safeGit, parsePorcelainPath, formatWaitOptions, checkApproval, getStageSteps, warnApprovalUnknown } from './shared.js'
 import { computeScanProfile, applyScanProfileSteps, executeScanPreflight, executeScanPostcheck } from './scan-profile.js'
-import { outputStep } from './prompt.js'
+import { outputStep, collectStageWaitHistory } from './prompt.js'
 import { allocateQuicklogEntry, deriveTitleFromLinkedChange, sanitizeDesc } from '../quicklog.js'
 import { createHash } from 'node:crypto'
 import { checkTransition } from '../stage-contract.js'
@@ -74,14 +74,17 @@ export async function runStage(pm, progress, stageName, cwd, changeName, skipApp
       console.log(`🔗 worktree 已存在: ${existingMeta.worktreePath} (${existingMeta.mode})`)
     } else {
       try {
-        const result = wm.create(effectiveChange)
-        console.log(`🔗 worktree 已创建: ${result.worktreePath} (分支: ${result.branch}, 模式: ${result.mode})`)
+        const result = wm.create(effectiveChange, { adoptBranch: !!(quickOpts && quickOpts.adoptBranch) })
+        console.log(`🔗 worktree 已创建: ${result.worktreePath} (分支: ${result.branch}, 模式: ${result.mode}${result.adoptedBranch ? ', 收编既有分支' : ''})`)
       } catch (e) {
         console.error(`❌ worktree 创建失败: ${e.message}`)
+        // 修复建议不再无条件推荐 git branch -D（坑 worktree-user-branch-conflict，2026-08-24：
+        // 同名分支可能是用户有意创建的——分支冲突时 create 报错已带三选一决策菜单，删不删
+        // 交由菜单/人工判断；doctor 的分支删除也有 review 锚点 + 无库保守双保护）。
         console.error(`   修复建议：`)
-        console.error(`   1. 运行 sillyspec worktree doctor --fix 检查并修复 worktree 状态`)
-        console.error(`   2. 或手动清理残留：git worktree prune && git branch -D sillyspec/${effectiveChange}`)
-        console.error(`   3. 必要时删除残留目录 .sillyspec/.runtime/worktrees/${effectiveChange}/ 后重试`)
+        console.error(`   1. 同名分支冲突/收编：按上方报错内三选一菜单处置（遗留分支确认作废后才删；用户指定分支用 --adopt-branch 收编）`)
+        console.error(`   2. worktree 状态异常：sillyspec worktree doctor --fix（分支删除有 review 锚点保护，不会误删在用分支）`)
+        console.error(`   3. 目录残留：确认无未提交改动后清理 .sillyspec/.runtime/worktrees/${effectiveChange}/ 再重试`)
         process.exit(1)
       }
     }
@@ -139,18 +142,18 @@ export async function runStage(pm, progress, stageName, cwd, changeName, skipApp
       const { resolveVerifyChangedFiles } = await import('../verify-postcheck.js')
       const activeChanges = (pm.listChanges(cwd) || []).filter(c => c && c !== changeName)
       if (activeChanges.length > 0) {
-        const myFiles = resolveVerifyChangedFiles(cwd, changeName, null, { includeWorkingTree: true }) || []
+        const myFiles = resolveVerifyChangedFiles(cwd, changeName, null, { includeWorkingTree: true, specBase }) || []
         const mySet = new Set(myFiles.map(f => f.replace(/\\/g, '/')).filter(f => !f.startsWith('.sillyspec/')))
         if (mySet.size > 0) {
           const conflicts = []
           for (const other of activeChanges) {
-            const otherFiles = resolveVerifyChangedFiles(cwd, other, null, { includeWorkingTree: true }) || []
+            const otherFiles = resolveVerifyChangedFiles(cwd, other, null, { includeWorkingTree: true, specBase }) || []
             const overlap = [...new Set(otherFiles.map(f => f.replace(/\\/g, '/')))]
               .filter(f => mySet.has(f))
             if (overlap.length > 0) conflicts.push({ other, overlap })
           }
           if (conflicts.length > 0) {
-            console.warn(`⚠️ 跨变更文件冲突预警：本变更（${changeName}}）与其他活跃变更改动重叠——`)
+            console.warn(`⚠️ 跨变更文件冲突预警：本变更（${changeName}）与其他活跃变更改动重叠——`)
             for (const c of conflicts) {
               console.warn(`   与 ${c.other} 重叠 ${c.overlap.length} 个文件：${c.overlap.slice(0, 5).join(', ')}${c.overlap.length > 5 ? ` …（共 ${c.overlap.length}）` : ''}`)
             }
@@ -174,7 +177,7 @@ export async function runStage(pm, progress, stageName, cwd, changeName, skipApp
         .split('\n').filter(Boolean).map(l => l.slice(3).trim().split(' -> ').pop() || '')
         .map(p => p.replace(/^"|"$/g, '').replace(/\\/g, '/'))
         .filter(p => p && !p.startsWith('.sillyspec/'))
-      const myFiles = (await import('../verify-postcheck.js')).resolveVerifyChangedFiles(cwd, changeName, null, { includeWorkingTree: true }) || []
+      const myFiles = (await import('../verify-postcheck.js')).resolveVerifyChangedFiles(cwd, changeName, null, { includeWorkingTree: true, specBase }) || []
       const mySet = new Set(myFiles.map(f => f.replace(/\\/g, '/')))
       const foreign = mainDirty.filter(p => !mySet.has(p))
       if (foreign.length > 0) {
@@ -485,7 +488,7 @@ export async function runStage(pm, progress, stageName, cwd, changeName, skipApp
       const nextIdx = stageData.steps.findIndex(s => s.status === 'pending' || s.status === 'in-progress')
       if (nextIdx !== -1 && defSteps[nextIdx]) {
         console.log('')
-        await outputStep(stageName, nextIdx, defSteps, cwd, changeName, progress.project || null, platformOpts)
+        await outputStep(stageName, nextIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, stageName))
       } else {
         // 所有步骤完成
         stageData.status = 'completed'
@@ -503,7 +506,7 @@ export async function runStage(pm, progress, stageName, cwd, changeName, skipApp
       }
       return
     }
-    await outputStep(stageName, currentIdx, defSteps, cwd, changeName, progress.project || null, platformOpts)
+    await outputStep(stageName, currentIdx, defSteps, cwd, changeName, progress.project || null, platformOpts, null, collectStageWaitHistory(progress, stageName))
   }
 }
 

package/src/scan-diff.js

@@ -246,8 +246,10 @@ function renderTerminal(r, { full }) {
 /** 文件归属状态字母（渲染用）：R（renameMap 命中）> A > D > M */
 function statusLetter(r, f) {
   if (r.renameMap[f]) return 'R'
-  if (r.added.includes(f)) return 'A'
-  if (r.deleted.includes(f)) return 'D'
+  // Set 惰性缓存（挂在 r 上，渲染期只建一次）：added/deleted 数组线性扫在数千文件逐条渲染时是 O(n²)
+  if (!r._statusSets) r._statusSets = { added: new Set(r.added), deleted: new Set(r.deleted) }
+  if (r._statusSets.added.has(f)) return 'A'
+  if (r._statusSets.deleted.has(f)) return 'D'
   return 'M'
 }
 

package/src/stage-contract-spec.js

@@ -223,7 +223,7 @@ const VERIFY_RULES = [
     target: { root: 'change', path: 'verify-result.md', scope: 'full' },
     data: {},
     spec: 'verify-result.md 结论不得为 FAIL(FAIL 阻断 verify 完成)。结论在含「结论/Conclusion/Result/结果」的二级标题后,值为 PASS / PASS WITH NOTES / FAIL。',
-    failMessage: 'verify-result.md 结论为 FAIL — 验证未通过，不能标记 verify 完成；请修复后重新运行验证',
+    failMessage: 'verify-result.md 结论为 FAIL — 验证未通过，不能标记 verify 完成；请修复后重新运行验证。⚠️ 重验成本预告：修复后 verify --done 时 CLI 会重新执行 local.yaml 的 commands.test 全量对账（同步执行，长套件可达数分钟、中途无输出属正常；可按 local.yaml test_strategy: module + modules 收窄命中模块），请在修复时一并评估测试范围',
     noConclusionWarning: 'verify-result.md 未识别到结论章节（含 结论/Conclusion/Result/结果 的二级标题，后跟 PASS / PASS WITH NOTES / FAIL）',
   },
   // integration-evidence(custom,D10 事前契约):风险门控。判定算法 detectChangeRisk +