@wuyanbin/ai-code-review-cli-remote 1.0.28 → 1.0.30
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/dist/constants.d.ts +7 -6
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +8 -14
- package/dist/constants.js.map +1 -1
- package/dist/core/context.d.ts +7 -1
- package/dist/core/context.d.ts.map +1 -1
- package/dist/core/context.js +34 -16
- package/dist/core/context.js.map +1 -1
- package/dist/core/diff.d.ts +58 -1
- package/dist/core/diff.d.ts.map +1 -1
- package/dist/core/diff.js +202 -57
- package/dist/core/diff.js.map +1 -1
- package/dist/core/incremental.d.ts +68 -1
- package/dist/core/incremental.d.ts.map +1 -1
- package/dist/core/incremental.js +396 -69
- package/dist/core/incremental.js.map +1 -1
- package/dist/core/model.d.ts +23 -1
- package/dist/core/model.d.ts.map +1 -1
- package/dist/core/model.js +107 -10
- package/dist/core/model.js.map +1 -1
- package/dist/core/prompt.d.ts +10 -2
- package/dist/core/prompt.d.ts.map +1 -1
- package/dist/core/prompt.js +39 -24
- package/dist/core/prompt.js.map +1 -1
- package/dist/core/revalidation.d.ts +23 -0
- package/dist/core/revalidation.d.ts.map +1 -0
- package/dist/core/revalidation.js +150 -0
- package/dist/core/revalidation.js.map +1 -0
- package/dist/core/reviewer.d.ts +11 -2
- package/dist/core/reviewer.d.ts.map +1 -1
- package/dist/core/reviewer.js +116 -14
- package/dist/core/reviewer.js.map +1 -1
- package/dist/core/semantic-match.d.ts +29 -0
- package/dist/core/semantic-match.d.ts.map +1 -0
- package/dist/core/semantic-match.js +150 -0
- package/dist/core/semantic-match.js.map +1 -0
- package/dist/core/summarizer.d.ts.map +1 -1
- package/dist/core/summarizer.js +1 -1
- package/dist/core/summarizer.js.map +1 -1
- package/dist/gitlab/api.d.ts +42 -0
- package/dist/gitlab/api.d.ts.map +1 -1
- package/dist/gitlab/api.js +120 -23
- package/dist/gitlab/api.js.map +1 -1
- package/dist/platform/report.d.ts +3 -0
- package/dist/platform/report.d.ts.map +1 -1
- package/dist/platform/report.js.map +1 -1
- package/dist/runner.d.ts.map +1 -1
- package/dist/runner.js +121 -28
- package/dist/runner.js.map +1 -1
- package/dist/shared/identity.d.ts +5 -0
- package/dist/shared/identity.d.ts.map +1 -1
- package/dist/shared/identity.js +11 -0
- package/dist/shared/identity.js.map +1 -1
- package/dist/shared/model-json.d.ts +6 -0
- package/dist/shared/model-json.d.ts.map +1 -0
- package/dist/shared/model-json.js +19 -0
- package/dist/shared/model-json.js.map +1 -0
- package/dist/types.d.ts +12 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incremental.js","sourceRoot":"","sources":["../../src/core/incremental.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"incremental.js","sourceRoot":"","sources":["../../src/core/incremental.ts"],"names":[],"mappings":"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"}
|
package/dist/core/model.d.ts
CHANGED
|
@@ -1,6 +1,28 @@
|
|
|
1
1
|
import type { AIModelApiFormat } from "../types";
|
|
2
|
+
export interface ModelCallOptions {
|
|
3
|
+
/** 调用用途(review / summary / revalidate / semantic),用于用量归因 */
|
|
4
|
+
purpose?: string;
|
|
5
|
+
/**
|
|
6
|
+
* 在 user 内容上打 prompt cache 断点。仅在同一 prompt 确定会重发时开启
|
|
7
|
+
* (如 baseline 双趟),否则缓存写入溢价(1.25×)没有回收机会。
|
|
8
|
+
*/
|
|
9
|
+
cacheUserPrompt?: boolean;
|
|
10
|
+
}
|
|
2
11
|
export interface ModelAdapter {
|
|
3
|
-
call(model: string, systemPrompt: string, userPrompt: string): Promise<string | null>;
|
|
12
|
+
call(model: string, systemPrompt: string, userPrompt: string, options?: ModelCallOptions): Promise<string | null>;
|
|
13
|
+
}
|
|
14
|
+
export interface ModelUsageTotals {
|
|
15
|
+
calls: number;
|
|
16
|
+
/** 总 prompt token(含缓存读写部分,两种 API 已归一化) */
|
|
17
|
+
inputTokens: number;
|
|
18
|
+
outputTokens: number;
|
|
19
|
+
cacheReadTokens: number;
|
|
20
|
+
cacheWriteTokens: number;
|
|
4
21
|
}
|
|
22
|
+
export declare function resetModelUsage(): void;
|
|
23
|
+
export declare function getModelUsageSummary(): {
|
|
24
|
+
total: ModelUsageTotals;
|
|
25
|
+
byPurpose: Record<string, ModelUsageTotals>;
|
|
26
|
+
};
|
|
5
27
|
export declare function createModelAdapter(endpoint: string, apiKey: string, apiFormat?: AIModelApiFormat): ModelAdapter;
|
|
6
28
|
//# sourceMappingURL=model.d.ts.map
|
package/dist/core/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,WAAW,YAAY;IAC3B,IAAI,CACF,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CACF,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAsBD,wBAAgB,eAAe,IAAI,IAAI,CAEtC;AAED,wBAAgB,oBAAoB,IAAI;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C,CAYA;AA0PD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,gBAAgB,GAC3B,YAAY,CAOd"}
|
package/dist/core/model.js
CHANGED
|
@@ -1,8 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resetModelUsage = resetModelUsage;
|
|
4
|
+
exports.getModelUsageSummary = getModelUsageSummary;
|
|
3
5
|
exports.createModelAdapter = createModelAdapter;
|
|
4
6
|
const constants_1 = require("../constants");
|
|
5
7
|
const http_1 = require("../shared/http");
|
|
8
|
+
// —— run 级用量累计:CLI 单进程只跑一个 run,模块级累计器零侵入调用链 ——
|
|
9
|
+
const usageByPurpose = new Map();
|
|
10
|
+
function emptyTotals() {
|
|
11
|
+
return {
|
|
12
|
+
calls: 0,
|
|
13
|
+
inputTokens: 0,
|
|
14
|
+
outputTokens: 0,
|
|
15
|
+
cacheReadTokens: 0,
|
|
16
|
+
cacheWriteTokens: 0,
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
function resetModelUsage() {
|
|
20
|
+
usageByPurpose.clear();
|
|
21
|
+
}
|
|
22
|
+
function getModelUsageSummary() {
|
|
23
|
+
const total = emptyTotals();
|
|
24
|
+
const byPurpose = {};
|
|
25
|
+
for (const [purpose, totals] of usageByPurpose) {
|
|
26
|
+
byPurpose[purpose] = { ...totals };
|
|
27
|
+
total.calls += totals.calls;
|
|
28
|
+
total.inputTokens += totals.inputTokens;
|
|
29
|
+
total.outputTokens += totals.outputTokens;
|
|
30
|
+
total.cacheReadTokens += totals.cacheReadTokens;
|
|
31
|
+
total.cacheWriteTokens += totals.cacheWriteTokens;
|
|
32
|
+
}
|
|
33
|
+
return { total, byPurpose };
|
|
34
|
+
}
|
|
35
|
+
function recordUsage(purpose, usage) {
|
|
36
|
+
const totals = usageByPurpose.get(purpose) ?? emptyTotals();
|
|
37
|
+
totals.calls += 1;
|
|
38
|
+
totals.inputTokens += usage.inputTokens;
|
|
39
|
+
totals.outputTokens += usage.outputTokens;
|
|
40
|
+
totals.cacheReadTokens += usage.cacheReadTokens;
|
|
41
|
+
totals.cacheWriteTokens += usage.cacheWriteTokens;
|
|
42
|
+
usageByPurpose.set(purpose, totals);
|
|
43
|
+
}
|
|
44
|
+
function toCount(value) {
|
|
45
|
+
return typeof value === "number" && Number.isFinite(value) && value > 0
|
|
46
|
+
? Math.floor(value)
|
|
47
|
+
: 0;
|
|
48
|
+
}
|
|
6
49
|
async function readErrorBody(resp) {
|
|
7
50
|
const text = await resp.text().catch(() => "");
|
|
8
51
|
return text.trim().slice(0, 1000);
|
|
@@ -12,9 +55,10 @@ class BaseModelAdapter {
|
|
|
12
55
|
this.endpoint = endpoint;
|
|
13
56
|
this.apiKey = apiKey;
|
|
14
57
|
}
|
|
15
|
-
async call(model, systemPrompt, userPrompt) {
|
|
58
|
+
async call(model, systemPrompt, userPrompt, options = {}) {
|
|
16
59
|
const tag = this.providerName;
|
|
17
|
-
|
|
60
|
+
const purpose = options.purpose ?? "other";
|
|
61
|
+
console.error(`[model] ${tag} request start model=${model} purpose=${purpose}`);
|
|
18
62
|
let resp;
|
|
19
63
|
try {
|
|
20
64
|
resp = await (0, http_1.fetchWithTimeout)(this.buildRequestUrl(), {
|
|
@@ -23,7 +67,7 @@ class BaseModelAdapter {
|
|
|
23
67
|
"Content-Type": "application/json",
|
|
24
68
|
...this.buildHeaders(),
|
|
25
69
|
},
|
|
26
|
-
body: JSON.stringify(this.buildBody(model, systemPrompt, userPrompt)),
|
|
70
|
+
body: JSON.stringify(this.buildBody(model, systemPrompt, userPrompt, options)),
|
|
27
71
|
}, constants_1.REQUEST_TIMEOUT_MS);
|
|
28
72
|
}
|
|
29
73
|
catch (err) {
|
|
@@ -45,6 +89,14 @@ class BaseModelAdapter {
|
|
|
45
89
|
console.error(`[model] ${tag} response body parse failed`);
|
|
46
90
|
return null;
|
|
47
91
|
}
|
|
92
|
+
const usage = this.extractUsage(json) ?? {
|
|
93
|
+
inputTokens: 0,
|
|
94
|
+
outputTokens: 0,
|
|
95
|
+
cacheReadTokens: 0,
|
|
96
|
+
cacheWriteTokens: 0,
|
|
97
|
+
};
|
|
98
|
+
recordUsage(purpose, usage);
|
|
99
|
+
console.error(`[model] ${tag} usage purpose=${purpose} input=${usage.inputTokens} output=${usage.outputTokens} cacheRead=${usage.cacheReadTokens} cacheWrite=${usage.cacheWriteTokens}`);
|
|
48
100
|
const content = this.extractContent(json);
|
|
49
101
|
console.error(content
|
|
50
102
|
? `[model] ${tag} request complete bytes=${Buffer.byteLength(content)}`
|
|
@@ -63,6 +115,7 @@ class OpenAIAdapter extends BaseModelAdapter {
|
|
|
63
115
|
buildHeaders() {
|
|
64
116
|
return { Authorization: `Bearer ${this.apiKey}` };
|
|
65
117
|
}
|
|
118
|
+
// openai 格式不加 cache 协议字段:稳定 system 前置后由服务端自动前缀缓存受益
|
|
66
119
|
buildBody(model, systemPrompt, userPrompt) {
|
|
67
120
|
return {
|
|
68
121
|
model,
|
|
@@ -77,6 +130,18 @@ class OpenAIAdapter extends BaseModelAdapter {
|
|
|
77
130
|
const data = json;
|
|
78
131
|
return data.choices?.[0]?.message?.content?.trim() || null;
|
|
79
132
|
}
|
|
133
|
+
extractUsage(json) {
|
|
134
|
+
const usage = json.usage;
|
|
135
|
+
if (!usage)
|
|
136
|
+
return null;
|
|
137
|
+
// OpenAI 的 prompt_tokens 已含缓存命中部分,直接作为总输入
|
|
138
|
+
return {
|
|
139
|
+
inputTokens: toCount(usage.prompt_tokens),
|
|
140
|
+
outputTokens: toCount(usage.completion_tokens),
|
|
141
|
+
cacheReadTokens: toCount(usage.prompt_tokens_details?.cached_tokens),
|
|
142
|
+
cacheWriteTokens: 0,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
80
145
|
}
|
|
81
146
|
class ClaudeAdapter extends BaseModelAdapter {
|
|
82
147
|
get providerName() {
|
|
@@ -92,26 +157,58 @@ class ClaudeAdapter extends BaseModelAdapter {
|
|
|
92
157
|
"anthropic-version": "2023-06-01",
|
|
93
158
|
};
|
|
94
159
|
}
|
|
95
|
-
buildBody(model, systemPrompt, userPrompt) {
|
|
160
|
+
buildBody(model, systemPrompt, userPrompt, options) {
|
|
96
161
|
return {
|
|
97
162
|
model,
|
|
98
163
|
max_tokens: 32768,
|
|
99
|
-
system
|
|
100
|
-
|
|
164
|
+
// system 稳定块恒打断点:run 内 shard 间与 baseline 双趟间复用
|
|
165
|
+
system: [
|
|
166
|
+
{
|
|
167
|
+
type: "text",
|
|
168
|
+
text: systemPrompt,
|
|
169
|
+
cache_control: { type: "ephemeral" },
|
|
170
|
+
},
|
|
171
|
+
],
|
|
172
|
+
messages: [
|
|
173
|
+
{
|
|
174
|
+
role: "user",
|
|
175
|
+
content: [
|
|
176
|
+
{
|
|
177
|
+
type: "text",
|
|
178
|
+
text: userPrompt,
|
|
179
|
+
...(options.cacheUserPrompt
|
|
180
|
+
? { cache_control: { type: "ephemeral" } }
|
|
181
|
+
: {}),
|
|
182
|
+
},
|
|
183
|
+
],
|
|
184
|
+
},
|
|
185
|
+
],
|
|
101
186
|
};
|
|
102
187
|
}
|
|
103
188
|
extractContent(json) {
|
|
104
189
|
const data = json;
|
|
105
190
|
return data.content?.find((b) => b.type === "text")?.text?.trim() || null;
|
|
106
191
|
}
|
|
192
|
+
extractUsage(json) {
|
|
193
|
+
const usage = json.usage;
|
|
194
|
+
if (!usage)
|
|
195
|
+
return null;
|
|
196
|
+
const cacheRead = toCount(usage.cache_read_input_tokens);
|
|
197
|
+
const cacheWrite = toCount(usage.cache_creation_input_tokens);
|
|
198
|
+
// Claude 的 input_tokens 不含缓存读写,归一化为总 prompt token
|
|
199
|
+
return {
|
|
200
|
+
inputTokens: toCount(usage.input_tokens) + cacheRead + cacheWrite,
|
|
201
|
+
outputTokens: toCount(usage.output_tokens),
|
|
202
|
+
cacheReadTokens: cacheRead,
|
|
203
|
+
cacheWriteTokens: cacheWrite,
|
|
204
|
+
};
|
|
205
|
+
}
|
|
107
206
|
}
|
|
108
207
|
function createModelAdapter(endpoint, apiKey, apiFormat) {
|
|
109
|
-
if (apiFormat === "claude")
|
|
208
|
+
if (apiFormat === "claude")
|
|
110
209
|
return new ClaudeAdapter(endpoint, apiKey);
|
|
111
|
-
|
|
112
|
-
if (apiFormat === "openai") {
|
|
210
|
+
if (apiFormat === "openai")
|
|
113
211
|
return new OpenAIAdapter(endpoint, apiKey);
|
|
114
|
-
}
|
|
115
212
|
if (endpoint.includes("anthropic.com") || endpoint.includes("/v1/messages")) {
|
|
116
213
|
return new ClaudeAdapter(endpoint, apiKey);
|
|
117
214
|
}
|
package/dist/core/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":";;AAoDA,0CAEC;AAED,oDAeC;AA0PD,gDAWC;AA5UD,4CAAkD;AAClD,yCAAiE;AAsCjE,+CAA+C;AAC/C,MAAM,cAAc,GAAG,IAAI,GAAG,EAA4B,CAAC;AAE3D,SAAS,WAAW;IAClB,OAAO;QACL,KAAK,EAAE,CAAC;QACR,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,CAAC;KACpB,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe;IAC7B,cAAc,CAAC,KAAK,EAAE,CAAC;AACzB,CAAC;AAED,SAAgB,oBAAoB;IAIlC,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAqC,EAAE,CAAC;IACvD,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;QAC/C,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;QACnC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;QAC5B,KAAK,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC;QACxC,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC;QAC1C,KAAK,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC;QAChD,KAAK,CAAC,gBAAgB,IAAI,MAAM,CAAC,gBAAgB,CAAC;IACpD,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,WAAW,CAAC,OAAe,EAAE,KAAkB;IACtD,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC;IAC5D,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;IAClB,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,CAAC;IACxC,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,CAAC;IAC1C,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC;IAChD,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,CAAC;IAClD,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC;QACrE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QACnB,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAqBD,KAAK,UAAU,aAAa,CAAC,IAAc;IACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/C,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,MAAe,gBAAgB;IAC7B,YACqB,QAAgB,EAChB,MAAc;QADd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,WAAM,GAAN,MAAM,CAAQ;IAChC,CAAC;IAeJ,KAAK,CAAC,IAAI,CACR,KAAa,EACb,YAAoB,EACpB,UAAkB,EAClB,UAA4B,EAAE;QAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC;QAC3C,OAAO,CAAC,KAAK,CACX,WAAW,GAAG,wBAAwB,KAAK,YAAY,OAAO,EAAE,CACjE,CAAC;QAEF,IAAI,IAAc,CAAC;QACnB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,IAAA,uBAAgB,EAC3B,IAAI,CAAC,eAAe,EAAE,EACtB;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,GAAG,IAAI,CAAC,YAAY,EAAE;iBACvB;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAClB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CACzD;aACF,EACD,8BAAkB,CACnB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GACV,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY;gBAC/C,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,eAAe,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,YAAY,MAAM,KAAK,GAAG,EAAE,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;YACvC,OAAO,CAAC,KAAK,CACX,IAAI;gBACF,CAAC,CAAC,WAAW,GAAG,sBAAsB,IAAI,CAAC,MAAM,SAAS,IAAI,EAAE;gBAChE,CAAC,CAAC,WAAW,GAAG,sBAAsB,IAAI,CAAC,MAAM,EAAE,CACtD,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAa,EAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,6BAA6B,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;YACvC,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,eAAe,EAAE,CAAC;YAClB,gBAAgB,EAAE,CAAC;SACpB,CAAC;QACF,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC5B,OAAO,CAAC,KAAK,CACX,WAAW,GAAG,kBAAkB,OAAO,UAAU,KAAK,CAAC,WAAW,WAAW,KAAK,CAAC,YAAY,cAAc,KAAK,CAAC,eAAe,eAAe,KAAK,CAAC,gBAAgB,EAAE,CAC1K,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,CAAC,KAAK,CACX,OAAO;YACL,CAAC,CAAC,WAAW,GAAG,2BAA2B,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YACvE,CAAC,CAAC,WAAW,GAAG,iBAAiB,CACpC,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED,MAAM,aAAc,SAAQ,gBAAgB;IAC1C,IAAc,YAAY;QACxB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAES,eAAe;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,OAAO,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,mBAAmB,CAAC;IAC7E,CAAC;IAES,YAAY;QACpB,OAAO,EAAE,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IACpD,CAAC;IAED,mDAAmD;IACzC,SAAS,CAAC,KAAa,EAAE,YAAoB,EAAE,UAAkB;QACzE,OAAO;YACL,KAAK;YACL,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE;gBACzC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;aACtC;YACD,MAAM,EAAE,KAAK;SACd,CAAC;IACJ,CAAC;IAES,cAAc,CAAC,IAAa;QACpC,MAAM,IAAI,GAAG,IAAsB,CAAC;QACpC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC;IAC7D,CAAC;IAES,YAAY,CAAC,IAAa;QAClC,MAAM,KAAK,GAAI,IAAuB,CAAC,KAAK,CAAC;QAC7C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,0CAA0C;QAC1C,OAAO;YACL,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;YACzC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC9C,eAAe,EAAE,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,aAAa,CAAC;YACpE,gBAAgB,EAAE,CAAC;SACpB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,aAAc,SAAQ,gBAAgB;IAC1C,IAAc,YAAY;QACxB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAES,eAAe;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,OAAO,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,cAAc,CAAC;IACnE,CAAC;IAES,YAAY;QACpB,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,MAAM;YACxB,mBAAmB,EAAE,YAAY;SAClC,CAAC;IACJ,CAAC;IAES,SAAS,CACjB,KAAa,EACb,YAAoB,EACpB,UAAkB,EAClB,OAAyB;QAEzB,OAAO;YACL,KAAK;YACL,UAAU,EAAE,KAAK;YACjB,+CAA+C;YAC/C,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,YAAY;oBAClB,aAAa,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;iBACrC;aACF;YACD,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,UAAU;4BAChB,GAAG,CAAC,OAAO,CAAC,eAAe;gCACzB,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE;gCAC1C,CAAC,CAAC,EAAE,CAAC;yBACR;qBACF;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAES,cAAc,CAAC,IAAa;QACpC,MAAM,IAAI,GAAG,IAAsB,CAAC;QACpC,OAAO,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC;IAC5E,CAAC;IAES,YAAY,CAAC,IAAa;QAClC,MAAM,KAAK,GAAI,IAAuB,CAAC,KAAK,CAAC;QAC7C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9D,kDAAkD;QAClD,OAAO;YACL,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,UAAU;YACjE,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;YAC1C,eAAe,EAAE,SAAS;YAC1B,gBAAgB,EAAE,UAAU;SAC7B,CAAC;IACJ,CAAC;CACF;AAED,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,MAAc,EACd,SAA4B;IAE5B,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvE,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvE,IAAI,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC5E,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC"}
|
package/dist/core/prompt.d.ts
CHANGED
|
@@ -3,14 +3,22 @@ export declare class PromptBuilder {
|
|
|
3
3
|
private diff;
|
|
4
4
|
private rules;
|
|
5
5
|
private repoRules;
|
|
6
|
-
private
|
|
6
|
+
private stableContext;
|
|
7
|
+
private shardContext;
|
|
7
8
|
private sensitiveMatches;
|
|
8
9
|
setDiff(diff: string): this;
|
|
9
10
|
setRules(custom: string[]): this;
|
|
10
11
|
/** 合并被审仓库 .cursor/rules 解析出的规则,作为审查准则与平台规则同等对待。 */
|
|
11
12
|
setRepoRules(repoRules: string[]): this;
|
|
12
|
-
|
|
13
|
+
/** run 内稳定的背景(MR 元信息、项目规则文档):进入 system,参与 prompt cache */
|
|
14
|
+
setStableContext(context: string): this;
|
|
15
|
+
/** 每 shard 变化的源码窗口:进入 user */
|
|
16
|
+
setShardContext(context: string): this;
|
|
13
17
|
setSensitiveMatches(matches: SensitiveMatch[]): this;
|
|
18
|
+
/**
|
|
19
|
+
* system 只放 run 内逐字节稳定的内容(指令、规范、MR 背景),
|
|
20
|
+
* 使所有 shard 与 baseline 双趟共享同一 system,prompt cache 才能命中。
|
|
21
|
+
*/
|
|
14
22
|
buildSystem(): string;
|
|
15
23
|
buildUser(): string;
|
|
16
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/core/prompt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAUlD,qBAAa,aAAa;IACxB,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,OAAO,CAAM;
|
|
1
|
+
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/core/prompt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAUlD,qBAAa,aAAa;IACxB,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,aAAa,CAAM;IAC3B,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,gBAAgB,CAAwB;IAEhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAKhC,mDAAmD;IACnD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAKvC,0DAA0D;IAC1D,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKvC,8BAA8B;IAC9B,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKtC,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI;IAKpD;;;OAGG;IACH,WAAW,IAAI,MAAM;IA4BrB,SAAS,IAAI,MAAM;CAqCpB;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,IAAI,CAAM;IAElB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAM3B,WAAW,IAAI,MAAM;IAqBrB,SAAS,IAAI,MAAM;CAGpB"}
|
package/dist/core/prompt.js
CHANGED
|
@@ -14,7 +14,8 @@ class PromptBuilder {
|
|
|
14
14
|
this.diff = "";
|
|
15
15
|
this.rules = [];
|
|
16
16
|
this.repoRules = [];
|
|
17
|
-
this.
|
|
17
|
+
this.stableContext = "";
|
|
18
|
+
this.shardContext = "";
|
|
18
19
|
this.sensitiveMatches = [];
|
|
19
20
|
}
|
|
20
21
|
setDiff(diff) {
|
|
@@ -30,19 +31,28 @@ class PromptBuilder {
|
|
|
30
31
|
this.repoRules = repoRules;
|
|
31
32
|
return this;
|
|
32
33
|
}
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
/** run 内稳定的背景(MR 元信息、项目规则文档):进入 system,参与 prompt cache */
|
|
35
|
+
setStableContext(context) {
|
|
36
|
+
this.stableContext = context;
|
|
37
|
+
return this;
|
|
38
|
+
}
|
|
39
|
+
/** 每 shard 变化的源码窗口:进入 user */
|
|
40
|
+
setShardContext(context) {
|
|
41
|
+
this.shardContext = context;
|
|
35
42
|
return this;
|
|
36
43
|
}
|
|
37
44
|
setSensitiveMatches(matches) {
|
|
38
45
|
this.sensitiveMatches = matches;
|
|
39
46
|
return this;
|
|
40
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* system 只放 run 内逐字节稳定的内容(指令、规范、MR 背景),
|
|
50
|
+
* 使所有 shard 与 baseline 双趟共享同一 system,prompt cache 才能命中。
|
|
51
|
+
*/
|
|
41
52
|
buildSystem() {
|
|
42
|
-
return "你是一个资深的代码审查助手,需要根据给定的 Git diff 和项目规范,对改动的代码进行严格的 Code Review。";
|
|
43
|
-
}
|
|
44
|
-
buildUser() {
|
|
45
53
|
const parts = [
|
|
54
|
+
"你是一个资深的代码审查助手,需要根据给定的 Git diff 和项目规范,对改动的代码进行严格的 Code Review。",
|
|
55
|
+
"",
|
|
46
56
|
"请你只针对 diff 中【新增或修改】的代码行给出审查意见。",
|
|
47
57
|
"输出格式要求:必须返回严格的 JSON,形如:",
|
|
48
58
|
'{"comments":[{"file":"src/xxx.ts","line":123,"code":"该行完整代码","severity":"P1","message":"问题描述","suggestion":"修复建议"}]}',
|
|
@@ -52,19 +62,27 @@ class PromptBuilder {
|
|
|
52
62
|
"- P1 (Major): 性能隐患、违反团队核心规范、严重的冗余代码。建议修复。",
|
|
53
63
|
"- P2 (Minor): 代码风格优化、命名建议、更优雅的语法糖实现。参考即可,不强制。",
|
|
54
64
|
"",
|
|
55
|
-
"注意:severity 只能是 P0 / P1 / P2;file
|
|
56
|
-
"",
|
|
57
|
-
"
|
|
58
|
-
|
|
59
|
-
"",
|
|
60
|
-
"审查上下文(MR 元信息、项目规则、变更附近源码):",
|
|
61
|
-
this.context,
|
|
65
|
+
"注意:severity 只能是 P0 / P1 / P2;file 必须使用注解 diff 中 ### 标注的路径;只能评论 [ADD] 行。",
|
|
66
|
+
"line 取该 [ADD] 行行号列的数字(新文件侧行号)。",
|
|
67
|
+
"每条评论的 code 必填;code 取该 [ADD] 行竖线 | 之后的源码原样复制,line 与 code 必须指向同一行。",
|
|
68
|
+
"code 只填源码本身,不要带 [ADD] / [CTX] / [DEL] 标记、行号、竖线分隔符。",
|
|
69
|
+
"[CTX] 行与 [DEL] 行(已删除代码)仅用于理解,禁止作为评论目标。",
|
|
62
70
|
"",
|
|
63
71
|
"项目规范:",
|
|
64
72
|
[...this.rules, ...this.repoRules].join("\n"),
|
|
73
|
+
];
|
|
74
|
+
if (this.stableContext) {
|
|
75
|
+
parts.push("", "审查背景(MR 元信息、项目规则文档):", this.stableContext);
|
|
76
|
+
}
|
|
77
|
+
return parts.join("\n");
|
|
78
|
+
}
|
|
79
|
+
buildUser() {
|
|
80
|
+
const parts = [
|
|
81
|
+
"变更内容(带新文件侧行号的注解 diff,[ADD] 行可评论):",
|
|
82
|
+
(0, diff_1.buildAnnotatedDiff)(this.diff),
|
|
65
83
|
"",
|
|
66
|
-
"
|
|
67
|
-
this.
|
|
84
|
+
"变更附近源码:",
|
|
85
|
+
this.shardContext || "(无源码上下文)",
|
|
68
86
|
];
|
|
69
87
|
if (this.sensitiveMatches.length > 0) {
|
|
70
88
|
const matchLines = this.sensitiveMatches.map((m) => {
|
|
@@ -89,17 +107,14 @@ class SummaryPromptBuilder {
|
|
|
89
107
|
this.diff = diff;
|
|
90
108
|
return this;
|
|
91
109
|
}
|
|
110
|
+
// 固定指令集中于 system(与评审 prompt 同一缓存策略),user 只保留 diff
|
|
92
111
|
buildSystem() {
|
|
93
112
|
return [
|
|
94
113
|
"你是一位资深开发工程师,擅长分析代码改动并生成清晰的技术摘要。",
|
|
95
|
-
"根据给定 Git diff 生成中文 Markdown
|
|
114
|
+
"根据给定 Git diff 生成中文 Markdown 汇总报告。",
|
|
96
115
|
"必须直接输出纯 Markdown 文本,不要返回 JSON,不要用代码块包裹。",
|
|
97
|
-
].join("\n");
|
|
98
|
-
}
|
|
99
|
-
buildUser() {
|
|
100
|
-
return [
|
|
101
|
-
"请根据以下 Git diff 生成一份代码改动汇总报告。",
|
|
102
116
|
"",
|
|
117
|
+
"报告结构:",
|
|
103
118
|
"## 概述",
|
|
104
119
|
"用 1-2 句话说明整体目的和范围。",
|
|
105
120
|
"",
|
|
@@ -111,11 +126,11 @@ class SummaryPromptBuilder {
|
|
|
111
126
|
"",
|
|
112
127
|
"## 注意事项",
|
|
113
128
|
"列出需要关注的风险;没有则写\u201C无\u201D。",
|
|
114
|
-
"",
|
|
115
|
-
"Git diff:",
|
|
116
|
-
this.diff,
|
|
117
129
|
].join("\n");
|
|
118
130
|
}
|
|
131
|
+
buildUser() {
|
|
132
|
+
return ["Git diff:", this.diff].join("\n");
|
|
133
|
+
}
|
|
119
134
|
}
|
|
120
135
|
exports.SummaryPromptBuilder = SummaryPromptBuilder;
|
|
121
136
|
//# sourceMappingURL=prompt.js.map
|
package/dist/core/prompt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/core/prompt.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/core/prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { type ModelAdapter } from "./model";
|
|
2
|
+
import type { CodeReviewConfig, RevalidationCandidate, RevalidationVerdict } from "../types";
|
|
3
|
+
/** 单轮复核候选上限,超限部分保活;P0 优先复核 */
|
|
4
|
+
export declare const MAX_REVALIDATION_FINDINGS = 50;
|
|
5
|
+
/**
|
|
6
|
+
* 截取锚点 ±radius 行并标注行号,锚点行以 `>>>` 标记。
|
|
7
|
+
* 锚点超出文件范围(checkout 与 diff 新侧不一致的罕见情形)返回 null,按 UNSURE 处理。
|
|
8
|
+
*/
|
|
9
|
+
export declare function buildCodeWindow(content: string, anchorLine: number, radius?: number): string | null;
|
|
10
|
+
export interface RevalidationOptions {
|
|
11
|
+
cwd?: string;
|
|
12
|
+
/** 测试注入;缺省按 config.ai 创建 */
|
|
13
|
+
adapter?: ModelAdapter;
|
|
14
|
+
maxFindings?: number;
|
|
15
|
+
chunkSize?: number;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* 对保活候选执行模型复核,返回 fingerprint → verdict。
|
|
19
|
+
* 任何失败(文件不可读、模型调用失败、解析失败)均落为 UNSURE,
|
|
20
|
+
* 不抛错、不影响流水线;超出上限的候选不产生判定(保活)。
|
|
21
|
+
*/
|
|
22
|
+
export declare function revalidateFindings(candidates: RevalidationCandidate[], config: CodeReviewConfig, options?: RevalidationOptions): Promise<Map<string, RevalidationVerdict>>;
|
|
23
|
+
//# sourceMappingURL=revalidation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"revalidation.d.ts","sourceRoot":"","sources":["../../src/core/revalidation.ts"],"names":[],"mappings":"AAMA,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAIlB,8BAA8B;AAC9B,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAO5C;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAAsB,GAC7B,MAAM,GAAG,IAAI,CAaf;AA0ED,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,qBAAqB,EAAE,EACnC,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CA4E3C"}
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MAX_REVALIDATION_FINDINGS = void 0;
|
|
4
|
+
exports.buildCodeWindow = buildCodeWindow;
|
|
5
|
+
exports.revalidateFindings = revalidateFindings;
|
|
6
|
+
const promises_1 = require("node:fs/promises");
|
|
7
|
+
const node_path_1 = require("node:path");
|
|
8
|
+
const jsonrepair_1 = require("jsonrepair");
|
|
9
|
+
const zod_1 = require("zod");
|
|
10
|
+
const concurrency_1 = require("../shared/concurrency");
|
|
11
|
+
const model_json_1 = require("../shared/model-json");
|
|
12
|
+
const model_1 = require("./model");
|
|
13
|
+
/** 锚点上下代码窗口半径:需覆盖同函数内的语义修复(入口守卫等) */
|
|
14
|
+
const WINDOW_RADIUS = 60;
|
|
15
|
+
/** 单轮复核候选上限,超限部分保活;P0 优先复核 */
|
|
16
|
+
exports.MAX_REVALIDATION_FINDINGS = 50;
|
|
17
|
+
/** 单次模型调用的候选条数:控制输入规模与解析失败的爆炸半径 */
|
|
18
|
+
const DEFAULT_CHUNK_SIZE = 10;
|
|
19
|
+
const CHUNK_CONCURRENCY = 2;
|
|
20
|
+
const SEVERITY_RANK = { P0: 2, P1: 1, P2: 0 };
|
|
21
|
+
/**
|
|
22
|
+
* 截取锚点 ±radius 行并标注行号,锚点行以 `>>>` 标记。
|
|
23
|
+
* 锚点超出文件范围(checkout 与 diff 新侧不一致的罕见情形)返回 null,按 UNSURE 处理。
|
|
24
|
+
*/
|
|
25
|
+
function buildCodeWindow(content, anchorLine, radius = WINDOW_RADIUS) {
|
|
26
|
+
const lines = content.split("\n");
|
|
27
|
+
if (anchorLine < 1 || anchorLine > lines.length)
|
|
28
|
+
return null;
|
|
29
|
+
const start = Math.max(1, anchorLine - radius);
|
|
30
|
+
const end = Math.min(lines.length, anchorLine + radius);
|
|
31
|
+
return lines
|
|
32
|
+
.slice(start - 1, end)
|
|
33
|
+
.map((line, index) => {
|
|
34
|
+
const lineNumber = start + index;
|
|
35
|
+
const marker = lineNumber === anchorLine ? ">>>" : " ";
|
|
36
|
+
return `${marker} ${String(lineNumber).padStart(5, " ")} | ${line}`;
|
|
37
|
+
})
|
|
38
|
+
.join("\n");
|
|
39
|
+
}
|
|
40
|
+
const verdictResponseSchema = zod_1.z.object({
|
|
41
|
+
results: zod_1.z
|
|
42
|
+
.array(zod_1.z.object({
|
|
43
|
+
index: zod_1.z.number().int(),
|
|
44
|
+
verdict: zod_1.z.enum(["FIXED", "PRESENT", "UNSURE"]),
|
|
45
|
+
}))
|
|
46
|
+
.default([]),
|
|
47
|
+
});
|
|
48
|
+
/** 解析单块复核输出为 index → verdict;整体失败返回 null,由调用方按 UNSURE 降级 */
|
|
49
|
+
function parseVerdicts(content) {
|
|
50
|
+
try {
|
|
51
|
+
const parsed = verdictResponseSchema.safeParse(JSON.parse((0, jsonrepair_1.jsonrepair)((0, model_json_1.extractJsonObject)(content))));
|
|
52
|
+
if (!parsed.success)
|
|
53
|
+
return null;
|
|
54
|
+
const verdicts = new Map();
|
|
55
|
+
for (const item of parsed.data.results) {
|
|
56
|
+
if (!verdicts.has(item.index))
|
|
57
|
+
verdicts.set(item.index, item.verdict);
|
|
58
|
+
}
|
|
59
|
+
return verdicts;
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function buildSystemPrompt() {
|
|
66
|
+
return [
|
|
67
|
+
"你是代码评审复核员。给定若干条历史代码评审发现的问题,以及当前最新代码的相关片段,逐条判断该问题当前是否仍然存在。",
|
|
68
|
+
"",
|
|
69
|
+
"判定规则:",
|
|
70
|
+
'- 问题已被修复(已加入校验、修正逻辑、移除风险代码,或以其他方式消除)→ verdict 为 "FIXED"',
|
|
71
|
+
'- 问题仍然存在 → verdict 为 "PRESENT"',
|
|
72
|
+
'- 仅凭给出的代码无法确定 → verdict 为 "UNSURE"',
|
|
73
|
+
"- 证据不足时宁可回答 UNSURE,MUST NOT 猜测为 FIXED",
|
|
74
|
+
"",
|
|
75
|
+
'只输出 JSON,格式:{"results":[{"index":1,"verdict":"FIXED"}]},results 必须覆盖每个问题编号,不要输出任何其他内容。',
|
|
76
|
+
].join("\n");
|
|
77
|
+
}
|
|
78
|
+
function buildUserPrompt(chunk) {
|
|
79
|
+
const sections = chunk.map(({ candidate, window }, index) => {
|
|
80
|
+
const lines = [
|
|
81
|
+
`### 问题 #${index + 1}`,
|
|
82
|
+
`- 文件: ${candidate.file}`,
|
|
83
|
+
`- 行号: ${candidate.line}(下方代码中以 >>> 标记)`,
|
|
84
|
+
`- 严重级别: ${candidate.severity}`,
|
|
85
|
+
`- 问题描述: ${candidate.message}`,
|
|
86
|
+
];
|
|
87
|
+
if (candidate.suggestion) {
|
|
88
|
+
lines.push(`- 历史修复建议: ${candidate.suggestion}`);
|
|
89
|
+
}
|
|
90
|
+
lines.push(`- 被标记代码: \`${candidate.code.trim()}\``, "", "当前代码片段(取自最新提交):", "```", window, "```");
|
|
91
|
+
return lines.join("\n");
|
|
92
|
+
});
|
|
93
|
+
return sections.join("\n\n");
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* 对保活候选执行模型复核,返回 fingerprint → verdict。
|
|
97
|
+
* 任何失败(文件不可读、模型调用失败、解析失败)均落为 UNSURE,
|
|
98
|
+
* 不抛错、不影响流水线;超出上限的候选不产生判定(保活)。
|
|
99
|
+
*/
|
|
100
|
+
async function revalidateFindings(candidates, config, options = {}) {
|
|
101
|
+
const verdicts = new Map();
|
|
102
|
+
if (candidates.length === 0)
|
|
103
|
+
return verdicts;
|
|
104
|
+
const cwd = options.cwd ?? process.cwd();
|
|
105
|
+
const maxFindings = options.maxFindings ?? exports.MAX_REVALIDATION_FINDINGS;
|
|
106
|
+
const ordered = [...candidates].sort((a, b) => SEVERITY_RANK[b.severity] - SEVERITY_RANK[a.severity]);
|
|
107
|
+
const selected = ordered.slice(0, maxFindings);
|
|
108
|
+
if (ordered.length > selected.length) {
|
|
109
|
+
console.error(`[revalidation] candidates over cap, skipped=${ordered.length - selected.length} (kept OPEN without verdict)`);
|
|
110
|
+
}
|
|
111
|
+
const withWindows = [];
|
|
112
|
+
for (const candidate of selected) {
|
|
113
|
+
let window = null;
|
|
114
|
+
try {
|
|
115
|
+
const content = await (0, promises_1.readFile)((0, node_path_1.resolve)(cwd, candidate.file), "utf8");
|
|
116
|
+
window = buildCodeWindow(content, candidate.line);
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
// 文件不可读:按 UNSURE 保活
|
|
120
|
+
}
|
|
121
|
+
if (window) {
|
|
122
|
+
withWindows.push({ candidate, window });
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
verdicts.set(candidate.fingerprint, "UNSURE");
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if (withWindows.length === 0)
|
|
129
|
+
return verdicts;
|
|
130
|
+
const adapter = options.adapter ??
|
|
131
|
+
(0, model_1.createModelAdapter)(config.ai.endpoint, config.ai.apiKey, config.ai.apiFormat);
|
|
132
|
+
const chunkSize = options.chunkSize ?? DEFAULT_CHUNK_SIZE;
|
|
133
|
+
const chunks = [];
|
|
134
|
+
for (let i = 0; i < withWindows.length; i += chunkSize) {
|
|
135
|
+
chunks.push(withWindows.slice(i, i + chunkSize));
|
|
136
|
+
}
|
|
137
|
+
const responses = await (0, concurrency_1.mapConcurrent)(chunks, CHUNK_CONCURRENCY, async (chunk) => adapter.call(config.ai.model, buildSystemPrompt(), buildUserPrompt(chunk), { purpose: "revalidate" }));
|
|
138
|
+
for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
|
|
139
|
+
const raw = responses[chunkIndex];
|
|
140
|
+
const parsed = raw ? parseVerdicts(raw) : null;
|
|
141
|
+
if (!parsed) {
|
|
142
|
+
console.error(`[revalidation] chunk ${chunkIndex + 1}/${chunks.length} ${raw ? "parse failed" : "model returned empty"}, degrading ${chunks[chunkIndex].length} finding(s) to UNSURE`);
|
|
143
|
+
}
|
|
144
|
+
chunks[chunkIndex].forEach(({ candidate }, index) => {
|
|
145
|
+
verdicts.set(candidate.fingerprint, parsed?.get(index + 1) ?? "UNSURE");
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
return verdicts;
|
|
149
|
+
}
|
|
150
|
+
//# sourceMappingURL=revalidation.js.map
|