@feng0531/dsh-code-review 0.11.1 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 变更记录
 
+## 0.12.0
+
+- 多批主文件增加有界跨窗口综合，使用完整原始窗口定位目录及批准快照读取，不把目录当作源码证据。
+- 综合发现必须引用至少两个不同窗口编辑，且每个引用编辑的非空旧/新侧至少一侧在本阶段read完整覆盖；保持原始定位和精确证据复核。
+- 综合与局部/复核共享每文件超时、全局调用及读取额度；预检包含综合初始请求，局部覆盖和综合状态分别记录，超限/耗尽/取消不冒完成。
+- 离线集成覆盖综合检索、旧新证据凭据复核、取消和预算边界；不扩权限、不证明模型结论质量，不自动升级宿主。
+
 ## 0.11.1
 
 - 0.11.0候选标签Windows CI发现临时目录8.3短路径与canonical长路径的测试比较差异，未触发正式发布。夹具根统一realpath，保留生产路径安全校验不放宽；原标签不移动，使用新候选。

package/README.md

@@ -4,12 +4,16 @@
 
 ## 当前状态
 
-当前代码版本为 0.11.1，包含有界覆盖预检、显式项目规则及候选证据与反证复核；发布状态以 npm 和 GitHub Release 为准。已通过真实临时 Git/SVN 仓库测试，以及隔离进程中的真实 DSH ToolRuntime 注册验证。当前开发会话的实际预览已返回0.6.0的plan/rules字段，空变更预览与默认关闭外发已验证；已进行经宿主审批的六次小规模真实试跑，累计12次模型调用；四组合成正负例与历史修复对照符合预期，历史引入方向检出候选但引用复核未完成（partial）。不是独立盲测或整体质量证明。详情见 [试跑结果](evaluation/PILOT-RESULTS.md)。
+当前代码版本为 0.12.0，包含有界覆盖预检、显式项目规则及候选证据与反证复核；发布状态以 npm 和 GitHub Release 为准。已通过真实临时 Git/SVN 仓库测试，以及隔离进程中的真实 DSH ToolRuntime 注册验证。当前开发会话的实际预览已返回0.6.0的plan/rules字段，空变更预览与默认关闭外发已验证；已进行经宿主审批的六次小规模真实试跑，累计12次模型调用；四组合成正负例与历史修复对照符合预期，历史引入方向检出候选但引用复核未完成（partial）。不是独立盲测或整体质量证明。详情见 [试跑结果](evaluation/PILOT-RESULTS.md)。
 
 ## 工作区下多个子仓库（0.11.0）
 
 当会话目录不是仓库而其子目录含Git/SVN仓库时，预览可指定 `repositoryPath`，例如会话位于工作区根时传 `{ "repositoryPath": "c3animation" }`。该参数必须是工作区相对路径（正斜杠），指向明确仓库根；不能使用绝对路径、上级路径或链接目录。文件、上下文、规则路径仍相对此次选定仓库。多个子仓库分别预览和审批执行，不混用快照；execute只接收previewId，不能另改目标。省略参数保持原行为。使用此参数需宿主安装0.11.0或更新版本；仓库发布不会自动更新当前宿主。
 
+## 跨窗口综合分析（0.12.0）
+
+主文件需要多批精确窗口时，在局部分析后追加一次有界综合检查。完整原始窗口目录不充当源码；综合发现必须引用至少两个不同窗口的编辑，每个引用编辑至少一个非空旧/新侧必须在本综合生成阶段被批准read完整覆盖（不能借用前批/复核审计或search）。使用原定位及证据复核，不截断规则/context。共享原每文件超时和全局调用/读取额度；预检minimumCalls包含综合初始请求，后续检索复核另计。synthesisStatus独立记录pending/completed/blocked，局部窗口完成不表示综合完成；输入超限或预算耗尽不冒算覆盖。读取覆盖及模型分析仍不证明跨路径正确性或因果事实，真实模型质量未新增验证。
+
 ## 修改前后对照复核（0.11.0）
 
 复核可返回 `regression`：`introduced`（模型判断本次引入）、`preexisting`（模型判断原有问题）、`uncertain`（对照不足）。前两者必须引用候选主文件旧新两侧的已精确校验证据，索引指向本候选复核 `evidence` 数组；空源或缺少任一侧时不能虚构支持。旧协议缺省标为 `unassessed`，关闭复核同样明确未评估。报告保留全部候选并展示分类、理由及 `regressionCoverage`；模型支持但对照不足进入限制。分类及引用有效不等于因果事实成立，也不宣称真实模型质量提升已获验证。去重隔离分类/理由/证据索引冲突，uncertain及unassessed不折叠。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feng0531/dsh-code-review",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" },

package/src/coverage-plan.mjs

