sillyspec 3.26.6 → 3.26.8

package/src/run/complete.js

@@ -64,32 +64,6 @@ export function resolveWaitingStepWithAnswer(steps, doneAnswer, nowStr) {
   return waitIdx
 }
 
-/**
- * wait 选项单选校验（坑 wait-choice-enforcement）：定义了 waitOptions 的 requiresWait/
- * repeatableWait 步骤，--answer 必须命中预设选项之一——防止 agent 一句话代答绕过人工
- * 选择（方案选择类 wait 的 answer 本就该是选项本身）。开放回答型步骤（澄清追问，answer
- * 为自由文本）在 step 定义显式声明 waitFreeAnswer: true 豁免。
- * 校验失败打印选项清单 + exit 1（fail-loud，与 requiresWait 门同风格）。
- *
- * waitOptions 优先取 stepDef（运行时构建的步骤定义，与 brainstorm/plan 静态定义同源），
- * 回退 DB step entry（--continue 路径 waiting 步骤的 waitOptions 已落盘）。
- */
-function enforceWaitChoice(stepDef, stepEntry, answer, stageName, changeName) {
-  if (answer == null) return
-  const opts = Array.isArray(stepDef?.waitOptions) ? stepDef.waitOptions
-    : (Array.isArray(stepEntry?.waitOptions) ? stepEntry.waitOptions : null)
-  if (!opts || opts.length === 0) return
-  if (stepDef?.waitFreeAnswer === true) return
-  if (opts.includes(answer)) return
-  console.error(`❌ Step "${stepEntry?.name || '当前步骤'}" 是封闭单选 wait，--answer 必须命中预设选项之一（防 AI 代答绕过人工选择）。`)
-  console.error(`   你的 --answer: ${JSON.stringify(answer)}`)
-  console.error(`   可选值（复制其一）: ${opts.join(' / ')}`)
-  console.error(`   自由文本回答的场景，该步骤应声明 waitFreeAnswer（当前未声明）。`)
-  if (changeName) console.error(`   重试：sillyspec run ${stageName} --done --answer "<选项>" --change ${changeName}`)
-  else console.error(`   重试：sillyspec run ${stageName} --done --answer "<选项>"`)
-  process.exit(1)
-}
-
 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')
