dvalincode 0.21.0 → 0.23.0
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/README.md +261 -27
- package/README.zh-CN.md +203 -23
- package/dist/agent/compact.d.ts +8 -0
- package/dist/agent/compact.js +44 -5
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +5 -0
- package/dist/agent/loop.js +18 -9
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.d.ts +15 -3
- package/dist/agent/runner.js +99 -9
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +7 -0
- package/dist/agent/session.js +32 -4
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +5 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +5 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/agents.d.ts +11 -0
- package/dist/commands/agents.js +223 -0
- package/dist/commands/agents.js.map +1 -0
- package/dist/commands/dvalin.d.ts +7 -1
- package/dist/commands/dvalin.js +209 -9
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/mcpInstall.d.ts +24 -0
- package/dist/commands/mcpInstall.js +62 -17
- package/dist/commands/mcpInstall.js.map +1 -1
- package/dist/commands/provider.js +6 -1
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/run.js +4 -2
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/security.d.ts +15 -0
- package/dist/commands/security.js +273 -22
- package/dist/commands/security.js.map +1 -1
- package/dist/dvalinCli.js +2 -0
- package/dist/dvalinCli.js.map +1 -1
- package/dist/harness/run.d.ts +8 -2
- package/dist/harness/run.js +1 -1
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/agents.d.ts +41 -0
- package/dist/mcp/agents.js +129 -0
- package/dist/mcp/agents.js.map +1 -0
- package/dist/mcp/install.d.ts +43 -6
- package/dist/mcp/install.js +104 -1
- package/dist/mcp/install.js.map +1 -1
- package/dist/mcp/server.js +10 -2
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +14 -2
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/openaiCompatible.js +7 -6
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.d.ts +32 -0
- package/dist/providers/retry.js +150 -0
- package/dist/providers/retry.js.map +1 -0
- package/dist/providers/trustedBaseUrls.js +1 -1
- package/dist/providers/trustedBaseUrls.js.map +1 -1
- package/dist/providers/types.d.ts +10 -0
- package/dist/remediation/automate.d.ts +1 -1
- package/dist/remediation/automate.js +2 -1
- package/dist/remediation/automate.js.map +1 -1
- package/dist/remediation/cases.d.ts +1 -0
- package/dist/remediation/cases.js +1 -0
- package/dist/remediation/cases.js.map +1 -1
- package/dist/remediation/codeQualityExport.d.ts +25 -0
- package/dist/remediation/codeQualityExport.js +24 -0
- package/dist/remediation/codeQualityExport.js.map +1 -0
- package/dist/remediation/codexSecurity.d.ts +54 -0
- package/dist/remediation/codexSecurity.js +366 -0
- package/dist/remediation/codexSecurity.js.map +1 -0
- package/dist/remediation/evasion.d.ts +61 -0
- package/dist/remediation/evasion.js +190 -0
- package/dist/remediation/evasion.js.map +1 -0
- package/dist/remediation/fixLoop.d.ts +255 -0
- package/dist/remediation/fixLoop.js +639 -0
- package/dist/remediation/fixLoop.js.map +1 -0
- package/dist/remediation/fixLoopStats.d.ts +93 -0
- package/dist/remediation/fixLoopStats.js +244 -0
- package/dist/remediation/fixLoopStats.js.map +1 -0
- package/dist/remediation/rebase.d.ts +44 -0
- package/dist/remediation/rebase.js +114 -0
- package/dist/remediation/rebase.js.map +1 -0
- package/dist/remediation/reproduce.d.ts +47 -0
- package/dist/remediation/reproduce.js +75 -0
- package/dist/remediation/reproduce.js.map +1 -0
- package/dist/remediation/sarif.d.ts +14 -1
- package/dist/remediation/sarif.js +21 -3
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +52 -3
- package/dist/remediation/scannerSuite.js +347 -88
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/remediation/verify.d.ts +8 -0
- package/dist/remediation/verify.js +24 -11
- package/dist/remediation/verify.js.map +1 -1
- package/dist/security/config.d.ts +8 -2
- package/dist/security/config.js +10 -3
- package/dist/security/config.js.map +1 -1
- package/dist/security/contracts.js +15 -0
- package/dist/security/contracts.js.map +1 -1
- package/dist/security/fixRecord.d.ts +103 -8
- package/dist/security/fixRecord.js +113 -11
- package/dist/security/fixRecord.js.map +1 -1
- package/dist/security/fixRecordFile.d.ts +11 -2
- package/dist/security/fixRecordFile.js +20 -2
- package/dist/security/fixRecordFile.js.map +1 -1
- package/dist/security/fixRecordSignature.d.ts +104 -0
- package/dist/security/fixRecordSignature.js +227 -0
- package/dist/security/fixRecordSignature.js.map +1 -0
- package/dist/security/guardedScan.d.ts +39 -0
- package/dist/security/guardedScan.js +45 -0
- package/dist/security/guardedScan.js.map +1 -0
- package/dist/security/onboarding.d.ts +28 -0
- package/dist/security/onboarding.js +124 -0
- package/dist/security/onboarding.js.map +1 -0
- package/dist/security/reproduceInCi.d.ts +44 -0
- package/dist/security/reproduceInCi.js +96 -0
- package/dist/security/reproduceInCi.js.map +1 -0
- package/dist/security/reverify.d.ts +130 -0
- package/dist/security/reverify.js +361 -0
- package/dist/security/reverify.js.map +1 -0
- package/dist/security/suppressionGuard.d.ts +58 -0
- package/dist/security/suppressionGuard.js +216 -0
- package/dist/security/suppressionGuard.js.map +1 -0
- package/dist/security/verifyRun.js +14 -3
- package/dist/security/verifyRun.js.map +1 -1
- package/dist/security/workflow.d.ts +11 -1
- package/dist/security/workflow.js +2 -0
- package/dist/security/workflow.js.map +1 -1
- package/dist/server/routes/config.js +2 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/remediation.js +6 -5
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/tools/editFile.js +9 -2
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/registry.d.ts +4 -1
- package/dist/tools/registry.js +29 -9
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +3 -0
- package/dist/tools/runSecuritySuite.js +2 -2
- package/dist/tools/runSecuritySuite.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fixLoop.js","sourceRoot":"","sources":["../../src/remediation/fixLoop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { type FixLoopLog, type FixLoopOutcome } from './fixLoop.js';
|
|
2
|
+
/**
|
|
3
|
+
* What the round logs say about the fix loop, across every run on this machine.
|
|
4
|
+
*
|
|
5
|
+
* The loop's stop rules and feedback are tuned on this, and it is the only
|
|
6
|
+
* honest answer to "does it work?": how often a loop reaches green, in how many
|
|
7
|
+
* rounds, and — when it does not — what was still open when it stopped. Each
|
|
8
|
+
* number is derived from logs alone, so the summary can be re-derived by anyone
|
|
9
|
+
* holding the same files.
|
|
10
|
+
*/
|
|
11
|
+
export type FixLoopStats = {
|
|
12
|
+
dir: string;
|
|
13
|
+
loops: number;
|
|
14
|
+
/** Files in the directory that are not loop logs, or not readable as one. */
|
|
15
|
+
unreadable: string[];
|
|
16
|
+
/** Earliest and latest loop start among those counted. */
|
|
17
|
+
window: {
|
|
18
|
+
from: string | null;
|
|
19
|
+
to: string | null;
|
|
20
|
+
};
|
|
21
|
+
outcomes: Partial<Record<FixLoopOutcome, number>>;
|
|
22
|
+
/** Verified loops over loops that attempted a fix (excludes not-auto-fixable). */
|
|
23
|
+
verifiedRate: number | null;
|
|
24
|
+
/** Fix rounds a verified loop took. Reproduce rounds are not counted. */
|
|
25
|
+
roundsToGreen: Distribution | null;
|
|
26
|
+
/** Which stop rule fired; v1 logs did not record it and count as `unknown`. */
|
|
27
|
+
stopRules: Record<string, number>;
|
|
28
|
+
/**
|
|
29
|
+
* For loops that stopped short (stalled or budget-exhausted): how many still
|
|
30
|
+
* had each kind of problem open in their last fix round. One loop can count
|
|
31
|
+
* under several.
|
|
32
|
+
*/
|
|
33
|
+
openAtStop: {
|
|
34
|
+
loops: number;
|
|
35
|
+
targets: number;
|
|
36
|
+
introduced: number;
|
|
37
|
+
failedChecks: number;
|
|
38
|
+
suppressions: number;
|
|
39
|
+
evasion: number;
|
|
40
|
+
};
|
|
41
|
+
/** Loops where any fix round was judged to hide a finding rather than fix it. */
|
|
42
|
+
evasionLoops: number;
|
|
43
|
+
/** Loops where the executor added a suppression in any fix round. */
|
|
44
|
+
suppressionLoops: number;
|
|
45
|
+
reproduction: Record<string, number>;
|
|
46
|
+
rebasedLoops: number;
|
|
47
|
+
needsHuman: number;
|
|
48
|
+
/** Wall time spent in rounds, per loop. */
|
|
49
|
+
durationMs: Distribution | null;
|
|
50
|
+
/**
|
|
51
|
+
* Scan time per fix round, split by how the round was scanned. Logs written
|
|
52
|
+
* before rounds recorded their scan are not counted here.
|
|
53
|
+
*/
|
|
54
|
+
scanMs: {
|
|
55
|
+
narrowed: Distribution | null;
|
|
56
|
+
full: Distribution | null;
|
|
57
|
+
};
|
|
58
|
+
/**
|
|
59
|
+
* Narrowed rounds that would have stopped, re-judged on a full scan; and how
|
|
60
|
+
* many of those the full scan decided differently.
|
|
61
|
+
*/
|
|
62
|
+
confirmations: {
|
|
63
|
+
total: number;
|
|
64
|
+
changedDecision: number;
|
|
65
|
+
};
|
|
66
|
+
byExecutor: Record<string, {
|
|
67
|
+
loops: number;
|
|
68
|
+
verified: number;
|
|
69
|
+
roundsToGreen: Distribution | null;
|
|
70
|
+
}>;
|
|
71
|
+
};
|
|
72
|
+
export type Distribution = {
|
|
73
|
+
median: number;
|
|
74
|
+
p90: number;
|
|
75
|
+
max: number;
|
|
76
|
+
histogram: Record<string, number>;
|
|
77
|
+
};
|
|
78
|
+
export type FixLoopStatsFilter = {
|
|
79
|
+
/** Only loops started at or after this time. */
|
|
80
|
+
since?: Date;
|
|
81
|
+
executor?: string;
|
|
82
|
+
};
|
|
83
|
+
export declare function readFixLoopLogs(dir?: string): Promise<{
|
|
84
|
+
logs: FixLoopLog[];
|
|
85
|
+
unreadable: string[];
|
|
86
|
+
}>;
|
|
87
|
+
export declare function summarizeFixLoops(logs: FixLoopLog[], options: {
|
|
88
|
+
dir: string;
|
|
89
|
+
unreadable?: string[];
|
|
90
|
+
} & FixLoopStatsFilter): FixLoopStats;
|
|
91
|
+
export declare function renderFixLoopStats(stats: FixLoopStats): string;
|
|
92
|
+
/** v2 logs carry `startedAt`; v1 logs only have it inside their id. */
|
|
93
|
+
export declare function loopStart(log: Pick<FixLoopLog, 'id' | 'startedAt'>): Date | undefined;
|
|
@@ -0,0 +1,244 @@
|
|
|
1
|
+
import { readdir, readFile } from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { defaultFixLoopDir } from './fixLoop.js';
|
|
4
|
+
export async function readFixLoopLogs(dir = defaultFixLoopDir()) {
|
|
5
|
+
let names;
|
|
6
|
+
try {
|
|
7
|
+
names = (await readdir(dir)).filter(name => name.endsWith('.json')).sort();
|
|
8
|
+
}
|
|
9
|
+
catch (error) {
|
|
10
|
+
// No loop has run here yet: an empty history, not a failure.
|
|
11
|
+
if (error.code === 'ENOENT')
|
|
12
|
+
return { logs: [], unreadable: [] };
|
|
13
|
+
throw error;
|
|
14
|
+
}
|
|
15
|
+
const logs = [];
|
|
16
|
+
const unreadable = [];
|
|
17
|
+
for (const name of names) {
|
|
18
|
+
try {
|
|
19
|
+
const parsed = JSON.parse(await readFile(path.join(dir, name), 'utf8'));
|
|
20
|
+
if (isLoopLog(parsed))
|
|
21
|
+
logs.push(parsed);
|
|
22
|
+
else
|
|
23
|
+
unreadable.push(name);
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
unreadable.push(name);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return { logs, unreadable };
|
|
30
|
+
}
|
|
31
|
+
export function summarizeFixLoops(logs, options) {
|
|
32
|
+
const selected = logs.filter(log => {
|
|
33
|
+
if (options.executor && (log.executor ?? 'unknown') !== options.executor)
|
|
34
|
+
return false;
|
|
35
|
+
if (options.since) {
|
|
36
|
+
const started = loopStart(log);
|
|
37
|
+
// A loop whose start cannot be told is not known to be in the window.
|
|
38
|
+
if (!started || started < options.since)
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
return true;
|
|
42
|
+
});
|
|
43
|
+
const outcomes = {};
|
|
44
|
+
const stopRules = {};
|
|
45
|
+
const reproduction = {};
|
|
46
|
+
const openAtStop = { loops: 0, targets: 0, introduced: 0, failedChecks: 0, suppressions: 0, evasion: 0 };
|
|
47
|
+
const greenRounds = [];
|
|
48
|
+
const durations = [];
|
|
49
|
+
const scanNarrowed = [];
|
|
50
|
+
const scanFull = [];
|
|
51
|
+
const confirmations = { total: 0, changedDecision: 0 };
|
|
52
|
+
const executors = new Map();
|
|
53
|
+
const starts = [];
|
|
54
|
+
let evasionLoops = 0;
|
|
55
|
+
let suppressionLoops = 0;
|
|
56
|
+
let rebasedLoops = 0;
|
|
57
|
+
let needsHuman = 0;
|
|
58
|
+
for (const log of selected) {
|
|
59
|
+
bump(outcomes, log.outcome);
|
|
60
|
+
bump(stopRules, log.stopRule ?? 'unknown');
|
|
61
|
+
if (log.reproduction)
|
|
62
|
+
bump(reproduction, log.reproduction);
|
|
63
|
+
needsHuman += log.needsHuman.length;
|
|
64
|
+
const start = loopStart(log);
|
|
65
|
+
if (start)
|
|
66
|
+
starts.push(start);
|
|
67
|
+
const fixRounds = log.rounds.filter(round => round.phase === 'fix');
|
|
68
|
+
if (fixRounds.some(round => round.evasion > 0))
|
|
69
|
+
evasionLoops += 1;
|
|
70
|
+
if (fixRounds.some(round => round.suppressions > 0))
|
|
71
|
+
suppressionLoops += 1;
|
|
72
|
+
if (log.rounds.some(round => round.rebased))
|
|
73
|
+
rebasedLoops += 1;
|
|
74
|
+
if (log.rounds.length)
|
|
75
|
+
durations.push(log.rounds.reduce((sum, round) => sum + round.durationMs, 0));
|
|
76
|
+
for (const round of fixRounds) {
|
|
77
|
+
if (!round.scan)
|
|
78
|
+
continue;
|
|
79
|
+
(round.scan.mode === 'narrowed' ? scanNarrowed : scanFull).push(round.scan.durationMs);
|
|
80
|
+
if (round.scan.confirmed) {
|
|
81
|
+
confirmations.total += 1;
|
|
82
|
+
if (round.scan.decisionChanged)
|
|
83
|
+
confirmations.changedDecision += 1;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
const executor = log.executor ?? 'unknown';
|
|
87
|
+
const entry = executors.get(executor) ?? { loops: 0, verified: 0, rounds: [] };
|
|
88
|
+
entry.loops += 1;
|
|
89
|
+
if (log.outcome === 'verified') {
|
|
90
|
+
entry.verified += 1;
|
|
91
|
+
entry.rounds.push(fixRounds.length);
|
|
92
|
+
greenRounds.push(fixRounds.length);
|
|
93
|
+
}
|
|
94
|
+
executors.set(executor, entry);
|
|
95
|
+
const last = fixRounds.at(-1);
|
|
96
|
+
if (last && (log.outcome === 'stalled' || log.outcome === 'budget-exhausted')) {
|
|
97
|
+
openAtStop.loops += 1;
|
|
98
|
+
if (last.remaining > 0)
|
|
99
|
+
openAtStop.targets += 1;
|
|
100
|
+
if (last.blockingIntroduced > 0)
|
|
101
|
+
openAtStop.introduced += 1;
|
|
102
|
+
if (last.failedChecks.length > 0)
|
|
103
|
+
openAtStop.failedChecks += 1;
|
|
104
|
+
if (last.suppressions > 0)
|
|
105
|
+
openAtStop.suppressions += 1;
|
|
106
|
+
if (last.evasion > 0)
|
|
107
|
+
openAtStop.evasion += 1;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
const attempted = selected.length - (outcomes['not-auto-fixable'] ?? 0);
|
|
111
|
+
starts.sort((a, b) => a.getTime() - b.getTime());
|
|
112
|
+
return {
|
|
113
|
+
dir: options.dir,
|
|
114
|
+
loops: selected.length,
|
|
115
|
+
unreadable: options.unreadable ?? [],
|
|
116
|
+
window: { from: starts[0]?.toISOString() ?? null, to: starts.at(-1)?.toISOString() ?? null },
|
|
117
|
+
outcomes,
|
|
118
|
+
verifiedRate: attempted > 0 ? (outcomes.verified ?? 0) / attempted : null,
|
|
119
|
+
roundsToGreen: distribution(greenRounds),
|
|
120
|
+
stopRules,
|
|
121
|
+
openAtStop,
|
|
122
|
+
evasionLoops,
|
|
123
|
+
suppressionLoops,
|
|
124
|
+
reproduction,
|
|
125
|
+
rebasedLoops,
|
|
126
|
+
needsHuman,
|
|
127
|
+
durationMs: distribution(durations, false),
|
|
128
|
+
scanMs: { narrowed: distribution(scanNarrowed, false), full: distribution(scanFull, false) },
|
|
129
|
+
confirmations,
|
|
130
|
+
byExecutor: Object.fromEntries([...executors].sort(([a], [b]) => a.localeCompare(b)).map(([name, entry]) => [
|
|
131
|
+
name,
|
|
132
|
+
{ loops: entry.loops, verified: entry.verified, roundsToGreen: distribution(entry.rounds) },
|
|
133
|
+
])),
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
export function renderFixLoopStats(stats) {
|
|
137
|
+
const lines = [`Fix loops: ${stats.loops} in ${stats.dir}`];
|
|
138
|
+
if (stats.unreadable.length)
|
|
139
|
+
lines.push(`Skipped ${stats.unreadable.length} file(s) that are not loop logs: ${stats.unreadable.join(', ')}`);
|
|
140
|
+
if (!stats.loops) {
|
|
141
|
+
lines.push('No loop has been logged yet. Run `dvalincode dvalin --fix --until-clean` to start one.');
|
|
142
|
+
return lines.join('\n');
|
|
143
|
+
}
|
|
144
|
+
if (stats.window.from)
|
|
145
|
+
lines.push(`Window: ${stats.window.from} → ${stats.window.to}`);
|
|
146
|
+
lines.push('', 'Outcomes:');
|
|
147
|
+
for (const [outcome, count] of sortedEntries(stats.outcomes))
|
|
148
|
+
lines.push(` ${outcome.padEnd(18)} ${count}`);
|
|
149
|
+
if (stats.verifiedRate !== null)
|
|
150
|
+
lines.push(`Verified: ${percent(stats.verifiedRate)} of loops that attempted a fix`);
|
|
151
|
+
if (stats.roundsToGreen) {
|
|
152
|
+
lines.push(`Rounds to green: median ${stats.roundsToGreen.median}, p90 ${stats.roundsToGreen.p90}, max ${stats.roundsToGreen.max}`);
|
|
153
|
+
lines.push(` ${Object.entries(stats.roundsToGreen.histogram).map(([rounds, count]) => `${rounds}: ${count}`).join(' · ')}`);
|
|
154
|
+
}
|
|
155
|
+
lines.push('', 'Stop rules:');
|
|
156
|
+
for (const [rule, count] of sortedEntries(stats.stopRules))
|
|
157
|
+
lines.push(` ${rule.padEnd(18)} ${count}`);
|
|
158
|
+
if (stats.openAtStop.loops) {
|
|
159
|
+
const open = stats.openAtStop;
|
|
160
|
+
lines.push('', `Still open when ${open.loops} loop(s) stalled or ran out of rounds:`);
|
|
161
|
+
lines.push(` targets not closed ${open.targets}`);
|
|
162
|
+
lines.push(` introduced findings ${open.introduced}`);
|
|
163
|
+
lines.push(` failing checks ${open.failedChecks}`);
|
|
164
|
+
lines.push(` added suppressions ${open.suppressions}`);
|
|
165
|
+
lines.push(` evasion signals ${open.evasion}`);
|
|
166
|
+
}
|
|
167
|
+
lines.push('', `Judged evasion in some round: ${stats.evasionLoops} loop(s); added a suppression: ${stats.suppressionLoops}; rebased: ${stats.rebasedLoops}`);
|
|
168
|
+
if (Object.keys(stats.reproduction).length) {
|
|
169
|
+
lines.push(`Reproduction: ${sortedEntries(stats.reproduction).map(([status, count]) => `${status} ${count}`).join(', ')}`);
|
|
170
|
+
}
|
|
171
|
+
if (stats.needsHuman)
|
|
172
|
+
lines.push(`Targets handed to a person: ${stats.needsHuman}`);
|
|
173
|
+
if (stats.durationMs)
|
|
174
|
+
lines.push(`Time in rounds per loop: median ${seconds(stats.durationMs.median)}, p90 ${seconds(stats.durationMs.p90)}`);
|
|
175
|
+
const { narrowed, full } = stats.scanMs ?? { narrowed: null, full: null };
|
|
176
|
+
if (narrowed || full) {
|
|
177
|
+
const part = (label, d) => d ? `${label} median ${seconds(d.median)}, p90 ${seconds(d.p90)}` : undefined;
|
|
178
|
+
lines.push(`Scan time per round: ${[part('narrowed', narrowed), part('full', full)].filter(Boolean).join(' · ')}`);
|
|
179
|
+
}
|
|
180
|
+
if (stats.confirmations?.total) {
|
|
181
|
+
lines.push(`Stops confirmed by a full scan: ${stats.confirmations.total}, decision changed by it: ${stats.confirmations.changedDecision}`);
|
|
182
|
+
}
|
|
183
|
+
if (Object.keys(stats.byExecutor).length > 1) {
|
|
184
|
+
lines.push('', 'By executor:');
|
|
185
|
+
for (const [name, entry] of Object.entries(stats.byExecutor)) {
|
|
186
|
+
const green = entry.roundsToGreen ? `, median ${entry.roundsToGreen.median} round(s) to green` : '';
|
|
187
|
+
lines.push(` ${name.padEnd(12)} ${entry.verified}/${entry.loops} verified${green}`);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
return lines.join('\n');
|
|
191
|
+
}
|
|
192
|
+
function isLoopLog(value) {
|
|
193
|
+
if (!value || typeof value !== 'object')
|
|
194
|
+
return false;
|
|
195
|
+
const log = value;
|
|
196
|
+
return log.kind === 'dvalin-fix-loop'
|
|
197
|
+
&& typeof log.id === 'string'
|
|
198
|
+
&& typeof log.outcome === 'string'
|
|
199
|
+
&& Array.isArray(log.rounds)
|
|
200
|
+
&& log.rounds.every(round => round && typeof round === 'object' && typeof round.durationMs === 'number')
|
|
201
|
+
&& Array.isArray(log.needsHuman);
|
|
202
|
+
}
|
|
203
|
+
/** v2 logs carry `startedAt`; v1 logs only have it inside their id. */
|
|
204
|
+
export function loopStart(log) {
|
|
205
|
+
if (log.startedAt) {
|
|
206
|
+
const parsed = new Date(log.startedAt);
|
|
207
|
+
if (!Number.isNaN(parsed.getTime()))
|
|
208
|
+
return parsed;
|
|
209
|
+
}
|
|
210
|
+
const match = /^fixloop-(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z-/.exec(log.id);
|
|
211
|
+
if (!match)
|
|
212
|
+
return undefined;
|
|
213
|
+
const parsed = new Date(`${match[1]}T${match[2]}:${match[3]}:${match[4]}.${match[5]}Z`);
|
|
214
|
+
return Number.isNaN(parsed.getTime()) ? undefined : parsed;
|
|
215
|
+
}
|
|
216
|
+
function distribution(values, histogram = true) {
|
|
217
|
+
if (!values.length)
|
|
218
|
+
return null;
|
|
219
|
+
const sorted = [...values].sort((a, b) => a - b);
|
|
220
|
+
const counts = {};
|
|
221
|
+
if (histogram)
|
|
222
|
+
for (const value of sorted)
|
|
223
|
+
bump(counts, String(value));
|
|
224
|
+
return { median: quantile(sorted, 0.5), p90: quantile(sorted, 0.9), max: sorted.at(-1), histogram: counts };
|
|
225
|
+
}
|
|
226
|
+
/** Nearest-rank, so every reported value is one a real loop produced. */
|
|
227
|
+
function quantile(sorted, q) {
|
|
228
|
+
return sorted[Math.max(0, Math.ceil(q * sorted.length) - 1)];
|
|
229
|
+
}
|
|
230
|
+
function bump(counts, key) {
|
|
231
|
+
counts[key] = (counts[key] ?? 0) + 1;
|
|
232
|
+
}
|
|
233
|
+
function sortedEntries(counts) {
|
|
234
|
+
return Object.entries(counts)
|
|
235
|
+
.filter((entry) => typeof entry[1] === 'number')
|
|
236
|
+
.sort(([a, x], [b, y]) => y - x || a.localeCompare(b));
|
|
237
|
+
}
|
|
238
|
+
function percent(rate) {
|
|
239
|
+
return `${Math.round(rate * 100)}%`;
|
|
240
|
+
}
|
|
241
|
+
function seconds(ms) {
|
|
242
|
+
return `${(ms / 1000).toFixed(1)}s`;
|
|
243
|
+
}
|
|
244
|
+
//# sourceMappingURL=fixLoopStats.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fixLoopStats.js","sourceRoot":"","sources":["../../src/remediation/fixLoopStats.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Keep the fix on top of a moving base, inside the loop.
|
|
3
|
+
*
|
|
4
|
+
* The manual version of this is the second half of the pain the loop exists to
|
|
5
|
+
* remove: the agent's patch was written against yesterday's main, the CI
|
|
6
|
+
* scanner runs against today's, and a person rebases, resolves, and pushes
|
|
7
|
+
* again — sometimes reintroducing what the fix removed. Here the rebase happens
|
|
8
|
+
* between the executor's edit and Dvalin's judgement, so every verdict the
|
|
9
|
+
* loop reaches is about the change as it sits on the current base.
|
|
10
|
+
*
|
|
11
|
+
* Mechanics: the executor's uncommitted work is committed as a temporary
|
|
12
|
+
* commit, the branch is rebased with git's own rebase, and the temporary commit
|
|
13
|
+
* is undone again, leaving the work uncommitted on the new base. Conflicts go to
|
|
14
|
+
* the executor — conflicts only, with the files named — and Dvalin, not the
|
|
15
|
+
* executor, continues the rebase. Markers left in a file are a conflict not
|
|
16
|
+
* resolved, whatever the executor says. If they cannot be resolved the rebase is
|
|
17
|
+
* aborted and the tree is left exactly as it was.
|
|
18
|
+
*/
|
|
19
|
+
export type RebaseResult = {
|
|
20
|
+
status: 'up-to-date';
|
|
21
|
+
base: string;
|
|
22
|
+
} | {
|
|
23
|
+
status: 'rebased';
|
|
24
|
+
from: string;
|
|
25
|
+
to: string;
|
|
26
|
+
base: string;
|
|
27
|
+
conflicts: string[];
|
|
28
|
+
} | {
|
|
29
|
+
status: 'conflict';
|
|
30
|
+
files: string[];
|
|
31
|
+
detail: string;
|
|
32
|
+
};
|
|
33
|
+
export type SyncInput = {
|
|
34
|
+
cwd: string;
|
|
35
|
+
/** The commit the uncommitted work currently sits on. */
|
|
36
|
+
baseCommit: string;
|
|
37
|
+
/** What to rebase onto, e.g. `origin/main`. Fetched first when it names a remote branch. */
|
|
38
|
+
onto: string;
|
|
39
|
+
/** Asked to resolve conflict markers in these files. Must not run git itself; Dvalin continues the rebase. */
|
|
40
|
+
resolveConflicts: (files: string[], attempt: number) => Promise<void>;
|
|
41
|
+
maxConflictRounds: number;
|
|
42
|
+
};
|
|
43
|
+
export declare function syncWithUpstream(input: SyncInput): Promise<RebaseResult>;
|
|
44
|
+
export declare function buildConflictPrompt(onto: string, files: string[], attempt: number): string;
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { readFile } from 'node:fs/promises';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { promisify } from 'node:util';
|
|
5
|
+
import { assertSafeRef } from './diffScope.js';
|
|
6
|
+
const execFileAsync = promisify(execFile);
|
|
7
|
+
const MARKER = /^(?:<{7}|>{7})(?: |$)/m;
|
|
8
|
+
const WIP_MESSAGE = 'dvalin: fix in progress (temporary, undone after rebase)';
|
|
9
|
+
export async function syncWithUpstream(input) {
|
|
10
|
+
assertSafeRef(input.onto);
|
|
11
|
+
await fetchIfRemote(input.cwd, input.onto);
|
|
12
|
+
const target = (await git(input.cwd, ['rev-parse', '--verify', '--quiet', `${input.onto}^{commit}`]).catch(() => '')).trim();
|
|
13
|
+
if (!target)
|
|
14
|
+
throw new Error(`Cannot resolve rebase target '${input.onto}'.`);
|
|
15
|
+
// Already contains upstream: nothing to do, and nothing to disturb.
|
|
16
|
+
if (await isAncestor(input.cwd, target, input.baseCommit))
|
|
17
|
+
return { status: 'up-to-date', base: input.baseCommit };
|
|
18
|
+
await git(input.cwd, ['add', '-A']);
|
|
19
|
+
const hasWork = Boolean((await git(input.cwd, ['diff', '--cached', '--name-only'])).trim());
|
|
20
|
+
if (hasWork)
|
|
21
|
+
await git(input.cwd, ['-c', 'commit.gpgsign=false', 'commit', '--no-verify', '-q', '-m', WIP_MESSAGE]);
|
|
22
|
+
const before = (await git(input.cwd, ['rev-parse', 'HEAD'])).trim();
|
|
23
|
+
const conflicts = new Set();
|
|
24
|
+
let stopped = !(await tryGit(input.cwd, ['rebase', '--quiet', target]));
|
|
25
|
+
for (let attempt = 1; stopped && attempt <= input.maxConflictRounds; attempt++) {
|
|
26
|
+
const files = await conflictedFiles(input.cwd);
|
|
27
|
+
files.forEach(file => conflicts.add(file));
|
|
28
|
+
if (files.length)
|
|
29
|
+
await input.resolveConflicts(files, attempt);
|
|
30
|
+
if (files.length && (await filesWithMarkers(input.cwd, files)).length)
|
|
31
|
+
continue;
|
|
32
|
+
await git(input.cwd, ['add', '-A']);
|
|
33
|
+
// The next commit in the rebase may stop again; that is another round.
|
|
34
|
+
stopped = !(await tryGit(input.cwd, ['rebase', '--continue']));
|
|
35
|
+
}
|
|
36
|
+
if (stopped) {
|
|
37
|
+
const files = await conflictedFiles(input.cwd);
|
|
38
|
+
const marked = await filesWithMarkers(input.cwd, files);
|
|
39
|
+
await tryGit(input.cwd, ['rebase', '--abort']);
|
|
40
|
+
if (hasWork)
|
|
41
|
+
await undoWip(input.cwd);
|
|
42
|
+
return {
|
|
43
|
+
status: 'conflict',
|
|
44
|
+
files: [...new Set([...files, ...marked])],
|
|
45
|
+
detail: `rebasing onto ${input.onto} stopped on conflicts that were not resolved in ${input.maxConflictRounds} attempt(s)`,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
// The temporary commit can vanish in the rebase — git drops a commit that
|
|
49
|
+
// became empty because upstream made the same change — so look, don't assume.
|
|
50
|
+
const wipOnTop = (await git(input.cwd, ['log', '-1', '--format=%s'])).trim() === WIP_MESSAGE;
|
|
51
|
+
const base = (await git(input.cwd, ['rev-parse', wipOnTop ? 'HEAD~1' : 'HEAD'])).trim();
|
|
52
|
+
if (wipOnTop)
|
|
53
|
+
await undoWip(input.cwd);
|
|
54
|
+
return { status: 'rebased', from: before, to: target, base, conflicts: [...conflicts].sort() };
|
|
55
|
+
}
|
|
56
|
+
export function buildConflictPrompt(onto, files, attempt) {
|
|
57
|
+
return [
|
|
58
|
+
`Dvalin rebased your security fix onto ${onto} and the rebase stopped on conflicts (attempt ${attempt}). Resolve them:`,
|
|
59
|
+
...files.map(file => `- ${file}`),
|
|
60
|
+
'',
|
|
61
|
+
'Edit only these files. Keep both the upstream change and the security fix; if they cannot both stand, keep the fix and say what you dropped.',
|
|
62
|
+
'Remove every conflict marker (<<<<<<<, =======, >>>>>>>). Do not run git — no add, commit, rebase, or checkout. Dvalin continues the rebase and judges the result.',
|
|
63
|
+
].join('\n');
|
|
64
|
+
}
|
|
65
|
+
async function undoWip(cwd) {
|
|
66
|
+
const subject = (await git(cwd, ['log', '-1', '--format=%s'])).trim();
|
|
67
|
+
if (subject !== WIP_MESSAGE)
|
|
68
|
+
return;
|
|
69
|
+
await git(cwd, ['reset', '--soft', 'HEAD~1']);
|
|
70
|
+
await git(cwd, ['reset', '-q']);
|
|
71
|
+
}
|
|
72
|
+
async function fetchIfRemote(cwd, onto) {
|
|
73
|
+
const remotes = (await git(cwd, ['remote']).catch(() => '')).split('\n').map(line => line.trim()).filter(Boolean);
|
|
74
|
+
const remote = remotes.find(name => onto.startsWith(`${name}/`));
|
|
75
|
+
if (!remote)
|
|
76
|
+
return;
|
|
77
|
+
// A failed fetch leaves the last fetched ref, which is still a valid target.
|
|
78
|
+
await tryGit(cwd, ['fetch', '--quiet', remote, onto.slice(remote.length + 1)]);
|
|
79
|
+
}
|
|
80
|
+
async function isAncestor(cwd, ancestor, descendant) {
|
|
81
|
+
return tryGit(cwd, ['merge-base', '--is-ancestor', ancestor, descendant]);
|
|
82
|
+
}
|
|
83
|
+
async function conflictedFiles(cwd) {
|
|
84
|
+
return (await git(cwd, ['diff', '--name-only', '--diff-filter=U']).catch(() => '')).split('\n').filter(Boolean);
|
|
85
|
+
}
|
|
86
|
+
async function filesWithMarkers(cwd, files) {
|
|
87
|
+
const root = (await git(cwd, ['rev-parse', '--show-toplevel'])).trim();
|
|
88
|
+
const marked = [];
|
|
89
|
+
for (const file of files) {
|
|
90
|
+
const content = await readFile(path.join(root, file), 'utf8').catch(() => '');
|
|
91
|
+
if (MARKER.test(content))
|
|
92
|
+
marked.push(file);
|
|
93
|
+
}
|
|
94
|
+
return marked;
|
|
95
|
+
}
|
|
96
|
+
async function tryGit(cwd, args) {
|
|
97
|
+
try {
|
|
98
|
+
await git(cwd, args);
|
|
99
|
+
return true;
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
async function git(cwd, args) {
|
|
106
|
+
// GIT_EDITOR=true: `rebase --continue` must never wait on an editor.
|
|
107
|
+
const { stdout } = await execFileAsync('git', args, {
|
|
108
|
+
cwd,
|
|
109
|
+
maxBuffer: 64 * 1024 * 1024,
|
|
110
|
+
env: { ...process.env, GIT_EDITOR: 'true', GIT_SEQUENCE_EDITOR: 'true' },
|
|
111
|
+
});
|
|
112
|
+
return stdout;
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=rebase.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../src/remediation/rebase.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Reproduce, then fix.
|
|
3
|
+
*
|
|
4
|
+
* "The scanner stopped reporting it" is a weak oracle: rules have blind spots,
|
|
5
|
+
* and a loop that optimizes against them learns where they are. A test is a
|
|
6
|
+
* stronger one, but only if the test is not written by the same hand to fit the
|
|
7
|
+
* fix. So the order is fixed and observed:
|
|
8
|
+
*
|
|
9
|
+
* 1. Before any fix, the executor writes a test that exercises the finding.
|
|
10
|
+
* Dvalin runs it on the still-vulnerable code and requires it to **fail**.
|
|
11
|
+
* 2. The test files are hashed. The fix must make them **pass without being
|
|
12
|
+
* touched** — a changed reproduction test is an open problem, not a pass.
|
|
13
|
+
*
|
|
14
|
+
* What the flip proves is exactly this: a test written before the fix failed on
|
|
15
|
+
* the vulnerable code and passes after it, unchanged. It does not prove the test
|
|
16
|
+
* exercises the vulnerability rather than something adjacent — the prompt asks
|
|
17
|
+
* for that and a reviewer can read it, but nothing here can check it.
|
|
18
|
+
*/
|
|
19
|
+
export type ReproRunner = {
|
|
20
|
+
/** A command with `{files}` (space-separated test paths) or `{dirs}` (their `./dir` packages). */
|
|
21
|
+
template: string;
|
|
22
|
+
source: 'flag' | 'config' | 'inferred';
|
|
23
|
+
/**
|
|
24
|
+
* Exit codes that mean the runner itself failed — not found, usage error, no
|
|
25
|
+
* tests collected — rather than that a test failed. A reproduction "fails"
|
|
26
|
+
* only when a test does; a broken runner is not evidence of a vulnerability.
|
|
27
|
+
*/
|
|
28
|
+
errorExitCodes: number[];
|
|
29
|
+
};
|
|
30
|
+
export type ReproOutcome = 'failed' | 'passed' | 'error';
|
|
31
|
+
/**
|
|
32
|
+
* How to run just the reproduction tests.
|
|
33
|
+
*
|
|
34
|
+
* An explicit flag wins, then the policy file's `reproduce`, then inference
|
|
35
|
+
* from the project. The executor never chooses: a runner it picked could be one
|
|
36
|
+
* that fails on anything and passes on anything.
|
|
37
|
+
*/
|
|
38
|
+
export declare function resolveReproRunner(cwd: string, options?: {
|
|
39
|
+
flag?: string;
|
|
40
|
+
configured?: string;
|
|
41
|
+
}): Promise<ReproRunner | undefined>;
|
|
42
|
+
export declare function reproCommand(template: string, files: string[]): string;
|
|
43
|
+
export declare function classifyReproExit(runner: Pick<ReproRunner, 'errorExitCodes'>, exitCode: number | null, output?: string): ReproOutcome;
|
|
44
|
+
export declare function hashFiles(cwd: string, files: string[]): Promise<Array<{
|
|
45
|
+
path: string;
|
|
46
|
+
sha256: string | null;
|
|
47
|
+
}>>;
|