@feng0531/dsh-code-review 0.14.0 → 0.16.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 变更记录
 
+## 0.16.0
+
+- 批准范围C++头/实现命名与quoted include关系接入现有分组综合，显式context原include位置及方向/当前版本注释。
+- C++零参独立调用原行导航，每侧20条，未解析宏/重载/动态，不冒充完整调用覆盖或因果。
+- 保留宿主审批闭集拒绝诊断，只有literal allowed-once放行；服务级拒绝0发送回归，不变更宿主策略。
+- 线程退出、调试器关闭、分配器生命周期缺陷/safe合成样本及跨文件精确凭据复核；230项全量与宿主只读离线冒烟通过，真实效果未测。
+
+## 0.15.0
+
+- C#显式批准上下文补窄范围静态类型/零参方法位置线索，原行号进入主输入及输入预算，无新增读取/权限。
+- 不支持目标仍保留为歧义竞争者，拒绝重载、同名遮蔽及畸形/类型外/嵌套声明；current context不冒充old历史。
+- 219项全量与宿主只读审批离线冒烟通过；仅语法提示，不是通用语义绑定或C++适配，不宣称真实模型质量。
+
 ## 0.14.0
 
 - 同一批准仓库关联组追加有界跨文件综合，2–4文件，目录精确编辑与本阶段原文read覆盖，不静默截断规则/context。

package/README.md

@@ -4,12 +4,24 @@
 
 ## 当前状态
 
-当前代码版本为 0.14.0，包含有界覆盖预检、显式项目规则及候选证据与反证复核；发布状态以 npm 和 GitHub Release 为准。已通过真实临时 Git/SVN 仓库测试，以及隔离进程中的真实 DSH ToolRuntime 注册验证。当前开发会话的实际预览已返回0.6.0的plan/rules字段，空变更预览与默认关闭外发已验证；已进行经宿主审批的六次小规模真实试跑，累计12次模型调用；四组合成正负例与历史修复对照符合预期，历史引入方向检出候选但引用复核未完成（partial）。不是独立盲测或整体质量证明。详情见 [试跑结果](evaluation/PILOT-RESULTS.md)。
+当前代码版本为 0.16.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或更新版本；仓库发布不会自动更新当前宿主。
 
+## C++关联与审批诊断（0.16.0）
+
+批准文件中的同目录唯一头/实现命名与字面量引号include进入现有关联分组，最多4文件的综合仍共享原读取/调用/生命周期预算。显式context注释保留from/to与include原行，current内容不冒充old历史。无需扫描新文件或执行编译器；系统include、构建搜索路径、条件宏和不支持文本不解析，同目录命名不证明绑定。
+
+主输入提供每侧最多20条零参独立调用原位置，含 `worker.join()`、`debugger->Close()`、`Allocator::Shutdown()` 等语法导航；标记未解析，不证明宏展开、重载选择、动态分派或执行顺序，也不表示全部调用覆盖。其他源码须批准范围内read获取。线程退出/调试器关闭/分配器生命周期合成缺陷与safe反例仅验证明确抽象契约及离线证据协议，不是编译或真实模型质量成绩。
+
+审批只有宿主字面量allowed-once放行；rejected/cancelled/unavailable分别诊断，缺失服务及异常值拒绝。不绕过用户策略，confirmed=true不代替批准；拒绝表示没有发送代码/没有审查，不是通过。检查执行会话的审批策略与UI可用性并重新预览，不自动修改宿主配置、安装或重启。本版本没有解决用户另会话具体拒绝配置，也没有完成其实际C++改动审查。
+
+## C#显式上下文位置线索（0.15.0）
+
+仅注释已批准.cs context，不增加读取或覆盖。支持file-scoped同namespace、静态class、public static零参void/int/bool/string方法与独立Type.Method()语法；保留调用/类型/方法原始行号。目标括号须平衡、方法直属类型；重载、同名竞争者（包括不支持语法）、局部遮蔽、using/partial/继承或动态等不推定绑定。有字符串/注释/预处理等不支持文本保守不生成线索，不影响普通源码审查。当前context明确不是old历史内容。不执行编译器、工程或用户源码，不冒充C++适配、语义绑定或可达性证明，线索不足仍须模型说明证据限制。
+
 ## 批准快照内跨文件综合（0.14.0）
 
 关联组最多4个批准主文件、至少2个文本变化时追加跨文件综合。目录保留完整精确编辑原位置，不作为源码证据；每条发现须引用至少2文件的 `interaction.editRefs:[{fileId,editId}]`，主attribution与主引用一致，原锚重叠主编辑，每个引用编辑至少一非空侧须本综合生成read完整覆盖。共享批准reader/全局调用额度，嵌入组最后主文件原超时，不重置生命周期；预检包含额外初始调用，检索复核另计。interactions独立记录pending/completed/blocked，跨组和未完成明确限制。不合并多文件候选，不自动扩文件/仓库。源码/规则/context仍不可信。真实模型样本未跑，安全反例空输出模拟不代表模型查准率；拒绝审批表示未审查不是通过。