@@ -14,7 +14,7 @@ export function buildCoveragePlan(input, options) {
     const item = { fileId: file.id, path: file.path, status: file.eligibility, minimumCalls: 0 };
     if (file.eligibility !== 'reviewable') return item;
     const prepared = preparePrimaryInput(input, file, options);
-    return { ...item, ...prepared.metadata, status: prepared.budget.fits ? 'ready' : 'input-blocked', minimumCalls: prepared.budget.fits ? (prepared.batches?.length ?? 1) : 0 };
+    return { ...item, ...prepared.metadata, status: prepared.budget.fits ? 'ready' : 'input-blocked', minimumCalls: prepared.budget.fits ? ((prepared.batches?.length ?? 1) + (prepared.synthesis?.budget.fits ? 1 : 0)) : 0 };
   });
   return { snapshotId: input.id, maxInputBytes: options.maxInputBytes, items, minimumCalls: items.reduce((sum,item) => sum + item.minimumCalls, 0), initialRequestsOnly: true };
 }

package/src/primary-input.mjs

@@ -1,4 +1,5 @@
 import { inferContextRelations } from './context-relations.mjs';
+import { prepareWindowSynthesis } from './window-synthesis.mjs';
 import { planWindowBatches } from './window-batches.mjs';
 import { changeWindows } from './change-windows.mjs';
 import { changeMap } from './change-map.mjs';