@@ -148,10 +122,6 @@ export async function completeStep(pm, progress, stageName, cwd, outputText, inp
   const defStepsForCurrent = await getStageSteps(stageName, cwd, progress, platformOpts?.specRoot || null)
   const currentStepDef = defStepsForCurrent?.[currentIdx] || {}
   const currentStep = steps[currentIdx]
-  // --done --answer 解 waiting 的路径同样过单选校验（与下方 requiresWait doneAnswer 分支同规则）
-  if (_resolvedWaitIdx !== -1 && _doneAnswer) {
-    enforceWaitChoice(currentStepDef, currentStep, _doneAnswer, stageName, changeName)
-  }
   if (currentStepDef.requiresWait === true && !currentStep.waitAnswer) {
     // 检查 --done 是否带了 --answer：如果是，自动补全 waitAnswer 状态，一步完成
     const doneAnswer = typeof options !== 'undefined' && options.doneAnswer ? options.doneAnswer : null
@@ -168,7 +138,6 @@ export async function completeStep(pm, progress, stageName, cwd, outputText, inp
       currentStep.waitReason = currentStepDef.waitReason || '等待用户输入'
       console.log(`⚠️  Step "${currentStep.name}" 的确认（${currentStepDef.waitReason}）已在前置步骤完成，自动跳过。`)
     } else if (doneAnswer) {
-      enforceWaitChoice(currentStepDef, currentStep, doneAnswer, stageName, changeName)
       currentStep.status = 'waiting'
       currentStep.waitAnswer = doneAnswer
       currentStep.waitReason = currentStepDef.waitReason || '等待用户输入'
@@ -508,8 +477,14 @@ async function autoCheckPlanFromReviews({ stageName, changeName, cwd, platformOp
     if (!existsSync(planPath) || !existsSync(runIdFile)) {
       return { autoChecked: false, checkedCount: 0, skippedCount: 0 }
     }
-    const executeRunId = readFileSync(runIdFile, 'utf8').trim()
-    const { readReview } = await import('../task-review.js')
+    const c = readFileSync(runIdFile, 'utf8').trim()
+    const { readReview, isValidExecuteRunId } = await import('../task-review.js')
+    // marker 是 agent 可写内容：格式校验防注入/穿越，非法视为缺失（跳过 autoCheck，不误勾）
+    if (c && !isValidExecuteRunId(c)) {
+      console.warn(`⚠️ execute run marker 内容非法（期望 exec-YYYY-MM-DD-HHMMSS，实得 ${JSON.stringify(c.slice(0, 60))}），跳过 review 自动勾选`)
+      return { autoChecked: false, checkedCount: 0, skippedCount: 0 }
+    }
+    const executeRunId = c
     // plan.md 是 agent 与 CLI 都会写的共享文件（agent 勾 checkbox、此处 autoCheck 也勾选）。
     // 读-改-写必须整体持锁（withFileLock 串行化多进程），否则并发 execute --done / 手动勾选互相覆盖
     // （后到者覆盖先到者）；写入用 writeAtomicSync（tmp+rename 原子），防 Windows 整文件覆盖被读半截
@@ -744,7 +719,6 @@ export async function continueStep(pm, progress, stageName, cwd, answer, options
   const prevOutput = currentStep.output || ''
   const waitRound = (currentStep.waitRound || 0) + 1
   currentStep.waitRound = waitRound
-  enforceWaitChoice(currentStepDef, currentStep, answer, stageName, changeName)
   currentStep.waitAnswer = answer
   currentStep.waitAnswers = Array.isArray(currentStep.waitAnswers) ? currentStep.waitAnswers : []
   currentStep.waitAnswers.push({

package/src/run/gates.js

@@ -115,9 +115,14 @@ export async function enforceReviewJsonGate(stageName, cwd, changeName, step, st
   const runIdFile = join(runtimeRoot, `current-execute-run-id-${changeName}`)
   const planPath = join(specBase, 'changes', changeName, 'plan.md')
   if (!existsSync(runIdFile) || !existsSync(planPath)) return true
+  const { validateCheckedTaskReviews, resolveLatestExecuteRunIdWithTasks, isValidExecuteRunId } = await import('../task-review.js')
   let executeRunId = readFileSync(runIdFile, 'utf8').trim()
+  // marker 是 agent 可写内容：格式校验防注入/穿越，非法视为缺失走漂移兜底重定位
+  if (executeRunId && !isValidExecuteRunId(executeRunId)) {
+    console.warn(`⚠️ execute run marker 内容非法（期望 exec-YYYY-MM-DD-HHMMSS，实得 ${JSON.stringify(executeRunId.slice(0, 60))}），改扫真实 run 目录`)
+    executeRunId = ''
+  }
   const planContent = readFileSync(planPath, 'utf8')
-  const { validateCheckedTaskReviews, resolveLatestExecuteRunIdWithTasks } = await import('../task-review.js')
   // marker 漂移兜底（gate-atom-a 正确修法）：marker 指向的 run 缺 tasks/（generateExecuteRunId 只写
   // marker 不建目录，漂移后新 run 不继承旧 review）时，无视 marker 改扫 execute-runs/ 取 mtime 最新
   // 且真正含 tasks/ 的 run，用其齐备的 review.json 校验，避免误报「review.json 不存在」。注意不能用
@@ -243,6 +248,24 @@ export async function runStageCompletionGates({ stageName, cwd, changeName, plat
     const { runVerifyRequiredEvidenceCheck, printVerifyRequiredEvidenceCheck } = await import('../verify-postcheck.js')
     const evidenceCheck = runVerifyRequiredEvidenceCheck({ cwd, specBase, changeName })
     printVerifyRequiredEvidenceCheck(evidenceCheck)
+    // ── module-impact 死信探针（blocking，债单 D-1/D-5）：更新结果表 pending/待办行 → 阻断 verify ──
+    // 与 archive 移动前校验（extractPendingDocSyncRows）同一口径，把死信号从 archive 提前到 verify：
+    // agent 在 verify 阶段就须完成文档同步并回填 done/skipped，而非拖到归档被拦（修复 perf-remediation
+    // 类「verify PASS → archive 才发现 pending」的时序漏洞）。
+    const verifyChangeDir = resolveChangeDir(cwd, progress, platformOpts?.specRoot)
+    if (verifyChangeDir) {
+      const impactPath = join(verifyChangeDir, 'module-impact.md')
+      if (existsSync(impactPath)) {
+        const { extractPendingDocSyncRows } = await import('./complete-handlers.js')
+        const pendingRows = extractPendingDocSyncRows(readFileSync(impactPath, 'utf8'))
+        if (pendingRows.length > 0) {
+          console.error(`\n❌ verify 阶段被阻断：module-impact.md「更新结果」表存在 ${pendingRows.length} 个未清 pending/待办项（死信）`)
+          for (const row of pendingRows) console.error(`   - ${row}`)
+          console.error('   文档同步是 verify 的收尾义务：请完成模块文档同步并回填状态为 done/skipped（说明原因），再重新完成 verify。')
+          return rollbackCompletionAndReturn(pm, progress, stageData, steps, currentIdx, cwd, changeName, platformOpts)
+        }
+      }
+    }
     console.log('\n✅ 验证通过，下一步：sillyspec run archive')
   }
 
@@ -333,12 +356,18 @@ export async function runStageCompletionGates({ stageName, cwd, changeName, plat
         const planContent = readFileSync(planPath, 'utf8')
         const runtimeRoot = resolveRuntimeRoot(platformOpts, effectiveSpecBase)
 
-        // execute run id：从变更专属标记文件读取
+        // execute run id：从变更专属标记文件读取（agent 可写内容，格式校验防注入/穿越）
         const runIdFile = join(runtimeRoot, `current-execute-run-id-${changeName}`)
         let executeRunId = ''
         try {
           if (existsSync(runIdFile)) {
-            executeRunId = readFileSync(runIdFile, 'utf8').trim()
+            const c = readFileSync(runIdFile, 'utf8').trim()
+            const { isValidExecuteRunId } = await import('../task-review.js')
+            if (c && !isValidExecuteRunId(c)) {
+              console.warn(`⚠️ execute run marker 内容非法（期望 exec-YYYY-MM-DD-HHMMSS，实得 ${JSON.stringify(c.slice(0, 60))}），视为缺失回退扫描`)
+            } else {
+              executeRunId = c
+            }
           }
         } catch {}
         if (!executeRunId) {