@feng0531/dsh-code-review 0.23.3 → 0.24.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 变更记录
 
+## 0.24.1
+
+- 历史上下文关系分别对基线/目标文本推断，标记contextSide/contextVersion；缺少oldText不回退目标正文。
+- 避免旧import绑定新definition；263测试通过，不增读取调用。
+
+## 0.24.0
+
+- 历史旧侧import/include导航未修改上下文，保留oldText/oldRevision/目标revision，context-old检索身份分离并校验来源。
+- 同时保留目标侧正文，原总文件/大小预算与排除边界不变；旧侧独有/删除上下文和调用者搜索尚不支持。
+
 ## 0.23.3
 
 - 发布验收实际有界下载npm tarball并逐字节/内容SHA512验证，不再仅相信metadata integrity；tarball404重试耗尽失败。

package/README.md

@@ -4,7 +4,9 @@
 
 ## 当前状态
 
-当前代码版本为 0.23.3
+当前代码版本为 0.24.1
+
+历史自动上下文也导航旧侧import/include，仅未修改且两侧普通blob；上下文oldText/oldRevision和目标revision明确，检索context-old单独身份，仍共用20文件总量及4MiB快照。旧侧独有/删除上下文暂不捕获，调用者覆盖仍不保证。
 
 单提交审查直接读取原始commit头的父节点，不受浅克隆遍历边界影响；缺失父树明确失败且不自动fetch，不能把非根提交当空旧侧。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feng0531/dsh-code-review",
-  "version": "0.23.3",
+  "version": "0.24.1",
   "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/git-history.mjs

@@ -25,10 +25,10 @@ export async function captureGitHistory(cwd, options={}) {
  if(options.autoContext!==undefined&&typeof options.autoContext!=='boolean')throw new Error('Invalid autoContext option');
  if(!Array.isArray(rulePaths)||rulePaths.some(p=>contextPaths.includes(p)))throw new Error('Rule paths must be separate from context paths');
  const context=[], regular=e=>e?.type==='blob'&&['100644','100755'].includes(e.mode);
- const captureContext=async name=>{relativePath(name);const changed=files.find(f=>f.path===name);if(changed){if(changed.eligibility!=='reviewable'||changed.rightExists===false)throw new Error('Historical context is excluded blocked or deleted');return {path:name,...changed.right};}const entry=right.get(name);if(!regular(entry))throw new Error('Historical context not a target regular blob');return {path:name,...decode(await git(root,['cat-file','blob',entry.oid],maxFileBytes))};};
+ const captureContext=async name=>{relativePath(name);const changed=files.find(f=>f.path===name);if(changed){if(changed.eligibility!=='reviewable'||changed.rightExists===false)throw new Error('Historical context is excluded blocked or deleted');return {path:name,...changed.right};}const entry=right.get(name);if(!regular(entry))throw new Error('Historical context not a target regular blob');const content=decode(await git(root,['cat-file','blob',entry.oid],maxFileBytes));const previous=left.get(name);return {path:name,...content,revision:target,...(regular(previous)?{oldText:decode(await git(root,['cat-file','blob',previous.oid],maxFileBytes)).text,oldRevision:base}:{})};};
  for(const name of [...new Set(contextPaths)].sort())context.push(await captureContext(name));
  const rules=await captureProjectRules(root,rulePaths,{signal,files,read:async (_root,name,{maxFileBytes:limit})=>{const entry=right.get(name);if(!regular(entry))throw new Error('Historical rule not a target regular blob');return decode(await git(root,['cat-file','blob',entry.oid],limit));}});
  let autoContext;
- if(options.autoContext===true){const plan=contextCandidates(files,[...right].filter(([,e])=>regular(e)).map(([p])=>p));autoContext={...plan,notice:'Direct target-tree import/include navigation only; no caller coverage, binding or working-tree reads.',target,candidates:plan.candidates.filter(c=>!contextPaths.includes(c.path)&&!rulePaths.includes(c.path)),capturedPaths:[]};for(const c of autoContext.candidates){signal?.throwIfAborted();if(context.length>=maxContextFiles){c.status='blocked';c.reason='Context file limit exceeded';continue;}try{context.push(await captureContext(c.path));c.status='captured';autoContext.capturedPaths.push(c.path);}catch(error){signal?.throwIfAborted();c.status='blocked';c.reason=error.message;}}}
+ if(options.autoContext===true){const plan=contextCandidates(files,[...right].filter(([,e])=>regular(e)).map(([p])=>p));const oldPlan=contextCandidates(files.map(f=>f.eligibility==='reviewable'?{...f,right:f.left,rightExists:true}:f),[...left].filter(([p,e])=>regular(e)&&regular(right.get(p))&&!names.includes(p)).map(([p])=>p));const combined=new Map(plan.candidates.map(c=>[c.path,{...c,sourceSides:['new']}]));for(const c of oldPlan.candidates){if(combined.has(c.path))combined.get(c.path).sourceSides.push('old');else combined.set(c.path,{...c,sourceSides:['old']});}plan.candidates=[...combined.values()].sort((a,b)=>a.path<b.path?-1:a.path>b.path?1:0);plan.truncated ||= oldPlan.truncated;autoContext={...plan,notice:'Direct baseline/target-tree import/include navigation only; no caller coverage, binding or working-tree reads.',target,base,candidates:plan.candidates.filter(c=>!contextPaths.includes(c.path)&&!rulePaths.includes(c.path)),capturedPaths:[]};for(const c of autoContext.candidates){signal?.throwIfAborted();if(context.length>=maxContextFiles){c.status='blocked';c.reason='Context file limit exceeded';continue;}try{context.push(await captureContext(c.path));c.status='captured';autoContext.capturedPaths.push(c.path);}catch(error){signal?.throwIfAborted();c.status='blocked';c.reason=error.message;}}}
  const snapshot={context,...(rules.length?{rules}:{}),...(autoContext?{autoContext}:{}),schemaVersion:1,vcs:'git',root,baseline:base,history:{mode:commit!==undefined?'commit':'range',base,target,semantics:'exact-tree-endpoints; renames represented as add/delete'},files};const serialized=JSON.stringify(snapshot);if(Buffer.byteLength(serialized)>maxSnapshotBytes)throw new Error('Historical snapshot limit exceeded');return {...snapshot,id:hash(serialized)};
 }

package/src/primary-input.mjs

@@ -16,7 +16,7 @@ export function preparePrimaryInput(input, file, { instructions, scope, grouping
   const contextRelations = inferContextRelations(input, file);
   if (contextRelations.length) {
     base.contextRelations = contextRelations;
-    base.contextRelationNotice = '导入/include/命名与调用位置仅为语法线索；可能被宏、构建搜索路径或同名局部变量影响，不证明绑定、可达性或因果。context为批准当前文本，不是old历史内容。';
+    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 })));

package/src/retrieval-scope.mjs

@@ -27,6 +27,10 @@ export function createRetrievalScope(snapshot, options) {
       continue;
     }
     add(item.path, 'context', item.text);
+    if (item.oldText !== undefined) {
+      if (!snapshot.history || item.oldRevision !== snapshot.history.base || item.revision !== snapshot.history.target || typeof item.oldText !== 'string') throw new Error('Invalid historical context provenance');
+      add(item.path, 'context-old', item.oldText);
+    }
   }
   const reader = createSnapshotReader(snapshot.id, entries, options);
   return Object.freeze({ ...reader, catalog: () => structuredClone(catalog) });