pi-pair-programmer 0.1.5 → 0.1.6
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/package.json +1 -1
- package/src/finding-admission.ts +72 -37
- package/src/index.ts +35 -5
- package/src/logger.ts +26 -0
- package/src/model-usage.ts +3 -3
- package/src/pair-stats.ts +97 -0
- package/src/review-runner.ts +163 -25
package/package.json
CHANGED
package/src/finding-admission.ts
CHANGED
|
@@ -1,21 +1,41 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { noul, TypeSafeClient } from "@typesafe-ai/sdk";
|
|
3
|
-
import {
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import {
|
|
5
|
+
notify,
|
|
6
|
+
observeJudgment,
|
|
7
|
+
type ModelCallObserver,
|
|
8
|
+
} from "./model-usage.js";
|
|
9
|
+
import type { DedupJudgment, JudgmentObserver } from "./pair-stats.js";
|
|
4
10
|
import type { ProposedFinding } from "./review-runner.js";
|
|
5
11
|
import type { ReviewStore, Finding, StoredFinding } from "./review-store.js";
|
|
6
12
|
|
|
7
|
-
interface
|
|
13
|
+
interface FindingScope {
|
|
8
14
|
file: string;
|
|
9
15
|
reviewer: string;
|
|
10
16
|
revision: string;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
interface AdmissionRequest extends FindingScope {
|
|
11
20
|
findings: readonly ProposedFinding[];
|
|
12
21
|
signal: AbortSignal;
|
|
13
22
|
onModelCall?: ModelCallObserver;
|
|
23
|
+
onJudgment?: JudgmentObserver;
|
|
14
24
|
isCurrent: () => Promise<boolean>;
|
|
15
25
|
}
|
|
16
26
|
|
|
27
|
+
type Observers = Pick<
|
|
28
|
+
AdmissionRequest,
|
|
29
|
+
"signal" | "onModelCall" | "onJudgment"
|
|
30
|
+
>;
|
|
17
31
|
type Candidate = Finding & { duplicateKey: string };
|
|
18
32
|
|
|
33
|
+
const DUPLICATE_THRESHOLD = 0.5;
|
|
34
|
+
const dedupSchema = z.object({
|
|
35
|
+
answers: z.object({
|
|
36
|
+
duplicate: z.object({ noul: z.number().min(0).max(1) }),
|
|
37
|
+
}),
|
|
38
|
+
});
|
|
19
39
|
let jevClient: TypeSafeClient | undefined;
|
|
20
40
|
|
|
21
41
|
function hash(parts: readonly string[]): string {
|
|
@@ -25,8 +45,15 @@ function hash(parts: readonly string[]): string {
|
|
|
25
45
|
.slice(0, 16);
|
|
26
46
|
}
|
|
27
47
|
|
|
48
|
+
export function findingId(
|
|
49
|
+
scope: FindingScope,
|
|
50
|
+
proposed: ProposedFinding,
|
|
51
|
+
): string {
|
|
52
|
+
return candidateOf(scope, proposed).id;
|
|
53
|
+
}
|
|
54
|
+
|
|
28
55
|
function candidateOf(
|
|
29
|
-
request:
|
|
56
|
+
request: FindingScope,
|
|
30
57
|
proposed: ProposedFinding,
|
|
31
58
|
): Candidate {
|
|
32
59
|
const duplicateKey = hash([
|
|
@@ -52,27 +79,38 @@ function sameProblem(candidate: Candidate, finding: Finding): boolean {
|
|
|
52
79
|
return candidate.duplicateKey === (finding.duplicateKey ?? finding.id);
|
|
53
80
|
}
|
|
54
81
|
|
|
55
|
-
async function
|
|
82
|
+
async function judgeNovelty(
|
|
56
83
|
candidate: Candidate,
|
|
57
84
|
history: readonly StoredFinding[],
|
|
58
85
|
earlier: readonly Candidate[],
|
|
59
|
-
signal:
|
|
60
|
-
|
|
61
|
-
)
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
86
|
+
{ signal, onModelCall }: Observers,
|
|
87
|
+
): Promise<DedupJudgment> {
|
|
88
|
+
const priors = [...history.map(({ finding }) => finding), ...earlier];
|
|
89
|
+
const matching = priors.filter((finding) => sameProblem(candidate, finding));
|
|
90
|
+
const judgment = (
|
|
91
|
+
decision: DedupJudgment["decision"],
|
|
92
|
+
reason: DedupJudgment["reason"],
|
|
93
|
+
): DedupJudgment => ({
|
|
94
|
+
stage: "dedup",
|
|
95
|
+
decision,
|
|
96
|
+
reason,
|
|
97
|
+
findingId: candidate.id,
|
|
98
|
+
duplicateKey: candidate.duplicateKey,
|
|
99
|
+
line: candidate.line,
|
|
100
|
+
title: candidate.title,
|
|
101
|
+
history: history.map(({ finding }) => finding.id),
|
|
102
|
+
candidates: earlier.map(({ id }) => id),
|
|
103
|
+
sameKey: matching.map(({ id }) => id),
|
|
104
|
+
});
|
|
105
|
+
if (matching.some(({ evidence }) => evidence === candidate.evidence))
|
|
106
|
+
return judgment("drop", "unchanged");
|
|
107
|
+
if (priors.length === 0) return judgment("keep", "first");
|
|
108
|
+
const fallback = matching.length === 0 ? "keep" : "drop";
|
|
109
|
+
let response: unknown;
|
|
72
110
|
try {
|
|
73
111
|
jevClient ??= new TypeSafeClient({ logLevel: "off" });
|
|
74
112
|
const client = jevClient;
|
|
75
|
-
|
|
113
|
+
response = await observeJudgment("dedup", signal, onModelCall, () =>
|
|
76
114
|
client.systemOne(
|
|
77
115
|
{
|
|
78
116
|
model: "jev-latest",
|
|
@@ -99,28 +137,32 @@ async function isNovel(
|
|
|
99
137
|
{ signal, timeout: 30_000, retry: { maxRetries: 0 } },
|
|
100
138
|
),
|
|
101
139
|
);
|
|
102
|
-
return response.answers.duplicate.noul < 0.5;
|
|
103
140
|
} catch {
|
|
104
|
-
return (
|
|
105
|
-
history.every(({ finding }) => !matches(finding)) &&
|
|
106
|
-
earlier.every((finding) => !matches(finding))
|
|
107
|
-
);
|
|
141
|
+
return judgment(fallback, signal.aborted ? "cancelled" : "request_failed");
|
|
108
142
|
}
|
|
143
|
+
const parsed = dedupSchema.safeParse(response);
|
|
144
|
+
if (!parsed.success) return judgment(fallback, "response_invalid");
|
|
145
|
+
const score = parsed.data.answers.duplicate.noul;
|
|
146
|
+
return {
|
|
147
|
+
...judgment(score < DUPLICATE_THRESHOLD ? "keep" : "drop", "judged"),
|
|
148
|
+
score,
|
|
149
|
+
threshold: DUPLICATE_THRESHOLD,
|
|
150
|
+
};
|
|
109
151
|
}
|
|
110
152
|
|
|
111
153
|
async function novelFindings(
|
|
112
154
|
candidates: readonly Candidate[],
|
|
113
155
|
history: readonly StoredFinding[],
|
|
114
156
|
compareCandidates: boolean,
|
|
115
|
-
|
|
116
|
-
onModelCall: ModelCallObserver | undefined,
|
|
157
|
+
observers: Observers,
|
|
117
158
|
): Promise<Candidate[]> {
|
|
118
159
|
const novel: Candidate[] = [];
|
|
119
160
|
for (const [index, candidate] of candidates.entries()) {
|
|
120
|
-
if (signal.aborted) break;
|
|
161
|
+
if (observers.signal.aborted) break;
|
|
121
162
|
const earlier = compareCandidates ? candidates.slice(0, index) : [];
|
|
122
|
-
|
|
123
|
-
|
|
163
|
+
const judgment = await judgeNovelty(candidate, history, earlier, observers);
|
|
164
|
+
notify(observers.onJudgment, judgment);
|
|
165
|
+
if (judgment.decision === "keep") novel.push(candidate);
|
|
124
166
|
}
|
|
125
167
|
return novel;
|
|
126
168
|
}
|
|
@@ -141,8 +183,7 @@ export class FindingAdmission {
|
|
|
141
183
|
request.findings.map((finding) => candidateOf(request, finding)),
|
|
142
184
|
history,
|
|
143
185
|
true,
|
|
144
|
-
|
|
145
|
-
request.onModelCall,
|
|
186
|
+
request,
|
|
146
187
|
);
|
|
147
188
|
for (;;) {
|
|
148
189
|
if (!(await request.isCurrent()) || signal.aborted) return "obsolete";
|
|
@@ -150,13 +191,7 @@ export class FindingAdmission {
|
|
|
150
191
|
const added = latest.slice(history.length);
|
|
151
192
|
if (novel.length === 0 || added.length === 0) break;
|
|
152
193
|
history = latest;
|
|
153
|
-
novel = await novelFindings(
|
|
154
|
-
novel,
|
|
155
|
-
added,
|
|
156
|
-
false,
|
|
157
|
-
signal,
|
|
158
|
-
request.onModelCall,
|
|
159
|
-
);
|
|
194
|
+
novel = await novelFindings(novel, added, false, request);
|
|
160
195
|
}
|
|
161
196
|
let result: "unchanged" | "added" = "unchanged";
|
|
162
197
|
for (const finding of novel) {
|
package/src/index.ts
CHANGED
|
@@ -12,12 +12,13 @@ import {
|
|
|
12
12
|
captureBaseline,
|
|
13
13
|
type TaskBaseline,
|
|
14
14
|
} from "./change-evidence.js";
|
|
15
|
-
import { FindingAdmission } from "./finding-admission.js";
|
|
15
|
+
import { FindingAdmission, findingId } from "./finding-admission.js";
|
|
16
16
|
import { createPairLogger, type PairLogger } from "./logger.js";
|
|
17
17
|
import type { ModelCallObserver } from "./model-usage.js";
|
|
18
18
|
import {
|
|
19
19
|
SessionAccounting,
|
|
20
20
|
STATS_ENTRY,
|
|
21
|
+
type JudgmentObserver,
|
|
21
22
|
type PairStats,
|
|
22
23
|
type ReviewOutcome,
|
|
23
24
|
} from "./pair-stats.js";
|
|
@@ -373,6 +374,22 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
373
374
|
});
|
|
374
375
|
}
|
|
375
376
|
};
|
|
377
|
+
const onJudgment: JudgmentObserver = (judgment) => {
|
|
378
|
+
job.stats.judge(job.id, judgment);
|
|
379
|
+
logger?.log("finding.judged", {
|
|
380
|
+
...fields,
|
|
381
|
+
stage: judgment.stage,
|
|
382
|
+
outcome: judgment.decision === "fail" ? "invalid" : judgment.decision,
|
|
383
|
+
reasonCode: judgment.reason,
|
|
384
|
+
confidence:
|
|
385
|
+
judgment.stage === "attribution" ? judgment.confidence : undefined,
|
|
386
|
+
probability:
|
|
387
|
+
judgment.stage === "attribution"
|
|
388
|
+
? judgment.probabilities?.inherited
|
|
389
|
+
: undefined,
|
|
390
|
+
score: judgment.stage === "dedup" ? judgment.score : undefined,
|
|
391
|
+
});
|
|
392
|
+
};
|
|
376
393
|
controllers.set(controller, job.key);
|
|
377
394
|
cancelJobs.set(controller, () => {
|
|
378
395
|
finish("cancelled", false);
|
|
@@ -381,7 +398,12 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
381
398
|
logger?.log("review.started", fields);
|
|
382
399
|
void (async () => {
|
|
383
400
|
try {
|
|
384
|
-
const result = await runJob(
|
|
401
|
+
const result = await runJob(
|
|
402
|
+
job,
|
|
403
|
+
controller.signal,
|
|
404
|
+
onModelCall,
|
|
405
|
+
onJudgment,
|
|
406
|
+
);
|
|
385
407
|
const settledOutcome =
|
|
386
408
|
reviewState.outcome === "success" ? result : reviewState.outcome;
|
|
387
409
|
finish(controller.signal.aborted ? "cancelled" : settledOutcome);
|
|
@@ -424,6 +446,7 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
424
446
|
job: ReviewJob,
|
|
425
447
|
signal: AbortSignal,
|
|
426
448
|
onModelCall: ModelCallObserver,
|
|
449
|
+
onJudgment: JudgmentObserver,
|
|
427
450
|
): Promise<ReviewOutcome> {
|
|
428
451
|
const proposed = await reviewFile({
|
|
429
452
|
host: job.host,
|
|
@@ -434,6 +457,7 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
434
457
|
source: job.source,
|
|
435
458
|
signal,
|
|
436
459
|
onModelCall,
|
|
460
|
+
onJudgment,
|
|
437
461
|
});
|
|
438
462
|
if (!(await current(job))) {
|
|
439
463
|
logger?.log("review.skipped", {
|
|
@@ -448,6 +472,7 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
448
472
|
reviewed.set(`${job.key}:${reviewer}:${job.model}`, job.revision);
|
|
449
473
|
return "success";
|
|
450
474
|
}
|
|
475
|
+
const scope = { file: job.file, reviewer, revision: job.revision };
|
|
451
476
|
const judged = await Promise.all(
|
|
452
477
|
proposed.map(async (finding) => ({
|
|
453
478
|
finding,
|
|
@@ -463,6 +488,12 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
463
488
|
),
|
|
464
489
|
signal,
|
|
465
490
|
onModelCall,
|
|
491
|
+
onJudgment: (attribution) => {
|
|
492
|
+
onJudgment({
|
|
493
|
+
...attribution,
|
|
494
|
+
findingId: findingId(scope, finding),
|
|
495
|
+
});
|
|
496
|
+
},
|
|
466
497
|
}),
|
|
467
498
|
})),
|
|
468
499
|
);
|
|
@@ -474,15 +505,14 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
|
|
|
474
505
|
});
|
|
475
506
|
if (signal.aborted || !(await current(job))) return "obsolete";
|
|
476
507
|
const result = await admission.admit({
|
|
477
|
-
|
|
478
|
-
reviewer,
|
|
479
|
-
revision: job.revision,
|
|
508
|
+
...scope,
|
|
480
509
|
findings: judged.flatMap(({ finding, inherited }) =>
|
|
481
510
|
inherited ? [] : [finding],
|
|
482
511
|
),
|
|
483
512
|
signal,
|
|
484
513
|
isCurrent: () => current(job),
|
|
485
514
|
onModelCall,
|
|
515
|
+
onJudgment,
|
|
486
516
|
});
|
|
487
517
|
logger?.log("finding.admission", {
|
|
488
518
|
sessionId: job.stats.sessionId,
|
package/src/logger.ts
CHANGED
|
@@ -16,6 +16,7 @@ export type PairLogEvent =
|
|
|
16
16
|
| "review.skipped"
|
|
17
17
|
| "model.finished"
|
|
18
18
|
| "finding.filtered"
|
|
19
|
+
| "finding.judged"
|
|
19
20
|
| "finding.admission"
|
|
20
21
|
| "finding.verdict"
|
|
21
22
|
| "delivery.sent"
|
|
@@ -37,6 +38,9 @@ export interface PairLogFields {
|
|
|
37
38
|
cacheWriteTokens?: number;
|
|
38
39
|
totalTokens?: number;
|
|
39
40
|
costUsd?: number;
|
|
41
|
+
confidence?: number | undefined;
|
|
42
|
+
probability?: number | undefined;
|
|
43
|
+
score?: number | undefined;
|
|
40
44
|
}
|
|
41
45
|
|
|
42
46
|
export interface PairLogger {
|
|
@@ -56,6 +60,7 @@ const events: Record<PairLogEvent, true> = {
|
|
|
56
60
|
"review.skipped": true,
|
|
57
61
|
"model.finished": true,
|
|
58
62
|
"finding.filtered": true,
|
|
63
|
+
"finding.judged": true,
|
|
59
64
|
"finding.admission": true,
|
|
60
65
|
"finding.verdict": true,
|
|
61
66
|
"delivery.sent": true,
|
|
@@ -70,6 +75,9 @@ const numericFields: Record<string, true> = {
|
|
|
70
75
|
cacheWriteTokens: true,
|
|
71
76
|
totalTokens: true,
|
|
72
77
|
costUsd: true,
|
|
78
|
+
confidence: true,
|
|
79
|
+
probability: true,
|
|
80
|
+
score: true,
|
|
73
81
|
};
|
|
74
82
|
const identifierFields: Record<string, true> = {
|
|
75
83
|
sessionId: true,
|
|
@@ -93,6 +101,8 @@ const outcomes = {
|
|
|
93
101
|
accept: true,
|
|
94
102
|
reject: true,
|
|
95
103
|
invalid: true,
|
|
104
|
+
keep: true,
|
|
105
|
+
drop: true,
|
|
96
106
|
on: true,
|
|
97
107
|
off: true,
|
|
98
108
|
};
|
|
@@ -123,6 +133,20 @@ const reasonCodes = {
|
|
|
123
133
|
baseline_unavailable: true,
|
|
124
134
|
configuration_failed: true,
|
|
125
135
|
ui_unavailable: true,
|
|
136
|
+
entry_invalid: true,
|
|
137
|
+
line_out_of_range: true,
|
|
138
|
+
quote_mismatch: true,
|
|
139
|
+
output_not_json: true,
|
|
140
|
+
envelope_invalid: true,
|
|
141
|
+
too_many_findings: true,
|
|
142
|
+
judged: true,
|
|
143
|
+
evidence_unavailable: true,
|
|
144
|
+
no_diff: true,
|
|
145
|
+
no_origin: true,
|
|
146
|
+
response_invalid: true,
|
|
147
|
+
request_failed: true,
|
|
148
|
+
cancelled: true,
|
|
149
|
+
first: true,
|
|
126
150
|
};
|
|
127
151
|
const maxFileBytes = 1024 * 1024;
|
|
128
152
|
const maxBufferedBytes = 64 * 1024;
|
|
@@ -163,6 +187,7 @@ const warningReasons: Record<string, true> = {
|
|
|
163
187
|
missing_model: true,
|
|
164
188
|
baseline_unavailable: true,
|
|
165
189
|
ui_unavailable: true,
|
|
190
|
+
response_invalid: true,
|
|
166
191
|
};
|
|
167
192
|
|
|
168
193
|
function severity(
|
|
@@ -192,6 +217,7 @@ function severity(
|
|
|
192
217
|
outcome === "obsolete" ||
|
|
193
218
|
event === "review.skipped" ||
|
|
194
219
|
event === "finding.filtered" ||
|
|
220
|
+
event === "finding.judged" ||
|
|
195
221
|
(event === "delivery.wake" && reason !== "ready")
|
|
196
222
|
? "debug"
|
|
197
223
|
: "info";
|
package/src/model-usage.ts
CHANGED
|
@@ -69,9 +69,9 @@ function metadata(value: unknown, judge = false): Metadata {
|
|
|
69
69
|
return result;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
function notify(
|
|
73
|
-
observer:
|
|
74
|
-
event:
|
|
72
|
+
export function notify<T>(
|
|
73
|
+
observer: ((event: T) => void) | undefined,
|
|
74
|
+
event: T,
|
|
75
75
|
): void {
|
|
76
76
|
try {
|
|
77
77
|
observer?.(event);
|
package/src/pair-stats.ts
CHANGED
|
@@ -34,6 +34,79 @@ const Observation = z.object({
|
|
|
34
34
|
})
|
|
35
35
|
.optional(),
|
|
36
36
|
});
|
|
37
|
+
const Probability = z.number().min(0).max(1);
|
|
38
|
+
const Decision = z.enum(["keep", "drop"]);
|
|
39
|
+
const ReviewDrop = z.object({
|
|
40
|
+
stage: z.literal("review"),
|
|
41
|
+
decision: z.literal("drop"),
|
|
42
|
+
reason: z.enum(["entry_invalid", "line_out_of_range", "quote_mismatch"]),
|
|
43
|
+
line: z.number().nullable(),
|
|
44
|
+
title: z.string().nullable(),
|
|
45
|
+
quote: z.string().nullable(),
|
|
46
|
+
lineText: z.string().nullable(),
|
|
47
|
+
quoteLines: z.array(z.number()),
|
|
48
|
+
invalidFields: z.array(z.string()),
|
|
49
|
+
});
|
|
50
|
+
const ReviewFailure = z.object({
|
|
51
|
+
stage: z.literal("review"),
|
|
52
|
+
decision: z.literal("fail"),
|
|
53
|
+
reason: z.enum(["output_not_json", "envelope_invalid", "too_many_findings"]),
|
|
54
|
+
count: Count.nullable(),
|
|
55
|
+
});
|
|
56
|
+
const Attribution = z.object({
|
|
57
|
+
stage: z.literal("attribution"),
|
|
58
|
+
decision: Decision,
|
|
59
|
+
reason: z.enum([
|
|
60
|
+
"judged",
|
|
61
|
+
"evidence_unavailable",
|
|
62
|
+
"no_diff",
|
|
63
|
+
"no_origin",
|
|
64
|
+
"response_invalid",
|
|
65
|
+
"request_failed",
|
|
66
|
+
"cancelled",
|
|
67
|
+
]),
|
|
68
|
+
findingId: z.string(),
|
|
69
|
+
line: z.number(),
|
|
70
|
+
title: z.string(),
|
|
71
|
+
quote: z.string(),
|
|
72
|
+
evidenceStatus: z.enum(["available", "unavailable"]),
|
|
73
|
+
evidenceReason: z.string().nullable(),
|
|
74
|
+
choice: z.enum(["inherited", "introduced", "unknown"]).optional(),
|
|
75
|
+
confidence: Probability.optional(),
|
|
76
|
+
probabilities: z
|
|
77
|
+
.object({
|
|
78
|
+
inherited: Probability,
|
|
79
|
+
introduced: Probability,
|
|
80
|
+
unknown: Probability,
|
|
81
|
+
})
|
|
82
|
+
.optional(),
|
|
83
|
+
thresholds: z
|
|
84
|
+
.object({ confidence: Probability, inherited: Probability })
|
|
85
|
+
.optional(),
|
|
86
|
+
issues: z.array(z.string()).optional(),
|
|
87
|
+
});
|
|
88
|
+
const Dedup = z.object({
|
|
89
|
+
stage: z.literal("dedup"),
|
|
90
|
+
decision: Decision,
|
|
91
|
+
reason: z.enum([
|
|
92
|
+
"first",
|
|
93
|
+
"unchanged",
|
|
94
|
+
"judged",
|
|
95
|
+
"response_invalid",
|
|
96
|
+
"request_failed",
|
|
97
|
+
"cancelled",
|
|
98
|
+
]),
|
|
99
|
+
findingId: z.string(),
|
|
100
|
+
duplicateKey: z.string(),
|
|
101
|
+
line: z.number(),
|
|
102
|
+
title: z.string(),
|
|
103
|
+
history: z.array(z.string()),
|
|
104
|
+
candidates: z.array(z.string()),
|
|
105
|
+
sameKey: z.array(z.string()),
|
|
106
|
+
score: Probability.optional(),
|
|
107
|
+
threshold: Probability.optional(),
|
|
108
|
+
});
|
|
109
|
+
const Judgment = z.union([ReviewDrop, ReviewFailure, Attribution, Dedup]);
|
|
37
110
|
const Event = z.discriminatedUnion("action", [
|
|
38
111
|
z.object({
|
|
39
112
|
action: z.literal("start"),
|
|
@@ -60,6 +133,13 @@ const Event = z.discriminatedUnion("action", [
|
|
|
60
133
|
jobId: z.string(),
|
|
61
134
|
observation: Observation,
|
|
62
135
|
}),
|
|
136
|
+
z.object({
|
|
137
|
+
action: z.literal("judgment"),
|
|
138
|
+
id: z.string(),
|
|
139
|
+
sessionId: z.string(),
|
|
140
|
+
jobId: z.string(),
|
|
141
|
+
judgment: Judgment,
|
|
142
|
+
}),
|
|
63
143
|
]);
|
|
64
144
|
const Entry = z.object({
|
|
65
145
|
type: z.literal("custom"),
|
|
@@ -69,6 +149,12 @@ const Entry = z.object({
|
|
|
69
149
|
|
|
70
150
|
type StatsEvent = z.infer<typeof Event>;
|
|
71
151
|
export type ReviewOutcome = z.infer<typeof Outcome>;
|
|
152
|
+
export type ReviewDropJudgment = z.infer<typeof ReviewDrop>;
|
|
153
|
+
export type ReviewFailureJudgment = z.infer<typeof ReviewFailure>;
|
|
154
|
+
export type AttributionJudgment = z.infer<typeof Attribution>;
|
|
155
|
+
export type DedupJudgment = z.infer<typeof Dedup>;
|
|
156
|
+
export type Judgment = z.infer<typeof Judgment>;
|
|
157
|
+
export type JudgmentObserver = (judgment: Judgment) => void;
|
|
72
158
|
export interface MeasuredTotal {
|
|
73
159
|
value: number;
|
|
74
160
|
measured: number;
|
|
@@ -175,6 +261,16 @@ export class PairStats {
|
|
|
175
261
|
});
|
|
176
262
|
}
|
|
177
263
|
|
|
264
|
+
judge(jobId: string, judgment: Judgment): void {
|
|
265
|
+
this.record({
|
|
266
|
+
action: "judgment",
|
|
267
|
+
id: randomUUID(),
|
|
268
|
+
sessionId: this.sessionId,
|
|
269
|
+
jobId,
|
|
270
|
+
judgment,
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
|
|
178
274
|
snapshot(): StatsSnapshot {
|
|
179
275
|
const result: StatsSnapshot = {
|
|
180
276
|
reviews: {
|
|
@@ -225,6 +321,7 @@ export class PairStats {
|
|
|
225
321
|
break;
|
|
226
322
|
}
|
|
227
323
|
case "settled":
|
|
324
|
+
case "judgment":
|
|
228
325
|
break;
|
|
229
326
|
}
|
|
230
327
|
}
|
package/src/review-runner.ts
CHANGED
|
@@ -3,19 +3,34 @@ import { choice, TypeSafeClient } from "@typesafe-ai/sdk";
|
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import type { ChangeEvidence } from "./change-evidence.js";
|
|
5
5
|
import {
|
|
6
|
+
notify,
|
|
6
7
|
observeJudgment,
|
|
7
8
|
ReviewEventStream,
|
|
8
9
|
type ModelCallObserver,
|
|
9
10
|
} from "./model-usage.js";
|
|
11
|
+
import type {
|
|
12
|
+
AttributionJudgment,
|
|
13
|
+
JudgmentObserver,
|
|
14
|
+
ReviewDropJudgment,
|
|
15
|
+
ReviewFailureJudgment,
|
|
16
|
+
} from "./pair-stats.js";
|
|
10
17
|
|
|
11
18
|
const MAX_SOURCE_CHARACTERS = 60_000;
|
|
12
19
|
const MAX_FINDINGS = 5;
|
|
20
|
+
const MAX_RECORDED_TEXT = 500;
|
|
21
|
+
const MAX_QUOTE_LINES = 5;
|
|
22
|
+
const ATTRIBUTION_THRESHOLDS = { confidence: 0.95, inherited: 0.95 } as const;
|
|
13
23
|
const proposedFindingSchema = z.looseObject({
|
|
14
24
|
line: z.number().int().positive(),
|
|
15
25
|
title: z.string().min(1).max(160).regex(/\S/u),
|
|
16
26
|
quote: z.string().min(1).max(240).regex(/\S/u),
|
|
17
27
|
evidence: z.string().min(1).max(500).regex(/\S/u),
|
|
18
28
|
});
|
|
29
|
+
const rawFindingSchema = z.looseObject({
|
|
30
|
+
line: z.unknown(),
|
|
31
|
+
title: z.unknown(),
|
|
32
|
+
quote: z.unknown(),
|
|
33
|
+
});
|
|
19
34
|
const reviewResultSchema = z.object({
|
|
20
35
|
findings: z.array(z.unknown()).max(MAX_FINDINGS),
|
|
21
36
|
});
|
|
@@ -71,6 +86,7 @@ interface ReviewRequest {
|
|
|
71
86
|
source: string;
|
|
72
87
|
signal: AbortSignal;
|
|
73
88
|
onModelCall?: ModelCallObserver;
|
|
89
|
+
onJudgment?: JudgmentObserver;
|
|
74
90
|
}
|
|
75
91
|
|
|
76
92
|
function invoke(
|
|
@@ -152,7 +168,7 @@ async function complete(
|
|
|
152
168
|
prompt: string,
|
|
153
169
|
signal: AbortSignal,
|
|
154
170
|
onModelCall: ModelCallObserver | undefined,
|
|
155
|
-
): Promise<
|
|
171
|
+
): Promise<string> {
|
|
156
172
|
const args = [
|
|
157
173
|
"--no-session",
|
|
158
174
|
"--no-tools",
|
|
@@ -177,11 +193,7 @@ async function complete(
|
|
|
177
193
|
args.unshift(script);
|
|
178
194
|
}
|
|
179
195
|
|
|
180
|
-
|
|
181
|
-
await invoke(args, cwd, prompt, signal, model, onModelCall)
|
|
182
|
-
).trim();
|
|
183
|
-
const fenced = /^```(?:json)?[ \t]*\r?\n([\s\S]*?)\r?\n```$/iu.exec(stdout);
|
|
184
|
-
return JSON.parse(fenced?.[1] ?? stdout) as unknown;
|
|
196
|
+
return (await invoke(args, cwd, prompt, signal, model, onModelCall)).trim();
|
|
185
197
|
}
|
|
186
198
|
|
|
187
199
|
export async function reviewFile(
|
|
@@ -228,8 +240,36 @@ Reply with the JSON object alone, without any other text.`,
|
|
|
228
240
|
request.onModelCall,
|
|
229
241
|
);
|
|
230
242
|
|
|
231
|
-
|
|
243
|
+
return validFindings(result, lines, request.onJudgment);
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
function validFindings(
|
|
247
|
+
answer: string,
|
|
248
|
+
lines: readonly string[],
|
|
249
|
+
onJudgment: JudgmentObserver | undefined,
|
|
250
|
+
): ProposedFinding[] {
|
|
251
|
+
const fail = (
|
|
252
|
+
reason: ReviewFailureJudgment["reason"],
|
|
253
|
+
count: number | null,
|
|
254
|
+
): void => {
|
|
255
|
+
notify(onJudgment, { stage: "review", decision: "fail", reason, count });
|
|
256
|
+
};
|
|
257
|
+
const fenced = /^```(?:json)?[ \t]*\r?\n([\s\S]*?)\r?\n```$/iu.exec(answer);
|
|
258
|
+
let output: unknown;
|
|
259
|
+
try {
|
|
260
|
+
output = JSON.parse(fenced?.[1] ?? answer);
|
|
261
|
+
} catch (error) {
|
|
262
|
+
fail("output_not_json", null);
|
|
263
|
+
throw error;
|
|
264
|
+
}
|
|
265
|
+
const envelope = reviewResultSchema.safeParse(output);
|
|
232
266
|
if (!envelope.success) {
|
|
267
|
+
const entries = z
|
|
268
|
+
.object({ findings: z.array(z.unknown()) })
|
|
269
|
+
.safeParse(output);
|
|
270
|
+
if (entries.success)
|
|
271
|
+
fail("too_many_findings", entries.data.findings.length);
|
|
272
|
+
else fail("envelope_invalid", null);
|
|
233
273
|
throw new Error("Reviewer returned an invalid findings array");
|
|
234
274
|
}
|
|
235
275
|
const findings: ProposedFinding[] = [];
|
|
@@ -240,28 +280,110 @@ Reply with the JSON object alone, without any other text.`,
|
|
|
240
280
|
lines[parsed.data.line - 1]?.includes(parsed.data.quote) === true
|
|
241
281
|
) {
|
|
242
282
|
findings.push(parsed.data);
|
|
283
|
+
} else {
|
|
284
|
+
notify(onJudgment, rejectedEntry(entry, parsed, lines));
|
|
243
285
|
}
|
|
244
286
|
}
|
|
245
287
|
return findings;
|
|
246
288
|
}
|
|
247
289
|
|
|
248
|
-
|
|
290
|
+
function rejectedEntry(
|
|
291
|
+
entry: unknown,
|
|
292
|
+
parsed: z.ZodSafeParseResult<z.infer<typeof proposedFindingSchema>>,
|
|
293
|
+
lines: readonly string[],
|
|
294
|
+
): ReviewDropJudgment {
|
|
295
|
+
if (parsed.success) {
|
|
296
|
+
const { line, title, quote } = parsed.data;
|
|
297
|
+
const lineText = lines[line - 1];
|
|
298
|
+
return {
|
|
299
|
+
stage: "review",
|
|
300
|
+
decision: "drop",
|
|
301
|
+
reason: lineText === undefined ? "line_out_of_range" : "quote_mismatch",
|
|
302
|
+
line,
|
|
303
|
+
title,
|
|
304
|
+
quote,
|
|
305
|
+
lineText: recordedText(lineText),
|
|
306
|
+
quoteLines: linesContaining(lines, quote),
|
|
307
|
+
invalidFields: [],
|
|
308
|
+
};
|
|
309
|
+
}
|
|
310
|
+
const raw = rawFindingSchema.safeParse(entry);
|
|
311
|
+
const fields: { line?: unknown; title?: unknown; quote?: unknown } =
|
|
312
|
+
raw.success ? raw.data : {};
|
|
313
|
+
const line = Number.isSafeInteger(fields.line) ? Number(fields.line) : null;
|
|
314
|
+
const quote = typeof fields.quote === "string" ? fields.quote : null;
|
|
315
|
+
return {
|
|
316
|
+
stage: "review",
|
|
317
|
+
decision: "drop",
|
|
318
|
+
reason: "entry_invalid",
|
|
319
|
+
line,
|
|
320
|
+
title: recordedText(fields.title),
|
|
321
|
+
quote: recordedText(quote),
|
|
322
|
+
lineText: line === null ? null : recordedText(lines[line - 1]),
|
|
323
|
+
quoteLines:
|
|
324
|
+
quote === null || !/\S/u.test(quote) ? [] : linesContaining(lines, quote),
|
|
325
|
+
invalidFields: [
|
|
326
|
+
...new Set(
|
|
327
|
+
parsed.error.issues.map((issue) =>
|
|
328
|
+
issue.path.length === 0 ? "entry" : String(issue.path[0]),
|
|
329
|
+
),
|
|
330
|
+
),
|
|
331
|
+
],
|
|
332
|
+
};
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
function recordedText(value: unknown): string | null {
|
|
336
|
+
return typeof value === "string" ? value.slice(0, MAX_RECORDED_TEXT) : null;
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
function linesContaining(lines: readonly string[], quote: string): number[] {
|
|
340
|
+
const found: number[] = [];
|
|
341
|
+
for (const [index, line] of lines.entries()) {
|
|
342
|
+
if (found.length === MAX_QUOTE_LINES) break;
|
|
343
|
+
if (line.includes(quote)) found.push(index + 1);
|
|
344
|
+
}
|
|
345
|
+
return found;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
type Attribution = Omit<AttributionJudgment, "findingId">;
|
|
349
|
+
|
|
350
|
+
interface AttributionRequest {
|
|
249
351
|
finding: ProposedFinding;
|
|
250
352
|
evidence: ChangeEvidence;
|
|
251
353
|
signal: AbortSignal;
|
|
252
354
|
onModelCall?: ModelCallObserver;
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
)
|
|
260
|
-
|
|
355
|
+
onJudgment?: (judgment: Attribution) => void;
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
export async function isInherited(
|
|
359
|
+
request: AttributionRequest,
|
|
360
|
+
): Promise<boolean> {
|
|
361
|
+
const judgment = await attribute(request);
|
|
362
|
+
notify(request.onJudgment, judgment);
|
|
363
|
+
return judgment.decision === "drop";
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
async function attribute(request: AttributionRequest): Promise<Attribution> {
|
|
367
|
+
const { evidence, finding } = request;
|
|
368
|
+
const keep = (reason: Attribution["reason"]): Attribution => ({
|
|
369
|
+
stage: "attribution",
|
|
370
|
+
decision: "keep",
|
|
371
|
+
reason,
|
|
372
|
+
line: finding.line,
|
|
373
|
+
title: finding.title,
|
|
374
|
+
quote: finding.quote,
|
|
375
|
+
evidenceStatus: evidence.status,
|
|
376
|
+
evidenceReason: evidence.reason,
|
|
377
|
+
});
|
|
378
|
+
if (evidence.status !== "available") return keep("evidence_unavailable");
|
|
379
|
+
if (evidence.diff === null) return keep("no_diff");
|
|
380
|
+
if (evidence.before === null && evidence.origins.length === 0) {
|
|
381
|
+
return keep("no_origin");
|
|
261
382
|
}
|
|
383
|
+
let response: unknown;
|
|
262
384
|
try {
|
|
263
385
|
const client = jev();
|
|
264
|
-
|
|
386
|
+
response = await observeJudgment(
|
|
265
387
|
"attribution",
|
|
266
388
|
request.signal,
|
|
267
389
|
request.onModelCall,
|
|
@@ -295,14 +417,30 @@ export async function isInherited(request: {
|
|
|
295
417
|
{ signal: request.signal, timeout: 30_000, retry: { maxRetries: 0 } },
|
|
296
418
|
),
|
|
297
419
|
);
|
|
298
|
-
const parsed = attributionSchema.safeParse(response);
|
|
299
|
-
return (
|
|
300
|
-
parsed.success &&
|
|
301
|
-
parsed.data.answers.category.choice === "inherited" &&
|
|
302
|
-
parsed.data.answers.category.confidence >= 0.95 &&
|
|
303
|
-
parsed.data.answers.category.probabilities.inherited >= 0.95
|
|
304
|
-
);
|
|
305
420
|
} catch {
|
|
306
|
-
return
|
|
421
|
+
return keep(request.signal.aborted ? "cancelled" : "request_failed");
|
|
422
|
+
}
|
|
423
|
+
const parsed = attributionSchema.safeParse(response);
|
|
424
|
+
if (!parsed.success) {
|
|
425
|
+
return {
|
|
426
|
+
...keep("response_invalid"),
|
|
427
|
+
issues: [
|
|
428
|
+
...new Set(parsed.error.issues.map((issue) => issue.path.join("."))),
|
|
429
|
+
],
|
|
430
|
+
};
|
|
307
431
|
}
|
|
432
|
+
const category = parsed.data.answers.category;
|
|
433
|
+
const { confidence, probabilities } = category;
|
|
434
|
+
const inherited =
|
|
435
|
+
category.choice === "inherited" &&
|
|
436
|
+
confidence >= ATTRIBUTION_THRESHOLDS.confidence &&
|
|
437
|
+
probabilities.inherited >= ATTRIBUTION_THRESHOLDS.inherited;
|
|
438
|
+
return {
|
|
439
|
+
...keep("judged"),
|
|
440
|
+
decision: inherited ? "drop" : "keep",
|
|
441
|
+
choice: category.choice,
|
|
442
|
+
confidence,
|
|
443
|
+
probabilities: { ...probabilities },
|
|
444
|
+
thresholds: { ...ATTRIBUTION_THRESHOLDS },
|
|
445
|
+
};
|
|
308
446
|
}
|