dvalincode 0.16.1 → 0.18.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 +203 -44
- package/README.zh-CN.md +171 -38
- package/THIRD_PARTY_NOTICES.md +98 -43
- package/dist/agent/loop.d.ts +1 -1
- package/dist/agent/loop.js +2 -1
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.js +2 -2
- package/dist/agent/runner.js.map +1 -1
- package/dist/cli.js +6 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/chat.js +3 -2
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/data.js +2 -1
- package/dist/commands/data.js.map +1 -1
- package/dist/commands/dvalin.d.ts +9 -1
- package/dist/commands/dvalin.js +185 -44
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/evidence.js +17 -3
- package/dist/commands/evidence.js.map +1 -1
- package/dist/commands/mcpInstall.d.ts +2 -0
- package/dist/commands/mcpInstall.js +69 -0
- package/dist/commands/mcpInstall.js.map +1 -0
- package/dist/commands/mcpServe.js +3 -2
- package/dist/commands/mcpServe.js.map +1 -1
- package/dist/commands/policy.js +2 -1
- package/dist/commands/policy.js.map +1 -1
- package/dist/commands/report.js +6 -3
- package/dist/commands/report.js.map +1 -1
- package/dist/commands/runTool.d.ts +20 -0
- package/dist/commands/runTool.js +73 -13
- package/dist/commands/runTool.js.map +1 -1
- package/dist/commands/security.d.ts +47 -0
- package/dist/commands/security.js +415 -0
- package/dist/commands/security.js.map +1 -0
- package/dist/commands/tools.d.ts +11 -1
- package/dist/commands/tools.js +24 -3
- package/dist/commands/tools.js.map +1 -1
- package/dist/commands/update.js +2 -1
- package/dist/commands/update.js.map +1 -1
- package/dist/core/exitCodes.d.ts +38 -0
- package/dist/core/exitCodes.js +38 -0
- package/dist/core/exitCodes.js.map +1 -0
- package/dist/dvalinCli.d.ts +3 -0
- package/dist/dvalinCli.js +36 -0
- package/dist/dvalinCli.js.map +1 -0
- package/dist/dvalinIndex.d.ts +2 -0
- package/dist/dvalinIndex.js +9 -0
- package/dist/dvalinIndex.js.map +1 -0
- package/dist/evidence/pack.d.ts +8 -0
- package/dist/evidence/pack.js +16 -0
- package/dist/evidence/pack.js.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/install.d.ts +48 -0
- package/dist/mcp/install.js +74 -0
- package/dist/mcp/install.js.map +1 -0
- package/dist/mcp/server.d.ts +12 -1
- package/dist/mcp/server.js +233 -14
- package/dist/mcp/server.js.map +1 -1
- package/dist/remediation/automate.d.ts +4 -1
- package/dist/remediation/automate.js +35 -18
- package/dist/remediation/automate.js.map +1 -1
- package/dist/remediation/diffScope.d.ts +29 -0
- package/dist/remediation/diffScope.js +107 -0
- package/dist/remediation/diffScope.js.map +1 -0
- package/dist/remediation/executor.d.ts +60 -0
- package/dist/remediation/executor.js +144 -0
- package/dist/remediation/executor.js.map +1 -0
- package/dist/remediation/localScan.d.ts +2 -1
- package/dist/remediation/localScan.js +73 -3
- package/dist/remediation/localScan.js.map +1 -1
- package/dist/remediation/sarif.d.ts +6 -0
- package/dist/remediation/sarif.js +36 -14
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +21 -0
- package/dist/remediation/scannerSuite.js +65 -4
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/remediation/verify.d.ts +38 -0
- package/dist/remediation/verify.js +116 -0
- package/dist/remediation/verify.js.map +1 -0
- package/dist/security/baseline.d.ts +7 -0
- package/dist/security/baseline.js +26 -0
- package/dist/security/baseline.js.map +1 -0
- package/dist/security/config.d.ts +32 -0
- package/dist/security/config.js +131 -0
- package/dist/security/config.js.map +1 -0
- package/dist/security/contracts.d.ts +149 -0
- package/dist/security/contracts.js +231 -0
- package/dist/security/contracts.js.map +1 -0
- package/dist/security/fixRecord.d.ts +125 -0
- package/dist/security/fixRecord.js +169 -0
- package/dist/security/fixRecord.js.map +1 -0
- package/dist/security/fixRecordFile.d.ts +8 -0
- package/dist/security/fixRecordFile.js +37 -0
- package/dist/security/fixRecordFile.js.map +1 -0
- package/dist/security/fixRecordStore.d.ts +23 -0
- package/dist/security/fixRecordStore.js +74 -0
- package/dist/security/fixRecordStore.js.map +1 -0
- package/dist/security/render.d.ts +8 -0
- package/dist/security/render.js +20 -0
- package/dist/security/render.js.map +1 -0
- package/dist/security/suppressions.d.ts +12 -0
- package/dist/security/suppressions.js +60 -0
- package/dist/security/suppressions.js.map +1 -0
- package/dist/security/verifyRun.d.ts +21 -0
- package/dist/security/verifyRun.js +74 -0
- package/dist/security/verifyRun.js.map +1 -0
- package/dist/security/workflow.d.ts +98 -0
- package/dist/security/workflow.js +263 -0
- package/dist/security/workflow.js.map +1 -0
- package/dist/server/routes/remediation.d.ts +19 -0
- package/dist/server/routes/remediation.js +90 -18
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/tools/registry.d.ts +9 -0
- package/dist/tools/registry.js +11 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runCheck.d.ts +6 -0
- package/dist/tools/runCheck.js +1 -1
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +3 -0
- package/dist/tools/runSecuritySuite.js +18 -11
- package/dist/tools/runSecuritySuite.js.map +1 -1
- package/dist/tui/app.js +21 -2
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.js +2 -0
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +17 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/commands/data.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/commands/data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
import type { Command } from 'commander';
|
|
2
|
+
import { type SecurityCoverage } from '../security/contracts.js';
|
|
2
3
|
import { type DvalinScannerId, type DvalinScanSuiteResult } from '../remediation/scannerSuite.js';
|
|
3
4
|
declare const SEVERITIES: readonly ['critical', 'high', 'medium', 'low'];
|
|
4
5
|
type FailSeverity = typeof SEVERITIES[number] | 'none';
|
|
5
6
|
export declare function parseDvalinScannerIds(value: string): DvalinScannerId[];
|
|
6
7
|
export declare function dvalinFailureThresholdMet(result: DvalinScanSuiteResult, threshold: FailSeverity): boolean;
|
|
7
|
-
export declare function renderDvalinResult(result: DvalinScanSuiteResult, root: string, limit?: number): string;
|
|
8
|
+
export declare function renderDvalinResult(result: DvalinScanSuiteResult, root: string, limit?: number, coverage?: SecurityCoverage): string;
|
|
8
9
|
export declare function registerDvalinCommand(program: Command): void;
|
|
10
|
+
/**
|
|
11
|
+
* Parse `git status --porcelain -z`.
|
|
12
|
+
*
|
|
13
|
+
* Rename and copy entries carry two NUL-separated paths; the second is the
|
|
14
|
+
* current one. Everything else is a two-character status, a space, then the path.
|
|
15
|
+
*/
|
|
16
|
+
export declare function parsePorcelainZ(output: string): string[];
|
|
9
17
|
export {};
|
package/dist/commands/dvalin.js
CHANGED
|
@@ -2,12 +2,20 @@ import path from 'node:path';
|
|
|
2
2
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
3
3
|
import { execFile } from 'node:child_process';
|
|
4
4
|
import { promisify } from 'node:util';
|
|
5
|
-
import {
|
|
5
|
+
import { EXIT, UsageError } from '../core/exitCodes.js';
|
|
6
6
|
import { upsertRemediationCases, updateRemediationCase } from '../remediation/cases.js';
|
|
7
|
+
import { resolveDiffScope } from '../remediation/diffScope.js';
|
|
8
|
+
import { runProjectVerification } from '../remediation/verify.js';
|
|
9
|
+
import { sha256 } from '../audit/hash.js';
|
|
10
|
+
import { deriveCoverage, findingTargetFingerprint, securityProjectId, snapshotFinding } from '../security/contracts.js';
|
|
11
|
+
import { renderCoverage } from '../security/render.js';
|
|
12
|
+
import { FIX_EXECUTORS, buildFixRecord, renderFixRecord } from '../security/fixRecord.js';
|
|
13
|
+
import { saveFixRecord } from '../security/fixRecordStore.js';
|
|
14
|
+
import { EXECUTOR_IDS, resolveExecutor, } from '../remediation/executor.js';
|
|
7
15
|
import { createRemediationWorktree } from '../remediation/worktree.js';
|
|
8
16
|
import { runDvalinScanSuite, } from '../remediation/scannerSuite.js';
|
|
9
17
|
import { buildDvalinSarif } from '../remediation/sarifExport.js';
|
|
10
|
-
import { buildAutomatedFixPrompt,
|
|
18
|
+
import { buildAutomatedFixPrompt, buildDraftPrPrompt, evaluateVerificationGate, extractDraftPrUrl, } from '../remediation/automate.js';
|
|
11
19
|
const execFileAsync = promisify(execFile);
|
|
12
20
|
const SCANNER_IDS = ['builtin', 'semgrep', 'trivy', 'osv-scanner'];
|
|
13
21
|
const SEVERITIES = ['critical', 'high', 'medium', 'low'];
|
|
@@ -15,22 +23,22 @@ export function parseDvalinScannerIds(value) {
|
|
|
15
23
|
const ids = value.split(',').map(item => item.trim()).filter(Boolean);
|
|
16
24
|
const invalid = ids.filter(id => !SCANNER_IDS.includes(id));
|
|
17
25
|
if (invalid.length) {
|
|
18
|
-
throw new
|
|
26
|
+
throw new UsageError(`Unknown scanner(s): ${invalid.join(', ')}. Choose from ${SCANNER_IDS.join(', ')}.`);
|
|
19
27
|
}
|
|
20
28
|
if (!ids.length)
|
|
21
|
-
throw new
|
|
29
|
+
throw new UsageError('Select at least one Dvalin scanner.');
|
|
22
30
|
return [...new Set(ids)];
|
|
23
31
|
}
|
|
24
32
|
function positiveInteger(value, label) {
|
|
25
33
|
const parsed = Number(value);
|
|
26
34
|
if (!Number.isInteger(parsed) || parsed <= 0)
|
|
27
|
-
throw new
|
|
35
|
+
throw new UsageError(`${label} must be a positive integer.`);
|
|
28
36
|
return parsed;
|
|
29
37
|
}
|
|
30
38
|
function parseFailSeverity(value) {
|
|
31
39
|
if (value === 'none' || SEVERITIES.includes(value))
|
|
32
40
|
return value;
|
|
33
|
-
throw new
|
|
41
|
+
throw new UsageError(`--fail-on must be one of none, ${SEVERITIES.join(', ')}.`);
|
|
34
42
|
}
|
|
35
43
|
function findingSeverity(finding) {
|
|
36
44
|
const score = Number.parseFloat(finding.securitySeverity ?? '');
|
|
@@ -48,10 +56,14 @@ export function dvalinFailureThresholdMet(result, threshold) {
|
|
|
48
56
|
const thresholdIndex = SEVERITIES.indexOf(threshold);
|
|
49
57
|
return result.findings.some(finding => SEVERITIES.indexOf(findingSeverity(finding)) <= thresholdIndex);
|
|
50
58
|
}
|
|
51
|
-
export function renderDvalinResult(result, root, limit = 20) {
|
|
59
|
+
export function renderDvalinResult(result, root, limit = 20, coverage = deriveCoverage(result)) {
|
|
52
60
|
const lines = [
|
|
53
|
-
|
|
54
|
-
|
|
61
|
+
result.scope
|
|
62
|
+
? `Dvalin security scan · ${root} · changed lines vs ${result.scope.ref}`
|
|
63
|
+
: `Dvalin security scan · ${root}`,
|
|
64
|
+
result.scope
|
|
65
|
+
? `${result.findings.length} findings in ${result.scope.files} changed file(s) · ${result.metrics.rules} rules`
|
|
66
|
+
: `Health ${result.score}/100 (${result.grade}) · ${result.findings.length} findings · ${result.metrics.files} files · ${result.metrics.rules} rules`,
|
|
55
67
|
`Severity critical ${result.metrics.critical} · high ${result.metrics.high} · medium ${result.metrics.medium} · low ${result.metrics.low}`,
|
|
56
68
|
'',
|
|
57
69
|
'Scanners',
|
|
@@ -70,10 +82,13 @@ export function renderDvalinResult(result, root, limit = 20) {
|
|
|
70
82
|
}
|
|
71
83
|
}
|
|
72
84
|
else {
|
|
73
|
-
lines.push('',
|
|
85
|
+
lines.push('', result.scope
|
|
86
|
+
? 'No actionable findings on the changed lines. Pre-existing findings elsewhere were not read.'
|
|
87
|
+
: 'No actionable findings. Review scanner coverage before treating this as assurance.');
|
|
74
88
|
}
|
|
89
|
+
lines.push('', renderCoverage(coverage));
|
|
75
90
|
if (result.skippedResults)
|
|
76
|
-
lines.push(
|
|
91
|
+
lines.push(`Note: ${result.skippedResults} result(s) were skipped or truncated.`);
|
|
77
92
|
return lines.join('\n');
|
|
78
93
|
}
|
|
79
94
|
export function registerDvalinCommand(program) {
|
|
@@ -93,6 +108,11 @@ export function registerDvalinCommand(program) {
|
|
|
93
108
|
.option('--in-place', 'apply fixes in the selected workspace instead of an isolated worktree')
|
|
94
109
|
.option('--max-fixes <count>', 'maximum findings sent to one remediation run', '20')
|
|
95
110
|
.option('--provider <name>', 'override the configured model provider for remediation')
|
|
111
|
+
.option('--diff [ref]', 'only report on changed lines; optionally against a revision (e.g. origin/main...HEAD)')
|
|
112
|
+
.option('--staged', 'only report on changed lines in the git index')
|
|
113
|
+
.option('--executor <name>', `who performs a --fix: ${EXECUTOR_IDS.join(', ')}`, 'dvalin')
|
|
114
|
+
.option('--verify-command <cmd>', 'command Dvalin runs to verify a fix; repeatable. Detected from the project when omitted', collectVerifyCommand, [])
|
|
115
|
+
.option('--record <file>', 'write the Verified Fix Record as JSON, whether or not the gate passed')
|
|
96
116
|
.action(async (inputPath, options) => {
|
|
97
117
|
const root = path.resolve(process.cwd(), inputPath);
|
|
98
118
|
const scanners = parseDvalinScannerIds(options.scanners);
|
|
@@ -103,12 +123,35 @@ export function registerDvalinCommand(program) {
|
|
|
103
123
|
const shouldFix = Boolean(options.fix || options.verify || options.draftPr);
|
|
104
124
|
const shouldVerify = Boolean(options.verify || options.draftPr);
|
|
105
125
|
if (options.json && shouldFix)
|
|
106
|
-
throw new
|
|
126
|
+
throw new UsageError('--json cannot be combined with --fix, --verify, or --draft-pr.');
|
|
107
127
|
if (options.draftPr && options.inPlace) {
|
|
108
|
-
throw new
|
|
128
|
+
throw new UsageError('--draft-pr requires the default isolated worktree; remove --in-place.');
|
|
109
129
|
}
|
|
110
|
-
|
|
111
|
-
|
|
130
|
+
if (options.diff && options.staged)
|
|
131
|
+
throw new UsageError('Use either --diff or --staged, not both.');
|
|
132
|
+
const scoped = Boolean(options.diff || options.staged);
|
|
133
|
+
if (scoped && shouldFix) {
|
|
134
|
+
// A repair may touch lines the diff never named, so verifying it needs
|
|
135
|
+
// to look wider than the scan did. Until that widening exists, refuse
|
|
136
|
+
// rather than verify against the wrong surface.
|
|
137
|
+
throw new UsageError('--diff and --staged scan only; they cannot be combined with --fix, --verify, or --draft-pr.');
|
|
138
|
+
}
|
|
139
|
+
const scope = scoped
|
|
140
|
+
? await resolveDiffScope(root, {
|
|
141
|
+
staged: Boolean(options.staged),
|
|
142
|
+
ref: typeof options.diff === 'string' ? options.diff : undefined,
|
|
143
|
+
})
|
|
144
|
+
: undefined;
|
|
145
|
+
const executor = shouldFix ? resolveExecutor(parseExecutorId(options.executor)) : undefined;
|
|
146
|
+
if (executor) {
|
|
147
|
+
const unavailable = await executor.unavailableReason();
|
|
148
|
+
if (unavailable)
|
|
149
|
+
throw new UsageError(`--executor ${executor.id} is unusable: ${unavailable}`);
|
|
150
|
+
}
|
|
151
|
+
const result = await runDvalinScanSuite(root, { scanners, timeoutMs, scope });
|
|
152
|
+
console.log(options.json
|
|
153
|
+
? JSON.stringify({ ...result, coverage: deriveCoverage(result) }, null, 2)
|
|
154
|
+
: renderDvalinResult(result, root, limit));
|
|
112
155
|
let thresholdResult = result;
|
|
113
156
|
if (shouldFix && result.findings.length) {
|
|
114
157
|
const findings = result.findings.slice(0, maxFixes);
|
|
@@ -117,6 +160,7 @@ export function registerDvalinCommand(program) {
|
|
|
117
160
|
}
|
|
118
161
|
thresholdResult = await runAutomatedRemediation({
|
|
119
162
|
root,
|
|
163
|
+
before: result,
|
|
120
164
|
findings,
|
|
121
165
|
baselineFindings: result.findings,
|
|
122
166
|
scanners,
|
|
@@ -125,6 +169,9 @@ export function registerDvalinCommand(program) {
|
|
|
125
169
|
verify: shouldVerify,
|
|
126
170
|
draftPr: Boolean(options.draftPr),
|
|
127
171
|
provider: options.provider,
|
|
172
|
+
executor: executor,
|
|
173
|
+
verifyCommands: options.verifyCommand,
|
|
174
|
+
recordPath: options.record,
|
|
128
175
|
});
|
|
129
176
|
}
|
|
130
177
|
else if (shouldFix) {
|
|
@@ -140,10 +187,11 @@ export function registerDvalinCommand(program) {
|
|
|
140
187
|
console.log(`\nSARIF written to ${sarifPath}`);
|
|
141
188
|
}
|
|
142
189
|
if (dvalinFailureThresholdMet(thresholdResult, failOn))
|
|
143
|
-
process.exitCode =
|
|
190
|
+
process.exitCode = EXIT.gateNotMet;
|
|
144
191
|
});
|
|
145
192
|
}
|
|
146
193
|
async function runAutomatedRemediation(input) {
|
|
194
|
+
const { executor } = input;
|
|
147
195
|
const cases = await upsertRemediationCases({ cwd: input.root, findings: input.findings });
|
|
148
196
|
let cwd = input.root;
|
|
149
197
|
let worktreeContext;
|
|
@@ -168,29 +216,31 @@ async function runAutomatedRemediation(input) {
|
|
|
168
216
|
}
|
|
169
217
|
for (const remediationCase of cases)
|
|
170
218
|
await updateRemediationCase(remediationCase.id, { status: 'fixing' });
|
|
171
|
-
console.log(
|
|
172
|
-
const fixTurn = await
|
|
173
|
-
|
|
219
|
+
console.log(`\n${executor.name}: validating and fixing findings…`);
|
|
220
|
+
const fixTurn = await executor.run({
|
|
221
|
+
prompt: buildAutomatedFixPrompt(input.findings, worktreeContext),
|
|
174
222
|
cwd,
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}, { onEvent: renderAutomationEvent });
|
|
179
|
-
console.log(`\n${fixTurn.result.output}\n`);
|
|
223
|
+
provider: input.provider,
|
|
224
|
+
}, renderAutomationEvent);
|
|
225
|
+
console.log(`\n${fixTurn.output}\n`);
|
|
180
226
|
if (!input.verify) {
|
|
181
227
|
console.log('Fix phase complete. Run again with --verify before publishing.');
|
|
182
228
|
return await runDvalinScanSuite(cwd, { scanners: input.scanners, timeoutMs: input.timeoutMs });
|
|
183
229
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
230
|
+
// Dvalin runs the checks. The executor is not asked whether its own patch
|
|
231
|
+
// works, because that is the one question it cannot answer against interest.
|
|
232
|
+
console.log('Dvalin: running the project checks…');
|
|
233
|
+
const verification = await runProjectVerification({
|
|
188
234
|
cwd,
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
235
|
+
commands: input.verifyCommands?.length ? input.verifyCommands : undefined,
|
|
236
|
+
timeoutMs: input.timeoutMs,
|
|
237
|
+
});
|
|
238
|
+
for (const check of verification.evidence) {
|
|
239
|
+
console.log(` ${check.passed ? '✓' : '✗'} ${check.kind}: ${check.command}${check.exitCode === null ? '' : ` (exit ${check.exitCode})`}`);
|
|
240
|
+
}
|
|
241
|
+
if (verification.skipped.length) {
|
|
242
|
+
console.log(` · not detected in this project: ${verification.skipped.join(', ')}. Use --verify-command to name them.`);
|
|
243
|
+
}
|
|
194
244
|
console.log('Dvalin gate: independently re-running scanners…');
|
|
195
245
|
const after = await runDvalinScanSuite(cwd, { scanners: input.scanners, timeoutMs: input.timeoutMs });
|
|
196
246
|
const { stdout: status } = await execFileAsync('git', ['status', '--porcelain'], { cwd });
|
|
@@ -198,9 +248,39 @@ async function runAutomatedRemediation(input) {
|
|
|
198
248
|
originals: input.findings,
|
|
199
249
|
baseline: input.baselineFindings,
|
|
200
250
|
after,
|
|
201
|
-
agentOutput:
|
|
251
|
+
agentOutput: fixTurn.output,
|
|
202
252
|
hasChanges: Boolean(status.trim()),
|
|
253
|
+
checkEvidence: verification.evidence,
|
|
254
|
+
});
|
|
255
|
+
// Issued whether or not the gate passed: a record that says a repair did not
|
|
256
|
+
// verify is exactly as useful as one that says it did, and dropping it on
|
|
257
|
+
// failure would leave the only unrecorded outcome the one worth recording.
|
|
258
|
+
const record = buildFixRecord({
|
|
259
|
+
projectId: securityProjectId(input.root),
|
|
260
|
+
executor: fixExecutorFor(executor.id),
|
|
261
|
+
before: {
|
|
262
|
+
scanId: input.before.id,
|
|
263
|
+
completedAt: input.before.completedAt,
|
|
264
|
+
coverage: deriveCoverage(input.before),
|
|
265
|
+
targets: input.findings.map(snapshotFinding),
|
|
266
|
+
},
|
|
267
|
+
after: {
|
|
268
|
+
scanId: after.id,
|
|
269
|
+
completedAt: after.completedAt,
|
|
270
|
+
coverage: deriveCoverage(after),
|
|
271
|
+
remainingTargets: remainingTargets(input.findings, after),
|
|
272
|
+
},
|
|
273
|
+
changes: await changesFrom(cwd),
|
|
274
|
+
checks: verification.evidence,
|
|
203
275
|
});
|
|
276
|
+
saveFixRecord(record);
|
|
277
|
+
if (input.recordPath) {
|
|
278
|
+
const target = path.resolve(process.cwd(), input.recordPath);
|
|
279
|
+
await mkdir(path.dirname(target), { recursive: true });
|
|
280
|
+
await writeFile(target, `${JSON.stringify(record, null, 2)}\n`, 'utf8');
|
|
281
|
+
console.log(`Fix record written to ${target}`);
|
|
282
|
+
}
|
|
283
|
+
console.log(renderFixRecord(record));
|
|
204
284
|
if (!gate.passed) {
|
|
205
285
|
throw new Error(`Dvalin verification gate failed: ${gate.reasons.join('; ')}`);
|
|
206
286
|
}
|
|
@@ -209,22 +289,83 @@ async function runAutomatedRemediation(input) {
|
|
|
209
289
|
console.log(`Verification passed · health ${after.score}/100 (${after.grade}) · ${after.findings.length} remaining finding(s)`);
|
|
210
290
|
if (!input.draftPr)
|
|
211
291
|
return after;
|
|
212
|
-
console.log(
|
|
213
|
-
const publishTurn = await
|
|
214
|
-
|
|
215
|
-
|
|
292
|
+
console.log(`\n${executor.name}: publishing verified remediation as a draft PR…`);
|
|
293
|
+
const publishTurn = await executor.run({
|
|
294
|
+
prompt: buildDraftPrPrompt(input.findings),
|
|
295
|
+
resume: fixTurn.session,
|
|
216
296
|
cwd,
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
console.log(`\n${publishTurn.result.output}\n`);
|
|
222
|
-
const url = extractDraftPrUrl(publishTurn.result.output);
|
|
297
|
+
provider: input.provider,
|
|
298
|
+
}, renderAutomationEvent);
|
|
299
|
+
console.log(`\n${publishTurn.output}\n`);
|
|
300
|
+
const url = extractDraftPrUrl(publishTurn.output);
|
|
223
301
|
if (!url)
|
|
224
302
|
throw new Error('Draft PR publication did not return a GitHub pull request URL.');
|
|
225
303
|
console.log(`Draft PR: ${url}`);
|
|
226
304
|
return after;
|
|
227
305
|
}
|
|
306
|
+
/** The original targets still present after the re-scan. */
|
|
307
|
+
function remainingTargets(originals, after) {
|
|
308
|
+
const present = new Set(after.findings.map(finding => findingTargetFingerprint(finding)));
|
|
309
|
+
return originals
|
|
310
|
+
.map(snapshotFinding)
|
|
311
|
+
.filter(target => present.has(target.targetFingerprint));
|
|
312
|
+
}
|
|
313
|
+
/**
|
|
314
|
+
* The changed files and a hash of the change itself.
|
|
315
|
+
*
|
|
316
|
+
* The hash covers the diff text, not the file list: two different patches over
|
|
317
|
+
* the same files are different repairs, and a hash that could not tell them
|
|
318
|
+
* apart would be worse than no hash, because it would look like one.
|
|
319
|
+
*/
|
|
320
|
+
async function changesFrom(cwd) {
|
|
321
|
+
// -z gives NUL-separated names, so a rename or a path with a space or a quote
|
|
322
|
+
// survives intact instead of arriving as `old -> new` or with its quotes.
|
|
323
|
+
const { stdout: named } = await execFileAsync('git', ['status', '--porcelain', '-z'], { cwd });
|
|
324
|
+
const files = parsePorcelainZ(named).sort();
|
|
325
|
+
if (!files.length)
|
|
326
|
+
return undefined;
|
|
327
|
+
// Tracked changes plus the content of anything new, so a repair that only
|
|
328
|
+
// adds a file still hashes to something specific to that file's content.
|
|
329
|
+
const { stdout: tracked } = await execFileAsync('git', ['diff', 'HEAD'], { cwd, maxBuffer: 64 * 1024 * 1024 });
|
|
330
|
+
const { stdout: untracked } = await execFileAsync('git', ['diff', '--no-index', '--', '/dev/null', '.'], { cwd, maxBuffer: 64 * 1024 * 1024 }).catch(() => ({ stdout: '' }));
|
|
331
|
+
return { files, diffHash: sha256(`${tracked}\n${untracked}`) };
|
|
332
|
+
}
|
|
333
|
+
/**
|
|
334
|
+
* Parse `git status --porcelain -z`.
|
|
335
|
+
*
|
|
336
|
+
* Rename and copy entries carry two NUL-separated paths; the second is the
|
|
337
|
+
* current one. Everything else is a two-character status, a space, then the path.
|
|
338
|
+
*/
|
|
339
|
+
export function parsePorcelainZ(output) {
|
|
340
|
+
const fields = output.split('\0').filter(Boolean);
|
|
341
|
+
const files = [];
|
|
342
|
+
for (let index = 0; index < fields.length; index++) {
|
|
343
|
+
const entry = fields[index];
|
|
344
|
+
const status = entry.slice(0, 2);
|
|
345
|
+
const current = entry.slice(3);
|
|
346
|
+
if (status.includes('R') || status.includes('C')) {
|
|
347
|
+
// The origin path follows as its own field; the destination is what exists now.
|
|
348
|
+
files.push(current);
|
|
349
|
+
index += 1;
|
|
350
|
+
continue;
|
|
351
|
+
}
|
|
352
|
+
if (current)
|
|
353
|
+
files.push(current);
|
|
354
|
+
}
|
|
355
|
+
return files;
|
|
356
|
+
}
|
|
357
|
+
/** Map a remediation executor id onto the record's vocabulary. */
|
|
358
|
+
function fixExecutorFor(id) {
|
|
359
|
+
return FIX_EXECUTORS.includes(id) ? id : 'unknown';
|
|
360
|
+
}
|
|
361
|
+
function collectVerifyCommand(value, previous) {
|
|
362
|
+
return [...previous, value];
|
|
363
|
+
}
|
|
364
|
+
function parseExecutorId(value) {
|
|
365
|
+
if (EXECUTOR_IDS.includes(value))
|
|
366
|
+
return value;
|
|
367
|
+
throw new UsageError(`Unknown --executor '${value}'. Expected one of: ${EXECUTOR_IDS.join(', ')}.`);
|
|
368
|
+
}
|
|
228
369
|
function renderAutomationEvent(event) {
|
|
229
370
|
if (event.type === 'tool_call')
|
|
230
371
|
console.log(` → ${event.name}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dvalin.js","sourceRoot":"","sources":["../../src/commands/dvalin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dvalin.js","sourceRoot":"","sources":["../../src/commands/dvalin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { EXIT } from '../core/exitCodes.js';
|
|
2
3
|
import { buildEvidencePack, verifyEvidencePack } from '../evidence/pack.js';
|
|
3
4
|
export function registerEvidenceCommand(program) {
|
|
4
5
|
const evidence = program
|
|
@@ -33,9 +34,20 @@ export function registerEvidenceCommand(program) {
|
|
|
33
34
|
}
|
|
34
35
|
catch (err) {
|
|
35
36
|
console.error(`Cannot read Evidence Pack: ${err instanceof Error ? err.message : String(err)}`);
|
|
36
|
-
process.exit(
|
|
37
|
+
process.exit(EXIT.usageError);
|
|
38
|
+
}
|
|
39
|
+
// A pack malformed enough to throw has still failed verification. Letting
|
|
40
|
+
// the exception escape would report it as exit 1 — indistinguishable from
|
|
41
|
+
// the tool breaking — when the honest answer is that it did not verify.
|
|
42
|
+
let report;
|
|
43
|
+
try {
|
|
44
|
+
report = verifyEvidencePack(pack);
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
console.error('✗ Evidence Pack verification FAILED');
|
|
48
|
+
console.error(` - not a well-formed Evidence Pack: ${err instanceof Error ? err.message : String(err)}`);
|
|
49
|
+
process.exit(EXIT.gateNotMet);
|
|
37
50
|
}
|
|
38
|
-
const report = verifyEvidencePack(pack);
|
|
39
51
|
if (report.ok) {
|
|
40
52
|
console.log(`✓ Evidence Pack intact — ${pack.runs.length} run chain(s) verified, all section hashes match`);
|
|
41
53
|
return;
|
|
@@ -44,7 +56,9 @@ export function registerEvidenceCommand(program) {
|
|
|
44
56
|
for (const issue of [...report.sectionIssues, ...report.runIssues, ...report.minimizationIssues]) {
|
|
45
57
|
console.error(` - ${issue}`);
|
|
46
58
|
}
|
|
47
|
-
|
|
59
|
+
// Verification ran and said no. That is a verdict, not a failure of the
|
|
60
|
+
// command, so it gets the gate code rather than the runtime-error one.
|
|
61
|
+
process.exit(EXIT.gateNotMet);
|
|
48
62
|
});
|
|
49
63
|
}
|
|
50
64
|
//# sourceMappingURL=evidence.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evidence.js","sourceRoot":"","sources":["../../src/commands/evidence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAqB,MAAM,qBAAqB,CAAC;AAE/F,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,MAAM,QAAQ,GAAG,OAAO;SACrB,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,0FAA0F,CAAC,CAAC;IAE3G,QAAQ;SACL,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,4DAA4D,CAAC;SACzE,MAAM,CAAC,cAAc,EAAE,6DAA6D,CAAC;SACrF,MAAM,CAAC,eAAe,EAAE,+BAA+B,CAAC;SACxD,MAAM,CAAC,YAAY,EAAE,8CAA8C,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;SAC1F,MAAM,CAAC,CAAC,OAAwD,EAAE,EAAE;QACnE,MAAM,IAAI,GAAG,iBAAiB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,uBAAuB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;QAChG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,mBAAmB,CAAC,CAAC;QAClH,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,+BAA+B,CAAC,CAAC;QAChG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QACzE,OAAO,CAAC,GAAG,CAAC,6CAA6C,GAAG,GAAG,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEL,QAAQ;SACL,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,4EAA4E,CAAC;SACzF,QAAQ,CAAC,QAAQ,EAAE,0BAA0B,CAAC;SAC9C,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE;QACvB,IAAI,IAAkB,CAAC;QACvB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAiB,CAAC;QAChE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"evidence.js","sourceRoot":"","sources":["../../src/commands/evidence.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { UsageError } from '../core/exitCodes.js';
|
|
4
|
+
import { MCP_CLIENT_IDS, mergeDvalinServer, renderConfig, resolveInstallTarget, } from '../mcp/install.js';
|
|
5
|
+
export function registerMcpInstallCommand(program) {
|
|
6
|
+
program
|
|
7
|
+
.command('mcp-install')
|
|
8
|
+
.description(`Write the Dvalin MCP server into an editor's config: ${MCP_CLIENT_IDS.join(', ')}`)
|
|
9
|
+
.argument('<client>', `editor to configure: ${MCP_CLIENT_IDS.join(', ')}`)
|
|
10
|
+
.option('--global', "write the user-level config instead of the project's")
|
|
11
|
+
.option('--print', 'show the resulting config without writing anything')
|
|
12
|
+
.option('--workspace <dir>', 'workspace the server is allowed to read', '.')
|
|
13
|
+
.option('--name <name>', 'name for the server entry', 'dvalin')
|
|
14
|
+
.action(async (client, options) => {
|
|
15
|
+
const id = parseClientId(client);
|
|
16
|
+
const root = process.cwd();
|
|
17
|
+
const target = resolveInstallTarget(id, root, Boolean(options.global));
|
|
18
|
+
const existing = await readJsonIfPresent(target.file);
|
|
19
|
+
const { config, action } = mergeDvalinServer(existing, target.client, options.workspace, options.name);
|
|
20
|
+
const rendered = renderConfig(config);
|
|
21
|
+
if (options.print) {
|
|
22
|
+
console.log(`# ${target.file}`);
|
|
23
|
+
console.log(rendered.trimEnd());
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
if (action === 'unchanged') {
|
|
27
|
+
console.log(`${target.client.name} already has '${options.name}' configured: ${target.file}`);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
await mkdir(path.dirname(target.file), { recursive: true });
|
|
31
|
+
await writeFile(target.file, rendered, 'utf8');
|
|
32
|
+
const verb = action === 'added' ? 'Added' : 'Replaced';
|
|
33
|
+
console.log(`${verb} '${options.name}' in ${target.file}`);
|
|
34
|
+
}
|
|
35
|
+
if (target.client.followUp)
|
|
36
|
+
console.log(`\n${target.client.followUp}`);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
function parseClientId(value) {
|
|
40
|
+
if (MCP_CLIENT_IDS.includes(value))
|
|
41
|
+
return value;
|
|
42
|
+
throw new UsageError(`Unknown client '${value}'. Expected one of: ${MCP_CLIENT_IDS.join(', ')}.`);
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* A malformed config is the user's file, not ours to silently replace — say so
|
|
46
|
+
* and stop, rather than writing over whatever was there.
|
|
47
|
+
*/
|
|
48
|
+
async function readJsonIfPresent(file) {
|
|
49
|
+
let raw;
|
|
50
|
+
try {
|
|
51
|
+
raw = await readFile(file, 'utf8');
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
if (!raw.trim())
|
|
57
|
+
return undefined;
|
|
58
|
+
try {
|
|
59
|
+
const parsed = JSON.parse(raw);
|
|
60
|
+
if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
|
|
61
|
+
throw new Error('not a JSON object');
|
|
62
|
+
}
|
|
63
|
+
return parsed;
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
throw new UsageError(`${file} is not valid JSON, so it was left alone: ${error instanceof Error ? error.message : String(error)}`);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=mcpInstall.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcpInstall.js","sourceRoot":"","sources":["../../src/commands/mcpInstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAS3B,MAAM,UAAU,yBAAyB,CAAC,OAAgB;IACxD,OAAO;SACJ,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,wDAAwD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;SAChG,QAAQ,CAAC,UAAU,EAAE,wBAAwB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;SACzE,MAAM,CAAC,UAAU,EAAE,sDAAsD,CAAC;SAC1E,MAAM,CAAC,SAAS,EAAE,oDAAoD,CAAC;SACvE,MAAM,CAAC,mBAAmB,EAAE,yCAAyC,EAAE,GAAG,CAAC;SAC3E,MAAM,CAAC,eAAe,EAAE,2BAA2B,EAAE,QAAQ,CAAC;SAC9D,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,OAAgB,EAAE,EAAE;QACjD,MAAM,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACvG,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAEtC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;YAChC,OAAO;QACT,CAAC;QAED,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,iBAAiB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ;YAAE,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,IAAK,cAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAoB,CAAC;IAC9E,MAAM,IAAI,UAAU,CAAC,mBAAmB,KAAK,uBAAuB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpG,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,iBAAiB,CAAC,IAAY;IAC3C,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,MAAiC,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,UAAU,CAClB,GAAG,IAAI,6CAA6C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC7G,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
+
import { EXIT } from '../core/exitCodes.js';
|
|
2
3
|
import { runMcpStdio } from '../mcp/server.js';
|
|
3
4
|
export function registerMcpServeCommand(program) {
|
|
4
5
|
program
|
|
@@ -10,7 +11,7 @@ export function registerMcpServeCommand(program) {
|
|
|
10
11
|
const ceiling = options.maxPermissionMode ?? 'auto';
|
|
11
12
|
if (!['plan', 'auto', 'bypass'].includes(ceiling)) {
|
|
12
13
|
console.error(`dvalincode mcp-serve: unknown permission ceiling: ${ceiling}`);
|
|
13
|
-
process.exitCode =
|
|
14
|
+
process.exitCode = EXIT.usageError;
|
|
14
15
|
return;
|
|
15
16
|
}
|
|
16
17
|
const cwd = process.cwd();
|
|
@@ -26,7 +27,7 @@ export function registerMcpServeCommand(program) {
|
|
|
26
27
|
}
|
|
27
28
|
catch (err) {
|
|
28
29
|
console.error(`dvalincode mcp-serve: ${err instanceof Error ? err.message : String(err)}`);
|
|
29
|
-
process.exitCode =
|
|
30
|
+
process.exitCode = EXIT.runtimeError;
|
|
30
31
|
}
|
|
31
32
|
});
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpServe.js","sourceRoot":"","sources":["../../src/commands/mcpServe.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"mcpServe.js","sourceRoot":"","sources":["../../src/commands/mcpServe.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAQ/C,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,2DAA2D,CAAC;SACxE,MAAM,CAAC,8BAA8B,EAAE,0DAA0D,CAAC;SAClG,MAAM,CAAC,mBAAmB,EAAE,qCAAqC,EAAE,OAAO,EAAE,EAAE,CAAC;SAC/E,MAAM,CAAC,KAAK,EAAE,OAAwB,EAAE,EAAE;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,IAAI,MAAM,CAAC;QACpD,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,OAAO,CAAC,KAAK,CAAC,qDAAqD,OAAO,EAAE,CAAC,CAAC;YAC9E,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC;YACnC,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,EAAE,MAAM;YAC1C,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,CAAC;YACH,MAAM,WAAW,CAAC;gBAChB,GAAG;gBACH,UAAU;gBACV,iBAAiB,EAAE,OAAmC;aACvD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,yBAAyB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3F,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,OAAO,CAAC,KAAa,EAAE,QAAkB;IAChD,OAAO,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC"}
|