@feng0531/dsh-code-review 0.24.0 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 变更记录
 
+## 0.25.0
+
+- 跨文件交互批次也制定风险假设，至少两文件精确editRefs，同一主调用signal及全局预算，不冒充证据。
+- 实际生成输入/单文件假设拒绝/调用耗尽回归，业务组集成更新额外规划调用。
+
+## 0.24.1
+
+- 历史上下文关系分别对基线/目标文本推断，标记contextSide/contextVersion；缺少oldText不回退目标正文。
+- 避免旧import绑定新definition；263测试通过，不增读取调用。
+
 ## 0.24.0
 
 - 历史旧侧import/include导航未修改上下文，保留oldText/oldRevision/目标revision，context-old检索身份分离并校验来源。

package/README.md

@@ -4,7 +4,7 @@
 
 ## 当前状态
 
-当前代码版本为 0.24.0
+当前代码版本为 0.25.0
 
 历史自动上下文也导航旧侧import/include，仅未修改且两侧普通blob；上下文oldText/oldRevision和目标revision明确，检索context-old单独身份，仍共用20文件总量及4MiB快照。旧侧独有/删除上下文暂不捕获，调用者覆盖仍不保证。
 

package/package.json

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

package/src/context-relations.mjs

@@ -4,6 +4,19 @@ import { inferImportRelations } from './import-relations.mjs';
 // Context entries are already sent with every primary. These annotations add
 // explanations only, never reads, group members, or reviewed coverage.
 export function inferContextRelations(input, file) {
+  if (input.history) {
+    const relations=[];
+    for (const side of ['old','new']) {
+      const contexts=(input.context ?? []).filter(c=>side==='new'||typeof c.oldText==='string').map(c=>({...c,text:side==='old'?c.oldText:c.text}));
+      const text=side==='old'?file.left.text:file.right.text;
+      // Infer each version independently: never bind an old import to target definitions.
+      const one={...file,left:{...file.left,text:''},right:{...file.right,text}};
+      const version=side==='old'?input.history.base:input.history.target;
+      const scoped={...input,history:undefined,context:contexts};
+      relations.push(...inferContextRelations(scoped,one).filter(e=>e.side!=='old').map(e=>({...e,side:e.fromPath===file.path?side:side==='old'?'context-old':'context',contextVersion:version,contextSide:side})));
+    }
+    return relations.slice(0,2000);
+  }
   const paths = new Set(input.files.map(f => f.path));
   const contexts = (input.context ?? []).filter(c => !paths.has(c.path));
   const primary = { ...file, id: 'primary' };

package/src/review.mjs

@@ -157,12 +157,14 @@ export async function reviewSnapshot(snapshot, model, options = {}) {
         for (const batch of batches) {
         enclosingRequest.signal.throwIfAborted();
         let batchPayload = batch.payload;
-        if (options.enableRiskPlanning === true && !batch.synthesis && !batch.interaction) {
+        if (options.enableRiskPlanning === true && !batch.synthesis) {
           state.riskPlans ??= [];
-          const entry = { status: 'pending', windowIds: batch.windowIds, risks: [] };
+          const entry = { status: 'pending', windowIds: batch.windowIds, ...(batch.interaction ? {groupId:batch.interaction.id,sourceMode:'file-interaction'} : {}), risks: [] };
           state.riskPlans.push(entry);
           const response = await executor({ ...enclosingRequest, input: batch.payload, instructions: RISK_PLAN_INSTRUCTIONS });
-          const risks = validateRiskPlan(response, [{ fileId: file.id, edits: changes.edits ?? [] }], scope?.catalog() ?? []);
+          const riskFiles = batch.interaction ? JSON.parse(batch.payload).files : [{ fileId: file.id, edits: changes.edits ?? [] }];
+          const risks = validateRiskPlan(response, riskFiles, scope?.catalog() ?? []);
+          if (batch.interaction && risks.some(r=>new Set(r.editRefs.map(ref=>ref.fileId)).size<2)) throw new Error('Interaction risk requires edits across at least two files');
           entry.status = 'completed'; entry.risks = risks;
           batchPayload = JSON.stringify({ ...JSON.parse(batch.payload), riskPlan: risks, riskPlanNotice: '未可信假设而非发现或证据；须验证及寻找反证，不增加读取权限。' });
           if (!initialInputBudget({ instructions: REVIEW_INSTRUCTIONS, input: batchPayload }, scope, maxInputBytes).fits) throw new Error('Risk-enriched review input exceeds budget');