@feng0531/dsh-code-review 0.41.0 → 0.43.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -1
- package/CORE-ALIGNMENT-TASKS.md +7 -5
- package/DEVELOPMENT.md +1 -0
- package/README.md +2 -2
- package/RELEASE-NOTES.md +10 -13
- package/index.mjs +1 -1
- package/package.json +1 -1
- package/src/context-relations.mjs +1 -1
- package/src/import-bindings.mjs +41 -2
- package/src/import-relations.mjs +3 -2
- package/src/primary-input.mjs +1 -1
- package/src/snapshot.mjs +5 -13
- package/src/svn-dependency-chain.mjs +26 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,9 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
本文件介绍对使用者有意义的变化。安装与参数见 [README](README.md),本次发布正文见 [发布说明](RELEASE-NOTES.md)。历史提交和安装包保留在 [GitHub Releases](https://github.com/f-e-n-g-0531/dsh-code-review/releases);本文不把开发日志当作功能介绍。
|
|
4
4
|
|
|
5
|
+
## 0.43.1 — 已批准正文中的唯一定义位置
|
|
6
|
+
|
|
7
|
+
命名导入可标出已批准目标正文里唯一的 function、const、let 或 class 位置。没有调用也会进入审查输入;重复、注释、重导出和跨侧正文不猜测。默认导出与命名导入不混用,同一行竞争及续行字符串拒绝提示。不新增读取权限,也不表示完整语义绑定。v0.43.0 候选在发布前复核被替代,未作为正式交付。
|
|
8
|
+
|
|
9
|
+
## 0.42.0 — SVN 安全依赖链
|
|
10
|
+
|
|
11
|
+
SVN 工作副本的自动上下文支持最多三层依赖及手动入口。精确路径探测替代全上下文索引;读取前检查节点与祖先身份,捕获后重新核验。歧义、未跟踪依赖及不安全属性不取得正文权限,各层共享数量、字节与时间上限。已正式发布;400 项回归、实际宿主、独立安装及四组 CI 通过,公开安装包与原包一致。
|
|
12
|
+
|
|
5
13
|
## 0.41.0 — Git 历史两侧依赖链
|
|
6
14
|
|
|
7
|
-
启用 autoContext 后,提交和区间审查沿固定修改前后版本的静态依赖读取最多三层上下文。两侧共享预算;旧侧专用上下文保持旧侧权限,不读取工作区,不恢复排除或阻断内容。SVN
|
|
15
|
+
启用 autoContext 后,提交和区间审查沿固定修改前后版本的静态依赖读取最多三层上下文。两侧共享预算;旧侧专用上下文保持旧侧权限,不读取工作区,不恢复排除或阻断内容。SVN 仍为直接导航。已正式发布;393 项回归、实际宿主、独立安装及四组 CI 通过,公开安装包与原包一致。
|
|
8
16
|
|
|
9
17
|
## 0.40.0 — 手动上下文的依赖导航
|
|
10
18
|
|
package/CORE-ALIGNMENT-TASKS.md
CHANGED
|
@@ -23,22 +23,24 @@
|
|
|
23
23
|
|
|
24
24
|
| 优先级 | 未完成项 | 验收重点 |
|
|
25
25
|
|---|---|---|
|
|
26
|
-
| 1 |
|
|
27
|
-
| 2 | Git
|
|
26
|
+
| 1 | 必要语义调用者、别名及实例上下文 | 唯一定义位置已接入已批准正文;完整调用者与实例仍待验收 |
|
|
27
|
+
| 2 | 剩余历史来源与旧侧组合 | Git 历史与 SVN 三层链已交付;其他旧侧来源仍待验收 |
|
|
28
28
|
| 3 | 其他旧侧独有来源 | 来源、版本、权限与删除场景保持一致 |
|
|
29
29
|
| 4 | 剩余语言与路径专用指导 | 只提示具体缺陷和反证;不照搬风格禁令 |
|
|
30
30
|
| 5 | 剩余预算组合与端到端矩阵 | 分组、窗口、检索、多次审查的终态与覆盖一致 |
|
|
31
31
|
| 后置 | 真实模型质量评测 | 保存真实输出,人工裁决,分开统计失败和未完成 |
|
|
32
32
|
|
|
33
|
-
Git 工作区三层字面依赖链已实现并通过测试。这解决了“导入转发文件后,未取得后续实现正文”的部分问题,但仍不是完整定义绑定。本批还补齐了手动上下文作为链入口,真实 Git、服务与独立安装四项测试通过,388 项全量回归和实际宿主检查通过,已随 v0.40.0 正式交付。Git 历史三层链本批已实现,5 项独立安装验收及 393
|
|
33
|
+
Git 工作区三层字面依赖链已实现并通过测试。这解决了“导入转发文件后,未取得后续实现正文”的部分问题,但仍不是完整定义绑定。本批还补齐了手动上下文作为链入口,真实 Git、服务与独立安装四项测试通过,388 项全量回归和实际宿主检查通过,已随 v0.40.0 正式交付。Git 历史三层链本批已实现,5 项独立安装验收及 393 项回归、实际宿主检查通过,已随 v0.41.0 正式交付;SVN 安全三层链本批已实现,6 项独立安装验收及节点属性变化专项通过,400 项完整回归与实际宿主检查通过,已随 v0.42.0 正式交付。唯一定义位置本批已接入审查输入,原候选 8 项独立安装验收及 403 项回归通过;发布前复核发现默认导出误匹配,已修正并增加反例,v0.43.1 待完整复验和正式发布。
|
|
34
34
|
|
|
35
35
|
## 当前验证结论
|
|
36
36
|
|
|
37
|
-
- 最近完整回归:
|
|
37
|
+
- 最近完整回归:403 项通过。
|
|
38
38
|
- 实际 DSH 工具运行时检查通过;模型响应受控,不是质量成绩。
|
|
39
39
|
- v0.39.0 独立安装包的真实 Git、服务与预算测试:5 项通过。
|
|
40
40
|
- v0.39.1 已正式交付,包含 Git 工作区三层依赖能力。四组 CI 通过;npm、Release 与保存原包的 91,502 字节完全一致,SHA-256、SHA-512 和校验清单通过。v0.39.0 不单独计作已核验交付。
|
|
41
|
-
- v0.40.0 已正式交付手动上下文依赖导航。四组 CI 与唯一发布通过,npm、Release 与保存原包的 91,901
|
|
41
|
+
- v0.40.0 已正式交付手动上下文依赖导航。四组 CI 与唯一发布通过,npm、Release 与保存原包的 91,901 字节完全一致,双哈希及校验清单通过。准确语义绑定和剩余旧侧来源等差距仍保留。
|
|
42
|
+
- v0.42.0 已正式交付 SVN 安全三层链。400 项回归、实际宿主、独立安装与四组 CI 通过;npm、Release 与原包的 94,404 字节一致,双哈希及校验清单通过。
|
|
43
|
+
- v0.41.0 已正式交付 Git 历史两侧三层链。393 项回归、实际宿主、独立安装与四组 CI 通过;npm、Release 与原包的 93,202 字节一致,双哈希及校验清单通过。
|
|
42
44
|
|
|
43
45
|
## 不在范围内
|
|
44
46
|
|
package/DEVELOPMENT.md
CHANGED
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
- 每个主文件的模型与检索阶段共享默认 120 秒;关联综合沿用相关主文件的生命周期,不因切换阶段重新计时。
|
|
20
20
|
- 每阶段最多三轮检索;全局最多 50 次读取请求,返回内容累计 256 KiB,单次最多 64 KiB,读取最多 200 行。
|
|
21
21
|
- Git 工作区依赖链最多三层、512 个精确路径查询、20 个候选、手动入口与自动依赖共享 1 MiB 正文;文件读取与最终复核共享 30 秒。
|
|
22
|
+
- SVN 依赖链最多三层,以精确本地路径和安全正常节点捕获;512 路径、20 候选和上下文、1 MiB 来源及 30 秒含核验,拒绝切换、外部与特殊属性节点。
|
|
22
23
|
- Git 历史依赖链同样最多三层,两侧共享 512 个路径、20 个候选和上下文、1 MiB 正文及 30 秒;只读取固定对象。
|
|
23
24
|
- 引用方发现最多四个不重叠的非根目录;128 个候选正文共 1 MiB,目录索引最多 256 条/64 KiB,竞争路径最多 512 个。发现与复核共享 30 秒。
|
|
24
25
|
|
package/README.md
CHANGED
|
@@ -58,7 +58,7 @@ DSH 的只读代码审查插件。它比较 Git 或 SVN 中的代码变更,使
|
|
|
58
58
|
| selectedPaths | 只审查选中的变更文件 | ["src/api.ts"] |
|
|
59
59
|
| repositoryPath | 指定工作区内的子仓库 | "project-a" |
|
|
60
60
|
| contextPaths | 手动加入理解代码所需的文件 | ["src/types.ts"] |
|
|
61
|
-
| autoContext | 从变更及手动上下文寻找依赖;Git
|
|
61
|
+
| autoContext | 从变更及手动上下文寻找依赖;Git 和 SVN 最多沿三层依赖链读取 | true |
|
|
62
62
|
| callerScopePaths | 在指定目录中寻找引用变更文件的代码 | ["src/clients"] |
|
|
63
63
|
| oldContextPaths | Git 历史审查中,只加入旧版本的上下文 | ["src/removed-helper.ts"] |
|
|
64
64
|
| rulePaths | 加入项目审查规则,最多四个 UTF-8 Markdown 或文本文件 | ["review-rules.md"] |
|
|
@@ -67,7 +67,7 @@ DSH 的只读代码审查插件。它比较 Git 或 SVN 中的代码变更,使
|
|
|
67
67
|
|
|
68
68
|
commit 与 baseRevision/targetRevision 不能同时使用。oldContextPaths 只能用于 Git 历史审查。
|
|
69
69
|
|
|
70
|
-
自动上下文和引用方发现是保守的文本导航,不是编译器分析。动态导入、宏、重载、继承和实例方法可能无法解析;找到引用不等于证明函数实际被调用。Git 历史可沿修改前后两侧分别捕获最多三层依赖;SVN
|
|
70
|
+
自动上下文和引用方发现是保守的文本导航,不是编译器分析。动态导入、宏、重载、继承和实例方法可能无法解析;找到引用不等于证明函数实际被调用。Git 历史可沿修改前后两侧分别捕获最多三层依赖;SVN 可沿安全的当前工作副本节点取得最多三层依赖,不读取 SVN 历史。已批准正文中的唯一命名声明会标出位置;同名或跨侧内容不猜测。
|
|
71
71
|
|
|
72
72
|
## 如何读报告
|
|
73
73
|
|
package/RELEASE-NOTES.md
CHANGED
|
@@ -1,22 +1,19 @@
|
|
|
1
|
-
# v0.
|
|
1
|
+
# v0.43.1 发布说明
|
|
2
2
|
|
|
3
|
-
##
|
|
3
|
+
## 新增:已批准正文中的唯一定义位置
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
命名导入现在可以标出目标文件里唯一的直接声明位置,包括 function、const、let 和 class。没有实际调用时也会保留该位置,供审查输入使用。
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
只检查已经批准的变更或上下文正文,不新增文件读取,也不扫描整个仓库。
|
|
8
8
|
|
|
9
|
-
##
|
|
9
|
+
## 限制
|
|
10
10
|
|
|
11
|
-
-
|
|
12
|
-
-
|
|
13
|
-
-
|
|
14
|
-
- 自动取得的普通历史上下文沿用原有两侧正文规则;各版本的依赖分别解析,不用工作区猜测。
|
|
15
|
-
|
|
16
|
-
SVN 仍仅支持直接依赖。此功能是保守文本导航,不是完整定义绑定或语义调用图。
|
|
11
|
+
- 默认导出不能匹配命名导入;同一行重复名称、别名冲突、注释、模板、续行字符串、重导出或未导入名称不生成定义位置。
|
|
12
|
+
- 旧侧只使用旧正文,不会借用目标侧声明。
|
|
13
|
+
- 这些位置仍是语法线索,不证明语义绑定、调用可达或因果。
|
|
17
14
|
|
|
18
15
|
## 验证
|
|
19
16
|
|
|
20
|
-
|
|
17
|
+
测试覆盖无调用的唯一定义、旧侧隔离、重复声明和审查输入过滤。全量回归、实际宿主、独立安装和四组 CI 是正式发布条件,不是模型效果成绩。
|
|
21
18
|
|
|
22
|
-
使用方法见 [README](README.md)
|
|
19
|
+
使用方法见 [README](README.md),维护步骤见 [开发指南](DEVELOPMENT.md)。
|
package/index.mjs
CHANGED
|
@@ -12,7 +12,7 @@ export function apply(ctx, config = {}) {
|
|
|
12
12
|
};
|
|
13
13
|
ctx.tools.register({
|
|
14
14
|
name: 'code_review_preview', description: 'Preview Git/SVN working-copy or Git commit/range review scope and model destination without sending source to a model. repositoryPath selects an explicit child repository relative to session workspace; file paths are repository-relative. Preview each repository separately. Show the preview before execution.',
|
|
15
|
-
parameters: { type: 'object', additionalProperties: false, properties: { reviewRounds: { type: 'integer', minimum: 1, maximum: 3, description: 'Explicit independent review passes, default 1. Preview discloses extra sends; later passes omit the first risk plan. Shares existing timeout, call and retrieval budgets, not provider reasoning effort. Bound to this preview; execute cannot override.' }, oldContextPaths: { type: 'array', maxItems: 20, items: { type: 'string' }, description: 'Explicit Git historical baseline-only blob context paths. Shares 20 context slots. No target text is inferred; selected old changes reuse their original identity, excluded changes cannot reenter. Unsupported on working reviews and SVN.' }, callerScopePaths: { type: 'array', minItems: 1, maxItems: 4, items: { type: 'string' }, description: 'Explicit non-root repository-relative directories for bounded tracked literal reverse import/include discovery. Git/SVN working review or Git fixed commit/range review. SVN uses offline normal nodes, rejects unsafe ancestor states and special/keyword properties. Historical sides share scan budgets and use object blobs only. Preview reads candidate bodies, including nonmatches; only captured matching context is sent. Navigation only, not complete caller coverage.' }, businessRequirement: { type: 'string', maxLength: 16384, description: 'Optional business constraint text up to 16KiB UTF8; untrusted data, not evidence or permission. Bound to preview and sent in review phases.' }, commit: { type: 'string', description: 'Git commit versus sole parent; root empty, merge requires range.' }, baseRevision: { type: 'string', description: 'Git old endpoint; requires targetRevision, mutually exclusive with commit.' }, targetRevision: { type: 'string', description: 'Git new endpoint, exact tree endpoints not merge-base. Explicit context uses target tree with available baseline provenance; oldContextPaths is baseline-only. Historical caller discovery scans fixed sides; explicit rules use target-tree blobs.' }, repositoryPath: { type: 'string', description: 'Workspace-relative explicit child Git/SVN repository root, forward slashes; omit for current repository.' }, selectedPaths: { type: 'array', items: { type: 'string' }, maxItems: 200 }, autoContext: { type: 'boolean', description: 'Opt in to tracked literal import/include context shown in preview. Working Git follows changed and explicitly selected context sources at most 3 dependency layers under shared 512 exact probes, 20 candidates/context slots, 1MiB source and 30s verification budget. Git history follows at most 3 baseline/target dependency layers with shared limits, object reads only; SVN
|
|
15
|
+
parameters: { type: 'object', additionalProperties: false, properties: { reviewRounds: { type: 'integer', minimum: 1, maximum: 3, description: 'Explicit independent review passes, default 1. Preview discloses extra sends; later passes omit the first risk plan. Shares existing timeout, call and retrieval budgets, not provider reasoning effort. Bound to this preview; execute cannot override.' }, oldContextPaths: { type: 'array', maxItems: 20, items: { type: 'string' }, description: 'Explicit Git historical baseline-only blob context paths. Shares 20 context slots. No target text is inferred; selected old changes reuse their original identity, excluded changes cannot reenter. Unsupported on working reviews and SVN.' }, callerScopePaths: { type: 'array', minItems: 1, maxItems: 4, items: { type: 'string' }, description: 'Explicit non-root repository-relative directories for bounded tracked literal reverse import/include discovery. Git/SVN working review or Git fixed commit/range review. SVN uses offline normal nodes, rejects unsafe ancestor states and special/keyword properties. Historical sides share scan budgets and use object blobs only. Preview reads candidate bodies, including nonmatches; only captured matching context is sent. Navigation only, not complete caller coverage.' }, businessRequirement: { type: 'string', maxLength: 16384, description: 'Optional business constraint text up to 16KiB UTF8; untrusted data, not evidence or permission. Bound to preview and sent in review phases.' }, commit: { type: 'string', description: 'Git commit versus sole parent; root empty, merge requires range.' }, baseRevision: { type: 'string', description: 'Git old endpoint; requires targetRevision, mutually exclusive with commit.' }, targetRevision: { type: 'string', description: 'Git new endpoint, exact tree endpoints not merge-base. Explicit context uses target tree with available baseline provenance; oldContextPaths is baseline-only. Historical caller discovery scans fixed sides; explicit rules use target-tree blobs.' }, repositoryPath: { type: 'string', description: 'Workspace-relative explicit child Git/SVN repository root, forward slashes; omit for current repository.' }, selectedPaths: { type: 'array', items: { type: 'string' }, maxItems: 200 }, autoContext: { type: 'boolean', description: 'Opt in to tracked literal import/include context shown in preview. Working Git follows changed and explicitly selected context sources at most 3 dependency layers under shared 512 exact probes, 20 candidates/context slots, 1MiB source and 30s verification budget. Git history follows at most 3 baseline/target dependency layers with shared limits, object reads only; SVN follows at most 3 safe offline current-side layers with exact path probes and node/ancestor identity verification, sharing limits; no SVN historical review. Not semantic binding or complete definitions.' }, contextPaths: { type: 'array', items: { type: 'string' }, maxItems: 20 }, rulePaths: { type: 'array', items: { type: 'string' }, maxItems: 4 } } },
|
|
16
16
|
output,
|
|
17
17
|
async execute(args, exec) { const preview = await service.preview(args, exec); return { json: JSON.stringify(preview), markdown: '' }; },
|
|
18
18
|
});
|
package/package.json
CHANGED
|
@@ -26,7 +26,7 @@ export function inferContextRelations(input, file) {
|
|
|
26
26
|
const all = [primary, ...entries, ...competitors];
|
|
27
27
|
if (all.length > 200) return [];
|
|
28
28
|
const byId = new Map(all.map(f => [f.id, f.path]));
|
|
29
|
-
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' }));
|
|
29
|
+
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, definitionHints: e.definitionHints, reason: 'relative-import:approved-context' }));
|
|
30
30
|
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' }));
|
|
31
31
|
return [...imports, ...cpp].slice(0, 2000);
|
|
32
32
|
}
|
package/src/import-bindings.mjs
CHANGED
|
@@ -17,11 +17,50 @@ export function directImportBindings(lines, importLine, calls, targetText) {
|
|
|
17
17
|
if (positions.some(call => [...lines[call.line - 1].matchAll(occurrences)].length !== 1)) continue;
|
|
18
18
|
// Every other occurrence may be declaration, parameter, mutation or escape.
|
|
19
19
|
if (lines.some((line, i) => i + 1 !== importLine && !positions.some(c => c.line === i + 1) && token.test(line))) continue;
|
|
20
|
-
const declarations = targets
|
|
20
|
+
const declarations = uniqueApprovedDeclarations(targets, imported);
|
|
21
21
|
if (declarations.length !== 1) continue;
|
|
22
22
|
const exportedToken = new RegExp('(^|[^A-Za-z0-9_$])' + imported.replaceAll('$', String.fromCharCode(92) + '$') + '([^A-Za-z0-9_$]|$)');
|
|
23
23
|
if (targets.some((line, i) => i + 1 !== declarations[0].number && exportedToken.test(line))) continue;
|
|
24
|
-
result.push(...positions.map(call => ({ imported, local, importLine, callLine: call.line, declarationLine: declarations[0].number, confidence: 'conservative-syntax-only' })));
|
|
24
|
+
result.push(...positions.map(call => ({ imported, local, importLine, callLine: call.line, declarationLine: declarations[0].number, declarationKind: declarations[0].kind, confidence: 'conservative-syntax-only' })));
|
|
25
|
+
}
|
|
26
|
+
return result.slice(0, 20);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
// Only one direct declaration inside already approved text. No extra file reads.
|
|
30
|
+
export function uniqueApprovedDeclarations(lines, imported) {
|
|
31
|
+
if (!Array.isArray(lines) || lines.length > 20000 || typeof imported !== 'string' || !/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(imported)) return [];
|
|
32
|
+
const text=lines.join(String.fromCharCode(10));
|
|
33
|
+
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 [];
|
|
34
|
+
const forms = [
|
|
35
|
+
['function', /^\s*export\s+(?:async\s+)?function\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*\(/],
|
|
36
|
+
['const', /^\s*export\s+(?:const|let)\s+([A-Za-z_$][A-Za-z0-9_$]*)\s*=/],
|
|
37
|
+
['class', /^\s*export\s+class\s+([A-Za-z_$][A-Za-z0-9_$]*)(?=\s|\{)/]
|
|
38
|
+
];
|
|
39
|
+
const found = [];
|
|
40
|
+
for (let i = 0; i < lines.length; i++) {
|
|
41
|
+
for (const [kind, pattern] of forms) {
|
|
42
|
+
if (pattern.exec(lines[i])?.[1] === imported) found.push({ number: i + 1, kind });
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (found.length !== 1) return [];
|
|
46
|
+
const occurrences=new RegExp('(^|[^A-Za-z0-9_$])'+imported.replaceAll('$','\\$')+'(?=[^A-Za-z0-9_$]|$)','g');
|
|
47
|
+
if ([...lines[found[0].number-1].matchAll(occurrences)].length!==1) return [];
|
|
48
|
+
const token = new RegExp('(^|[^A-Za-z0-9_$])' + imported.replaceAll('$', '\\$') + '([^A-Za-z0-9_$]|$)');
|
|
49
|
+
if (lines.some((line, i) => i + 1 !== found[0].number && token.test(line))) return [];
|
|
50
|
+
return found;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// Named imports only. Missing, duplicate, comment, or reexport names stay unresolved.
|
|
54
|
+
export function namedImportDefinitions(importLine, targetText) {
|
|
55
|
+
if (typeof targetText !== 'string' || Buffer.byteLength(targetText) > 256 * 1024 || /[\x60]|\/\*/.test(targetText)) return [];
|
|
56
|
+
const match = /^\s*import\s+\{([^}]+)\}\s+from\s+(['"])[^'"]+\2\s*;?\s*(?:\/\/.*)?$/.exec(importLine);
|
|
57
|
+
if (!match) return [];
|
|
58
|
+
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));
|
|
59
|
+
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 [];
|
|
60
|
+
const lines = targetText.split(String.fromCharCode(10)), result = [];
|
|
61
|
+
for (const name of names) {
|
|
62
|
+
const found = uniqueApprovedDeclarations(lines, name[1]);
|
|
63
|
+
if (found.length === 1) result.push({ imported: name[1], declarationLine: found[0].number, declarationKind: found[0].kind, confidence: 'approved-unique-syntax-only' });
|
|
25
64
|
}
|
|
26
65
|
return result.slice(0, 20);
|
|
27
66
|
}
|
package/src/import-relations.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
import { directImportBindings } from './import-bindings.mjs';
|
|
2
|
+
import { directImportBindings, namedImportDefinitions } from './import-bindings.mjs';
|
|
3
3
|
import { importedCallSites, indexStandaloneCalls } from './import-call-sites.mjs';
|
|
4
4
|
|
|
5
5
|
const extensions = ['.mjs', '.cjs', '.js', '.jsx', '.ts', '.tsx'];
|
|
@@ -39,7 +39,8 @@ export function inferImportRelations(files) {
|
|
|
39
39
|
const callSites = importedCallSites(lines, i + 1, callIndex);
|
|
40
40
|
const targetText = (side === 'old' ? matches[0].left : matches[0].right)?.text;
|
|
41
41
|
const bindingHints = directImportBindings(lines, i + 1, callSites, targetText);
|
|
42
|
-
|
|
42
|
+
const definitionHints = namedImportDefinitions(lines[i], targetText);
|
|
43
|
+
edges.push({ from: file.id, to: matches[0].id, reason: 'relative-import:' + side + ':L' + (i + 1), side, line: i + 1, specifier: match[2], callSites, bindingHints, definitionHints });
|
|
43
44
|
if (callSites.length && edges.length < 2000) edges.push({ from: file.id, to: matches[0].id, reason: 'imported-call-syntax:' + side + ':L' + callSites.map(c => c.line).join(','), side, callSites });
|
|
44
45
|
if (edges.length >= 2000) return edges;
|
|
45
46
|
}
|
package/src/primary-input.mjs
CHANGED
|
@@ -36,7 +36,7 @@ export function preparePrimaryInput(input, file, { instructions, scope, grouping
|
|
|
36
36
|
const relatedFiles = input.files.filter(f => f.id !== file.id && f.eligibility === 'reviewable' && group.fileIds.includes(f.id));
|
|
37
37
|
if (relatedFiles.length) {
|
|
38
38
|
const relations = grouping.links.filter(link => !link.split && group.fileIds.includes(link.from) && group.fileIds.includes(link.to));
|
|
39
|
-
const bindingRelations = inferImportRelations(input.files).filter(edge => edge.bindingHints?.length && (edge.from === file.id || edge.to === file.id) && group.fileIds.includes(edge.from) && group.fileIds.includes(edge.to)).map(({ from, to, side, bindingHints }) => ({ from, to, side, bindingHints }));
|
|
39
|
+
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 } : {}) }));
|
|
40
40
|
const grouped = JSON.stringify({ ...base, relatedFiles, relations, bindingRelations, relationNotice: '命名和相对导入关系仅为源码线索,可能被同名局部变量遮蔽,不证明绑定、调用可达或因果;只报告主file的问题,不为relatedFiles重复生成发现。' });
|
|
41
41
|
if (measure(grouped).fits) { payload = grouped; metadata.relatedFileIds = relatedFiles.map(f => f.id); }
|
|
42
42
|
else metadata.groupFallback = 'input-budget';
|
package/src/snapshot.mjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import {captureSvnDependencyChain} from './svn-dependency-chain.mjs';
|
|
1
2
|
import {captureDependencyChain} from './dependency-chain.mjs';
|
|
2
3
|
import {captureSvnCallers} from './svn-caller-capture.mjs';
|
|
3
4
|
import { captureCallers } from './caller-capture.mjs';
|
|
4
5
|
import { validateCallerScopes } from './caller-index.mjs';
|
|
5
6
|
import { bindBusinessRequirement, validateBusinessRequirement } from './business-requirement.mjs';
|
|
6
7
|
import { gitContextIndex, svnContextIndex } from './tracked-context.mjs';
|
|
7
|
-
import { contextCandidates } from './context-candidates.mjs';
|
|
8
8
|
import { lstat, realpath } from 'node:fs/promises';
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import { captureGitHistory } from './git-history.mjs';
|
|
@@ -49,22 +49,13 @@ export async function captureSnapshot(cwd, options = {}) {
|
|
|
49
49
|
if (!Array.isArray(rulePaths) || rulePaths.some(name => contextPaths.includes(name))) throw new Error('Rule paths must be separate from context paths');
|
|
50
50
|
const rules = await captureProjectRules(snapshot.root, rulePaths, { signal: options.signal, files: snapshot.files });
|
|
51
51
|
const context = [];
|
|
52
|
-
let autoContext, index, explicitSeeds = [], indexOptions = options;
|
|
52
|
+
let autoContext, index, verifyDependencies, explicitSeeds = [], indexOptions = options;
|
|
53
53
|
if (options.autoContext === true && type==='git') {
|
|
54
54
|
const chain=await captureDependencyChain(snapshot.root,snapshot.files,options);
|
|
55
55
|
explicitSeeds=chain.explicitSeeds;context.push(...chain.context);autoContext=chain.autoContext;index=chain.index;indexOptions=chain.indexOptions;
|
|
56
56
|
} else if (options.autoContext === true) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
const plan = contextCandidates(snapshot.files, index.paths);
|
|
60
|
-
autoContext = { ...plan, candidates: plan.candidates.filter(c => !contextPaths.includes(c.path) && !rulePaths.includes(c.path)), capturedPaths: [] };
|
|
61
|
-
for (const candidate of autoContext.candidates) {
|
|
62
|
-
if (context.length + new Set(contextPaths).size >= maxContextFiles) { candidate.status = 'blocked'; candidate.reason = 'Context file limit exceeded'; continue; }
|
|
63
|
-
try {
|
|
64
|
-
context.push({ path: candidate.path, ...await readLocal(snapshot.root, candidate.path, options) });
|
|
65
|
-
candidate.status = 'captured'; autoContext.capturedPaths.push(candidate.path);
|
|
66
|
-
} catch (error) { options.signal?.throwIfAborted(); candidate.status = 'blocked'; candidate.reason = error.message; }
|
|
67
|
-
}
|
|
57
|
+
const chain=await captureSvnDependencyChain(snapshot.root,snapshot.files,options);
|
|
58
|
+
explicitSeeds=chain.explicitSeeds;context.push(...chain.context);autoContext=chain.autoContext;indexOptions=chain.indexOptions;verifyDependencies=chain.verify;
|
|
68
59
|
}
|
|
69
60
|
for (const name of [...new Set(contextPaths)].sort()) {
|
|
70
61
|
const changed = snapshot.files.find(f => f.path === name);
|
|
@@ -103,6 +94,7 @@ export async function captureSnapshot(cwd, options = {}) {
|
|
|
103
94
|
if (index && (await (type === 'git' ? gitContextIndex : svnContextIndex)(snapshot.root, indexOptions)).fingerprint !== index.fingerprint) throw new Error('Tracked context index changed during capture');
|
|
104
95
|
const verifiedRules = await captureProjectRules(snapshot.root, rulePaths, { signal: options.signal, files: snapshot.files });
|
|
105
96
|
if (JSON.stringify(verifiedRules) !== JSON.stringify(rules)) throw new Error('Rules changed during capture');
|
|
97
|
+
if (verifyDependencies) await verifyDependencies();
|
|
106
98
|
if (verifyCallers) await verifyCallers();
|
|
107
99
|
const result = { ...snapshot, context, ...(callerDiscovery ? {callerDiscovery} : {}), ...(autoContext ? { autoContext } : {}), ...(rules.length ? { rules } : {}) };
|
|
108
100
|
delete result.id;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import {contextCandidates} from './context-candidates.mjs';
|
|
2
|
+
import {svnCallerNode,svnCallerProbes} from './svn-caller-node.mjs';
|
|
3
|
+
import {readLocal} from './content.mjs';
|
|
4
|
+
// Exact local path probes only. Every body requires safe offline SVN node identity.
|
|
5
|
+
export async function captureSvnDependencyChain(root,files,options={}){
|
|
6
|
+
const signal=AbortSignal.any([AbortSignal.timeout(30000),...(options.signal?[options.signal]:[])]),bounded={...options,signal,maxFileBytes:Math.min(options.maxFileBytes??256*1024,256*1024)};
|
|
7
|
+
const visited=new Set(files.map(f=>f.path)),reserved=new Set([...(options.contextPaths??[]),...(options.rulePaths??[])]),probes=new Set(),context=[],candidates=[],nodes=[];let frontier=[...files],bytes=0,truncated=false,index;
|
|
8
|
+
const limit=Math.min(options.maxContextFiles??20,20);if(new Set(options.contextPaths??[]).size>limit)throw new Error('Context file limit exceeded');
|
|
9
|
+
// Explicit context remains separately selected; safe normal nodes can seed navigation.
|
|
10
|
+
const explicitSeeds=[];for(const name of [...new Set(options.contextPaths??[])].sort()){
|
|
11
|
+
const changed=files.find(f=>f.path===name);if(changed){if(changed.eligibility!=='reviewable'||changed.rightExists===false)throw new Error('Context path is an excluded blocked or deleted change');continue;}
|
|
12
|
+
const node=await svnCallerNode(root,name,bounded),item={path:name,...await readLocal(root,name,bounded)};bytes+=item.bytes;if(bytes>1024*1024)throw new Error('SVN dependency source byte limit exceeded');nodes.push({path:name,fingerprint:node.fingerprint});explicitSeeds.push(item);visited.add(name);frontier.push({path:name,eligibility:'reviewable',right:item});
|
|
13
|
+
}
|
|
14
|
+
const onProbe=paths=>{for(const p of paths)probes.add(p);if(probes.size>512)throw new Error('SVN dependency lookup limit exceeded');};
|
|
15
|
+
for(let depth=1;depth<=3&&frontier.length;depth++){
|
|
16
|
+
for(let i=0;i<frontier.length;i+=200)contextCandidates(frontier.slice(i,i+200),[],{onProbe});index=await svnCallerProbes(root,[...probes],bounded);
|
|
17
|
+
const plans=[];for(let i=0;i<frontier.length;i+=200)plans.push(contextCandidates(frontier.slice(i,i+200),index.paths));const next=[];
|
|
18
|
+
for(const plan of plans){truncated ||= plan.truncated;for(const entry of plan.candidates){if(visited.has(entry.path)||reserved.has(entry.path))continue;visited.add(entry.path);const c={...entry,depth};candidates.push(c);if(candidates.length>20)throw new Error('SVN dependency candidate limit exceeded');
|
|
19
|
+
if(context.length+new Set(options.contextPaths??[]).size>=limit){c.status='blocked';c.reason='Context file limit exceeded';continue;}
|
|
20
|
+
try{const node=await svnCallerNode(root,entry.path,bounded),item={path:entry.path,...await readLocal(root,entry.path,bounded)};bytes+=item.bytes;if(bytes>1024*1024)throw new Error('SVN dependency source byte limit exceeded');context.push(item);nodes.push({path:item.path,fingerprint:node.fingerprint});c.status='captured';next.push({path:item.path,eligibility:'reviewable',right:item});}
|
|
21
|
+
catch(error){signal.throwIfAborted();if(error.message==='SVN dependency source byte limit exceeded')throw error;c.status='blocked';c.reason=error.message;}
|
|
22
|
+
}}frontier=next;
|
|
23
|
+
}if(frontier.length)truncated=true;
|
|
24
|
+
const verify=async()=>{for(const node of nodes)if((await svnCallerNode(root,node.path,bounded)).fingerprint!==node.fingerprint)throw new Error('SVN dependency node changed during capture');if(index&&(await svnCallerProbes(root,[...probes],bounded)).fingerprint!==index.fingerprint)throw new Error('SVN dependency resolution changed during capture');signal.throwIfAborted();};
|
|
25
|
+
return {context,explicitSeeds,indexOptions:bounded,verify,autoContext:{candidates,capturedPaths:context.map(c=>c.path),truncated,maxDepth:3,sourceBytes:bytes,probeCount:probes.size,notice:'Offline safe SVN current-side literal dependencies, at most 3 layers, 512 exact probes, 20 candidates/context slots, 1MiB source and 30s including verification. Not symbol binding or complete caller coverage.'}};
|
|
26
|
+
}
|