sillyspec 3.33.0 → 3.33.1

package/src/sync.js

@@ -11,6 +11,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync, unlinkSync, chmodSync, rmSync, statSync } from 'fs';
 import { createHash } from 'crypto';
 import { writeAtomicSync } from './fs-atomic.js';
+import { runtimeStatePath } from './runtime-paths.js';
 import { join, dirname, basename, isAbsolute, relative, resolve as pathResolve } from 'path';
 import { homedir } from 'os';
 import { resolvePlatformSpecDir } from './progress.js';
@@ -718,7 +719,19 @@ export class SyncManager {
           console.warn(`⚠️ [sync] 变更 ${changeName} 的未决冲突已过期（base_ts ≥ 平台 ts=${stalePlatTs}），自动清除并恢复推送`);
         } else {
           console.warn(`⚠️ [sync] 变更 ${changeName} 存在未决平台冲突，跳过自动推送。处理：sillyspec platform resolve ${changeName} --keep-local | --take-platform | --abort`);
-          return { synced: 0, errors: [`conflict pending: ${changeName}`], conflict: true, suppressed: true };
+          // spec 树与 progress 六表是独立通道（独立端点/独立冲突文件）：progress 冲突抑制
+          // 只应封锁六表上行，不应连带封锁 spec 树——否则删除 op 的唯一上行通道被冲突文件
+          // 长期封锁（2026-10-16 下游实证：409 窗口内本地删除的任务卡在服务器留存，后续整树
+          // 快照拉取把它们写回本地=复活，FR-01 上游成因）。补跑 best-effort：失败不改本分支
+          // 既有的 conflict/suppressed 返回语义（spec 树自身有失败可见性与下轮重试）。
+          let specTreeErrors = [];
+          try {
+            await syncSpecTree(safePlatformSpecDir(this.cwd) || join(this.cwd, '.sillyspec'), this._getPlatform(), changeName, { signal: opts.signal });
+          } catch (err) {
+            specTreeErrors = [`spec 树补跑失败（不影响抑制语义）: ${err.message}`];
+            debugLog(`[sync] 冲突抑制期间 spec 树同步异常: ${changeName}: ${err.message}`);
+          }
+          return { synced: 0, errors: [`conflict pending: ${changeName}`, ...specTreeErrors], conflict: true, suppressed: true, specTreeAttempted: true };
         }
       }
     }
@@ -904,8 +917,14 @@ export class SyncManager {
         // 树根与进度锚点同源（safePlatformSpecDir，平台模式 → specRoot）：此前硬编码
         // cwd/.sillyspec，平台模式下该目录只有 local.yaml（被 walk 排除）→ 本地树恒空
         // → 服务器清单全量 delete（BUG-01，computeSpecOps 护栏为第二道防线）。
+        // treeOk 透传（2026-10-17-archive-half-state-location-stuck-active）：树通道失败
+        // 不影响进度上行返回值（既有语义不变），但结果对象必须如实携带——终态强校验
+        // （triggerSyncTerminalStrict）按 treeOk 判「平台 location 是否收敛」，吞进
+        // debugLog 会让归档半态（status=archived + location=active）静默存活。
+        let treeOk = false;
         try {
-          await syncSpecTree(safePlatformSpecDir(this.cwd) || join(this.cwd, '.sillyspec'), this._getPlatform(), changeName, { signal: opts.signal });
+          const treeResult = await syncSpecTree(safePlatformSpecDir(this.cwd) || join(this.cwd, '.sillyspec'), this._getPlatform(), changeName, { signal: opts.signal });
+          treeOk = treeResult && treeResult.ok === true;
         } catch (err) {
           debugLog(`[sync] spec 树增量同步失败（不影响进度）: ${changeName}: ${err.message}`);
         }
@@ -922,7 +941,7 @@ export class SyncManager {
           }
         }
 