@@ -16,7 +17,7 @@ export function preparePrimaryInput(input, file, { instructions, scope, grouping
   let payload = JSON.stringify(base);
   const measure = value => initialInputBudget({ instructions, input: value }, scope, maxInputBytes);
   const metadata = {};
-  let batches;
+  let batches, synthesis;
   const group = grouping?.groups.find(g => g.fileIds.includes(file.id));
   if (group) {
     metadata.groupId = group.id;
@@ -53,6 +54,11 @@ 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, budget, metadata: { ...metadata, initialInputBytes: budget.bytes } };
+  return { changes, payload, batches, synthesis, budget, metadata: { ...metadata, initialInputBytes: budget.bytes } };
 }

package/src/review.mjs

@@ -1,5 +1,6 @@
 import { validateWindowFindings } from './window-findings.mjs';
 import { groupDuplicateFindings } from './finding-groups.mjs';
+import { validateSynthesisReads } from './synthesis-evidence.mjs';
 import { hash } from './content.mjs';
 import { coverageFollowup } from './coverage-followup.mjs';
 import { verificationLoop } from './verification-loop.mjs';
@@ -92,6 +93,8 @@ export async function reviewSnapshot(snapshot, model, options = {}) {
     const prepared = preparePrimaryInput(input, file, { instructions: REVIEW_INSTRUCTIONS, scope, grouping: report.grouping, maxInputBytes });
     const { changes, payload } = prepared;
     Object.assign(state, prepared.metadata);
+    if (prepared.synthesis) state.synthesisStatus = prepared.synthesis.budget.fits ? 'pending' : 'blocked';
+    if (prepared.synthesis && !prepared.synthesis.budget.fits) report.limitations.push({ fileId: file.id, text: '跨窗口综合输入超限，未发送；单窗口完成不表示交互影响已检查' });
     if (state.sourceMode === 'change-windows') state.windowCoverage = { completed: [], pending: [...state.windowIds] };
     if (changes.status === 'limited') report.limitations.push({ fileId: file.id, text: '精确变更分析受限：' + changes.reason + '；仍按完整两侧内容审查' });
     if (state.groupFallback) report.limitations.push({ fileId: file.id, text: '关联组上下文超过输入预算，回退单文件审查' });
@@ -110,12 +113,15 @@ export async function reviewSnapshot(snapshot, model, options = {}) {
         } })
         : request => { beforeCall(); return model(request); };
       await invoke(async enclosingRequest => {
-        const batches = prepared.batches ?? [{ payload, windowIds: state.windowIds ?? [] }];
+        const batches = [...(prepared.batches ?? [{ payload, windowIds: state.windowIds ?? [] }])];
+        if (prepared.synthesis?.budget.fits) batches.push({ payload: prepared.synthesis.payload, windowIds: [], synthesis: true });
         for (const batch of batches) {
         enclosingRequest.signal.throwIfAborted();
         const request = { ...enclosingRequest, input: batch.payload };
+        const auditStart = state.retrievalAudit?.length ?? 0;
         const generated = validateResponse(await executor(request), file, changes);
-        if (state.sourceMode === 'change-windows') validateWindowFindings(generated.findings, JSON.parse(batch.payload).windows);
+        if (batch.synthesis) validateSynthesisReads(generated.findings, changes, (state.retrievalAudit ?? []).slice(auditStart), scope.catalog(), file.id, input.id);
+        if (state.sourceMode === 'change-windows') validateWindowFindings(generated.findings, batch.synthesis ? prepared.synthesis.windows : JSON.parse(batch.payload).windows, batch.synthesis === true);
         request.signal.throwIfAborted();
         report.findings.push(...generated.findings);
         if (generated.findings.some(f => f.attribution.status === 'missing')) report.limitations.push({ fileId: file.id, text: '部分发现缺少变更归因，仅校验了定位，尚不能确认属于本次回归' });
@@ -138,6 +144,7 @@ export async function reviewSnapshot(snapshot, model, options = {}) {
             request.signal.throwIfAborted();
           }
         }
+        if (batch.synthesis) state.synthesisStatus = 'completed';
         if (state.windowCoverage) {
           state.windowCoverage.completed.push(...batch.windowIds);
           state.windowCoverage.pending = state.windowCoverage.pending.filter(id => !batch.windowIds.includes(id));
@@ -184,6 +191,7 @@ export function markdownReport(report) {
     for (const file of report.files) if (file.relatedFileIds?.length) output.push('- ' + safe(file.path) + '：输入包含 ' + file.relatedFileIds.length + ' 个关联文件');
   }
   for (const file of report.files) if (file.windowCoverage) output.push('- ' + safe(file.path) + '：变更窗口已完成 ' + file.windowCoverage.completed.length + '，待审 ' + file.windowCoverage.pending.length + '；仅表示窗口分析完成，不证明全文正确');
+  for (const file of report.files) if (file.synthesisStatus) output.push('- ' + safe(file.path) + '：跨窗口综合 ' + safe(file.synthesisStatus) + '；不等于事实正确性证明');
   if (report.rules?.length) output.push('', '## 项目规则', '规则仅为已批准约束数据，不扩大权限或证明缺陷。', ...report.rules.map(rule => '- ' + safe(rule.path) + ' · SHA256 ' + safe(rule.hash)));
   if (report.followup?.suggestedPaths.length) output.push('', '## 后续选择建议', '仅为原快照未完成项；不会自动续审。再次执行需新预览、新审批，并显式选择规则和上下文。阻断项需先处理原因；关联上下文不等于主文件已审查。', ...report.followup.items.filter(item => item.followup).map(item => '- ' + safe(item.path) + '：' + item.status + (item.incompleteVerification ? '（候选复核未完成）' : '')));
   output.push('', '## 审查发现');

package/src/synthesis-evidence.mjs

@@ -0,0 +1,17 @@
+// Audit only successful reads from this synthesis generation, never prior batches/searches.
+export function validateSynthesisReads(findings, changes, reads, catalog, fileId, snapshotId) {
+ const sources = new Map(catalog.map(s => [s.id, s]));
+ for (const finding of findings) {
+  for (const id of finding.attribution.editIds) {
+   const edit = changes.edits.find(e => e.id === id);
+   const covered = ['old', 'new'].some(side => {
+    const range = edit?.[side];
+    return range?.count > 0 && reads.some(r => {
+     const source = sources.get(r.sourceId);
+     return r.kind === 'read' && r.snapshotId === snapshotId && source?.fileId === fileId && source.side === side && r.start <= range.start && r.start + r.count >= range.start + range.count;
+    });
+   });
+   if (!covered) throw new Error('Synthesis referenced edit was not read in this generation');
+  }
+ }
+}

package/src/window-findings.mjs

@@ -1,9 +1,10 @@
 // Called after ordinary snapshot/attribution validation, before accepting batch findings.
-export function validateWindowFindings(findings, windows) {
+export function validateWindowFindings(findings, windows, synthesis = false) {
   const edits = new Set(windows.flatMap(w => w.editIds));
   for (const finding of findings) {
     const attribution = finding.attribution;
     if (attribution.status !== 'references-validated' || !attribution.editIds?.length || attribution.editIds.some(id => !edits.has(id))) throw new Error('Finding outside current window edits');
+    if (synthesis && windows.filter(w => w.editIds.some(id => attribution.editIds.includes(id))).length < 2) throw new Error('Synthesis finding must reference multiple windows');
     const anchor = finding.anchor;
     if (anchor.kind === 'line' && !windows.some(w => {
       const range = w[anchor.side];

package/src/window-synthesis.mjs

@@ -0,0 +1,12 @@
+// Pure approved-data preparation, no reads or sends. No source text is silently clipped.
+export function prepareWindowSynthesis(batchPayloads, measure) {
+  if (!Array.isArray(batchPayloads) || batchPayloads.length < 2 || batchPayloads.length > 20) throw new Error('Invalid synthesis batches');
+  const batches = batchPayloads.map(payload => JSON.parse(payload));
+  const base = batches[0];
+  const windows = batches.flatMap(batch => batch.windows);
+  if (batches.some(batch => batch.snapshotId !== base.snapshotId || batch.file.id !== base.file.id || batch.sourceMode !== 'change-windows') || windows.length > 200 || new Set(windows.map(w => w.id)).size !== windows.length) throw new Error('Inconsistent synthesis windows');
+  const windowIndex = windows.map(w => ({ id: w.id, editIds: w.editIds, old: { start: w.old.start, count: w.old.count }, new: { start: w.new.start, count: w.new.count } }));
+  const payload = JSON.stringify({ ...base, windows: undefined, windowIndex, sourceMode: 'window-synthesis', windowNotice: '本请求综合检查所有窗口的共同影响，不重报单窗口问题；windowIndex仅为原始定位目录，不含源码，必须在批准catalog中读取相关旧新片段，不能仅凭目录认定缺陷。输出仍仅主file的发现，归因至少关联两个不同窗口的编辑；证据不足明确限制。' });
+  const budget = measure(payload);
+  return { payload, windows, windowIds: windows.map(w => w.id), budget };
+}