iterate-plugin 2.9.4 → 2.11.0

package/src/client/index.ts

@@ -333,6 +333,27 @@ const ITERATE_CSS = `
 .iterate-switch[data-on] { background: var(--dsw-alias-brand-primary); border-color: var(--dsw-alias-brand-primary); }
 .iterate-switch[data-on] .iterate-switch-knob { transform: translateX(18px); background: #FFFFFF; }
 
+/* Shared keyboard focus ring for every iterate interactive control */
+.iterate-btn:focus-visible, .iterate-vbtn:focus-visible, .iterate-batch-btn:focus-visible,
+.iterate-filter-select:focus-visible, .iterate-filter-search:focus-visible,
+.iterate-finding:focus-visible, .iterate-switch:focus-visible {
+  outline: 2px solid var(--dsw-alias-brand-primary); outline-offset: 2px;
+}
+
+/* Dashboard empty/onboarding state */
+.iterate-dashboard-empty { opacity: 0.75; }
+.iterate-empty-hint { font-size: 12px; color: var(--dsw-alias-label-secondary); }
+
+/* Convergence-completed progress fill */
+.iterate-progress-fill-done { background: var(--dsw-alias-state-success-primary); }
+
+/* Batch scope segmented control */
+.iterate-batch-scope { opacity: 0.6; }
+.iterate-batch-scope-on { opacity: 1; border-color: var(--dsw-alias-brand-primary); color: var(--dsw-alias-label-primary); }
+
+/* Overflow dimension chip */
+.iterate-dim-more { opacity: 0.7; font-style: italic; }
+
 /* Button variants */
 .iterate-btn[data-ghost] { background: transparent; }
 .iterate-btn[data-danger] { border-color: color-mix(in srgb, var(--dsw-alias-state-error-primary) 45%, transparent); color: var(--dsw-alias-state-error-primary); background: transparent; }
@@ -402,16 +423,15 @@ function removeStorageByPrefix(prefix: string): number {
   return removed
 }
 
-/** Copy text to the clipboard, returning whether it succeeded. */
-function copyText(text: string): boolean {
+/** Copy text to the clipboard, resolving to whether it actually succeeded. */
+function copyText(text: string): Promise<boolean> {
   if (typeof navigator !== 'undefined' && navigator.clipboard && typeof navigator.clipboard.writeText === 'function') {
-    navigator.clipboard.writeText(text).then(
+    return navigator.clipboard.writeText(text).then(
       () => true,
       () => false,
     )
-    return true
   }
-  return false
+  return Promise.resolve(false)
 }
 
 /** Literal severity keys recognized by SEVERITY_LABEL / SEVERITY_COLOR. */
@@ -523,7 +543,14 @@ function TrendChart({ points }: { points: Array<{ round: number; count: number }
       style: { height: `${Math.max(4, Math.round((p.count / max) * 24))}px` },
     }),
   )
-  return React.createElement('div', { className: 'iterate-trend', title: '各轮发现数量趋势' }, ...bars)
+  // Accessible summary: the per-round counts are otherwise invisible to
+  // assistive tech (mouse-only title divs).
+  const summary = points.map((p) => `Round ${p.round}: ${p.count}`).join(', ')
+  return React.createElement('div', {
+    className: 'iterate-trend',
+    role: 'img',
+    'aria-label': `各轮发现数量趋势：${summary}`,
+  }, ...bars)
 }
 
 /** Dashboard: live convergence strip above the composer.
@@ -549,7 +576,16 @@ function ConvergenceDashboard(props: SlotProps) {
     setPulseKey((k) => k + 1)
   }, [report && hashReport(report) + ':' + getCurrentRound(report)])
 
-  if (!report) return null
+  if (!report) {
+    // Empty/onboarding state: first-time users otherwise see nothing and have
+    // no idea the plugin exists or how to start.
+    return React.createElement(
+      'div',
+      { 'data-iterate-root': '', 'data-iterate': 'dashboard', className: 'iterate-dashboard iterate-dashboard-empty' },
+      React.createElement('span', { className: 'iterate-round-badge' }, 'iterate'),
+      React.createElement('span', { className: 'iterate-empty-hint' }, '运行一次评审后，这里会显示收敛进度与发现统计。试试「review this project」或「/iterate review-only」'),
+    )
+  }
 
   const round = getCurrentRound(report)
   const total = getTotalRounds(report)
@@ -577,13 +613,25 @@ function ConvergenceDashboard(props: SlotProps) {
       }, `附件图片 ${String(imageCount)}`)
     : null
 
-  const dimBadges = Object.keys(dims).slice(0, 6).map((dim) =>
+  const dimNames = Object.keys(dims)
+  const dimBadges = dimNames.slice(0, 6).map((dim) =>
     React.createElement(
       'span',
       { key: dim, className: 'iterate-dim-badge' },
       `${dim} · ${(dims[dim]?.length ?? 0)}`,
     ),
   )
+  // Don't silently drop dimensions: surface the overflow as a +N chip.
+  const overflow = dimNames.length - 6
+  if (overflow > 0) {
+    dimBadges.push(
+      React.createElement(
+        'span',
+        { key: '+more', className: 'iterate-dim-badge iterate-dim-more', title: dimNames.slice(6).join(', ') },
+        `+${overflow} 更多`,
+      ),
+    )
+  }
 
   // Fix-count badge: show a running "fixes applied" metric when the report
   // carries a number (normal mode only — threaded through `fixedCount`).
@@ -599,6 +647,23 @@ function ConvergenceDashboard(props: SlotProps) {
       }, `${String(fixCount)} fixes`)
     : null
 
+  // Convergence is the payoff of the review — make it visible on the
+  // persistent dashboard, not only in the transient 3.6s capsule.
+  const converged = report.convergence && report.convergence.converged === true
+  const convChip = converged
+    ? React.createElement('span', {
+        className: 'iterate-chip-resume',
+        key: 'converged',
+        title: '审查已收敛：最后一轮未发现新问题',
+      }, '✓ 已收敛')
+    : null
+
+  const sevMetric = (key: 'critical' | 'high' | 'medium' | 'low', label: string) =>
+    React.createElement('span', { className: 'iterate-metric', key, title: label },
+      React.createElement('span', { className: 'iterate-sev-dot', style: { background: SEVERITY_COLOR[key] } }),
+      `${label} ${String(stats[key])}`,
+    )
+
   return React.createElement(
     'div',
     { 'data-iterate-root': '', 'data-iterate': 'dashboard', className: 'iterate-dashboard' },
@@ -608,20 +673,16 @@ function ConvergenceDashboard(props: SlotProps) {
       `Round ${round} / ${total}`,
     ),
     React.createElement('div', { className: 'iterate-progress' },
-      React.createElement('div', { className: 'iterate-progress-fill', style: { width: `${progress}%` } }),
-    ),
-    React.createElement('span', { className: 'iterate-metric' },
-      React.createElement('span', { className: 'iterate-sev-dot', style: { background: SEVERITY_COLOR.critical } }),
-      stats.critical,
-    ),
-    React.createElement('span', { className: 'iterate-metric' },
-      React.createElement('span', { className: 'iterate-sev-dot', style: { background: SEVERITY_COLOR.high } }),
-      stats.high,
-    ),
-    React.createElement('span', { className: 'iterate-metric' },
-      React.createElement('span', { className: 'iterate-sev-dot', style: { background: SEVERITY_COLOR.medium } }),
-      stats.medium,
+      React.createElement('div', {
+        className: converged ? 'iterate-progress-fill iterate-progress-fill-done' : 'iterate-progress-fill',
+        style: { width: `${progress}%` },
+      }),
     ),
+    convChip,
+    sevMetric('critical', 'CRIT'),
+    sevMetric('high', 'HIGH'),
+    sevMetric('medium', 'MED'),
+    sevMetric('low', 'LOW'),
     fixBadge,
     resumeChip,
     imageChip,
@@ -731,14 +792,15 @@ function TriagePanel(props: SlotProps) {
   const [selected, setSelected] = React.useState<number | null>(null)
   const [selectAll, setSelectAll] = React.useState(false)
 
-  /** Persist + return the next verdicts state. */
-  const persistVerdicts = (next: Record<string, 'keep' | 'skip' | 'ignore'>) => {
-    if (storage) storage.set(storageKey, JSON.stringify(next))
-    return next
-  }
+  /** Persist the verdicts to localStorage whenever they change. Kept OUT of
+   *  the state updater (updaters must stay pure — React may double-invoke them
+   *  under StrictMode, and a storage throw must not surface during render). */
+  React.useEffect(() => {
+    if (storage) storage.set(storageKey, JSON.stringify(verdicts))
+  }, [storageKey, verdicts])
 
   const setVerdict = (index: number, verdict: 'keep' | 'skip' | 'ignore') => {
-    setVerdicts((prev) => persistVerdicts({ ...prev, [String(index)]: verdict }))
+    setVerdicts((prev) => ({ ...prev, [String(index)]: verdict }))
   }
 
   // ── Filtering (visible findings + their original indices) ───────────────
@@ -757,13 +819,10 @@ function TriagePanel(props: SlotProps) {
   const allIndices = allVerdictKeys(verdicts)
   const batchTarget = selectAll ? allIndices : indices
   const applyBatch = (verdict: 'keep' | 'skip' | 'ignore') => {
-    setVerdicts((prev) => persistVerdicts(batchSetVerdict(prev, batchTarget, verdict)))
-  }
-  const applyBatchAll = (verdict: 'keep' | 'skip' | 'ignore') => {
-    setVerdicts((prev) => persistVerdicts(setAllVerdicts(prev, verdict)))
+    setVerdicts((prev) => batchSetVerdict(prev, batchTarget, verdict))
   }
   const doResetVerdicts = () => {
-    setVerdicts((prev) => persistVerdicts(setAllVerdicts(prev, 'keep')))
+    setVerdicts((prev) => setAllVerdicts(prev, 'keep'))
     setSelectAll(false)
   }
 
@@ -772,8 +831,13 @@ function TriagePanel(props: SlotProps) {
     const doc = typeof document !== 'undefined' ? document : null
     if (!doc) return
     const onKeyDown = (ev: KeyboardEvent) => {
+      // Never hijack modified shortcuts (Cmd/Ctrl/Alt combos like Cmd+A
+      // select-all) or keystrokes typed into an editable surface (the composer
+      // may be a contenteditable div, not a textarea).
+      if (ev.metaKey || ev.ctrlKey || ev.altKey) return
       const t = ev.target as HTMLElement | null
       if (t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || t.tagName === 'SELECT')) return
+      if (t && typeof t.isContentEditable === 'boolean' && t.isContentEditable) return
       const verdict = keyToVerdict(ev.key)
       if (verdict && selected !== null && indices.includes(selected)) {
         ev.preventDefault()
@@ -807,10 +871,16 @@ function TriagePanel(props: SlotProps) {
   const doCopyYaml = () => {
     const yaml = toKnownIntentionalYaml(ignored)
     if (!yaml) return
-    const ok = copyText(yaml)
-    setCopied(true)
-    setTimeout(() => setCopied(false), 1600)
-    if (!ok) setPayload(yaml)
+    copyText(yaml).then((ok) => {
+      if (ok) {
+        setCopied(true)
+        setTimeout(() => setCopied(false), 1600)
+      } else {
+        // Copy failed (permissions/unsupported) — reveal the payload as a
+        // manual-copy fallback instead of claiming success.
+        setPayload(yaml)
+      }
+    })
   }
 
   const doBuildInstruction = () => {
@@ -841,7 +911,14 @@ function TriagePanel(props: SlotProps) {
       key: String(index),
       className: 'iterate-finding',
       'data-selected': isSelected ? '' : undefined,
+      role: 'option',
+      'aria-selected': isSelected,
+      tabIndex: 0,
       onClick: () => setSelected(index),
+      onFocus: () => setSelected(index),
+      onKeyDown: (e: React.KeyboardEvent) => {
+        if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); setSelected(index) }
+      },
     },
       React.createElement('div', { className: 'iterate-finding-meta' },
         React.createElement('span', { className: 'iterate-sev-dot', style: { background: severityColor(severity) } }),
@@ -861,17 +938,17 @@ function TriagePanel(props: SlotProps) {
 
   return React.createElement('div', { 'data-iterate-root': '', 'data-iterate': 'triage', className: 'iterate-triage' },
     React.createElement('div', { className: 'iterate-triage-head' },
-      React.createElement('span', {}, `Iterate · Findings 分诊 (${filtered.length}/${findings.length})`),
+      React.createElement('span', { role: 'heading', 'aria-level': 3 }, `Iterate · Findings 分诊 (${filtered.length}/${findings.length})`),
       React.createElement('span', { className: 'iterate-triage-hint' }, 'y=修复 · n=跳过 · a=已知有意 · ↑/↓ 选择'),
     ),
     React.createElement('div', { className: 'iterate-filter' },
-      React.createElement('select', { className: 'iterate-filter-select', value: filter.severities[0] || '', onChange: (e: React.ChangeEvent<HTMLSelectElement>) => setSeverityFilter(e.target.value), title: '按严重度筛选' },
+      React.createElement('select', { className: 'iterate-filter-select', value: filter.severities[0] || '', onChange: (e: React.ChangeEvent<HTMLSelectElement>) => setSeverityFilter(e.target.value), 'aria-label': '按严重度筛选' },
         React.createElement('option', { value: '' }, '全部严重度'),
         ...options.severities.map((s) =>
           React.createElement('option', { key: s.value, value: s.value }, `${severityLabel(s.value)} (${s.count})`),
         ),
       ),
-      React.createElement('select', { className: 'iterate-filter-select', value: filter.dimensions[0] || '', onChange: (e: React.ChangeEvent<HTMLSelectElement>) => setDimensionFilter(e.target.value), title: '按维度筛选' },
+      React.createElement('select', { className: 'iterate-filter-select', value: filter.dimensions[0] || '', onChange: (e: React.ChangeEvent<HTMLSelectElement>) => setDimensionFilter(e.target.value), 'aria-label': '按维度筛选' },
         React.createElement('option', { value: '' }, '全部维度'),
         ...options.dimensions.map((d) =>
           React.createElement('option', { key: d.value, value: d.value }, `${d.value} (${d.count})`),
@@ -881,6 +958,7 @@ function TriagePanel(props: SlotProps) {
         className: 'iterate-filter-search',
         type: 'search',
         placeholder: '搜索文件 / 摘要…',
+        'aria-label': '搜索文件或摘要',
         value: filter.search,
         onChange: (e: React.ChangeEvent<HTMLInputElement>) => setSearchFilter(e.target.value),
       }),
@@ -891,26 +969,35 @@ function TriagePanel(props: SlotProps) {
       ),
     ),
     React.createElement('div', { className: 'iterate-batch' },
-      React.createElement('span', { className: 'iterate-batch-label' }, '批量：'),
-      React.createElement('label', { className: 'iterate-batch-check', title: '勾选后批量按钮作用于全部 findings，否则仅当前可见' },
-        React.createElement('input', { type: 'checkbox', checked: selectAll, onChange: (e) => setSelectAll(e.target.checked) }),
-        selectAll ? `全部 ${allIndices.length}` : '全选',
-      ),
-      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatch('keep') }, '全部 y'),
-      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatch('skip') }, '全部 n'),
-      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatch('ignore') }, '全部 a'),
-      React.createElement('span', { className: 'iterate-batch-label', style: { marginLeft: 8 } }, '全部：'),
-      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatchAll('keep') }, 'y'),
-      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatchAll('skip') }, 'n'),
-      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatchAll('ignore') }, 'a'),
+      React.createElement('span', { className: 'iterate-batch-label' }, '批量作用于：'),
+      React.createElement('button', {
+        className: selectAll ? 'iterate-batch-btn iterate-batch-scope' : 'iterate-batch-btn iterate-batch-scope iterate-batch-scope-on',
+        onClick: () => setSelectAll(false),
+        title: '批量按钮仅作用于当前筛选可见的 findings',
+      }, `可见 ${indices.length}`),
+      React.createElement('button', {
+        className: selectAll ? 'iterate-batch-btn iterate-batch-scope iterate-batch-scope-on' : 'iterate-batch-btn iterate-batch-scope',
+        onClick: () => setSelectAll(true),
+        title: '批量按钮作用于全部 findings',
+      }, `全部 ${allIndices.length}`),
+      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatch('keep') }, 'y'),
+      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatch('skip') }, 'n'),
+      React.createElement('button', { className: 'iterate-batch-btn', onClick: () => applyBatch('ignore') }, 'a'),
       React.createElement('button', { className: 'iterate-batch-btn', onClick: doResetVerdicts, title: '把所有判定恢复为默认 y（修复）' }, '重置'),
     ),
     ...rows,
     React.createElement('div', { className: 'iterate-triage-foot' },
       React.createElement('span', {}, `y ${counts.keep} · n ${counts.skip} · a ${counts.ignore} · 待写回 known_intentional：${ignoredCount} 条`),
       React.createElement('span', { style: { display: 'flex', gap: 6 } },
-        React.createElement('button', { className: 'iterate-btn', 'data-primary': '', 'data-copied': copied ? '' : undefined, onClick: doCopyYaml }, copied ? '已复制' : '复制 known_intentional'),
-        React.createElement('button', { className: 'iterate-btn', onClick: doBuildInstruction }, '生成应用指令'),
+        React.createElement('button', {
+          className: 'iterate-btn', 'data-primary': '', 'data-copied': copied ? '' : undefined,
+          onClick: doCopyYaml, disabled: ignoredCount === 0,
+          title: ignoredCount === 0 ? '当前没有标记为「已知有意」的 finding' : '复制 known_intentional YAML',
+        }, copied ? '已复制' : `复制 known_intentional${ignoredCount > 0 ? `（${ignoredCount}）` : ''}`),
+        React.createElement('button', {
+          className: 'iterate-btn', onClick: doBuildInstruction, disabled: ignoredCount === 0,
+          title: ignoredCount === 0 ? '当前没有标记为「已知有意」的 finding' : '生成 iterate_triage 应用指令',
+        }, '生成应用指令'),
       ),
     ),
     payload
@@ -1031,10 +1118,11 @@ function SettingsPanel(_props: SlotProps) {
     setTimeout(() => setter(false), 1600)
   }
 
-  /** Copy a guide/status block; keep the copy button state in sync. */
+  /** Copy a guide/status block; flash success only when it actually copied. */
   const doCopy = (text: string, slot: 'guide' | 'status') => {
-    copyText(text)
-    flashCopied(slot)
+    copyText(text).then((ok) => {
+      if (ok) flashCopied(slot)
+    })
   }
 
   /** Two-step destroy guard: first click arms, second click clears. */

package/src/config-loader.ts

@@ -1,4 +1,4 @@
-import { readFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { join, resolve, sep } from 'node:path'
 import yaml from 'js-yaml'
@@ -75,6 +75,10 @@ export function mergeConfig(
   const out: Record<string, unknown> = { ...base }
   for (const [key, value] of Object.entries(override)) {
     if (value === undefined) continue
+    // Prototype-pollution guard: a YAML `__proto__`/`constructor`/`prototype`
+    // key must never be plain-assigned — js-yaml stores __proto__ as an own
+    // data property, and `out[key] = value` would invoke the __proto__ setter.
+    if (key === '__proto__' || key === 'constructor' || key === 'prototype') continue
     const baseValue = out[key]
     if (
       baseValue &&
@@ -242,7 +246,13 @@ function effectiveCwd(sessionCwd?: string): string {
     if (encoded && encoded.startsWith('--') && encoded.endsWith('--')) {
       try {
         const decoded = decodeURIComponent(encoded.slice(2, -2).replace(/~/g, '%'))
-        if (decoded && decoded.startsWith(sep)) return decoded
+        // The workspace encoding drops the leading root separator (`/Volumes/…`
+        // → `Volumes-…`), so re-attach it when absent. `~<hex>` → `%<hex>` is
+        // the documented percent spelling; '-' doubles as the '/' separator, so
+        // literal dashes in a path cannot round-trip — verify the result exists
+        // and fall through otherwise.
+        const candidate = decoded && !decoded.startsWith(sep) ? sep + decoded : decoded
+        if (candidate && candidate.startsWith(sep) && existsSync(candidate)) return candidate
       } catch {
         // malformed encoding — fall through to cwd
       }

package/src/config-write.ts

@@ -10,7 +10,7 @@
  * config, always back up before writing, roll back on failure.
  */
 
-import { copyFileSync, existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { copyFileSync, existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import yaml from 'js-yaml'
 
@@ -169,12 +169,14 @@ export function writeConfigFile(
   try {
     writeFileSync(configPath, yaml.dump(config, { noRefs: true }), 'utf-8')
   } catch (err) {
+    let rollbackError = ''
     try {
       if (backupPath) copyFileSync(backupPath, configPath)
-    } catch {
-      // Rollback failure is reported, never swallowed silently.
+      else if (existsSync(configPath)) rmSync(configPath, { force: true })
+    } catch (rbErr) {
+      rollbackError = `; rollback also failed: ${String(rbErr)}`
     }
-    return { ok: false, error: `failed to write config: ${String(err)}` }
+    return { ok: false, error: `failed to write config: ${String(err)}${rollbackError}` }
   }
 
   return { ok: true, backupPath }

package/src/evidence.ts

@@ -23,13 +23,21 @@
  * filesystem half (`verifyFinding`) to stay unit-testable without touching disk.
  */
 
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, readFileSync, realpathSync, statSync } from 'node:fs'
 import { resolve, sep } from 'node:path'
 import type { ReviewFinding } from './types.ts'
 
 /** Sentinel for whole-file findings (line 0 or omitted means the whole file). */
 export const WHOLE_FILE_LINE = 0
 
+/**
+ * Hard cap on a single evidence file read. `verifyFinding` only needs the
+ * line count + a NUL check; reading an unbounded file (or a device file
+ * reached through a symlink) is a memory/hang hazard, so anything larger is
+ * treated as not line-addressable.
+ */
+const MAX_EVIDENCE_BYTES = 10 * 1024 * 1024
+
 export type EvidenceError = 'file_not_found' | 'line_out_of_range'
 
 /** Per-finding attestation result. */
@@ -79,6 +87,22 @@ export function resolveWithin(root: string, rel: string): string | null {
   return resolved
 }
 
+/** True when `candidate` is `root` itself or lexically inside `root`. */
+function isWithin(root: string, candidate: string): boolean {
+  if (candidate === root) return true
+  const prefix = root.endsWith(sep) ? root : root + sep
+  return candidate.startsWith(prefix)
+}
+
+/** best-effort realpath; falls back to the lexical path on any failure. */
+function safeRealpath(p: string): string {
+  try {
+    return realpathSync(p)
+  } catch {
+    return p
+  }
+}
+
 /**
  * Pure check that `line` (if anchored) exists in `text`.
  * Whole-file findings (undefined/0) are always bounds-valid.
@@ -116,6 +140,50 @@ export function verifyFinding(
     }
   }
 
+  // Symlink containment: resolveWithin is lexical only, but existsSync /
+  // readFileSync follow symlinks. Verify the REAL path stays inside the REAL
+  // project root so a finding path can never read (or line-count) a file
+  // outside the project via a symlinked directory or file.
+  const rootReal = safeRealpath(root)
+  const real = safeRealpath(resolved)
+  if (!isWithin(rootReal, real)) {
+    return {
+      file: relFile,
+      line,
+      lineTotal: null,
+      resolvedPath: resolved,
+      verified: false,
+      error: 'file_not_found',
+    }
+  }
+
+  // Regular-file + size guard: a directory, device file (/dev/zero), FIFO or
+  // multi-GB file is not a line-addressable text target. statSync follows
+  // symlinks, so a link to a device still lands here and is rejected.
+  let st
+  try {
+    st = statSync(resolved)
+  } catch {
+    return {
+      file: relFile,
+      line,
+      lineTotal: null,
+      resolvedPath: resolved,
+      verified: false,
+      error: 'file_not_found',
+    }
+  }
+  if (!st.isFile() || st.size > MAX_EVIDENCE_BYTES) {
+    return {
+      file: relFile,
+      line,
+      lineTotal: null,
+      resolvedPath: resolved,
+      verified: false,
+      error: 'line_out_of_range',
+    }
+  }
+
   let raw: Buffer
   try {
     raw = readFileSync(resolved)

package/src/git-scope.ts

@@ -38,14 +38,30 @@ export interface GitScopeResult {
 }
 
 /**
- * Parse `git diff --name-only` stdout into a list of relative paths.
- * Pure: strips blank lines, trims whitespace, drops quotes (git can quote
- * paths with special characters).
+ * Parse `git diff --name-only -z` stdout into a list of relative paths.
+ * Pure. NUL-delimited mode is machine-safe (handles any filename); when no
+ * NUL is present (callers that did not pass -z) fall back to newline-split
+ * with C-style quote/escape unescaping for core.quotePath output.
  */
 export function parseChangedFiles(stdout: string): string[] {
+  if (stdout.includes('\0')) {
+    return stdout.split('\0').map((s) => s.trim()).filter((s) => s.length > 0)
+  }
   return stdout
     .split('\n')
-    .map((line) => line.trim().replace(/^"|"$/g, ''))
+    .map((line) => {
+      const trimmed = line.trim()
+      // git core.quotePath wraps paths with special characters in "..."; the
+      // content uses C-style escapes (\" \\ \t \n and \ooo octal for non-ASCII).
+      const quoted = trimmed.match(/^"(.*)"$/)
+      if (!quoted) return trimmed
+      return quoted[1]!
+        .replace(/\\"/g, '"')
+        .replace(/\\\\/g, '\\')
+        .replace(/\\t/g, '\t')
+        .replace(/\\n/g, '\n')
+        .replace(/\\([0-7]{3})/g, (_m, oct: string) => String.fromCharCode(parseInt(oct, 8)))
+    })
     .filter((line) => line.length > 0)
 }
 
@@ -118,9 +134,21 @@ export async function resolveChangedFiles(
   root: string,
   targetBranch: string,
 ): Promise<GitScopeResult> {
-  const { ok, stdout, stderr } = await runGit(['diff', '--name-only', targetBranch, '--'], root)
+  // Option-injection guard: a branch name starting with '-' would be parsed by
+  // git as an option (e.g. --output=...), not a ref. Reject it outright.
+  if (typeof targetBranch !== 'string' || targetBranch.trim() === '' || targetBranch.startsWith('-')) {
+    return {
+      scope: 'full',
+      changedFiles: [],
+      fallbackToFull: true,
+      error: `invalid target branch "${String(targetBranch)}"`,
+    }
+  }
+  // -z: NUL-delimited names — machine-safe for any filename (spaces, quotes,
+  // non-ASCII), and never confused with option-like content.
+  const { ok, stdout, stderr } = await runGit(['diff', '--name-only', '-z', targetBranch, '--'], root)
   if (!ok) {
-    const reason = stderr.trim() || `git diff --name-only ${targetBranch} failed`
+    const reason = stderr.trim() || `git diff --name-only -z ${targetBranch} failed`
     return { scope: 'full', changedFiles: [], fallbackToFull: true, error: reason }
   }
   const existing = filterExistingFiles(root, parseChangedFiles(stdout))

package/src/meta-review.ts

@@ -70,8 +70,13 @@ export interface FinalReviewReport {
   }
 }
 
-/** Number of distinct consistency checks performed by `metaReviewReport`. */
-export const META_REVIEW_CHECKS = 6
+/**
+ * Number of distinct consistency checks performed by `metaReviewReport`.
+ * The check set is: COUNT_MATCH, SEVERITY_SUM, DIMENSION_SUM, DIMENSION_UNKNOWN,
+ * SORT_ORDER, CONVERGENCE_SUM, CONVERGENCE_FLAG, ROUND_NUMBER, ROUND_EMPTY,
+ * ROUND_GAP.
+ */
+export const META_REVIEW_CHECKS = 10
 
 /**
  * How many uncovered scope files are listed in a COVERAGE_GAP hint before the
@@ -266,14 +271,23 @@ export function metaReviewReport(report: ReviewReport): MetaReviewResult {
       )
     }
   }
-  for (let i = 1; i <= rounds.length; i++) {
-    if (!seenRounds.has(i)) {
-      add(
-        'ROUND_GAP',
-        'medium',
-        `Round ${i} is missing from the round sequence`,
-        `rounds present: ${[...seenRounds].sort((a, b) => a - b).join(', ') || 'none'}.`,
-      )
+  // ROUND_GAP: only flag gaps WITHIN the range of actually-present round
+  // numbers. Non-contiguous starts (e.g. a resumed run beginning at round 5)
+  // and arbitrary round numbering are supported by the aggregate engine, so
+  // missing 1..N prefixes are NOT defects. Checks min..max of present rounds.
+  const present = [...seenRounds].sort((a, b) => a - b)
+  if (present.length > 0) {
+    const min = present[0]!
+    const max = present[present.length - 1]!
+    for (let i = min; i <= max; i++) {
+      if (!seenRounds.has(i)) {
+        add(
+          'ROUND_GAP',
+          'medium',
+          `Round ${i} is missing from the round sequence`,
+          `rounds present: ${present.join(', ')}.`,
+        )
+      }
     }
   }
 

package/src/method-scope.ts

@@ -96,6 +96,8 @@ const SIGNATURE_PATTERNS: Array<{ kind: string; re: RegExp; nameIndex: number }>
 export function collectMethodSignatures(text: string): MethodSignature[] {
   const lines = text.split('\n')
   const out: MethodSignature[] = []
+  // Set lookup instead of scanning the growing array (O(S²) → O(S)).
+  const seen = new Set<string>()
   for (let i = 0; i < lines.length; i++) {
     const raw = lines[i]!
     const line = i + 1
@@ -105,7 +107,9 @@ export function collectMethodSignatures(text: string): MethodSignature[] {
       const name = m[p.nameIndex]
       if (!name || RESERVED_WORDS.has(name) || CALLABLE_NOISE.has(name)) continue
       // Avoid two patterns claiming the same line (e.g. TS method + arrow).
-      if (out.some((s) => s.line === line && s.name === name)) break
+      const key = `${line}|${name}`
+      if (seen.has(key)) break
+      seen.add(key)
       out.push({ name, line })
       break
     }