package/index.mjs

@@ -1,3 +1,4 @@
+import { requestModelApproval } from './src/model-approval.mjs';
 import { createReviewService } from './src/service.mjs';
 export const name = 'dsh-code-review';
 export const inject = ['tools', 'llm', 'approval'];
@@ -5,10 +6,10 @@ export const inject = ['tools', 'llm', 'approval'];
 export function apply(ctx, config = {}) {
   const service = createReviewService(ctx.llm, {
     allowModelSending: config.allowModelSending === true,
-    authorize: async ({ snapshot, route, exec }) => (await ctx.approval.request({
+    authorize: async ({ snapshot, route, exec }) => requestModelApproval(ctx.approval, {
       agent: exec.agent, toolName: 'code_review_execute', signal: exec.signal,
       reason: '只读代码审查将发送代码给 ' + route.provider + '/' + route.model + '。仓库：' + snapshot.root + '；快照：' + snapshot.id + '；文件：' + JSON.stringify(snapshot.files.filter(f => f.eligibility === 'reviewable').map(f => f.path)) + '；上下文：' + JSON.stringify(snapshot.context.map(c => c.path)) + '；项目规则（全文将发送）：' + JSON.stringify((snapshot.rules ?? []).map(({ path, hash }) => ({ path, hash }))),
-    })) === 'allowed-once',
+    }),
   });
   const output = {
     schema: { type: 'object', additionalProperties: false, properties: { json: { type: 'string' }, markdown: { type: 'string' } }, required: ['json', 'markdown'] },

package/package.json

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

package/src/context-relations.mjs

@@ -1,3 +1,4 @@
+import { inferCppRelations } from './cpp-relations.mjs';
 import { inferImportRelations } from './import-relations.mjs';
 
 // Context entries are already sent with every primary. These annotations add
@@ -12,5 +13,7 @@ export function inferContextRelations(input, file) {
   const all = [primary, ...entries, ...competitors];
   if (all.length > 200) return [];
   const byId = new Map(all.map(f => [f.id, f.path]));
-  return inferImportRelations(all).filter(e => e.specifier && (e.from === 'primary' || e.to === 'primary')).map(e => ({ fromPath: byId.get(e.from), toPath: byId.get(e.to), side: e.from === 'primary' ? e.side : 'context', line: e.line, specifier: e.specifier, callSites: e.callSites, bindingHints: e.bindingHints, reason: 'relative-import:approved-context' }));
+  const imports = inferImportRelations(all).filter(e => e.specifier && (e.from === 'primary' || e.to === 'primary')).map(e => ({ fromPath: byId.get(e.from), toPath: byId.get(e.to), side: e.from === 'primary' ? e.side : 'context', line: e.line, specifier: e.specifier, callSites: e.callSites, bindingHints: e.bindingHints, reason: 'relative-import:approved-context' }));
+  const cpp = inferCppRelations(all).filter(e => e.from === 'primary' || e.to === 'primary').map(e => ({ fromPath: byId.get(e.from), toPath: byId.get(e.to), side: e.from === 'primary' ? e.side : 'context', line: e.line, specifier: e.specifier, reason: e.reason, contextVersion: 'approved-current-not-historical' }));
+  return [...imports, ...cpp].slice(0, 2000);
 }

package/src/cpp-call-sites.mjs

@@ -0,0 +1,14 @@
+// Syntactic zero-argument lifecycle call navigation only, not resolved bindings.
+export function cppCallSites(text) {
+ if (typeof text !== 'string' || Buffer.byteLength(text) > 256*1024 || /\/\*|R"|\\\r?\n/.test(text)) return [];
+ const lines = text.split(String.fromCharCode(10));
+ if (lines.some(line => /^\s*#\s*(?:define|undef|if|ifdef|ifndef|elif|else|endif)\b/.test(line))) return [];
+ const sites = [];
+ for (let i=0;i<lines.length;i++) {
+  const match = /^\s*((?:[A-Za-z_][A-Za-z0-9_]*(?:::|->|\.))*[A-Za-z_][A-Za-z0-9_]*)\s*\(\s*\)\s*;\s*(?:\/\/.*)?$/.exec(lines[i]);
+  if (!match) continue;
+  sites.push({ line:i+1, expression:match[1], confidence:'syntax-only-unresolved', notice:'May be macro, overload or dynamic dispatch; no binding or order guarantee.' });
+  if (sites.length === 20) break;
+ }
+ return sites;
+}

package/src/cpp-relations.mjs

@@ -0,0 +1,38 @@
+import path from 'node:path';
+const cpp = p => /\.(?:c|cc|cpp|cxx|h|hh|hpp|hxx)$/.test(p);
+// Same-directory names and literal quoted includes are navigation hints, not builds.
+export function inferCppRelations(files) {
+ if (!Array.isArray(files) || files.length > 200) throw new Error('Invalid C++ relation input');
+ const byPath = new Map(), ids = new Set();
+ for (const file of files) {
+  if (!file || typeof file.id !== 'string' || !file.id || ids.has(file.id) || typeof file.path !== 'string' || !file.path || file.path.includes('\\') || file.path.includes(':') || file.path.startsWith('/') || file.path.split('/').some(s => !s || s === '.' || s === '..') || byPath.has(file.path) || !['reviewable','excluded','blocked'].includes(file.eligibility)) throw new Error('Invalid C++ relation file');
+  ids.add(file.id); byPath.set(file.path,file);
+ }
+ const edges = [];
+ for (const file of files.filter(f => f.eligibility === 'reviewable' && cpp(f.path))) {
+  const stem = file.path.replace(/\.[^.]+$/, '');
+  const headers = files.filter(f => f.path.replace(/\.[^.]+$/, '') === stem && /\.(?:h|hh|hpp|hxx)$/.test(f.path));
+  const implementations = files.filter(f => f.path.replace(/\.[^.]+$/, '') === stem && /\.(?:c|cc|cpp|cxx)$/.test(f.path));
+  if (headers.length === 1 && implementations.length === 1 && headers[0].eligibility === 'reviewable' && implementations[0].eligibility === 'reviewable' && file.id === implementations[0].id) edges.push({from:file.id,to:headers[0].id,reason:'cpp-header-implementation-name'});
+  for (const side of ['old','new']) {
+   if (side === 'old' && file.oldPath && file.oldPath !== file.path) continue;
+   const text = (side === 'old' ? file.left : file.right)?.text;
+   if (typeof text !== 'string' || Buffer.byteLength(text) > 256*1024 || /\/\*|\\\r?\n|R"/.test(text)) continue;
+   const lines = text.split(String.fromCharCode(10));
+   // Conditional/macro includes are not resolved without a build configuration.
+   if (lines.some(line => /^\s*#\s*(?:if|ifdef|ifndef|elif|else|endif|define|undef)\b/.test(line))) continue;
+   for (let i=0;i<lines.length;i++) {
+    const match = /^\s*#\s*include\s+"([^"\\]+)"\s*(?:\/\/.*)?$/.exec(lines[i]);
+    if (!match || match[1].startsWith('/') || match[1].includes(':')) continue;
+    const targetPath = path.posix.normalize(path.posix.join(path.posix.dirname(file.path),match[1]));
+    if (targetPath.startsWith('../') || targetPath === '..') continue;
+    if (side === 'old' && files.some(f => f.oldPath && f.oldPath !== f.path && (f.oldPath === targetPath || f.path === targetPath))) continue;
+    const target = byPath.get(targetPath);
+    if (!target || target.id === file.id || target.eligibility !== 'reviewable' || !cpp(target.path)) continue;
+    edges.push({from:file.id,to:target.id,side,line:i+1,specifier:match[1],reason:'cpp-quoted-include:'+side+':L'+(i+1)});
+    if (edges.length >= 2000) return edges;
+   }
+  }
+ }
+ return edges.slice(0,2000);
+}

package/src/csharp-context.mjs

@@ -0,0 +1,46 @@
+// Approved text only, no compiler/module lookup. Intentionally narrow syntax hints.
+const safe = text => typeof text === 'string' && Buffer.byteLength(text) <= 256 * 1024 && !/["'\x60#]|\/\/|\/\*/.test(text);
+const namespaceOf = text => { const matches = [...text.matchAll(/^\s*namespace\s+([A-Za-z_][A-Za-z0-9_.]*)\s*;\s*$/gm)]; return matches.length === 1 ? matches[0][1] : null; };
+export function inferCsharpContext(input, primary) {
+ if (!primary.path.endsWith('.cs')) return [];
+ const contexts = (input.context ?? []).filter(c => c.path.endsWith('.cs') && !input.files.some(f => f.path === c.path));
+ const result = [];
+ for (const side of ['old', 'new']) {
+  const source = (side === 'old' ? primary.left : primary.right)?.text;
+  if (!safe(source) || /\busing\b|\bdynamic\b/.test(source)) continue;
+  const ns = namespaceOf(source); if (!ns) continue;
+  const lines = source.split(String.fromCharCode(10));
+  for (let i = 0; i < lines.length; i++) {
+   const call = /^\s*(?:await\s+)?([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)\s*\(\s*\)\s*;\s*$/.exec(lines[i]);
+   if (!call) continue;
+   const [, type, method] = call;
+   const token = new RegExp('\\b' + type + '\\b');
+   // Other occurrences may introduce a variable/type that shadows the qualifier.
+   if (lines.some((line,j) => j !== i && token.test(line))) continue;
+   // Unsupported declarations still compete; filtering them out must not create uniqueness.
+   const competitors = contexts.filter(c => typeof c.text !== 'string' || token.test(c.text));
+   if (competitors.length !== 1 || input.files.some(f => f !== primary && f.path.endsWith('.cs') && f.path.split('/').at(-1) === type + '.cs')) continue;
+   const candidates = competitors.filter(c => safe(c.text) && namespaceOf(c.text) === ns && !/\busing\b|\bpartial\b|\bvirtual\b|\boverride\b|\binterface\b/.test(c.text));
+   const declarations = [];
+   for (const context of candidates) {
+    const targetLines = context.text.split(String.fromCharCode(10));
+    const classes = targetLines.map((line,j) => ({ line, number:j+1 })).filter(item => /^\s*(?:public|internal)\s+static\s+class\s+([A-Za-z_][A-Za-z0-9_]*)\s*\{?\s*$/.exec(item.line)?.[1] === type);
+    // Only one type per file; no nesting, inheritance, generics or partial resolution.
+    if (classes.length !== 1 || (context.text.match(/\bclass\b|\bstruct\b|\brecord\b/g) ?? []).length !== 1) continue;
+    const occurrences = targetLines.filter(line => new RegExp('\\b' + method + '\\s*\\(').test(line));
+    const methods = targetLines.map((line,j) => ({ line, number:j+1 })).filter(item => new RegExp('^\\s*public\\s+static\\s+(?:void|int|bool|string)\\s+' + method + '\\s*\\(\\s*\\)\\s*(?:\\{|$)').test(item.line));
+    let depth = 0, typeDepth, methodDepth, malformed = false;
+    for (let j = 0; j < targetLines.length; j++) {
+     if (j + 1 === classes[0].number) typeDepth = depth;
+     if (j + 1 === methods[0]?.number) methodDepth = depth;
+     for (const character of targetLines[j]) { if (character === '{') depth++; if (character === '}') depth--; if (depth < 0) malformed = true; }
+    }
+    if (malformed || depth !== 0 || typeDepth !== 0 || methodDepth !== 1 || methods[0]?.number <= classes[0].number) continue;
+    if (occurrences.length === 1 && methods.length === 1) declarations.push({ contextPath:context.path, typeLine:classes[0].number, declarationLine:methods[0].number });
+   }
+   if (declarations.length === 1) result.push({ primaryPath:primary.path, side, contextVersion:'approved-current-not-historical', callLine:i+1, namespace:ns, type, method, ...declarations[0], confidence:'conservative-syntax-only' });
+   if (result.length >= 20) return result;
+  }
+ }
+ return result;
+}

package/src/file-relations.mjs

@@ -1,8 +1,9 @@
+import { inferCppRelations } from './cpp-relations.mjs';
 import { inferImportRelations } from './import-relations.mjs';
 
 export function inferFileRelations(files) {
   // Keep the existing group edge budget; naming hints have priority at the cap.
-  return [...inferTestRelations(files), ...inferImportRelations(files)].slice(0, 2000);
+  return [...inferTestRelations(files), ...inferImportRelations(files), ...inferCppRelations(files)].slice(0, 2000);
 }
 
 // Conservative naming hints only. No filesystem access or dependency claims.

package/src/model-approval.mjs

@@ -0,0 +1,8 @@
+// Host is the only authority. Never reinterpret truthy values as a grant.
+export async function requestModelApproval(approval, request) {
+ if (typeof approval?.request !== 'function') throw new Error('Model sending approval unavailable: host approval service missing; no code sent. Enable host approval before a new preview; confirmed=true is not a grant.');
+ const outcome = await approval.request(request);
+ if (outcome === 'allowed-once') return true;
+ const status = ['rejected', 'cancelled', 'unavailable'].includes(outcome) ? outcome : 'invalid-outcome';
+ throw new Error('Model sending approval denied or unavailable (' + status + '): no code sent, review not performed. Check host approval policy/UI availability; obtain allowed-once after a new preview. confirmed=true does not replace host approval.');
+}

package/src/primary-input.mjs

@@ -1,3 +1,5 @@
+import { cppCallSites } from './cpp-call-sites.mjs';
+import { inferCsharpContext } from './csharp-context.mjs';
 import { inferImportRelations } from './import-relations.mjs';
 import { inferContextRelations } from './context-relations.mjs';
 import { prepareWindowSynthesis } from './window-synthesis.mjs';
@@ -13,8 +15,14 @@ export function preparePrimaryInput(input, file, { instructions, scope, grouping
   const contextRelations = inferContextRelations(input, file);
   if (contextRelations.length) {
     base.contextRelations = contextRelations;
-    base.contextRelationNotice = '导入与调用位置仅为语法线索；可能被同名局部变量遮蔽，不证明绑定、可达性或因果。';
+    base.contextRelationNotice = '导入/include/命名与调用位置仅为语法线索；可能被宏、构建搜索路径或同名局部变量影响，不证明绑定、可达性或因果。context为批准当前文本，不是old历史内容。';
   }
+  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条零参语法位置/侧，仅导航子集；不表示全部调用覆盖，不证明宏展开、重载选择、动态分派或执行顺序。其他源码须在批准范围内读取。'; }
+  }
+  const csharpHints = inferCsharpContext(input, file);
+  if (csharpHints.length) { base.csharpContextHints = csharpHints; base.csharpContextNotice = '仅批准当前context的C#静态类型/方法语法位置；不证明语义绑定或执行可达，也不是旧侧历史上下文。歧义不推定，线索不增加审查覆盖。'; }
   let payload = JSON.stringify(base);
   const measure = value => initialInputBudget({ instructions, input: value }, scope, maxInputBytes);
   const metadata = {};