@feng0531/dsh-code-review 0.82.3 → 0.83.1

package/src/import-bindings.mjs

@@ -1,81 +1,90 @@
 // Conservative direct exported-function hints, never execution/reachability proof.
+function identifierPattern(name, suffix, flags = '') {
+  return new RegExp('(^|[^A-Za-z0-9_$])' + name.replaceAll('$', '\\$') + suffix, flags);
+}
+
 export function directImportBindings(lines, importLine, calls, targetText) {
- if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
- const match = /^\s*import\s+\{([^}]+)\}\s+from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(lines[importLine - 1]);
- if (!match) return [];
- const bindings = match[1].split(',').map(part => /^\s*([A-Za-z_$][A-Za-z0-9_$]*)(?:\s+as\s+([A-Za-z_$][A-Za-z0-9_$]*))?\s*$/.exec(part));
- if (bindings.some(b => !b)) return [];
- const targets = targetText.split(String.fromCharCode(10)), result = [];
- for (const binding of bindings) {
-  const imported = binding[1], local = binding[2] ?? imported;
-  const token = new RegExp('(^|[^A-Za-z0-9_$])' + local.replaceAll('$', '\\$') + '([^A-Za-z0-9_$]|$)');
-  const positions = calls.filter(c => c.local === local);
-  if (!positions.length) continue;
-  // Arguments may mutate/escape the alias on the SAME indexed call line.
-  // Keep a hint only when the sole local token is the call callee.
-  const occurrences = new RegExp('(^|[^A-Za-z0-9_$])' + local.replaceAll('$', '\\$') + '(?=[^A-Za-z0-9_$]|$)', 'g');
-  if (positions.some(call => [...lines[call.line - 1].matchAll(occurrences)].length !== 1)) continue;
-  // Every other occurrence may be declaration, parameter, mutation or escape.
-  if (lines.some((line, i) => i + 1 !== importLine && !positions.some(c => c.line === i + 1) && token.test(line))) continue;
-  const declarations = uniqueApprovedDeclarations(targets, imported);
-  if (declarations.length !== 1) continue;
-  const exportedToken = new RegExp('(^|[^A-Za-z0-9_$])' + imported.replaceAll('$', String.fromCharCode(92) + '$') + '([^A-Za-z0-9_$]|$)');
-  if (targets.some((line, i) => i + 1 !== declarations[0].number && exportedToken.test(line))) continue;
-  result.push(...positions.map(call => ({ imported, local, importLine, callLine: call.line, declarationLine: declarations[0].number, declarationKind: declarations[0].kind, confidence: 'conservative-syntax-only' })));
- }
- return result.slice(0, 20);
+  if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
+  const match = /^\s*import\s+\{([^}]+)\}\s+from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(lines[importLine - 1]);
+  if (!match) return [];
+  const bindings = match[1].split(',').map(part => /^\s*([A-Za-z_$][A-Za-z0-9_$]*)(?:\s+as\s+([A-Za-z_$][A-Za-z0-9_$]*))?\s*$/.exec(part));
+  if (bindings.some(b => !b)) return [];
+  const targets = targetText.split(String.fromCharCode(10));
+  const result = [];
+  for (const binding of bindings) {
+    const imported = binding[1], local = binding[2] ?? imported;
+    const token = identifierPattern(local, '([^A-Za-z0-9_$]|$)');
+    const positions = calls.filter(c => c.local === local);
+    if (!positions.length) continue;
+    // Arguments may mutate/escape the alias on the SAME indexed call line.
+    // Keep a hint only when the sole local token is the call callee.
+    const occurrences = identifierPattern(local, '(?=[^A-Za-z0-9_$]|$)', 'g');
+    if (positions.some(call => [...lines[call.line - 1].matchAll(occurrences)].length !== 1)) continue;
+    // Every other occurrence may be declaration, parameter, mutation or escape.
+    if (lines.some((line, i) => i + 1 !== importLine && !positions.some(c => c.line === i + 1) && token.test(line))) continue;
+    const declarations = uniqueApprovedDeclarations(targets, imported);
+    if (declarations.length !== 1) continue;
+    const exportedToken = identifierPattern(imported, '([^A-Za-z0-9_$]|$)');
+    if (targets.some((line, i) => i + 1 !== declarations[0].number && exportedToken.test(line))) continue;
+    result.push(...positions.map(call => ({ imported, local, importLine, callLine: call.line, declarationLine: declarations[0].number, declarationKind: declarations[0].kind, confidence: 'conservative-syntax-only' })));
+  }
+  return result.slice(0, 20);
 }
 
 // Only one direct declaration inside already approved text. No extra file reads.
 export function uniqueApprovedDeclarations(lines, imported) {
- if (!Array.isArray(lines) || lines.length > 20000 || typeof imported !== 'string' || !/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(imported)) return [];
- const text=lines.join(String.fromCharCode(10));
- if (lines.some(line=>typeof line!=='string') || Buffer.byteLength(text)>256*1024 || text.includes('/*') || text.includes(String.fromCharCode(96)) || text.includes(String.fromCharCode(92,10)) || text.includes(String.fromCharCode(92,13,10))) return [];
- const forms = [
-  ['function', /^\s*export\s+(?:async\s+)?function\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*\(/],
-  ['const', /^\s*export\s+(?:const|let)\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*=/],
-  ['class', /^\s*export\s+class\s+([A-Za-z_$][A-Za-z0-9_$]*)(?=\s|\{)/]
- ];
- const found = [];
- for (let i = 0; i < lines.length; i++) {
-  for (const [kind, pattern] of forms) {
-   if (pattern.exec(lines[i])?.[1] === imported) found.push({ number: i + 1, kind });
+  if (!Array.isArray(lines) || lines.length > 20000 || typeof imported !== 'string' || !/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(imported)) return [];
+  const text = lines.join(String.fromCharCode(10));
+  if (lines.some(line => typeof line !== 'string') || Buffer.byteLength(text) > 256 * 1024 || text.includes('/*') || text.includes(String.fromCharCode(96)) || text.includes(String.fromCharCode(92, 10)) || text.includes(String.fromCharCode(92, 13, 10))) return [];
+  const forms = [
+    ['function', /^\s*export\s+(?:async\s+)?function\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*\(/],
+    ['const', /^\s*export\s+(?:const|let)\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*=/],
+    ['class', /^\s*export\s+class\s+([A-Za-z_$][A-Za-z0-9_$]*)(?=\s|\{)/],
+  ];
+  const found = [];
+  for (let i = 0; i < lines.length; i++) {
+    for (const [kind, pattern] of forms) {
+      if (pattern.exec(lines[i])?.[1] === imported) found.push({ number: i + 1, kind });
+    }
   }
- }
- if (found.length !== 1) return [];
- const occurrences=new RegExp('(^|[^A-Za-z0-9_$])'+imported.replaceAll('$','\\$')+'(?=[^A-Za-z0-9_$]|$)','g');
- if ([...lines[found[0].number-1].matchAll(occurrences)].length!==1) return [];
- const token = new RegExp('(^|[^A-Za-z0-9_$])' + imported.replaceAll('$', '\\$') + '([^A-Za-z0-9_$]|$)');
- if (lines.some((line, i) => i + 1 !== found[0].number && token.test(line))) return [];
- return found;
+  if (found.length !== 1) return [];
+  const occurrences = identifierPattern(imported, '(?=[^A-Za-z0-9_$]|$)', 'g');
+  if ([...lines[found[0].number - 1].matchAll(occurrences)].length !== 1) return [];
+  const token = identifierPattern(imported, '([^A-Za-z0-9_$]|$)');
+  if (lines.some((line, i) => i + 1 !== found[0].number && token.test(line))) return [];
+  return found;
 }
 
 // Named imports only. Missing, duplicate, comment, or reexport names stay unresolved.
 export function namedImportDefinitions(importLine, targetText) {
- if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
- const match = /^\s*import\s+(?:[A-Za-z_$][A-Za-z0-9_$]*\s*,\s*)?\{([^}]+)\}\s+from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(importLine);
- if (!match) return [];
- const names = match[1].split(',').map(part => /^\s*([A-Za-z_$][A-Za-z0-9_$]*)(?:\s+as\s+([A-Za-z_$][A-Za-z0-9_$]*))?\s*$/.exec(part));
- if (!names.length || names.some(item => !item) || new Set(names.map(item => item[1])).size !== names.length || new Set(names.map(item => item[2] ?? item[1])).size !== names.length) return [];
- const lines = targetText.split(String.fromCharCode(10)), result = [];
- for (const name of names) {
-  const found = uniqueApprovedDeclarations(lines, name[1]);
-  if (found.length === 1) result.push({ imported: name[1], declarationLine: found[0].number, declarationKind: found[0].kind, confidence: 'approved-unique-syntax-only' });
- }
- return result.slice(0, 20);
+  if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
+  const match = /^\s*import\s+(?:[A-Za-z_$][A-Za-z0-9_$]*\s*,\s*)?\{([^}]+)\}\s+from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(importLine);
+  if (!match) return [];
+  const names = match[1].split(',').map(part => /^\s*([A-Za-z_$][A-Za-z0-9_$]*)(?:\s+as\s+([A-Za-z_$][A-Za-z0-9_$]*))?\s*$/.exec(part));
+  if (!names.length || names.some(item => !item) || new Set(names.map(item => item[1])).size !== names.length || new Set(names.map(item => item[2] ?? item[1])).size !== names.length) return [];
+  const lines = targetText.split(String.fromCharCode(10));
+  const result = [];
+  for (const name of names) {
+    const found = uniqueApprovedDeclarations(lines, name[1]);
+    if (found.length === 1) result.push({ imported: name[1], declarationLine: found[0].number, declarationKind: found[0].kind, confidence: 'approved-unique-syntax-only' });
+  }
+  return result.slice(0, 20);
 }
 
 // Unique default export inside already approved text; anonymous defaults keep their line only.
 export function defaultImportDefinition(importLine, targetText) {
- if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
- if (targetText.includes(String.fromCharCode(92,10)) || targetText.includes(String.fromCharCode(92,13,10))) return [];
- const match = /^\s*import\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*(?:,\s*\{[^}]*\}\s*)?from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(importLine);
- if (!match) return [];
- const lines = targetText.split(String.fromCharCode(10)), declarations = [];
- for (let i = 0; i < lines.length; i++) if (/^\s*export\s+default\b/.test(lines[i])) declarations.push(i + 1);
- if (declarations.length !== 1) return [];
- const line = lines[declarations[0] - 1];
- const kind = /^\s*export\s+default\s+(?:function|class)\b/.test(line) ? 'default-declaration' : /^\s*export\s+default\s+[^=;]+;\s*(?:\/\/.*)?$/.test(line) ? 'default-expression' : undefined;
- if (!kind) return [];
- return [{ imported: 'default', local: match[1], declarationLine: declarations[0], declarationKind: kind, confidence: 'approved-default-syntax-only' }];
+  if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
+  if (targetText.includes(String.fromCharCode(92, 10)) || targetText.includes(String.fromCharCode(92, 13, 10))) return [];
+  const match = /^\s*import\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*(?:,\s*\{[^}]*\}\s*)?from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(importLine);
+  if (!match) return [];
+  const lines = targetText.split(String.fromCharCode(10));
+  const declarations = [];
+  for (let i = 0; i < lines.length; i++) if (/^\s*export\s+default\b/.test(lines[i])) declarations.push(i + 1);
+  if (declarations.length !== 1) return [];
+  const line = lines[declarations[0] - 1];
+  const kind = /^\s*export\s+default\s+(?:function|class)\b/.test(line) ? 'default-declaration'
+    : /^\s*export\s+default\s+[^=;]+;\s*(?:\/\/.*)?$/.test(line) ? 'default-expression'
+    : undefined;
+  if (!kind) return [];
+  return [{ imported: 'default', local: match[1], declarationLine: declarations[0], declarationKind: kind, confidence: 'approved-default-syntax-only' }];
 }

package/src/job-progress.mjs

@@ -0,0 +1,21 @@
+import { recoveryCoverage } from './recovery-coverage.mjs';
+
+const NOTICE = 'Percent measures terminal primary-file processing, not successful review or synthesis completion. Unknown capture denominator is null, never invented.';
+
+export function jobProgress(record) {
+  const r = recoveryCoverage(record);
+  const counts = { completed: 0, excluded: 0, blocked: 0, failed: 0, cancelled: 0, pending: 0 };
+  for (const f of r.files) counts[f.status] = (counts[f.status] ?? 0) + 1;
+  const terminal = !['queued', 'running'].includes(record.status);
+  const processed = r.files.filter(f => !['pending'].includes(f.status)).length;
+  return {
+    stage: record.stage,
+    terminal,
+    elapsedMs: Date.now() - Date.parse(record.createdAt),
+    total: r.manifestSaved ? r.files.length : null,
+    counts,
+    processed,
+    percent: r.manifestSaved && r.files.length ? Math.floor(100 * processed / r.files.length) : null,
+    notice: NOTICE,
+  };
+}

package/src/model-contract.mjs

@@ -1,2 +1,18 @@
 // Describe only transport shape; never invent evidence or fill missing fields.
-export function modelContract(input,instructions=''){let p;try{p=JSON.parse(input);}catch{return '';}if(!p||typeof p!=='object'||Array.isArray(p))return '';if(Array.isArray(p.candidates))return '本阶段必须返回 {"verdicts":[{"candidateId":"c1","verdict":"uncertain","reason":"证据不足原因","evidence":[]}]}，candidateId必须来自本次candidates；supported/refuted证据规则仍按原指令。不是findings响应。';if(/返回\{groups:/.test(instructions))return '本阶段返回groups数组，每项含fileIds和reason，文件身份必须来自输入，不是findings响应。';if(/仅制定审查计划/.test(instructions))return '本阶段返回 {"risks":[]} 或原指令要求的风险条目，不是findings。';if(p.sourceMode==='file-interaction')return '本阶段返回 {"findings":[],"limitations":[]}；发现必须包含原指令全部字段和跨文件interaction.editRefs。无足够跨文件证据时说明limitations，不编造。';if(p.file)return '本阶段最终返回 {"findings":[],"limitations":[]}。每项finding必须含fileId、severity（critical/high/medium/low）、title、evidence、trigger、impact、suggestion和anchor；fileId原样复制file.id，不用文件名替代。anchor.line用side/start/end/snippet且精确匹配原行；需要更多证据可按检索协议先返回requests。';return ''; }
+const VERDICT_CONTRACT = '本阶段必须返回 {"verdicts":[{"candidateId":"c1","verdict":"uncertain","reason":"证据不足原因","evidence":[]}]}，candidateId必须来自本次candidates；supported/refuted证据规则仍按原指令。不是findings响应。';
+const GROUPS_CONTRACT = '本阶段返回groups数组，每项含fileIds和reason，文件身份必须来自输入，不是findings响应。';
+const RISK_CONTRACT = '本阶段返回 {"risks":[]} 或原指令要求的风险条目，不是findings。';
+const INTERACTION_CONTRACT = '本阶段返回 {"findings":[],"limitations":[]}；发现必须包含原指令全部字段和跨文件interaction.editRefs。无足够跨文件证据时说明limitations，不编造。';
+const FINDINGS_CONTRACT = '本阶段最终返回 {"findings":[],"limitations":[]}。每项finding必须含fileId、severity（critical/high/medium/low）、title、evidence、trigger、impact、suggestion和anchor；fileId原样复制file.id，不用文件名替代。anchor.line用side/start/end/snippet且精确匹配原行；需要更多证据可按检索协议先返回requests。';
+
+export function modelContract(input, instructions = '') {
+  let p;
+  try { p = JSON.parse(input); } catch { return ''; }
+  if (!p || typeof p !== 'object' || Array.isArray(p)) return '';
+  if (Array.isArray(p.candidates)) return VERDICT_CONTRACT;
+  if (/返回\{groups:/.test(instructions)) return GROUPS_CONTRACT;
+  if (/仅制定审查计划/.test(instructions)) return RISK_CONTRACT;
+  if (p.sourceMode === 'file-interaction') return INTERACTION_CONTRACT;
+  if (p.file) return FINDINGS_CONTRACT;
+  return '';
+}

package/src/primary-input.mjs

@@ -1,5 +1,5 @@
-import {sourceSegments} from './source-segments.mjs';
-import {changeRegion} from './change-region.mjs';
+import { sourceSegments } from './source-segments.mjs';
+import { changeRegion } from './change-region.mjs';
 import { CONTEXT_SIDE_NOTICE } from './context-identity.mjs';
 import { approvedCallerBindings } from './caller-binding-input.mjs';
 import { REQUIREMENT_NOTICE } from './business-requirement.mjs';
@@ -14,44 +14,85 @@ import { changeWindows } from './change-windows.mjs';
 import { changeMap } from './change-map.mjs';
 import { initialInputBudget } from './input-budget.mjs';
 
+const CPP_FILE = /\.(?:c|cc|cpp|cxx|h|hh|hpp|hxx)$/;
+const RELATION_NOTICE = '命名和相对导入关系仅为源码线索，可能被同名局部变量遮蔽，不证明绑定、调用可达或因果；只报告主file的问题，不为relatedFiles重复生成发现。';
+const optional = h => h.confidence === 'namespace-member-syntax-only' || h.confidence === 'instance-method-syntax-only';
+
 // Pure preparation over already captured data. No model calls or new reads.
 export function preparePrimaryInput(input, file, { instructions, scope, grouping, maxInputBytes }) {
   let changes = changeMap(file.left.text, file.right.text);
-  if(changes.status==='limited'){const region=changeRegion(file.left.text,file.right.text);if(region.status==='changed')changes={status:'changed',precision:'envelope',reason:'Exact diff unavailable; broad region includes potentially unchanged lines, not exact edits or causal proof.',edits:[{id:'envelope1',old:region.old,new:region.new}],hunks:[{id:'envelope-h1',old:region.old,new:region.new,editIds:['envelope1']}]};}
-  const base = { ...(input.projectScope?{projectScope:input.projectScope,reviewNotice:'Full current-file review; empty left is a sentinel, not a historical baseline. changes are transport coordinates only, do not infer introduced regression.'}:{}), ...(input.history ? {contextSideNotice:CONTEXT_SIDE_NOTICE} : {}), ...(input.businessRequirement!==undefined?{businessRequirement:input.businessRequirement,requirementNotice:REQUIREMENT_NOTICE}:{}), defectGuidance: defectGuidance(file.path, file.rightExists === false ? file.left.text : file.right.text), snapshotId: input.id, file, changes, context: input.context ?? [], rules: input.rules ?? [] };
+  if (changes.status === 'limited') {
+    const region = changeRegion(file.left.text, file.right.text);
+    if (region.status === 'changed') {
+      changes = {
+        status: 'changed', precision: 'envelope',
+        reason: 'Exact diff unavailable; broad region includes potentially unchanged lines, not exact edits or causal proof.',
+        edits: [{ id: 'envelope1', old: region.old, new: region.new }],
+        hunks: [{ id: 'envelope-h1', old: region.old, new: region.new, editIds: ['envelope1'] }],
+      };
+    }
+  }
+
+  const base = {
+    ...(input.projectScope ? { projectScope: input.projectScope, reviewNotice: 'Full current-file review; empty left is a sentinel, not a historical baseline. changes are transport coordinates only, do not infer introduced regression.' } : {}),
+    ...(input.history ? { contextSideNotice: CONTEXT_SIDE_NOTICE } : {}),
+    ...(input.businessRequirement !== undefined ? { businessRequirement: input.businessRequirement, requirementNotice: REQUIREMENT_NOTICE } : {}),
+    defectGuidance: defectGuidance(file.path, file.rightExists === false ? file.left.text : file.right.text),
+    snapshotId: input.id,
+    file,
+    changes,
+    context: input.context ?? [],
+    rules: input.rules ?? [],
+  };
+
   const contextRelations = inferContextRelations(input, file);
   if (contextRelations.length) {
     base.contextRelations = contextRelations;
     base.contextRelationNotice = '导入/include/命名与调用位置仅为语法线索；可能被宏、构建搜索路径或同名局部变量影响，不证明绑定、可达性或因果。context.text为批准当前/目标侧文本；仅明确oldText/oldRevision字段是历史旧侧，禁止互换。';
   }
-  if (/\.(?:c|cc|cpp|cxx|h|hh|hpp|hxx)$/.test(file.path)) {
-    const calls = ['old','new'].flatMap(side => cppCallSites((side === 'old' ? file.left : file.right).text).map(site => ({ ...site, side })));
-    if (calls.length) { base.cppCallSites = calls; base.cppCallNotice = '最多20条零参语法位置/侧，仅导航子集；不表示全部调用覆盖，不证明宏展开、重载选择、动态分派或执行顺序。其他源码须在批准范围内读取。'; }
+
+  if (CPP_FILE.test(file.path)) {
+    const calls = ['old', 'new'].flatMap(side => cppCallSites((side === 'old' ? file.left : file.right).text).map(site => ({ ...site, side })));
+    if (calls.length) {
+      base.cppCallSites = calls;
+      base.cppCallNotice = '最多20条零参语法位置/侧，仅导航子集；不表示全部调用覆盖，不证明宏展开、重载选择、动态分派或执行顺序。其他源码须在批准范围内读取。';
+    }
   }
+
   const csharpHints = inferCsharpContext(input, file);
-  if (csharpHints.length) { base.csharpContextHints = csharpHints; base.csharpContextNotice = '仅批准context的C#静态类型/方法语法位置；历史输入按contextSide/contextVersion区分正文，无旧正文不回退目标侧。不证明语义绑定或执行可达。歧义不推定，线索不增加审查覆盖。'; }
+  if (csharpHints.length) {
+    base.csharpContextHints = csharpHints;
+    base.csharpContextNotice = '仅批准context的C#静态类型/方法语法位置；历史输入按contextSide/contextVersion区分正文，无旧正文不回退目标侧。不证明语义绑定或执行可达。歧义不推定，线索不增加审查覆盖。';
+  }
+
   if (input.callerDiscovery) {
     const callerBindings = approvedCallerBindings(input, file);
-    if (callerBindings.length) { base.callerBindings = callerBindings; base.callerBindingNotice = '调用方文件的导入行、调用行与目标声明行仅为语法位置线索，来源限于已批准上下文；历史side/revision要求调用方与目标声明同版本，缺侧不回退。仅导航，窗口中的原文须按相应版本catalog读取；不证明执行可达、动态分派、重载选择或完整调用覆盖，也不代表全部调用方。'; }
+    if (callerBindings.length) {
+      base.callerBindings = callerBindings;
+      base.callerBindingNotice = '调用方文件的导入行、调用行与目标声明行仅为语法位置线索，来源限于已批准上下文；历史side/revision要求调用方与目标声明同版本，缺侧不回退。仅导航，窗口中的原文须按相应版本catalog读取；不证明执行可达、动态分派、重载选择或完整调用覆盖，也不代表全部调用方。';
+    }
   }
+
   let payload = JSON.stringify(base);
   const measure = value => initialInputBudget({ instructions, input: value }, scope, maxInputBytes);
   const metadata = {};
-  const optional = h => h.confidence === 'namespace-member-syntax-only' || h.confidence === 'instance-method-syntax-only';
+
   // Optional member navigation must not block source review or force extra windows.
-  if (base.contextRelations?.some(e=>e.bindingHints?.some(optional)) && !measure(payload).fits) {
+  if (base.contextRelations?.some(e => e.bindingHints?.some(optional)) && !measure(payload).fits) {
     metadata.optionalBindingFallback = 'input-budget';
-    metadata.omittedOptionalBindingCount = base.contextRelations.reduce((n,e)=>n+(e.bindingHints??[]).filter(optional).length,0);
-    base.contextRelations = base.contextRelations.map(e=>({...e,bindingHints:(e.bindingHints??[]).filter(h=>!optional(h))}));
+    metadata.omittedOptionalBindingCount = base.contextRelations.reduce((n, e) => n + (e.bindingHints ?? []).filter(optional).length, 0);
+    base.contextRelations = base.contextRelations.map(e => ({ ...e, bindingHints: (e.bindingHints ?? []).filter(h => !optional(h)) }));
     payload = JSON.stringify(base);
   }
   // Optional navigation must not block source review or force extra windows.
   if (base.callerBindings?.length && !measure(payload).fits) {
     metadata.callerBindingFallback = 'input-budget';
-    metadata.omittedCallerBindingCount = base.callerBindings.reduce((count,c)=>count+c.bindings.length,0);
-    delete base.callerBindings; delete base.callerBindingNotice;
+    metadata.omittedCallerBindingCount = base.callerBindings.reduce((count, c) => count + c.bindings.length, 0);
+    delete base.callerBindings;
+    delete base.callerBindingNotice;
     payload = JSON.stringify(base);
   }
+
   let batches, synthesis;
   const group = grouping?.groups.find(g => g.fileIds.includes(file.id));
   if (group) {
@@ -59,32 +100,48 @@ export function preparePrimaryInput(input, file, { instructions, scope, grouping
     const relatedFiles = input.files.filter(f => f.id !== file.id && f.eligibility === 'reviewable' && group.fileIds.includes(f.id));
     if (relatedFiles.length) {
       const relations = grouping.links.filter(link => !link.split && group.fileIds.includes(link.from) && group.fileIds.includes(link.to));
-      const bindingRelations = inferImportRelations(input.files).filter(edge => (edge.bindingHints?.length || edge.definitionHints?.length) && (edge.from === file.id || edge.to === file.id) && group.fileIds.includes(edge.from) && group.fileIds.includes(edge.to)).map(({ from, to, side, bindingHints, definitionHints }) => ({ from, to, side, bindingHints, ...(definitionHints?.length ? { definitionHints } : {}) }));
-      const grouped = JSON.stringify({ ...base, relatedFiles, relations, bindingRelations, relationNotice: '命名和相对导入关系仅为源码线索，可能被同名局部变量遮蔽，不证明绑定、调用可达或因果；只报告主file的问题，不为relatedFiles重复生成发现。' });
-      if (measure(grouped).fits) { payload = grouped; metadata.relatedFileIds = relatedFiles.map(f => f.id); }
-      else {
+      const bindingRelations = inferImportRelations(input.files)
+        .filter(edge => (edge.bindingHints?.length || edge.definitionHints?.length) && (edge.from === file.id || edge.to === file.id) && group.fileIds.includes(edge.from) && group.fileIds.includes(edge.to))
+        .map(({ from, to, side, bindingHints, definitionHints }) => ({ from, to, side, bindingHints, ...(definitionHints?.length ? { definitionHints } : {}) }));
+      const grouped = JSON.stringify({ ...base, relatedFiles, relations, bindingRelations, relationNotice: RELATION_NOTICE });
+      if (measure(grouped).fits) {
+        payload = grouped;
+        metadata.relatedFileIds = relatedFiles.map(f => f.id);
+      } else {
         // Optional member hints must not cost the grouped related sources either.
         const groupedOmitted = bindingRelations.reduce((n, e) => n + (e.bindingHints ?? []).filter(optional).length, 0);
         const trimmedRelations = bindingRelations.map(e => ({ ...e, bindingHints: (e.bindingHints ?? []).filter(h => !optional(h)) })).filter(e => e.bindingHints.length || e.definitionHints?.length);
-        const trimmed = JSON.stringify({ ...base, relatedFiles, relations, bindingRelations: trimmedRelations, relationNotice: '命名和相对导入关系仅为源码线索，可能被同名局部变量遮蔽，不证明绑定、调用可达或因果；只报告主file的问题，不为relatedFiles重复生成发现。' });
-        if (groupedOmitted && measure(trimmed).fits) { payload = trimmed; metadata.relatedFileIds = relatedFiles.map(f => f.id); metadata.optionalBindingFallback = 'input-budget'; metadata.omittedOptionalBindingCount = (metadata.omittedOptionalBindingCount ?? 0) + groupedOmitted; }
-        else metadata.groupFallback = 'input-budget';
+        const trimmed = JSON.stringify({ ...base, relatedFiles, relations, bindingRelations: trimmedRelations, relationNotice: RELATION_NOTICE });
+        if (groupedOmitted && measure(trimmed).fits) {
+          payload = trimmed;
+          metadata.relatedFileIds = relatedFiles.map(f => f.id);
+          metadata.optionalBindingFallback = 'input-budget';
+          metadata.omittedOptionalBindingCount = (metadata.omittedOptionalBindingCount ?? 0) + groupedOmitted;
+        } else {
+          metadata.groupFallback = 'input-budget';
+        }
       }
     }
   }
+
   if (!measure(payload).fits && scope) {
-    const exactWindows=changeWindows(file,changes);
-    const windows=exactWindows?sourceSegments(exactWindows):null;
+    const exactWindows = changeWindows(file, changes);
+    const windows = exactWindows ? sourceSegments(exactWindows) : null;
     if (windows) {
       const compactFile = { ...file, left: { ...file.left, text: undefined }, right: { ...file.right, text: undefined } };
       const contextCatalog = scope.catalog().filter(source => ['context', 'context-old'].includes(source.side));
       if (contextCatalog.length) metadata.contextMode = 'approved-retrieval';
       const windowBase = { ...base };
       if (base.cppCallSites?.length) {
-        windowBase.cppCallSites = base.cppCallSites.map(({line,expression,side})=>({line,expression,side}));
+        windowBase.cppCallSites = base.cppCallSites.map(({ line, expression, side }) => ({ line, expression, side }));
         windowBase.cppCallNotice = '最多40条旧/新侧零参语法导航；统一confidence=syntax-only-unresolved，可能为宏/重载/动态分派，无绑定、可达性或顺序保证，不是证据或完整覆盖。原文仍须按批准catalog读取。';
       }
-      const compact = JSON.stringify({ ...windowBase, context: [], contextCatalog, contextMode: 'approved-retrieval', contextNotice: '上下文全文仍在同一批准快照，仅目录进入窗口初始输入；必须按sourceId和版本侧read原文，不把目录视为证据或完整覆盖。', file: compactFile, windows, sourceMode: 'change-windows', windowNotice: '窗口可能为精确hunk的分段或粗粒度包络，精度以changes.precision为准；片段两侧不保证行对齐，不以片段证明精确编辑或回归因果。start/count为原始源码行号，不得重编号。完整源码未随初始输入发送，可在catalog批准范围内检索；缺少上下文时说明限制。' });
+      const compact = JSON.stringify({
+        ...windowBase, context: [], contextCatalog, contextMode: 'approved-retrieval',
+        contextNotice: '上下文全文仍在同一批准快照，仅目录进入窗口初始输入；必须按sourceId和版本侧read原文，不把目录视为证据或完整覆盖。',
+        file: compactFile, windows, sourceMode: 'change-windows',
+        windowNotice: '窗口可能为精确hunk的分段或粗粒度包络，精度以changes.precision为准；片段两侧不保证行对齐，不以片段证明精确编辑或回归因果。start/count为原始源码行号，不得重编号。完整源码未随初始输入发送，可在catalog批准范围内检索；缺少上下文时说明限制。',
+      });
       if (!measure(compact).fits) {
         const envelope = JSON.parse(compact);
         const plan = planWindowBatches(windows, subset => JSON.stringify({ ...envelope, windows: subset, windowNotice: '本批仅审查windows包含的编辑，其他hunk另批；行号为原始行号，跨片段上下文不足说明限制。' }), measure);
@@ -105,11 +162,13 @@ export function preparePrimaryInput(input, file, { instructions, scope, grouping
       }
     }
   }
+
   if (batches?.length > 1) {
     synthesis = prepareWindowSynthesis(batches.map(batch => batch.payload), measure);
     metadata.synthesisStatus = synthesis.budget.fits ? 'ready' : 'input-blocked';
     metadata.synthesisInputBytes = synthesis.budget.bytes;
   }
+
   const budget = measure(payload);
   return { changes, payload, batches, synthesis, budget, metadata: { ...metadata, initialInputBytes: budget.bytes } };
 }

package/src/project-report.mjs

@@ -1,6 +1,23 @@
-import {markdownReport} from './review.mjs';
-export function renderProjectReport(report){
- const seen=new Set(),findings=[];for(const f of report.findings??[]){const key=JSON.stringify([f.path,f.anchor,f.title,f.evidence]);if(!seen.has(key)){seen.add(key);findings.push(f);}}
- const merged={...report,findings,interactions:(report.batches??[]).flatMap(b=>b.interactions??[]),limitations:(report.batches??[]).flatMap(b=>b.limitations??[])};
- return markdownReport(merged).replace('# Code Review 报告','# 全项目代码审查报告')+'\n\n总体范围：'+report.coverage.completed+'/'+report.coverage.total+' 个文件完成主审；排除 '+report.coverage.excluded+'，阻断 '+report.coverage.blocked+'，未完成 '+report.coverage.pending+'。综合未完成项单独列出；主审完成不等于审核通过。'+(report.outdated?'\n注意：来源已变化或无法复核，仅对应原批准快照。':'');
+import { markdownReport } from './review.mjs';
+
+function dedupeFindings(findings) {
+  const seen = new Set();
+  const result = [];
+  for (const f of findings ?? []) {
+    const key = JSON.stringify([f.path, f.anchor, f.title, f.evidence]);
+    if (!seen.has(key)) { seen.add(key); result.push(f); }
+  }
+  return result;
+}
+
+export function renderProjectReport(report) {
+  const merged = {
+    ...report,
+    findings: dedupeFindings(report.findings),
+    interactions: (report.batches ?? []).flatMap(b => b.interactions ?? []),
+    limitations: (report.batches ?? []).flatMap(b => b.limitations ?? []),
+  };
+  const scope = '总体范围：' + report.coverage.completed + '/' + report.coverage.total + ' 个文件完成主审；排除 ' + report.coverage.excluded + '，阻断 ' + report.coverage.blocked + '，未完成 ' + report.coverage.pending + '。综合未完成项单独列出；主审完成不等于审核通过。';
+  const outdated = report.outdated ? '\n注意：来源已变化或无法复核，仅对应原批准快照。' : '';
+  return markdownReport(merged).replace('# Code Review 报告', '# 全项目代码审查报告') + '\n\n' + scope + outdated;
 }