-        return { synced: 1, errors: [] };
+        return { synced: 1, errors: [], treeOk };
       }
 
       if (res.status !== 409) {
@@ -1293,7 +1312,7 @@ export class SyncManager {
         .digest('hex');
     } catch { /* 指纹失败按有变化处理 */ }
     if (!manual && docsFingerprint) {
-      const markerPath = join(safePlatformSpecDir(this.cwd) || join(this.cwd, '.sillyspec'), '.runtime', `sync-docs-lastpush-${changeName}.json`);
+      const markerPath = runtimeStatePath(join(safePlatformSpecDir(this.cwd) || join(this.cwd, '.sillyspec'), '.runtime'), `sync-docs-lastpush-${changeName}.json`);
       try {
         const prev = JSON.parse(readFileSync(markerPath, 'utf8'));
         if (prev && prev.hash === docsFingerprint) {
@@ -1323,7 +1342,8 @@ export class SyncManager {
       try {
         const runtimeDir = join(safePlatformSpecDir(this.cwd) || join(this.cwd, '.sillyspec'), '.runtime');
         mkdirSync(runtimeDir, { recursive: true });
-        writeFileSync(join(runtimeDir, `sync-docs-lastpush-${changeName}.json`), JSON.stringify({ hash: docsFingerprint, at: Date.now() }) + '\n', 'utf8');
+        try { mkdirSync(join(runtimeDir, 'state'), { recursive: true }); } catch { /* marker fail-open */ }
+        writeFileSync(runtimeStatePath(runtimeDir, `sync-docs-lastpush-${changeName}.json`), JSON.stringify({ hash: docsFingerprint, at: Date.now() }) + '\n', 'utf8');
       } catch { /* marker 失败只损失去重（下轮多推一次），不影响同步 */ }
     }
     console.log(`[sync] 已同步 ${syncedCount} 个文档: ${changeName}`);
@@ -1509,7 +1529,7 @@ export class SyncManager {
     if (!specDir) return null;
     const runtimeDir = join(specDir, '.runtime');
     if (!existsSync(runtimeDir)) mkdirSync(runtimeDir, { recursive: true });
-    const conflictPath = join(runtimeDir, `sync-conflict-${changeName}.json`);
+    const conflictPath = runtimeStatePath(runtimeDir, `sync-conflict-${changeName}.json`);
     const payload = {
       change: changeName,
       base_ts: info.base_ts ?? null,
@@ -1530,7 +1550,7 @@ export class SyncManager {
   readConflictFile(changeName) {
     const specDir = safePlatformSpecDir(this.cwd);
     if (!specDir) return null;
-    const conflictPath = join(specDir, '.runtime', `sync-conflict-${changeName}.json`);
+    const conflictPath = runtimeStatePath(join(specDir, '.runtime'), `sync-conflict-${changeName}.json`);
     if (!existsSync(conflictPath)) return null;
     try {
       return JSON.parse(readFileSync(conflictPath, 'utf8'));
@@ -1545,7 +1565,7 @@ export class SyncManager {
   readSpecConflictFile(changeName) {
     const specDir = safePlatformSpecDir(this.cwd);
     if (!specDir) return null;
-    const p = join(specDir, '.runtime', `spec-sync-conflict-${changeName}.json`);
+    const p = runtimeStatePath(join(specDir, '.runtime'), `spec-sync-conflict-${changeName}.json`);
     if (!existsSync(p)) return null;
     try {
       return JSON.parse(readFileSync(p, 'utf8'));
@@ -1558,7 +1578,7 @@ export class SyncManager {
   clearSpecConflictFile(changeName) {
     const specDir = safePlatformSpecDir(this.cwd);
     if (!specDir) return false;
-    const p = join(specDir, '.runtime', `spec-sync-conflict-${changeName}.json`);
+    const p = runtimeStatePath(join(specDir, '.runtime'), `spec-sync-conflict-${changeName}.json`);
     if (!existsSync(p)) return false;
     try { unlinkSync(p); return true; }
     catch { return false; }
@@ -1571,7 +1591,7 @@ export class SyncManager {
   clearConflictFile(changeName) {
     const specDir = safePlatformSpecDir(this.cwd);
     if (!specDir) return false;
-    const conflictPath = join(specDir, '.runtime', `sync-conflict-${changeName}.json`);
+    const conflictPath = runtimeStatePath(join(specDir, '.runtime'), `sync-conflict-${changeName}.json`);
     if (!existsSync(conflictPath)) return false;
     try { unlinkSync(conflictPath); return true; }
     catch { return false; }
@@ -1881,6 +1901,30 @@ export class SyncManager {
     // ①rm 前先把内容原子写到树外 `<specDir 根名>.local.yaml.bak`（树内会被 rm 一并删掉，
     //   故放父目录）；②恢复主路径不变，失败时从 .bak 再兜底复制一次；③成功路径末尾
     //   清理 .bak（明文 token 不留第二份；顺带清历史失败残留）。
+    // 防复活抑制（坑 spec-tree-file-resurrect，2026-10-16 下游实证）：progress 冲突/熔断
+    // 窗口内本地删除的文件（删除 op 未上行成功，服务器清单仍含它）会在整树快照回放时被
+    // 服务器旧内容写回=复活（幽灵任务卡 + 验证误报「文件未清理」）。抑制判据无状态现算：
+    // 基线快照（.runtime/spec-sync-base.json = 上次成功同步时刻的本地文件全集，语义见
+    // spec-sync.js BASE_SNAPSHOT）有、当前盘面无 = 本地删除，回放时跳过这些条目；删除 op
+    // 后续上行成功 → 服务器清单不再含该路径 → bundle 不再携带 → 抑制面自然衰减。
+    // 基线在下方 rm 时会被连带删除（bundle 恒不含 .runtime），故必须在 rm 前读取。
+    // restoreDeleted: true = 用户显式意志优先，跳过抑制（恢复纯快照回放语义）。
+    const suppressResurrect = new Set();
+    const resurrectSkipped = []; // 被防复活抑制挡下的条目（suppressResurrect 命中面；try 外可见供返回值携带）
+    if (!opts.restoreDeleted) {
+      try {
+        const baseRaw = JSON.parse(readFileSync(runtimeStatePath(join(specDir, '.runtime'), 'spec-sync-base.json'), 'utf8'));
+        const baseHashes = baseRaw && typeof baseRaw.hashes === 'object' ? baseRaw.hashes : null;
+        if (baseHashes) {
+          for (const p of Object.keys(baseHashes)) {
+            const rel = String(p).replace(/\\/g, '/').replace(/^\.\//, '');
+            if (!rel || rel === 'local.yaml' || rel.startsWith('.runtime/')) continue;
+            if (!existsSync(join(specDir, rel))) suppressResurrect.add(rel);
+          }
+        }
+      } catch { /* 基线缺失/损坏 = 无抑制面（全新空环境全量回放，既有行为不变） */ }
+    }
+
     const localYamlPath = join(specDir, 'local.yaml');
     const localYamlBakPath = join(dirname(specDir), `${basename(specDir)}.local.yaml.bak`);
     let localYamlSaved = null; // null = 本无此文件，无需恢复
@@ -1916,6 +1960,11 @@ export class SyncManager {
       const crlfEntries = [];
       for (const e of entries) {
         _assertSafeTarName(e.name.replace(/\/+$/, ''), specDir);
+        const relName = e.name.replace(/^\.\//, '').replace(/\\/g, '/');
+        if (!e.isDir && suppressResurrect.has(relName)) {
+          resurrectSkipped.push(relName); // 基线有、盘面无=本地删除：不从快照复活
+          continue;
+        }
         const fullPath = join(specDir, e.name);
         if (e.isDir) {
           mkdirSync(fullPath, { recursive: true });
@@ -1926,6 +1975,10 @@ export class SyncManager {
           if (e.data && e.data.length < 4 * 1024 * 1024) crlfEntries.push([e.name, e.data]); // CRLF 画像采样（超 4MB 大文件跳过采样，写入不受影响）
         }
       }
+      // 防复活抑制可见（宁可吵不可静默复活）：被挡路径点名（截断防刷屏），出路指 --restore-deleted
+      if (resurrectSkipped.length > 0) {
+        console.warn(`⚠️ [sync] 防复活抑制：${resurrectSkipped.length} 个本地已删除文件未从快照恢复（基线有、盘面无=本地删除尚未上行成功；确要从快照恢复用 --restore-deleted）: ${resurrectSkipped.slice(0, 5).join(', ')}${resurrectSkipped.length > 5 ? ' 等' : ''}`);
+      }
       // 批量写入留痕（2026-09-17 反馈⑥②法证收口）：整树解包=逐字节回放，他机 CRLF 内容
       // 原样落盘——审计行记 时间/触发面/文件数/CRLF 命中数（fail-open）。
       try {
@@ -1937,6 +1990,7 @@ export class SyncManager {
           crlfPaths: crlfPaths.slice(0, WRITE_AUDIT_FILE_CAP),
           crlfCount: crlfPaths.length,
           force: opts.force === true,
+          resurrectSkippedCount: resurrectSkipped.length,
         });
       } catch { /* 审计 fail-open */ }
       if (localYamlSaved !== null) {
@@ -1962,7 +2016,7 @@ export class SyncManager {
       return { ok: false, pulled: false, specDir, reason: `解压 spec bundle 失败: ${err.message}` };
     }
     console.log(`[sync] 已拉取 spec 快照并解压到 ${specDir}${specVersion ? `（平台 spec_version: ${specVersion}，打包时刻快照非实时）` : ''}`);
-    return { ok: true, pulled: true, specDir, specVersion };
+    return { ok: true, pulled: true, specDir, specVersion, ...(resurrectSkipped.length > 0 ? { resurrectSkipped } : {}) };
   }
 
   /**
@@ -2063,7 +2117,7 @@ export class SyncManager {
     // 基线快照刷新（best-effort）：被覆盖路径回写当前盘面 hash（= 服务器内容 hash）、被删
     // 路径移除条目——下次同步这些路径按「本地未改动」豁免回推（take-platform 语义闭环）。
     try {
-      const baseFile = join(specDir, '.runtime', 'spec-sync-base.json');
+      const baseFile = runtimeStatePath(join(specDir, '.runtime'), 'spec-sync-base.json');
       let base = null;
       try { base = JSON.parse(readFileSync(baseFile, 'utf8')); } catch { base = null; }
       const hashes = base && typeof base.hashes === 'object' ? base.hashes : {};
@@ -2290,9 +2344,11 @@ export class SyncManager {
     if (!specDir) return [];
     const runtimeDir = join(specDir, '.runtime');
     if (!existsSync(runtimeDir)) return [];
+    // 2026-10-18 布局分层：冲突文件落 state/；根目录扫描保留旧布局兜底
     let files = [];
-    try { files = readdirSync(runtimeDir); }
-    catch { return []; }
+    for (const dir of [join(runtimeDir, 'state'), runtimeDir]) {
+      try { files.push(...readdirSync(dir)); } catch { /* 可选层缺失跳过 */ }
+    }
     const conflicts = [];
     // HUB-08：同时扫描进度冲突（sync-conflict-*）与 spec 树冲突（spec-sync-conflict-*），
     // type 字段供 status 展示与 resolve 分流
@@ -2302,7 +2358,7 @@ export class SyncManager {
       else if (f.startsWith('spec-sync-conflict-') && f.endsWith('.json')) prefix = 'spec-sync-conflict-';
       else continue;
       const type = prefix === 'sync-conflict-' ? 'progress' : 'spec-tree';
-      const filePath = join(runtimeDir, f);
+      const filePath = existsSync(runtimeStatePath(runtimeDir, f)) ? runtimeStatePath(runtimeDir, f) : join(runtimeDir, f);
       try {
         const cf = JSON.parse(readFileSync(filePath, 'utf8'));
         conflicts.push({

package/src/task-done.js

@@ -19,6 +19,7 @@
  * `task start` 的受影响测试族注入不在本命令面（开工前置提示，保留不动）。
  */
 import { existsSync, readFileSync, unlinkSync } from 'node:fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { join } from 'node:path'
 
 /**
@@ -50,7 +51,7 @@ export async function runTaskDone({ changeName, cwd, taskId, verdict, notes = ''
   let reviewSkipped = false
   try {
     let runId = ''
-    const markerFile = join(runtimeRoot, 'current-execute-run-id-' + changeName)
+    const markerFile = runtimeStatePath(runtimeRoot, 'current-execute-run-id-' + changeName)
     try {
       if (existsSync(markerFile)) {
         const c = readFileSync(markerFile, 'utf8').trim()

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,27 @@ 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：失败不影响翻格 */ }
+  }
   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 死锁修复）`