sillyspec 3.33.0 → 3.33.2

package/src/task-review.js

@@ -9,6 +9,7 @@
  */
 
 import { existsSync, readFileSync, mkdirSync, writeFileSync, readdirSync, statSync } from 'fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { join, resolve, basename, dirname } from 'path'
 import { execFileSync } from 'child_process'
 import { git, unquoteGitPath } from './git-helper.js'
@@ -959,7 +960,7 @@ export function resolveLatestExecuteRunIdWithTasks({ runtimeRoot, changeName = n
 }
 
 export function resolveLatestExecuteRunId({ runtimeRoot, changeName }) {
-  const marker = join(runtimeRoot, `current-execute-run-id-${changeName}`)
+  const marker = runtimeStatePath(runtimeRoot, `current-execute-run-id-${changeName}`)
   try {
     if (existsSync(marker)) {
       const c = readFileSync(marker, 'utf8').trim()
@@ -1077,7 +1078,7 @@ export function resolveExecuteRunForChange({ runtimeRoot, changeName, taskIds =
     // 1. marker
     let markerRunId = null
     try {
-      const marker = join(runtimeRoot, `current-execute-run-id-${changeName}`)
+      const marker = runtimeStatePath(runtimeRoot, `current-execute-run-id-${changeName}`)
       if (existsSync(marker)) {
         const c = readFileSync(marker, 'utf8').trim()
         if (c && !isValidExecuteRunId(c)) console.warn(`[sillyspec] execute run marker 内容非法（期望 exec-YYYY-MM-DD-HHMMSS，实得 ${JSON.stringify(c.slice(0, 60))}），忽略并回退归属扫描`)
@@ -1341,7 +1342,7 @@ export async function generateTaskReviewDrafts({ changeName, cwd, platformOpts =
   }
 
   // exec-id：与 Task Review Gate（gates.js:269）/ autoCheckPlanFromReviews 同源
-  const runIdFile = join(runtimeRoot, 'current-execute-run-id-' + changeName)
+  const runIdFile = runtimeStatePath(runtimeRoot, 'current-execute-run-id-' + changeName)
   let executeRunId = ''
   try {
     if (existsSync(runIdFile)) {
@@ -1637,7 +1638,7 @@ export async function adoptTaskReviewMechanics({ changeName, cwd, platformOpts =
   // executeRunId：与草稿/gate 同源 marker。缺 marker 不新建 run——adopt 修的是当前 run 里
   // 已存在的 review，marker 丢失说明无「当前 run」语义，无对象可修（gate 对 marker 缺失放行，
   // 下游 Task Review Gate 兜底，这里同口径不造 run）。
-  const runIdFile = join(runtimeRoot, 'current-execute-run-id-' + changeName)
+  const runIdFile = runtimeStatePath(runtimeRoot, 'current-execute-run-id-' + changeName)
   let executeRunId = ''
   try {
     if (existsSync(runIdFile)) {
@@ -1969,7 +1970,7 @@ export async function writeTaskReview({
   if (!existsSync(taskCardPath)) {
     return { ok: false, errors: [`task 卡不存在：${taskCardPath}（先由 plan 阶段生成或手建）`], warnings }
   }
-  const markerFile = join(runtimeRoot, 'current-execute-run-id-' + changeName)
+  const markerFile = runtimeStatePath(runtimeRoot, 'current-execute-run-id-' + changeName)
   let executeRunId = ''
   try {
     if (existsSync(markerFile)) {
@@ -1986,6 +1987,7 @@ export async function writeTaskReview({
       // 排他认领（坑 exec-run-id-same-second-collision）+ 幂等 mkdir，认领碰撞换后缀
       executeRunId = claimExecuteRunId(runtimeRoot, executeRunId)
       mkdirSync(join(runtimeRoot, 'execute-runs', executeRunId, 'tasks'), { recursive: true })
+      try { mkdirSync(dirname(markerFile), { recursive: true }); } catch { /* fail-open */ }
       writeFileSync(markerFile, executeRunId + '\n')
       stampExecuteRunChange(runtimeRoot, executeRunId, changeName)
       warnings.push(`无 execute run marker——已生成新 runId ${executeRunId} 并建目录（正常应先跑过 execute Wave 步）`)

package/src/task-tick.js

@@ -19,6 +19,7 @@
  *   - 归档件只读：变更已归档时拒收（exit 2）。
  */
 import { existsSync, readFileSync, appendFileSync } from 'node:fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { join } from 'node:path'
 
 /** 任务行（宽容缩进/星号有序标记，与哨兵判集行锚同口径 + 缩进容差）。 */
@@ -137,7 +138,7 @@ export async function runTaskTick({ changeName, cwd, taskId, specBase, evidence
     try {
       const { resolveRuntimeRoot } = await import('./run/shared.js')
       const runtimeRoot = resolveRuntimeRoot({}, specBase)
-      const eventsPath = join(runtimeRoot, `watcher-events-${changeName}.jsonl`)
+      const eventsPath = runtimeStatePath(runtimeRoot, `watcher-events-${changeName}.jsonl`)
       const from = Math.max(0, r.checked - 1)
       appendFileSync(eventsPath, JSON.stringify({
         ts: Date.now(), kind: 'task-done', stage: 'tasks',
@@ -168,6 +169,49 @@ export async function runTaskTick({ changeName, cwd, taskId, specBase, evidence
     ? `｜下一任务：${r.next.id} ${r.next.desc.slice(0, 40)}${r.next.desc.length > 40 ? '…' : ''}`
     : `｜🎉 ${r.total}/${r.total} 全勾——可收口：sillyspec flow done --change ${changeName}`
   console.log(`${r.kind === 'ticked' ? '✅ 已勾' : 'ℹ️ 已是勾选态（幂等跳过写盘）'}（${r.checked}/${r.total}）${nextTip}`)
+  if (r.kind === 'ticked') {
+    // 勾选随交付入库教学（2026-10-17-tick-timing-source，坑 tick-timing-squash-blindspot 根因 1/3
+    // 断链处）：翻格后给现成提交命令——pathspec 含 tasks.md 与侧车（勾选修改与任务交付同一提交
+    // 入库，消息占位带 task-NN token），把纪律变成可抄的命令；并当场提醒「此前勾选仍未进
+    // git」（已勾 ≥2 格且 tasks.md 零提交）——反馈不再等到 flow done 终点。best-effort：
+    // git 不可用（非 git 目录/失败返回 null）只给命令不给提醒，失败不影响翻格与 exit code。
+    try {
+      const { relative } = await import('node:path')
+      const rel = (p) => relative(cwd, p).split('\\').join('/')
+      const sidecar = join(changesRoot, changeName, 'task-ticks.jsonl')
+      const paths = `${rel(tasksPath)}${existsSync(sidecar) ? ` ${rel(sidecar)}` : ''}`
+      console.log(`📦 勾选随交付入库（add 与 commit 同一清单——勾选修改随任务交付同一提交）：`)
+      console.log(`   git add -- <交付文件…> ${paths}`)
+      console.log(`   git commit -m "<本任务交付概括> (${normalizeTaskId(taskId) || taskId})" -- <交付文件…> ${paths}`)
+      const { gitQuiet } = await import('./git-helper.js')
+      const touched = gitQuiet(cwd, ['log', '-n', '1', '--format=%h', '--', tasksPath])
+      if (r.checked >= 2 && touched === '') {
+        console.log(`ℹ️ tasks.md 尚无任何提交（此前勾选未随交付入库）——上面两行命令已把它带进清单，照抄即闭环`)
+      }
+    } catch { /* 教学面 best-effort：失败不影响翻格 */ }
+  }
+  // 顺序正典现场提醒（2026-10-19-approve-gate-tick-nudge FR-04，advisory）：勾选是「正在干活」
+  // 的最高频时刻——spec 面未齐或未过断点① 时给一行警示（不阻断、不改既有行；读取失败静默，
+  // 回显退化为现状）。判定与 flow status 同源（designSectionsFilled 单一源）。
+  try {
+    const dText = readFileSync(join(changesRoot, changeName, 'design.md'), 'utf8')
+    const { designSectionsFilled } = await import('./flow-review.js')
+    const unanswered = !designSectionsFilled(dText)
+    const fsText = readFileSync(join(changesRoot, changeName, 'flow-state.yaml'), 'utf8')
+    const unapproved = !/^spec_approved:\s*true/m.test(fsText) && !/^autopilot:\s*true/m.test(fsText)
+    if (unanswered || unapproved) {
+      const parts = []
+      if (unanswered) parts.push('design 四节未答')
+      if (unapproved) parts.push('未过断点①（flow approve）')
+      console.log(`⚠️ spec 面未就位（${parts.join('、')}）——顺序正典：先答 spec 面并过批准，再继续勾任务`)
+    }
+  } catch { /* 提醒 best-effort：读取失败静默，不影响勾选回显与 exit code */ }
+  // 执行期用户决策落盘提示（2026-10-20-thin-user-decision-record，advisory）：tick 是执行期
+  // 对 agent 最高频触点——decisions.md 尚未落盘时提一句（用户中途给了实现影响方向可当场
+  // decisions add 记录；缺席合法，纯提示不阻断；存在性判定即时读盘，在场分支零新增行）。
+  if (!existsSync(join(changesRoot, changeName, 'decisions.md'))) {
+    console.log(`💡 本变更 decisions.md 尚未落盘——执行期用户给过实现影响方向的话，当场 sillyspec decisions add --change ${changeName} --id D-001 --title "…" 记录（收口随蒸馏进知识防复潮；纯提示不阻断）`)
+  }
   return r
 }
 

package/src/validate-artifacts.js

@@ -11,6 +11,7 @@
  * 无既有 validator 的 required-evidence 与 endpoints（容忍缺省，出场才算）。
  */
 import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { join } from 'node:path'
 
 function checkJson(path, fn) {
@@ -66,7 +67,7 @@ export async function validateChangeArtifacts({ cwd, specBase, changeName, runti
 
   // ③ task review.json（最新 execute run 的逐 task 产物——既有 validateReviewSchema）
   {
-    const markerPath = join(rt, `current-execute-run-id-${changeName}`)
+    const markerPath = runtimeStatePath(rt, `current-execute-run-id-${changeName}`)
     const runId = existsSync(markerPath) ? readFileSync(markerPath, 'utf8').trim() : null
     if (!runId) {
       checks.push({ artifact: 'task reviews', status: 'skip', reason: '无 execute run marker（未经 execute 或已清理）' })

package/src/verify-draft.js

@@ -21,6 +21,7 @@
  * 纯 --init（无 --draft）路径零变化；无 sidecar → 门禁 not-applicable（存量变更零红）。
  */
 import { existsSync, readFileSync } from 'node:fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { join } from 'node:path'
 import { writeAtomicSync } from './fs-atomic.js'
 // 三件套原语消费方化（R7 切片三 task-04）：标记格式/指纹/三态判定/重锚的机械半边在本模块，
@@ -33,7 +34,7 @@ const AMEND_CMD = 'sillyspec verify-probes --change <变更名> --amend-draft'
 
 /** sidecar 路径（.runtime 下，与质量扫描记录/探针回执同族） */
 export function verifyDraftSidecarPath(runtimeRoot, changeName) {
-  return join(runtimeRoot, `verify-draft-${changeName}.json`)
+  return runtimeStatePath(runtimeRoot, `verify-draft-${changeName}.json`)
 }
 
 /**

package/src/verify-postcheck.js

@@ -23,6 +23,7 @@
  */
 
 import { execSync, spawnSync } from 'child_process'
+import { runtimeStatePath } from './runtime-paths.js'
 import { createHash } from 'crypto'
 import { IR_STRICT_SINCE } from './constants.js'
 import { gitQuiet } from './git-helper.js'
@@ -236,7 +237,7 @@ function recordVerifyLintTally({ specBase, result }) {
   try {
     const runtimeDir = join(specBase, '.runtime')
     mkdirSync(runtimeDir, { recursive: true })
-    const tallyPath = join(runtimeDir, 'verify-lint-tally.json')
+    const tallyPath = runtimeStatePath(runtimeDir, 'verify-lint-tally.json')
     let tally = { totalRuns: 0, failedRuns: 0, history: [] }
     try {
       tally = { ...tally, ...JSON.parse(readFileSync(tallyPath, 'utf8')) }
@@ -1424,7 +1425,7 @@ function readTestRerunConfig(specBase) {
 }
 
 function testRerunLedgerPath(specBase, changeName) {
-  return join(specBase, '.runtime', `test-rerun-${changeName || 'change'}.json`)
+  return runtimeStatePath(join(specBase, '.runtime'), `test-rerun-${changeName || 'change'}.json`)
 }
 
 /**
@@ -1861,7 +1862,7 @@ export function resolveVerifyChangedFiles(cwd, changeName, ctx = null, opts = {}
   if (!ctx || typeof ctx.repos !== 'object' || ctx.repos === null) {
     try {
       const rtRoot = resolveRuntimeRoot({ runtimeRoot: opts.runtimeRoot, specDriftAnchor: opts.specDriftAnchor }, opts.specBase || join(cwd, '.sillyspec'))
-      const pathspecFile = join(rtRoot, `apply-pathspec-${changeName}.txt`)
+      const pathspecFile = runtimeStatePath(rtRoot, `apply-pathspec-${changeName}.txt`)
       if (existsSync(pathspecFile)) {
         const declared = readFileSync(pathspecFile, 'utf8').split('\n').map(l => l.trim()).filter(Boolean)
           .map(p => p.replace(/\\/g, '/'))
@@ -3138,7 +3139,7 @@ export function resolveTraceResidual({ specBase, changeName, cwd }) {
     const repoKey = r.repo && r.repo !== 'main' ? r.repo : null
     for (const t of (r.tests || [])) {
       const f = testAnchorFile(t)
-      const key = (repoKey ? repoKey + '' : '') + f
+      const key = (repoKey ? repoKey + '\u0000' : '') + f
       if (!seen.has(key)) { seen.add(key); perFile.push({ repo: repoKey, file: f }) }
     }
   }
@@ -3230,7 +3231,7 @@ export function applyTraceResidual({ mainResult, action, cwd, specBase, changeNa
     const _rk = x.repo || null
     // worktree 感知（同悬空判定口径）：主仓行按 resolvedRoot（主仓或变更 worktree 根）取执行根。
     const _root = (_rk && _repoRoots.get(_rk)) || x.resolvedRoot || cwd
-    const _gk = _rk + '' + _root
+    const _gk = _rk + '\u0000' + _root
     if (!_gmap.has(_gk)) _gmap.set(_gk, { repo: _rk, root: _root, files: [] })
     _gmap.get(_gk).files.push(x.file)
   }
@@ -3780,7 +3781,7 @@ export function trackVerifyResultRegression(specBase, changeName, absPath) {
     if (!absPath || !existsSync(absPath)) return { regressed: false, prevMtime: null }
     const st = statSync(absPath)
     const hash = createHash('sha256').update(readFileSync(absPath)).digest('hex')
-    const hwmPath = join(specBase, '.runtime', `verify-result-hwm-${changeName}.json`)
+    const hwmPath = runtimeStatePath(join(specBase, '.runtime'), `verify-result-hwm-${changeName}.json`)
     let prev = null
     try { prev = JSON.parse(readFileSync(hwmPath, 'utf8')) } catch { prev = null }
     const regressed = !!(prev && typeof prev.hash === 'string' &&
@@ -3790,7 +3791,7 @@ export function trackVerifyResultRegression(specBase, changeName, absPath) {
     if (!prev || st.mtimeMs >= (prev.mtimeMs || 0)) {
       try {
         mkdirSync(join(specBase, '.runtime'), { recursive: true })
-        writeFileSync(hwmPath, JSON.stringify({ hash, mtimeMs: st.mtimeMs, ts: Date.now() }) + '\n')
+        writeFileSync(hwmPath, JSON.stringify({ hash, mtimeMs: Math.round(st.mtimeMs), ts: Date.now() }) + '\n')
       } catch { /* hwm 落盘失败 → 下次当首次（fail-open） */ }
     }
     return { regressed, prevMtime: prev && prev.mtimeMs ? prev.mtimeMs : null }
@@ -4307,7 +4308,7 @@ export function resolveReconcileActualFiles({ cwd, specBase, runtimeRoot, change
       }
     } catch { /* 窗口源失败静默省略 */ }
     // B3 apply-pathspec 兜底（存在则并入，读取失败静默忽略——前两源不受影响）
-    const pathspecFile = join(runtimeRoot, `apply-pathspec-${changeName}.txt`)
+    const pathspecFile = runtimeStatePath(runtimeRoot, `apply-pathspec-${changeName}.txt`)
     if (existsSync(pathspecFile)) {
       try {
         const lines = readFileSync(pathspecFile, 'utf8').split('\n').map(l => l.trim()).filter(Boolean).map(normalizeReconcilePath)
@@ -4704,7 +4705,7 @@ export async function runCeremonyDualRunCheck({ cwd, specBase = null, changeName
   const rt = runtimeRoot || join(sb, '.runtime')
 
   // —— 声明侧：开跑定价落档（task-03 产物，tier/components/reasons/transitions）——
-  const tierPath = join(rt, `ceremony-tier-${changeName}.json`)
+  const tierPath = runtimeStatePath(rt, `ceremony-tier-${changeName}.json`)
   let tierFile = null
   try { tierFile = JSON.parse(readFileSync(tierPath, 'utf8')) } catch { /* 缺失/坏 JSON → 下方跳过 */ }
   if (tierFile == null || typeof tierFile !== 'object' || Array.isArray(tierFile)) {
@@ -4801,7 +4802,7 @@ export async function runCeremonyDualRunCheck({ cwd, specBase = null, changeName
       recomputedReasons: [`双跑低报自动追赶（事实面 tier=${verdict.factTier}，证据面 seed ${actual.files.length} 文件）`],
       frictionCounts: {},
     })
-    const tierPathForReprice = join(rt, `ceremony-tier-${changeName}.json`)
+    const tierPathForReprice = runtimeStatePath(rt, `ceremony-tier-${changeName}.json`)
     const { writeAtomicSync } = await import('./fs-atomic.js')
     writeAtomicSync(tierPathForReprice, JSON.stringify(caught, null, 2) + '\n')
     result.violation.message += `；档位文件已自动按事实面追赶重定价（${String(declaredTier)} → ${caught.tier}）——修复低报根因后重跑 --done 即对账通过，勿手动改档（ql-013 死锁修复）`