sillyspec 3.33.0 → 3.33.2

package/src/spec-sync.js

@@ -19,6 +19,7 @@ import { createHash } from 'crypto';
 import { existsSync, readdirSync, readFileSync, statSync, mkdirSync, writeFileSync, unlinkSync } from 'fs';
 import { join, relative, sep } from 'path';
 import { bindSyncNoiseRoot, syncConnectionWarn, isConnectionClassStatus, noteSyncSuccess } from './sync-noise.js';
+import { runtimeStatePath } from './runtime-paths.js';
 import { writeAtomicSync } from './fs-atomic.js';
 
 // 与 sillyhub-daemon/src/spec-sync.ts 共用排除口径（task-07 / FR-06 / D-008@v2）：
@@ -69,7 +70,7 @@ export function describeSyncError(err) {
 // 才拿到），且失败走「下次自动重试」无限静默循环——归档半态（本地已归档、平台仍「进行中」）
 // 挂数小时无人知晓。两道护栏：①非 2xx 响应体解析进告警行；②按 label 连续失败计数持久化，
 // 连续 ≥3 次升级 🚨 显式告警，任一次成功清零。
-const FAIL_STREAK_FILE = join('.runtime', 'spec-sync-fail-streak.json');
+const FAIL_STREAK_FILE = join('.runtime', 'state', 'spec-sync-fail-streak.json');
 const FAIL_STREAK_ESCALATE_AT = 3;
 
 export function describeErrorBody(status, rawBody) {
@@ -387,7 +388,7 @@ const LAST_SUCCESS_MARKER = 'spec-sync-last-success.json';
 
 function readLastSyncTs(specRoot) {
   try {
-    const raw = readFileSync(join(specRoot, '.runtime', LAST_SUCCESS_MARKER), 'utf8');
+    const raw = readFileSync(runtimeStatePath(join(specRoot, '.runtime'), LAST_SUCCESS_MARKER), 'utf8');
     const ts = JSON.parse(raw).ts;
     return Number.isFinite(ts) ? ts : null;
   } catch {
@@ -398,7 +399,7 @@ function readLastSyncTs(specRoot) {
 function writeLastSyncTs(specRoot) {
   try {
     mkdirSync(join(specRoot, '.runtime'), { recursive: true });
-    writeFileSync(join(specRoot, '.runtime', LAST_SUCCESS_MARKER), JSON.stringify({ ts: Date.now() }) + '\n', 'utf8');
+    writeFileSync(runtimeStatePath(join(specRoot, '.runtime'), LAST_SUCCESS_MARKER), JSON.stringify({ ts: Date.now() }) + '\n', 'utf8');
   } catch { /* 标记失败只损失下次的防回推过滤，不影响本次同步结果 */ }
 }
 
@@ -415,7 +416,7 @@ const BASE_SNAPSHOT = 'spec-sync-base.json';
 
 function readBaseSnapshot(specRoot) {
   try {
-    const raw = readFileSync(join(specRoot, '.runtime', BASE_SNAPSHOT), 'utf8');
+    const raw = readFileSync(runtimeStatePath(join(specRoot, '.runtime'), BASE_SNAPSHOT), 'utf8');
     const hashes = JSON.parse(raw).hashes;
     return hashes && typeof hashes === 'object' ? hashes : null;
   } catch {
@@ -428,7 +429,7 @@ function writeBaseSnapshot(specRoot, localFiles) {
     const hashes = {};
     for (const f of localFiles) hashes[f.path] = f.hash;
     mkdirSync(join(specRoot, '.runtime'), { recursive: true });
-    writeFileSync(join(specRoot, '.runtime', BASE_SNAPSHOT), JSON.stringify({ ts: Date.now(), hashes }, null, 2) + '\n', 'utf8');
+    writeFileSync(runtimeStatePath(join(specRoot, '.runtime'), BASE_SNAPSHOT), JSON.stringify({ ts: Date.now(), hashes }, null, 2) + '\n', 'utf8');
   } catch { /* 快照失败只损失下次的内容级防回推，不影响本次同步结果 */ }
 }
 
@@ -497,7 +498,7 @@ export function partitionConflictPaths(serverVersions, localFiles, baseHashes, l
  */
 function isSamePendingSpecConflict(specRoot, changeName, realPaths) {
   try {
-    const raw = readFileSync(join(specRoot, '.runtime', `spec-sync-conflict-${changeName}.json`), 'utf8');
+    const raw = readFileSync(runtimeStatePath(join(specRoot, '.runtime'), `spec-sync-conflict-${changeName}.json`), 'utf8');
     const prev = JSON.parse(raw).conflicting_paths;
     if (!Array.isArray(prev) || prev.length !== realPaths.length) return false;
     const prevSet = new Set(prev);
@@ -514,7 +515,7 @@ function isSamePendingSpecConflict(specRoot, changeName, realPaths) {
  */
 function clearSpecConflictMarker(specRoot, changeName) {
   try {
-    const p = join(specRoot, '.runtime', `spec-sync-conflict-${changeName}.json`);
+    const p = runtimeStatePath(join(specRoot, '.runtime'), `spec-sync-conflict-${changeName}.json`);
     if (existsSync(p)) unlinkSync(p);
   } catch { /* 清理失败不影响同步结果 */ }
 }
@@ -553,7 +554,7 @@ export function writeTombstoneAttribution(specRoot, platformDeleted) {
   const byChange = extractTombstonedChanges(platformDeleted);
   const written = [];
   for (const [name, paths] of byChange) {
-    const filePath = join(specRoot, '.runtime', `spec-sync-conflict-${name}.json`);
+    const filePath = runtimeStatePath(join(specRoot, '.runtime'), `spec-sync-conflict-${name}.json`);
     let prev = null;
     try { prev = JSON.parse(readFileSync(filePath, 'utf8')); } catch { /* 首见 */ }
     const record = {
@@ -584,13 +585,17 @@ export function writeTombstoneAttribution(specRoot, platformDeleted) {
  * 清理条数。挂在两个全绿点：POST 成功无冲突分支与无差异跳过分支。
  */
 export function clearStaleTombstoneMarkers(specRoot) {
+  // 2026-10-18 布局分层：冲突文件落 state/；根目录扫描保留旧布局兜底
   const runtimeDir = join(specRoot, '.runtime');
   let files = [];
-  try { files = readdirSync(runtimeDir); } catch { return 0; }
+  const conflictDirs = [join(runtimeDir, 'state'), runtimeDir]
   let cleared = 0;
-  for (const f of files) {
+  for (const dir of conflictDirs) {
+  let dirFiles = [];
+  try { dirFiles = readdirSync(dir); } catch { continue; }
+  for (const f of dirFiles) {
     if (!f.startsWith('spec-sync-conflict-') || !f.endsWith('.json')) continue;
-    const p = join(runtimeDir, f);
+    const p = join(dir, f);
     try {
       const j = JSON.parse(readFileSync(p, 'utf8'));
       const cp = Array.isArray(j.conflicting_paths) ? j.conflicting_paths : null;
@@ -601,6 +606,7 @@ export function clearStaleTombstoneMarkers(specRoot) {
       }
     } catch { /* 损坏文件不动 */ }
   }
+  }
   if (cleared > 0) {
     console.log(`[spec-sync] 全绿同步清理 ${cleared} 条陈旧墓碑冲突记录（被删变更已收敛）`);
   }
@@ -624,7 +630,7 @@ const FOLLOW_REPORT_MARKER = 'spec-sync-follow-reported.json';
  */
 export function isFollowerSetChanged(specRoot, key, list) {
   const sorted = [...(list || [])].sort();
-  const p = join(specRoot, '.runtime', FOLLOW_REPORT_MARKER);
+  const p = runtimeStatePath(join(specRoot, '.runtime'), FOLLOW_REPORT_MARKER);
   let cur = {};
   try { cur = JSON.parse(readFileSync(p, 'utf8')) || {}; } catch { /* 无 marker = 首报 */ }
   const prev = Array.isArray(cur[key]) ? cur[key] : [];
@@ -665,10 +671,20 @@ function attributeChangeLabel(paths) {
   return names.size === 1 ? [...names][0] : 'full-tree'
 }
 
+/**
+ * spec 树增量同步（以服务器清单为锚做全树 diff → POST ops）。
+ *
+ * 返回契约（2026-10-17-archive-half-state-location-stuck-active）：`ok` 字段表达
+ * 「本轮文件树通道是否确认收敛」——ok:true = 确认（无差异 no-op / 推送成功 / 冲突自愈
+ * / 未连接本地合法态）；ok:false = 确认失败（清单/推送 HTTP 失败、异常）；**无 ok 字段
+ * = 未确认**（未决冲突待人裁等，fail-closed）。终态强校验消费方
+ * （run/shared.js triggerSyncTerminalStrict）按 `ok === true` 判收敛——历史调用方
+ * （syncSpecTreeOnly / resolve forcePush 等）不消费该字段，向后兼容。
+ */
 export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
   if (!platform || !platform.url || !platform.token) {
     debugLog('[spec-sync] 未连接平台（本地合法状态）；跳过 spec 树增量同步');
-    return { synced: 0 };
+    return { synced: 0, ok: true };
   }
   // 全树入口（platform sync 无 --change，2026-10-11-sync-conflict-tri-fix FR-03）
   // changeName=null：日志用 full-tree 标签，冲突归因见下方 conflictLabel。
@@ -705,7 +721,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
       if (failCount >= FAIL_STREAK_ESCALATE_AT) {
         console.warn(`🚨 [spec-sync] 已连续 ${failCount} 次同步失败——平台文件树可能持续落后（变更中心或仍显示「进行中」/旧内容）: ${logLabel}`);
       }
-      return { synced: 0 };
+      return { synced: 0, ok: false };
     }
     const body = await res.json().catch(() => ({}));
     serverManifest = body.files || {};
@@ -716,7 +732,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
     if (failCount >= FAIL_STREAK_ESCALATE_AT) {
       console.warn(`🚨 [spec-sync] 已连续 ${failCount} 次同步失败——平台文件树可能持续落后（变更中心或仍显示「进行中」/旧内容）: ${logLabel}`);
     }
-    return { synced: 0 };
+    return { synced: 0, ok: false };
   }
 
   // 2. walk/hash/diff
@@ -758,7 +774,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
     debugLog(`[spec-sync] 无差异，跳过同步: ${logLabel}`);
     clearStaleTombstoneMarkers(specRoot);
     clearFailStreak(specRoot, logLabel);
-    return { synced: 0 };
+    return { synced: 0, ok: true };
   }
 
   // 3. POST ops
@@ -782,7 +798,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
       if (failCount >= FAIL_STREAK_ESCALATE_AT) {
         console.warn(`🚨 [spec-sync] 已连续 ${failCount} 次同步失败——平台文件树可能持续落后（变更中心或仍显示「进行中」/旧内容）: ${logLabel}`);
       }
-      return { synced: 0 };
+      return { synced: 0, ok: false };
     }
     const body = await res.json().catch(() => ({}));
     if (body.conflict) {
@@ -843,7 +859,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
           debugLog(`[spec-sync] ${followers.length} 个本地未改动文件自动跟随服务器: ${followers.slice(0, 5).join(', ')}${followers.length > 5 ? ' 等' : ''}`);
         }
         console.warn(`⚠️ [spec-sync] 变更 ${conflictLabel} 存在未决 spec 树冲突（${realPaths.length} 个文件待裁决，本轮非冲突改动已照常同步）。处理：sillyspec platform resolve ${conflictLabel} --keep-local | --take-platform | --abort`);
-        return { synced: 0, conflict: true, serverVersions: real, autoResolved: followers.length, conflictPath: join(specRoot, '.runtime', `spec-sync-conflict-${conflictLabel}.json`), suppressed: true };
+        return { synced: 0, conflict: true, serverVersions: real, autoResolved: followers.length, conflictPath: runtimeStatePath(join(specRoot, '.runtime'), `spec-sync-conflict-${conflictLabel}.json`), suppressed: true };
       }
       if (followers.length > 0) {
         console.warn(`[spec-sync] ${followers.length} 个本地未改动文件自动跟随服务器（正常多端前进，无需人工裁决）: ${followers.slice(0, 5).join(', ')}${followers.length > 5 ? ' 等' : ''}`);
@@ -855,13 +871,13 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
         noteSyncSuccess();
         clearFailStreak(specRoot, logLabel);
         console.log(`[spec-sync] 冲突已自动消解（0 个需人工裁决；本会话改动 ${ops.length - followers.length > 0 ? '已同步' : '无差异'}）: ${conflictLabel}`);
-        return { synced: Math.max(ops.length - followers.length, 0), conflict: false, autoResolved: followers.length };
+        return { synced: Math.max(ops.length - followers.length, 0), ok: true, conflict: false, autoResolved: followers.length };
       }
       let conflictPath = null;
       try {
         const runtimeDir = join(specRoot, '.runtime');
         mkdirSync(runtimeDir, { recursive: true });
-        conflictPath = join(runtimeDir, `spec-sync-conflict-${conflictLabel}.json`);
+        conflictPath = runtimeStatePath(runtimeDir, `spec-sync-conflict-${conflictLabel}.json`);
         writeFileSync(conflictPath, JSON.stringify({
           change: conflictLabel,
           kind: 'spec-tree',
@@ -901,7 +917,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
     clearStaleTombstoneMarkers(specRoot);
     writeLastSyncTs(specRoot);
     writeBaseSnapshot(specRoot, localFiles);
-    return { synced: ops.length };
+    return { synced: ops.length, ok: true };
   } catch (err) {
     const failCount = bumpFailStreak(specRoot, logLabel, describeSyncError(err));
     const line = `[spec-sync] 同步异常（文件树本次未同步，下次自动重试）: ${logLabel}: ${describeSyncError(err)}`;
@@ -909,7 +925,7 @@ export async function syncSpecTree(specRoot, platform, changeName, opts = {}) {
     if (failCount >= FAIL_STREAK_ESCALATE_AT) {
       console.warn(`🚨 [spec-sync] 已连续 ${failCount} 次同步失败——平台文件树可能持续落后（变更中心或仍显示「进行中」/旧内容）: ${logLabel}`);
     }
-    return { synced: 0 };
+    return { synced: 0, ok: false };
   }
 }
 

package/src/stage-contract.js

@@ -897,7 +897,7 @@ function matrixEvidenceMissing(verdict, evidence) {
  */
 export function extractAcceptanceMatrixSlots(verifyMd) {
   const md = String(verifyMd || '')
-  const out = { present: false, rows: [], unfilled: 0, missingEvidence: 0 }
+  const out = { present: false, rows: [], unfilled: 0, missingEvidence: 0, strayRows: [] }
   const hm = md.match(/^#### 探针 7[：:]/m)
   if (!hm) return out
   out.present = true
@@ -905,15 +905,27 @@ export function extractAcceptanceMatrixSlots(verifyMd) {
   const endMatch = rest.match(/^#{1,4}(?:[ \t]|$)/m)
   const sectionText = endMatch ? rest.slice(0, endMatch.index) : rest
 
+  // 表头武装（坑 carry-orphan-rows，2026-10-16 下游实证）：五列表行只在探针 7 段已被表头行
+  // 武装时才计数；refresh 携载注释块解除武装——其后残行（旧模板占位行/键漂移携载行）是无
+  // 表头归属的孤行，不栽给最近 **task-NN** 锚误报「判定未填」，进独立 strayRows 桶由
+  // validateAcceptanceMatrix 报错要求裁决。武装是段级粘性（首表头武装整段，锚行不重置——
+  // 锚下不重复表头的既有手写/历史形态照旧按锚归属）；只有携载注释块与其后无新表头重新
+  // 武装的窗口内，行才进孤行桶。正常渲染文法（锚行→表头→分隔→数据行）行为与既有口径一致。
   let currentTask = ''
+  let tableArmed = false
   for (const rawLine of sectionText.split(/\r?\n/)) {
     const anchor = rawLine.match(/^\*\*\s*(task-[A-Za-z0-9._-]+)\s*\*\*/)
     if (anchor) { currentTask = anchor[1]; continue }
+    if (/<!--\s*refresh 携载/.test(rawLine)) { tableArmed = false; continue } // 携载注释块：其后表行是孤行（直至新表头重新武装）
     const cells = splitMatrixRowCells(rawLine)
     if (!cells || cells.length !== 5) continue // 列表防御行/不适用行/非五列表行不计槽
     const c = cells.map(x => x.trim())
     if (c.every(x => /^:?-{3,}:?$/.test(x))) continue // 分隔行 |---|---|…|
-    if (c[3] === '判定' && c[4] === '证据') continue // 表头行
+    if (c[3] === '判定' && c[4] === '证据') { tableArmed = true; continue } // 表头行（武装本段）
+    if (!tableArmed) {
+      out.strayRows.push({ task: currentTask, acceptance: c[0], verdict: c[3], evidence: c[4] })
+      continue
+    }
     const verdict = c[3]
     const evidence = c[4]
     const row = { task: currentTask, acceptance: c[0], verdict, evidence }
@@ -985,6 +997,16 @@ function validateAcceptanceMatrix(cwd, changeName, context = {}) {
       `修复：在证据列补测试锚点（如 \`test/foo.test.mjs\` 或 \`src/x.js:42\`）或 non-testable 理由（运行验证移交场景适用：构建回执+移交去向一句话）。`
     )
   }
+  // 孤行报错（坑 carry-orphan-rows，2026-10-16 下游实证）：无表头归属的五列残行（refresh
+  // 携载块后的旧模板占位行/键漂移携载行/手误行）不归属任何 task 锚——不栽给最近锚计
+  // unfilled（旧路径误报「文档同步任务判定未填」），独立报错要求裁决：删或补归属。
+  if ((matrix.strayRows || []).length > 0) {
+    const list = matrix.strayRows.map((r) => `${r.task || '（无 task 锚）'}｜${clip(r.acceptance)}`).join('；')
+    errors.push(
+      `探针 7 验收×测试覆盖矩阵存在 ${matrix.strayRows.length} 行无表头归属的孤行（携载残行/旧模板占位行/手误——不属于任何 task 锚下的有效表，不计入任务矩阵）：${list}。` +
+      `修复：删除这些残行，或补全 **task-NN** 锚行与表头后按五列格式填判定与证据。`
+    )
+  }
 
   // ── partial/uncovered × facts.handover 联动（D-003/FR-04，2026-09-17-pass-cap-semantics task-03）──
   // 部分实现必须有移交去向：矩阵含 partial/uncovered 行且 facts.handover 零有效行（任意

package/src/stage-review.js

@@ -14,6 +14,7 @@
  */
 
 import { existsSync, readFileSync, mkdirSync, readdirSync } from 'fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { writeAtomicSync } from './fs-atomic.js'
 import { join, dirname } from 'path'
 import { createHash } from 'crypto'
@@ -364,7 +365,7 @@ export function generateStageReviewRunId() {
  */
 export function stageReviewMarkerPath(runtimeRoot, stage, changeName) {
   const suffix = changeName ? `${stage}-${changeName}` : stage
-  return join(runtimeRoot, `current-stage-review-run-id-${suffix}`)
+  return runtimeStatePath(runtimeRoot, `current-stage-review-run-id-${suffix}`)
 }
 
 /**
@@ -853,7 +854,7 @@ export function printStageReviewResult(result, context = {}) {
     // fail-open：无 changeName / 无记录 / 读失败 → 零输出（旧口径）。
     if (changeName && runtimeRoot) {
       try {
-        const recPath = join(runtimeRoot, `review-dispatch-${changeName}.json`)
+        const recPath = runtimeStatePath(runtimeRoot, `review-dispatch-${changeName}.json`)
         if (existsSync(recPath)) {
           const rec = JSON.parse(readFileSync(recPath, 'utf8'))
           if (rec && typeof rec === 'object' && (rec.state === 'in-flight' || rec.state === 'dispatching')) {

package/src/stage-templates.js

@@ -16,6 +16,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'
 import { join } from 'path'
+import { DECISION_STATUSES, DECISION_TYPES } from './decision-values.js'
 
 /** brainstorm 四件套产物格式模板（自 stages/brainstorm.js「生成规范文件」步逐字迁移——
  *  与 prompt 指针版本同源；decisions 九字段与可选字段说明一并迁入）。 */
@@ -110,9 +111,9 @@ created_at: <now-datetime>
 # 决策记录（Decisions）
 
 ## D-001@v1: 决策短标题
-- type: definition | consistency | feasibility | term | boundary | premise | architecture | compatibility | risk
+- type: ${DECISION_TYPES.join(' | ')}
 - priority: P0 | P1 | P2
-- status: accepted | unresolved | rejected | superseded
+- status: ${DECISION_STATUSES.join(' | ')}
 - supersedes:
 - source: user | code | docs
 - question: 被解决的问题

package/src/stages/brainstorm.js

@@ -1,4 +1,5 @@
 import { REVIEW_CHECKLISTS } from '../stage-review-checklist.js'
+import { DECISION_STATUSES, DECISION_TYPES } from '../decision-values.js'
 
 export const definition = {
   name: 'brainstorm',
@@ -58,7 +59,7 @@ export const definition = {
 - **明显 small**（满足：单上下文可吞吐的纯执行类——改文案/修 bug/样式调整/配置微调，预计无 Wave 编排/上下文分片需求）→ 输出：「此变更规模较小，建议直接走轻量变更」+ 一句依据，给出可照抄建议命令（--input 引号内换行合法）：
 
 \`\`\`
-sillyspec flow start --change <YYYY-MM-DD-名> --input "<一句中文概括（首行即变更标题）；随后动机与背景
+sillyspec flow start --change <YYYY-MM-DD-名> --input "<一句 10-30 字中文概括（首行即变更标题，硬区间 10-30 必须、建议 ~20 字）；随后动机与背景
 
 成功标准：
 - <可验证标准>"
@@ -192,9 +193,9 @@ sillyspec flow start --change <YYYY-MM-DD-名> --input "<一句中文概括（
 
 \`\`\`markdown
 ## D-001@v1: <短标题>
-- type: term | boundary | premise | architecture | compatibility | risk
+- type: ${DECISION_TYPES.join(' | ')}
 - priority: P0 | P1 | P2
-- status: accepted | rejected | superseded
+- status: ${DECISION_STATUSES.join(' | ')}
 - source: user | code | docs
 - question: <被解决的问题>
 - answer: <用户确认或代码查证结果>
@@ -525,9 +526,9 @@ ${REVIEW_CHECKLISTS.brainstorm.slice(3).map((item) => '- ' + item).join('\n')}
 ### decisions.md 版本规则
 \`\`\`markdown
 ## D-001@v2: 缓存异常时的 fallback 语义
-- type: definition | consistency | feasibility | boundary | architecture | compatibility | risk
+- type: ${DECISION_TYPES.join(' | ')}
 - priority: P0 | P1 | P2
-- status: accepted | unresolved | rejected | superseded
+- status: ${DECISION_STATUSES.join(' | ')}
 - supersedes: D-001@v1
 - source: design-grill
 - question: §3 数据流与 §7 容错策略冲突时以哪个为准？

package/src/sync-noise.js

@@ -24,6 +24,7 @@
  * 调用方传 noMute 绕过。
  */
 import { readFileSync, writeFileSync, mkdirSync, unlinkSync } from 'fs'
+import { runtimeStatePath } from './runtime-paths.js'
 import { join } from 'path'
 
 const NOISE_MARKER = 'sync-noise-mute.json'
@@ -254,7 +255,7 @@ let _openedSelfHealByThisProcess = new Set()
 const _seenSelfHealInProcess = new Set()
 
 function _readSelfHealWindows() {
-  const p = _runtimeDir ? join(_runtimeDir, SELF_HEAL_MARKER) : null
+  const p = _runtimeDir ? runtimeStatePath(_runtimeDir, SELF_HEAL_MARKER) : null
   if (!p) return null
   try {
     const s = JSON.parse(readFileSync(p, 'utf8'))
@@ -279,7 +280,7 @@ function _selfHealLineVisible(changeName, kind, noMute) {
   next[key] = now + MUTE_WINDOW_MS
   try {
     mkdirSync(_runtimeDir, { recursive: true })
-    writeFileSync(join(_runtimeDir, SELF_HEAL_MARKER), JSON.stringify(next) + '\n', 'utf8')
+    writeFileSync(runtimeStatePath(_runtimeDir, SELF_HEAL_MARKER), JSON.stringify(next) + '\n', 'utf8')
   } catch { /* marker 写失败 = 闸门失效退化为直通，仅损失降噪 */ }
   _openedSelfHealByThisProcess.add(key)
   return true

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()