sillyspec 3.32.10 → 3.33.1

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, '/'))
@@ -2821,6 +2822,31 @@ function inferFullTestCommand(projectRoot) {
  * 相关回归）。组卷改配额制：每组优先面整跑，普通 import 依赖只填剩余席位（可为 0）——帽
  * 只界普通依赖尾。批尺寸上界护栏由 TEST_TIMEOUT_MS 兜底（超时=失败 fail-closed 不变）。
  */
+/**
+ * 批命令长度分块（2026-10-15 平台侧实证，跨仓事故驱动最小修复）：Windows cmd 执行器
+ * 命令行上限 ~8191 字符——大依赖面（广被引用的前端文件变更 → 依赖测试 100+ 个）拼单条
+ * vitest/node --test 命令必炸「命令行太长」exit 1，且失败批进增量账本自我循环恒败
+ * （实测：137 文件批反复重跑复败，verify 门禁无法收口）。按「命令前缀+文件参数拼接
+ * 总长」分块：单块保持原名（零回归），多块命名 <base>:N（N 从 1 起）；每块独立计账。
+ */
+function chunkByCommandLength(prefix, files, maxLen = 6000) {
+  const chunks = []
+  let cur = []
+  let curLen = prefix.length
+  for (const f of files) {
+    const add = f.length + 1
+    if (cur.length > 0 && curLen + add > maxLen) {
+      chunks.push(cur)
+      cur = []
+      curLen = prefix.length
+    }
+    cur.push(f)
+    curLen += add
+  }
+  if (cur.length > 0) chunks.push(cur)
+  return chunks
+}
+
 function buildDepsBatches({ deps, changedFiles = [], hits = [], cwd = null, priorityFiles = [] }) {
   const norm = (p2) => String(p2).replace(/\\/g, '/')
   const changedSet = new Set((changedFiles || []).map(norm))
@@ -2930,10 +2956,11 @@ function buildDepsBatches({ deps, changedFiles = [], hits = [], cwd = null, prio
   const jsProjectRun = jsProject.filter(f => !E2E_DIR_RE.test(_norm(f)))
   const e2eDroppedFiles = jsProject.filter(f => E2E_DIR_RE.test(_norm(f)))
   let jsxRunner = null
+  let jsxRunnerFromHits = false
   for (const h of hits || []) {
     const cmd = String(h.test || '')
     const m = /^((?:cd\s+[^&|;]+&&\s*)*[^&|;]*?(?:vitest|jest))(?=\s|$)/.exec(cmd) || /(?:^|&&|;|\|\|)\s*([^&|;]*(?:vitest|jest)(?:\s|$))/.exec(cmd)
-    if (m) { jsxRunner = m[1].trim(); break }
+    if (m) { jsxRunner = m[1].trim(); jsxRunnerFromHits = true; break }
   }
   if (!jsxRunner && cwd && jsProjectRun.length > 0) {
     const inferred = inferJsxRunner(cwd, jsProjectRun[0])
@@ -2958,24 +2985,59 @@ function buildDepsBatches({ deps, changedFiles = [], hits = [], cwd = null, prio
       gi++
     }
   }
-  if (jsNative.length > 0) batches.push({ name: 'deps(auto-js)', short: 'js', command: `node --test --test-reporter=spec --test-reporter-destination=stderr --test-reporter=tap --test-reporter-destination=stdout ${jsNative.join(' ')}`, count: jsNative.length, prioCount: jsNative.filter(f => prio(f) === 0).length, dropped: jsTest.length - jsRun.length, prioDropped: jsQ.prioDropped, tap: true, files: jsNative })
+  if (jsNative.length > 0) {
+    const jsPrefix = 'node --test --test-reporter=spec --test-reporter-destination=stderr --test-reporter=tap --test-reporter-destination=stdout '
+    const jsChunks = chunkByCommandLength(jsPrefix, jsNative)
+    jsChunks.forEach((chunk, i) => {
+      const isMulti = jsChunks.length > 1
+      batches.push({ name: isMulti ? `deps(auto-js:${i + 1}/${jsChunks.length})` : 'deps(auto-js)', short: 'js', command: jsPrefix + chunk.join(' '), count: chunk.length, prioCount: chunk.filter(f => prio(f) === 0).length, dropped: i === 0 ? (jsTest.length - jsRun.length) : 0, prioDropped: i === 0 ? jsQ.prioDropped : 0, tap: true, files: chunk })
+    })
+  }
   if (jsMeta.length > 0) batches.push({ name: 'deps(auto-js-meta-skip)', short: 'js-meta-skip', command: null, count: jsMeta.length, dropped: 0, skip: true, files: jsMeta, reason: '套件编排器（run-tests.mjs=npm test 组卷入口）非单测文件——内嵌执行=递归全量套件（嵌套 runner 污染假败）；全量门由收口实测/CI 的 npm test 承担' })
 
   if (nonTestFiles.length > 0) batches.push({ name: 'deps(auto-nontest-skip)', short: 'nontest-skip', command: null, count: nonTestFiles.length, dropped: 0, skip: true, files: nonTestFiles, reason: `非测试形态文件 ${nonTestFiles.length} 个不进单测执行批（node --test 语义「文件即测试」/ vitest No test suite found / pytest 0 collected exit 5——直跑必假败；坑 verify-dynamic-subset-node-test-ts-source）：${nonTestFiles.slice(0, 3).join('、')}${nonTestFiles.length > 3 ? ' 等' : ''}——FR 绑定面脏数据可 sillyspec tests --unbind --tests <路径> 清行` })
   if (jsProjectRun.length > 0) {
-    if (jsxRunner) {
-      const isVitest = /vitest/.test(jsxRunner)
-      // jsx 批的 cd 重定基（评审 MEDIUM 清偿）：cdDir 只源 pyRunner——jsxRunner 自带 cd 前缀
-      // （cd frontend && pnpm exec vitest）时文件未重定基产双前缀错路径；独立提取 jsxDir。
-      const jsxDir = /(?:^|\s)cd\s+(\S+)\s*&&/.exec(jsxRunner)?.[1]
-      const rebaseJsx = (f) => (jsxDir && f.startsWith(jsxDir + '/')) ? f.slice(jsxDir.length + 1) : f
-      // R20（2026-09-27-thin-display-fix 实证，用户授权修复）：Windows cmd 执行器对含
-      // 括号/方括号/空格的路径（src/app/(dashboard)/workspaces/[id]/...）不加引号会以
-      // 「此时不应有 <。」语法错误炸整批——文件参数含特殊字符时逐个 wrap 双引号。
-      const quoteWinPath = (f) => (/[()\[\]\s&^%,;!]/.test(f) ? `"${f}"` : f)
-      batches.push({ name: 'deps(auto-jsx)', short: 'jsx', command: `${jsxRunner} ${isVitest ? 'run ' : ''}${jsProjectRun.map(rebaseJsx).map(quoteWinPath).join(' ')}`, count: jsProjectRun.length, dropped: 0, files: jsProjectRun })
-    } else {
-      batches.push({ name: 'deps(auto-jsx-skip)', short: 'jsx-skip', command: null, count: jsProjectRun.length, dropped: 0, skip: true, files: jsProjectRun, reason: `JSX 测试文件（tsx/jsx，${jsProjectRun.length} 个）node 原生不可跑且项目结构无 vitest/jest 运行器可推断——转项目运行器执行并如实披露，不制造恒败段（R18-SF-full 残差段 11 连败的坑）` })
+    // R20（2026-09-27-thin-display-fix 实证，用户授权修复）：Windows cmd 执行器对含
+    // 括号/方括号/空格的路径（src/app/(dashboard)/workspaces/[id]/...）不加引号会以
+    // 「此时不应有 <。」语法错误炸整批——文件参数含特殊字符时逐个 wrap 双引号。
+    const quoteWinPath = (f) => (/[()\[\]\s&^%,;!]/.test(f) ? `"${f}"` : f)
+    // jsx 批按包根分组（2026-10-15-zcode-engine-appserver verify 实证，跨仓事故驱动修复）：
+    // 混合包根（frontend/ 的 tsx 测试 + sillyhub-daemon/ 的 ts 测试同批）共享单一 runner
+    // 前缀时，非本根路径在 runner 的 cwd 下「No test files found」exit 1 恒败（分块修复
+    // 后暴露：第二块全 daemon 路径仍跑 cd frontend）。与 pyGroups 同款：每文件按最近
+    // package.json 推断自身 runner/根；显式命中命令（hits）保持整批单组旧语义。
+    const jsxGroups = new Map() // key: 组命令前缀
+    const jsxUngrouped = []
+    for (const f of jsProjectRun) {
+      // 命中命令（hits）→ 整批单组旧语义；全局推断（jsProjectRun[0]）仅兜底，逐文件按自身包根推断优先。
+      let command = null
+      let dirKey = null
+      if (!jsxRunnerFromHits && cwd) {
+        const inferred = inferJsxRunner(cwd, f)
+        if (inferred) { command = inferred.command; dirKey = inferred.dir || null }
+      }
+      if (!command) command = jsxRunner
+      if (!command) { jsxUngrouped.push(f); continue }
+      if (!jsxGroups.has(command)) jsxGroups.set(command, { files: [], dirKey })
+      jsxGroups.get(command).files.push(f)
+    }
+    const multiGroup = jsxGroups.size > 1
+    for (const [command, grp] of jsxGroups) {
+      const isVitest = /vitest/.test(command)
+      const jsxPrefix = `${command} ${isVitest ? 'run ' : ''}`
+      const grpDir = grp.dirKey || /(?:^|\s)cd\s+(\S+)\s*&&/.exec(command)?.[1] || null
+      const rebaseJsx = (f) => (grpDir && f.startsWith(grpDir + '/')) ? f.slice(grpDir.length + 1) : f
+      const jsxArgs = grp.files.map(rebaseJsx).map(quoteWinPath)
+      const jsxChunks = chunkByCommandLength(jsxPrefix, jsxArgs)
+      const baseName = multiGroup ? `deps(auto-jsx:${grp.dirKey || 'root'})` : 'deps(auto-jsx)'
+      jsxChunks.forEach((chunk, i) => {
+        const isMulti = jsxChunks.length > 1
+        batches.push({ name: isMulti ? `${baseName}:${i + 1}/${jsxChunks.length}` : baseName, short: 'jsx', command: jsxPrefix + chunk.join(' '), count: chunk.length, dropped: 0, files: chunk })
+      })
+    }
+    if (jsxUngrouped.length > 0) {
+      // 无运行器可推断的文件（含 !jsxRunner && !cwd 全量形态）：skip 批如实披露（原整批 skip 语义按文件收窄）。
+      batches.push({ name: multiGroup || jsxGroups.size > 0 ? 'deps(auto-jsx-skip:unresolved)' : 'deps(auto-jsx-skip)', short: 'jsx-skip', command: null, count: jsxUngrouped.length, dropped: 0, skip: true, files: jsxUngrouped, reason: `JSX 测试文件（tsx/jsx，${jsxUngrouped.length} 个）node 原生不可跑且各自最近 package.json 无 vitest/jest 运行器可推断——转项目运行器执行并如实披露，不制造恒败段（R18-SF-full 残差段 11 连败的坑）` })
     }
   }
   if (e2eDroppedFiles.length > 0) {
@@ -3042,6 +3104,26 @@ function traceRepoRoots({ specBase, cwd }) {
 }
 
 /** 残差解析：active·非 superseded·锚命中的 trace 行 → { anchors, rows, files, dangling, perFile } */
+/**
+ * 主仓侧候选解析根（worktree 感知；2026-10-15-zcode-engine-appserver verify 实证，跨仓
+ * 事故驱动最小修复）：变更在隔离 worktree 内实现时，新增测试文件在主仓根不可见——
+ * 悬空判定对主仓文件按「主仓根 ∪ 变更 worktree 根」多根解析（任一存在即非悬空）；
+ * 残差执行根同款（文件在 worktree 存在则从 worktree 根跑）。meta 缺失/不可读 → 仅主仓。
+ */
+function traceMainRoots({ specBase, changeName, cwd }) {
+  const roots = [cwd]
+  try {
+    const metaPath = join(specBase, '.runtime', 'worktrees', changeName, 'meta.json')
+    if (existsSync(metaPath)) {
+      const meta = JSON.parse(readFileSync(metaPath, 'utf8'))
+      if (meta && typeof meta.worktreePath === 'string' && meta.worktreePath && existsSync(meta.worktreePath) && meta.worktreePath !== cwd) {
+        roots.push(meta.worktreePath)
+      }
+    }
+  } catch { /* meta 不可读 → 仅主仓（零回归） */ }
+  return roots
+}
+
 export function resolveTraceResidual({ specBase, changeName, cwd }) {
   const anchors = resolveVerifyAnchorSet({ specBase, changeName })
   if (anchors.length === 0) return { anchors, rows: [], files: [], dangling: [], perFile: [] }
@@ -3050,19 +3132,25 @@ export function resolveTraceResidual({ specBase, changeName, cwd }) {
   // tests 条目可携带用例锚（2026-09-26-binding-anchor-fidelity）——文件面/悬空判定走剥锚。
   // FR-06（2026-10-09）：文件按行 repo 归属配对（perFile），悬空判定/残差执行按行根解析。
   const repoRoots = traceRepoRoots({ specBase, cwd })
+  const mainRoots = traceMainRoots({ specBase, changeName, cwd })
   const seen = new Set()
   const perFile = []
   for (const r of rows) {
     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 }) }
     }
   }
   const files = [...new Set(perFile.map(x => x.file))].sort()
+  // 主仓文件多根解析：解析到 worktree 根则记录 resolvedRoot（残差执行同款消费）。
+  for (const x of perFile) {
+    if (x.repo) { x.resolvedRoot = repoRoots.get(x.repo) || cwd; continue }
+    x.resolvedRoot = mainRoots.find(root => existsSync(resolve(root, x.file))) || cwd
+  }
   const dangling = perFile
-    .filter(x => !existsSync(resolve((x.repo && repoRoots.get(x.repo)) || cwd, x.file)))
+    .filter(x => !existsSync(resolve(x.resolvedRoot, x.file)))
     .map(x => x.repo ? `${x.repo}:${x.file}` : x.file)
   return { anchors, rows, files, dangling, perFile }
 }
@@ -3141,8 +3229,9 @@ export function applyTraceResidual({ mainResult, action, cwd, specBase, changeNa
   for (const x of (tr.perFile || [])) {
     if (provable.has(String(x.file).replace(/\\/g, '/'))) continue
     const _rk = x.repo || null
-    const _root = (_rk && _repoRoots.get(_rk)) || cwd
-    const _gk = _rk + '' + _root
+    // worktree 感知（同悬空判定口径）：主仓行按 resolvedRoot（主仓或变更 worktree 根）取执行根。
+    const _root = (_rk && _repoRoots.get(_rk)) || x.resolvedRoot || cwd
+    const _gk = _rk + '\u0000' + _root
     if (!_gmap.has(_gk)) _gmap.set(_gk, { repo: _rk, root: _root, files: [] })
     _gmap.get(_gk).files.push(x.file)
   }
@@ -3284,8 +3373,20 @@ export function runModuleSubset({ cwd, specBase, changeName, hits, knownFailures
     // not ok 以测试文件为套件名（not ok N - test/b.test.mjs），用判账行集匹配批内文件名把
     // 「批失败」收窄到「文件失败」；归因不出（非 TAP/行集缺文件名）保守全记批文件。
     failedFiles: (() => {
+      // 基建失败甄别（坑 verify-incremental-rerun-infra-batch-growth，2026-10-15 两变更实证：
+      // Windows argv 超限/runner 启动失败类批失败无任何测试级失败行，重跑不可能转绿——计入
+      // 前轮失败批只会让增量面随轮膨胀（141→159 自锁）。判据：输出无 not ok/FAILED/ERROR/
+      // AssertionError 任何测试级痕迹，且 reason 命中基建关键词（命令行太长/E2BIG/spawn/
+      // Cannot find module/No test files found）——此类批不进失败批账本，loud 留痕供人工。
+      const INFRA_REASON_RE = /命令行太长|E2BIG|spawn|Cannot find module|No test files found|ENAMETOOLONG/i
+      const TEST_FAILURE_RE = /not ok \d|FAILED|ERROR|AssertionError|assert/i
       const out = new Set()
       for (const r of perModule.filter(x => x.status === 'failed')) {
+        const text = String(r.outputFull || r.outputTail || '')
+        if (!TEST_FAILURE_RE.test(text) && INFRA_REASON_RE.test(String(r.reason || '') + text)) {
+          console.warn(`⚠️ 批 ${r.name} 判定基建失败（${String(r.reason || 'runner 层失败').slice(0, 80)}）——不进增量失败批账本（重跑不可能转绿），修复基建后整轮重测`)
+          continue
+        }
         for (const f of attributeFailedFiles(r)) out.add(f)
       }
       return [...out].sort()
@@ -3680,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' &&
@@ -3690,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 }
@@ -4207,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)
@@ -4604,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)) {
@@ -4701,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 死锁修复）`