dvalincode 0.12.0 → 0.14.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 +122 -24
- package/README.zh-CN.md +52 -4
- package/dist/agent/compact.d.ts +4 -2
- package/dist/agent/compact.js +41 -7
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.js +30 -31
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.d.ts +2 -2
- package/dist/agent/modes.js +6 -3
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +14 -6
- package/dist/agent/runner.js +370 -75
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +3 -1
- package/dist/agent/session.js +23 -2
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +10 -5
- package/dist/agent/types.js +12 -2
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +4 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/report.js +5 -0
- package/dist/audit/report.js.map +1 -1
- package/dist/cli.js +6 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/chat.js +1 -1
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/dvalin.d.ts +9 -0
- package/dist/commands/dvalin.js +222 -0
- package/dist/commands/dvalin.js.map +1 -0
- package/dist/commands/provider.js +3 -3
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/tui.js +2 -2
- package/dist/commands/tui.js.map +1 -1
- package/dist/commands/update.d.ts +2 -0
- package/dist/commands/update.js +238 -0
- package/dist/commands/update.js.map +1 -0
- package/dist/core/context.d.ts +4 -0
- package/dist/core/context.js +8 -1
- package/dist/core/context.js.map +1 -1
- package/dist/core/guiUpdate.d.ts +27 -0
- package/dist/core/guiUpdate.js +65 -0
- package/dist/core/guiUpdate.js.map +1 -0
- package/dist/core/policy.d.ts +6 -3
- package/dist/core/policy.js +8 -1
- package/dist/core/policy.js.map +1 -1
- package/dist/core/selfUpdate.d.ts +108 -0
- package/dist/core/selfUpdate.js +180 -0
- package/dist/core/selfUpdate.js.map +1 -0
- package/dist/core/subprocessSandbox.d.ts +16 -0
- package/dist/core/subprocessSandbox.js +168 -28
- package/dist/core/subprocessSandbox.js.map +1 -1
- package/dist/core/trust.d.ts +8 -0
- package/dist/core/trust.js +1 -10
- package/dist/core/trust.js.map +1 -1
- package/dist/core/workspace.js +2 -1
- package/dist/core/workspace.js.map +1 -1
- package/dist/providers/anthropic.d.ts +14 -0
- package/dist/providers/anthropic.js +244 -0
- package/dist/providers/anthropic.js.map +1 -0
- package/dist/providers/manager.d.ts +3 -0
- package/dist/providers/manager.js +13 -2
- package/dist/providers/manager.js.map +1 -1
- package/dist/providers/openaiCompatible.d.ts +12 -1
- package/dist/providers/openaiCompatible.js +21 -6
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/pool.js +3 -4
- package/dist/providers/pool.js.map +1 -1
- package/dist/providers/trustedBaseUrls.js +1 -0
- package/dist/providers/trustedBaseUrls.js.map +1 -1
- package/dist/providers/types.d.ts +20 -4
- package/dist/remediation/automate.d.ts +18 -0
- package/dist/remediation/automate.js +78 -0
- package/dist/remediation/automate.js.map +1 -0
- package/dist/remediation/localScan.js +9 -1
- package/dist/remediation/localScan.js.map +1 -1
- package/dist/remediation/sarif.js +18 -4
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +43 -0
- package/dist/remediation/scannerSuite.js +248 -0
- package/dist/remediation/scannerSuite.js.map +1 -0
- package/dist/server/routes/config.js +2 -3
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/remediation.js +34 -0
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/server/scannerWorkspaceGrants.d.ts +7 -0
- package/dist/server/scannerWorkspaceGrants.js +48 -0
- package/dist/server/scannerWorkspaceGrants.js.map +1 -0
- package/dist/server/security.js +20 -6
- package/dist/server/security.js.map +1 -1
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/skills/store.js +28 -0
- package/dist/skills/store.js.map +1 -1
- package/dist/tools/registry.d.ts +7 -0
- package/dist/tools/registry.js +30 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runCheck.js +1 -0
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +14 -0
- package/dist/tools/runSecuritySuite.js +35 -0
- package/dist/tools/runSecuritySuite.js.map +1 -0
- package/dist/tools/shell.d.ts +3 -1
- package/dist/tools/shell.js +16 -6
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/app.d.ts +1 -0
- package/dist/tui/app.js +110 -16
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/presets.d.ts +2 -2
- package/dist/tui/presets.js +1 -0
- package/dist/tui/presets.js.map +1 -1
- package/dist/tui/render.js +2 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +8 -0
- package/dist/version.js +9 -0
- package/dist/version.js.map +1 -0
- package/package.json +4 -3
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { execFile } from 'node:child_process';
|
|
3
|
+
import { promisify } from 'node:util';
|
|
4
|
+
import { runAgentTurn } from '../agent/session.js';
|
|
5
|
+
import { upsertRemediationCases, updateRemediationCase } from '../remediation/cases.js';
|
|
6
|
+
import { createRemediationWorktree } from '../remediation/worktree.js';
|
|
7
|
+
import { runDvalinScanSuite, } from '../remediation/scannerSuite.js';
|
|
8
|
+
import { buildAutomatedFixPrompt, buildAutomatedVerificationPrompt, buildDraftPrPrompt, evaluateVerificationGate, extractDraftPrUrl, } from '../remediation/automate.js';
|
|
9
|
+
const execFileAsync = promisify(execFile);
|
|
10
|
+
const SCANNER_IDS = ['builtin', 'semgrep', 'trivy', 'osv-scanner'];
|
|
11
|
+
const SEVERITIES = ['critical', 'high', 'medium', 'low'];
|
|
12
|
+
export function parseDvalinScannerIds(value) {
|
|
13
|
+
const ids = value.split(',').map(item => item.trim()).filter(Boolean);
|
|
14
|
+
const invalid = ids.filter(id => !SCANNER_IDS.includes(id));
|
|
15
|
+
if (invalid.length) {
|
|
16
|
+
throw new Error(`Unknown scanner(s): ${invalid.join(', ')}. Choose from ${SCANNER_IDS.join(', ')}.`);
|
|
17
|
+
}
|
|
18
|
+
if (!ids.length)
|
|
19
|
+
throw new Error('Select at least one Dvalin scanner.');
|
|
20
|
+
return [...new Set(ids)];
|
|
21
|
+
}
|
|
22
|
+
function positiveInteger(value, label) {
|
|
23
|
+
const parsed = Number(value);
|
|
24
|
+
if (!Number.isInteger(parsed) || parsed <= 0)
|
|
25
|
+
throw new Error(`${label} must be a positive integer.`);
|
|
26
|
+
return parsed;
|
|
27
|
+
}
|
|
28
|
+
function parseFailSeverity(value) {
|
|
29
|
+
if (value === 'none' || SEVERITIES.includes(value))
|
|
30
|
+
return value;
|
|
31
|
+
throw new Error(`--fail-on must be one of none, ${SEVERITIES.join(', ')}.`);
|
|
32
|
+
}
|
|
33
|
+
function findingSeverity(finding) {
|
|
34
|
+
const score = Number.parseFloat(finding.securitySeverity ?? '');
|
|
35
|
+
if (score >= 9)
|
|
36
|
+
return 'critical';
|
|
37
|
+
if (finding.severity === 'error' || score >= 7)
|
|
38
|
+
return 'high';
|
|
39
|
+
if (finding.severity === 'warning' || score >= 4)
|
|
40
|
+
return 'medium';
|
|
41
|
+
return 'low';
|
|
42
|
+
}
|
|
43
|
+
export function dvalinFailureThresholdMet(result, threshold) {
|
|
44
|
+
if (threshold === 'none')
|
|
45
|
+
return false;
|
|
46
|
+
const thresholdIndex = SEVERITIES.indexOf(threshold);
|
|
47
|
+
return result.findings.some(finding => SEVERITIES.indexOf(findingSeverity(finding)) <= thresholdIndex);
|
|
48
|
+
}
|
|
49
|
+
export function renderDvalinResult(result, root, limit = 20) {
|
|
50
|
+
const lines = [
|
|
51
|
+
`Dvalin security scan · ${root}`,
|
|
52
|
+
`Health ${result.score}/100 (${result.grade}) · ${result.findings.length} findings · ${result.metrics.files} files · ${result.metrics.rules} rules`,
|
|
53
|
+
`Severity critical ${result.metrics.critical} · high ${result.metrics.high} · medium ${result.metrics.medium} · low ${result.metrics.low}`,
|
|
54
|
+
'',
|
|
55
|
+
'Scanners',
|
|
56
|
+
...result.scanners.map(scanner => {
|
|
57
|
+
const detail = scanner.status === 'missing'
|
|
58
|
+
? `missing${scanner.installCommand ? ` · install: ${scanner.installCommand}` : ''}`
|
|
59
|
+
: `${scanner.status} · ${scanner.findings} findings · ${scanner.durationMs}ms${scanner.error ? ` · ${scanner.error}` : ''}`;
|
|
60
|
+
return ` ${scanner.name}: ${detail}`;
|
|
61
|
+
}),
|
|
62
|
+
];
|
|
63
|
+
if (result.findings.length) {
|
|
64
|
+
lines.push('', `Findings (showing ${Math.min(limit, result.findings.length)} of ${result.findings.length})`);
|
|
65
|
+
for (const finding of result.findings.slice(0, limit)) {
|
|
66
|
+
lines.push(` [${findingSeverity(finding).toUpperCase()}] ${finding.path}${finding.startLine ? `:${finding.startLine}` : ''} · ${finding.ruleId}`);
|
|
67
|
+
lines.push(` ${finding.message}`);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
lines.push('', 'No actionable findings. Review scanner coverage before treating this as assurance.');
|
|
72
|
+
}
|
|
73
|
+
if (result.skippedResults)
|
|
74
|
+
lines.push('', `Note: ${result.skippedResults} result(s) were skipped or truncated.`);
|
|
75
|
+
return lines.join('\n');
|
|
76
|
+
}
|
|
77
|
+
export function registerDvalinCommand(program) {
|
|
78
|
+
program
|
|
79
|
+
.command('dvalin')
|
|
80
|
+
.description('Run Dvalin white-box security scanners')
|
|
81
|
+
.argument('[path]', 'workspace path', '.')
|
|
82
|
+
.option('--scanners <ids>', `comma-separated scanners: ${SCANNER_IDS.join(', ')}`, SCANNER_IDS.join(','))
|
|
83
|
+
.option('--timeout <seconds>', 'timeout for each external scanner', '300')
|
|
84
|
+
.option('--limit <count>', 'maximum findings shown in text output', '20')
|
|
85
|
+
.option('--json', 'print the complete scan result as JSON')
|
|
86
|
+
.option('--fail-on <severity>', 'exit non-zero at or above: critical, high, medium, low, none', 'none')
|
|
87
|
+
.option('--fix', 'validate and remediate findings with the configured agent in an isolated worktree')
|
|
88
|
+
.option('--verify', 'after fixing, run tests and an independent security re-scan gate')
|
|
89
|
+
.option('--draft-pr', 'after verification passes, commit, push, and create a draft GitHub PR')
|
|
90
|
+
.option('--in-place', 'apply fixes in the selected workspace instead of an isolated worktree')
|
|
91
|
+
.option('--max-fixes <count>', 'maximum findings sent to one remediation run', '20')
|
|
92
|
+
.option('--provider <name>', 'override the configured model provider for remediation')
|
|
93
|
+
.action(async (inputPath, options) => {
|
|
94
|
+
const root = path.resolve(process.cwd(), inputPath);
|
|
95
|
+
const scanners = parseDvalinScannerIds(options.scanners);
|
|
96
|
+
const timeoutMs = positiveInteger(options.timeout, '--timeout') * 1000;
|
|
97
|
+
const limit = positiveInteger(options.limit, '--limit');
|
|
98
|
+
const maxFixes = positiveInteger(options.maxFixes, '--max-fixes');
|
|
99
|
+
const failOn = parseFailSeverity(options.failOn);
|
|
100
|
+
const shouldFix = Boolean(options.fix || options.verify || options.draftPr);
|
|
101
|
+
const shouldVerify = Boolean(options.verify || options.draftPr);
|
|
102
|
+
if (options.json && shouldFix)
|
|
103
|
+
throw new Error('--json cannot be combined with --fix, --verify, or --draft-pr.');
|
|
104
|
+
if (options.draftPr && options.inPlace) {
|
|
105
|
+
throw new Error('--draft-pr requires the default isolated worktree; remove --in-place.');
|
|
106
|
+
}
|
|
107
|
+
const result = await runDvalinScanSuite(root, { scanners, timeoutMs });
|
|
108
|
+
console.log(options.json ? JSON.stringify(result, null, 2) : renderDvalinResult(result, root, limit));
|
|
109
|
+
let thresholdResult = result;
|
|
110
|
+
if (shouldFix && result.findings.length) {
|
|
111
|
+
const findings = result.findings.slice(0, maxFixes);
|
|
112
|
+
if (result.findings.length > findings.length) {
|
|
113
|
+
console.log(`\nRemediation limited to ${findings.length}/${result.findings.length} findings by --max-fixes.`);
|
|
114
|
+
}
|
|
115
|
+
thresholdResult = await runAutomatedRemediation({
|
|
116
|
+
root,
|
|
117
|
+
findings,
|
|
118
|
+
baselineFindings: result.findings,
|
|
119
|
+
scanners,
|
|
120
|
+
timeoutMs,
|
|
121
|
+
inPlace: Boolean(options.inPlace),
|
|
122
|
+
verify: shouldVerify,
|
|
123
|
+
draftPr: Boolean(options.draftPr),
|
|
124
|
+
provider: options.provider,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
else if (shouldFix) {
|
|
128
|
+
console.log('\nNo findings require remediation.');
|
|
129
|
+
}
|
|
130
|
+
if (dvalinFailureThresholdMet(thresholdResult, failOn))
|
|
131
|
+
process.exitCode = 2;
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
async function runAutomatedRemediation(input) {
|
|
135
|
+
const cases = await upsertRemediationCases({ cwd: input.root, findings: input.findings });
|
|
136
|
+
let cwd = input.root;
|
|
137
|
+
let worktreeContext;
|
|
138
|
+
if (!input.inPlace) {
|
|
139
|
+
const worktree = await createRemediationWorktree(input.root, input.findings[0]);
|
|
140
|
+
cwd = worktree.cwd;
|
|
141
|
+
worktreeContext = `Use the prepared isolated worktree ${worktree.cwd} on branch ${worktree.branch}. The original workspace is ${worktree.baseCwd}.`;
|
|
142
|
+
for (const remediationCase of cases) {
|
|
143
|
+
await updateRemediationCase(remediationCase.id, {
|
|
144
|
+
status: 'worktree_ready',
|
|
145
|
+
worktreeCwd: worktree.cwd,
|
|
146
|
+
branch: worktree.branch,
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
console.log(`\nIsolated worktree: ${worktree.cwd}\nBranch: ${worktree.branch}`);
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
const { stdout: initialStatus } = await execFileAsync('git', ['status', '--porcelain'], { cwd });
|
|
153
|
+
if (initialStatus.trim())
|
|
154
|
+
throw new Error('--in-place requires a clean git worktree. Commit or stash existing changes first.');
|
|
155
|
+
console.log(`\nApplying remediation in place: ${cwd}`);
|
|
156
|
+
}
|
|
157
|
+
for (const remediationCase of cases)
|
|
158
|
+
await updateRemediationCase(remediationCase.id, { status: 'fixing' });
|
|
159
|
+
console.log('\nDvalin agent: validating and fixing findings…');
|
|
160
|
+
const fixTurn = await runAgentTurn({
|
|
161
|
+
content: buildAutomatedFixPrompt(input.findings, worktreeContext),
|
|
162
|
+
cwd,
|
|
163
|
+
mode: 'dvalin',
|
|
164
|
+
codePermissionMode: 'bypass',
|
|
165
|
+
providerOverride: input.provider,
|
|
166
|
+
}, { onEvent: renderAutomationEvent });
|
|
167
|
+
console.log(`\n${fixTurn.result.output}\n`);
|
|
168
|
+
if (!input.verify) {
|
|
169
|
+
console.log('Fix phase complete. Run again with --verify before publishing.');
|
|
170
|
+
return await runDvalinScanSuite(cwd, { scanners: input.scanners, timeoutMs: input.timeoutMs });
|
|
171
|
+
}
|
|
172
|
+
console.log('Dvalin agent: running focused tests and verification…');
|
|
173
|
+
const verificationTurn = await runAgentTurn({
|
|
174
|
+
content: buildAutomatedVerificationPrompt(input.findings, input.scanners),
|
|
175
|
+
sessionId: fixTurn.sessionId,
|
|
176
|
+
cwd,
|
|
177
|
+
mode: 'dvalin',
|
|
178
|
+
codePermissionMode: 'bypass',
|
|
179
|
+
providerOverride: input.provider,
|
|
180
|
+
}, { onEvent: renderAutomationEvent });
|
|
181
|
+
console.log(`\n${verificationTurn.result.output}\n`);
|
|
182
|
+
console.log('Dvalin gate: independently re-running scanners…');
|
|
183
|
+
const after = await runDvalinScanSuite(cwd, { scanners: input.scanners, timeoutMs: input.timeoutMs });
|
|
184
|
+
const { stdout: status } = await execFileAsync('git', ['status', '--porcelain'], { cwd });
|
|
185
|
+
const gate = evaluateVerificationGate({
|
|
186
|
+
originals: input.findings,
|
|
187
|
+
baseline: input.baselineFindings,
|
|
188
|
+
after,
|
|
189
|
+
agentOutput: verificationTurn.result.output,
|
|
190
|
+
hasChanges: Boolean(status.trim()),
|
|
191
|
+
});
|
|
192
|
+
if (!gate.passed) {
|
|
193
|
+
throw new Error(`Dvalin verification gate failed: ${gate.reasons.join('; ')}`);
|
|
194
|
+
}
|
|
195
|
+
for (const remediationCase of cases)
|
|
196
|
+
await updateRemediationCase(remediationCase.id, { status: 'verified' });
|
|
197
|
+
console.log(`Verification passed · health ${after.score}/100 (${after.grade}) · ${after.findings.length} remaining finding(s)`);
|
|
198
|
+
if (!input.draftPr)
|
|
199
|
+
return after;
|
|
200
|
+
console.log('\nDvalin agent: publishing verified remediation as a draft PR…');
|
|
201
|
+
const publishTurn = await runAgentTurn({
|
|
202
|
+
content: buildDraftPrPrompt(input.findings),
|
|
203
|
+
sessionId: verificationTurn.sessionId,
|
|
204
|
+
cwd,
|
|
205
|
+
mode: 'dvalin',
|
|
206
|
+
codePermissionMode: 'bypass',
|
|
207
|
+
providerOverride: input.provider,
|
|
208
|
+
}, { onEvent: renderAutomationEvent });
|
|
209
|
+
console.log(`\n${publishTurn.result.output}\n`);
|
|
210
|
+
const url = extractDraftPrUrl(publishTurn.result.output);
|
|
211
|
+
if (!url)
|
|
212
|
+
throw new Error('Draft PR publication did not return a GitHub pull request URL.');
|
|
213
|
+
console.log(`Draft PR: ${url}`);
|
|
214
|
+
return after;
|
|
215
|
+
}
|
|
216
|
+
function renderAutomationEvent(event) {
|
|
217
|
+
if (event.type === 'tool_call')
|
|
218
|
+
console.log(` → ${event.name}`);
|
|
219
|
+
if (event.type === 'tool_error')
|
|
220
|
+
console.log(` ✗ ${event.name}: ${event.error}`);
|
|
221
|
+
}
|
|
222
|
+
//# sourceMappingURL=dvalin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dvalin.js","sourceRoot":"","sources":["../../src/commands/dvalin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { readConfig, writeConfig } from '../server/configStore.js';
|
|
2
|
-
import {
|
|
2
|
+
import { createProviderAdapter } from '../providers/manager.js';
|
|
3
3
|
import { keySourceLabel, resolveApiKey } from '../providers/secrets.js';
|
|
4
4
|
import { requireTrustedProviderBaseUrl } from '../providers/trustedBaseUrls.js';
|
|
5
5
|
const PROVIDER_PRESETS = {
|
|
6
6
|
deepseek: { baseUrl: 'https://api.deepseek.com/v1', model: 'deepseek-chat', keySource: 'stored' },
|
|
7
7
|
openai: { baseUrl: 'https://api.openai.com/v1', model: 'gpt-4o-mini', keySource: 'stored' },
|
|
8
|
+
anthropic: { baseUrl: 'https://api.anthropic.com/v1', model: 'claude-sonnet-4-6', keySource: 'stored' },
|
|
8
9
|
ollama: { baseUrl: 'http://localhost:11434/v1', model: 'qwen2.5-coder', keySource: 'gateway' },
|
|
9
10
|
'cc-switch': { baseUrl: 'http://localhost:3456/v1', model: 'deepseek-chat', keySource: 'gateway' },
|
|
10
11
|
gateway: { baseUrl: 'http://localhost:3456/v1', model: 'deepseek-chat', keySource: 'gateway' },
|
|
@@ -82,8 +83,7 @@ export function registerProviderCommand(program) {
|
|
|
82
83
|
throw new Error('Model is required. Pass --model <name>.');
|
|
83
84
|
const baseUrl = requireTrustedProviderBaseUrl(llm.provider, llm.baseUrl);
|
|
84
85
|
const started = Date.now();
|
|
85
|
-
const adapter =
|
|
86
|
-
name: llm.provider,
|
|
86
|
+
const adapter = createProviderAdapter(llm.provider, {
|
|
87
87
|
apiKey: resolveApiKey(llm),
|
|
88
88
|
baseUrl,
|
|
89
89
|
model: llm.model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/commands/provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAkB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/commands/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/tui.js
CHANGED
|
@@ -2,11 +2,11 @@ export function registerTuiCommand(program) {
|
|
|
2
2
|
program
|
|
3
3
|
.command('tui')
|
|
4
4
|
.description('Launch the interactive terminal coding agent (default when run bare in a TTY)')
|
|
5
|
-
.option('--mode <mode>', 'starting mode: chat | cowork | code', 'chat')
|
|
5
|
+
.option('--mode <mode>', 'starting mode: chat | cowork | code | dvalin', 'chat')
|
|
6
6
|
.option('--cwd <path>', 'workspace directory (defaults to the current directory)')
|
|
7
7
|
.action(async (options) => {
|
|
8
8
|
const { runTui } = await import('../tui/app.js');
|
|
9
|
-
const mode = (['chat', 'cowork', 'code'].includes(options.mode ?? '') ? options.mode : 'chat');
|
|
9
|
+
const mode = (['chat', 'cowork', 'code', 'dvalin'].includes(options.mode ?? '') ? options.mode : 'chat');
|
|
10
10
|
await runTui({ mode, cwd: options.cwd });
|
|
11
11
|
});
|
|
12
12
|
}
|
package/dist/commands/tui.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui.js","sourceRoot":"","sources":["../../src/commands/tui.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,+EAA+E,CAAC;SAC5F,MAAM,CAAC,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"tui.js","sourceRoot":"","sources":["../../src/commands/tui.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,+EAA+E,CAAC;SAC5F,MAAM,CAAC,eAAe,EAAE,8CAA8C,EAAE,MAAM,CAAC;SAC/E,MAAM,CAAC,cAAc,EAAE,yDAAyD,CAAC;SACjF,MAAM,CAAC,KAAK,EAAE,OAAwC,EAAE,EAAE;QACzD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAc,CAAC;QACtH,MAAM,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1,238 @@
|
|
|
1
|
+
import { fileURLToPath } from 'node:url';
|
|
2
|
+
import { Readable } from 'node:stream';
|
|
3
|
+
import { pipeline } from 'node:stream/promises';
|
|
4
|
+
import { createWriteStream } from 'node:fs';
|
|
5
|
+
import { mkdir, rm, rename, chmod, readdir, stat, readFile } from 'node:fs/promises';
|
|
6
|
+
import { execFile, spawn } from 'node:child_process';
|
|
7
|
+
import { promisify } from 'node:util';
|
|
8
|
+
import { createInterface } from 'node:readline/promises';
|
|
9
|
+
import path from 'node:path';
|
|
10
|
+
import { VERSION } from '../version.js';
|
|
11
|
+
import { RELEASE_REPO, RELEASE_HOSTS, assetName, detectInstall, detectPlatform, fetchLatestRelease, isNewer, parseSums, sha256File, } from '../core/selfUpdate.js';
|
|
12
|
+
const execFileAsync = promisify(execFile);
|
|
13
|
+
export function registerUpdateCommand(program) {
|
|
14
|
+
program
|
|
15
|
+
.command('update')
|
|
16
|
+
.alias('upgrade')
|
|
17
|
+
.description('Update DvalinCode to the latest release on GitHub')
|
|
18
|
+
.option('--check', 'only check whether a newer version exists; do not modify anything')
|
|
19
|
+
.option('-y, --yes', 'apply the update without an interactive confirmation')
|
|
20
|
+
.option('--force', 'reinstall even if already on the latest version')
|
|
21
|
+
.option('--prerelease', 'include prereleases when resolving the latest version')
|
|
22
|
+
.option('--json', 'print the update status as JSON (implies --check)')
|
|
23
|
+
.action(async (options) => {
|
|
24
|
+
try {
|
|
25
|
+
await runUpdate(options);
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
29
|
+
if (options.json) {
|
|
30
|
+
console.log(JSON.stringify({ ok: false, error: message }, null, 2));
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
console.error(`update: ${message}`);
|
|
34
|
+
}
|
|
35
|
+
process.exitCode = 1;
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
async function runUpdate(options) {
|
|
40
|
+
const current = VERSION;
|
|
41
|
+
const moduleDir = path.dirname(fileURLToPath(import.meta.url));
|
|
42
|
+
const install = detectInstall({ moduleDir });
|
|
43
|
+
if (!options.json) {
|
|
44
|
+
console.log(`Contacting ${RELEASE_HOSTS.join(', ')} for the latest release…`);
|
|
45
|
+
}
|
|
46
|
+
const release = await fetchLatestRelease({
|
|
47
|
+
includePrerelease: options.prerelease,
|
|
48
|
+
signal: AbortSignal.timeout(20_000),
|
|
49
|
+
});
|
|
50
|
+
const updateAvailable = isNewer(release.version, current);
|
|
51
|
+
// ── check / json: report and stop ─────────────────────────────────────────
|
|
52
|
+
if (options.json) {
|
|
53
|
+
console.log(JSON.stringify({
|
|
54
|
+
ok: true,
|
|
55
|
+
current,
|
|
56
|
+
latest: release.version,
|
|
57
|
+
updateAvailable,
|
|
58
|
+
prerelease: release.prerelease,
|
|
59
|
+
installMethod: install.method,
|
|
60
|
+
releaseUrl: release.htmlUrl,
|
|
61
|
+
}, null, 2));
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
console.log(` current ${current}`);
|
|
65
|
+
console.log(` latest ${release.version}${release.prerelease ? ' (prerelease)' : ''}`);
|
|
66
|
+
console.log('');
|
|
67
|
+
if (!updateAvailable && !options.force) {
|
|
68
|
+
console.log(`✓ You're on the latest version (${current}).`);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
if (options.check) {
|
|
72
|
+
console.log(updateAvailable
|
|
73
|
+
? `↑ Update available: ${current} → ${release.version}\n Run \`dvalincode update\` to install it.`
|
|
74
|
+
: `Re-run without --check to reinstall ${release.version}.`);
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
// ── Confirm ────────────────────────────────────────────────────────────────
|
|
78
|
+
const verb = updateAvailable ? `Update ${current} → ${release.version}` : `Reinstall ${release.version}`;
|
|
79
|
+
if (!options.yes) {
|
|
80
|
+
const ok = await confirm(`${verb} via the ${install.method} install?`);
|
|
81
|
+
if (!ok) {
|
|
82
|
+
console.log('Aborted.');
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
// ── Apply per install method ───────────────────────────────────────────────
|
|
87
|
+
switch (install.method) {
|
|
88
|
+
case 'binary':
|
|
89
|
+
await applyBinaryUpdate(install, release);
|
|
90
|
+
break;
|
|
91
|
+
case 'npm':
|
|
92
|
+
await applyNpmUpdate(release);
|
|
93
|
+
break;
|
|
94
|
+
case 'source':
|
|
95
|
+
printSourceGuidance(install, release);
|
|
96
|
+
break;
|
|
97
|
+
default:
|
|
98
|
+
printManualGuidance(release);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
// ── binary: download, verify checksum, swap in place ─────────────────────────
|
|
102
|
+
async function applyBinaryUpdate(install, release) {
|
|
103
|
+
const root = install.root;
|
|
104
|
+
const targetBinary = install.binary;
|
|
105
|
+
const platform = detectPlatform();
|
|
106
|
+
if (!platform) {
|
|
107
|
+
throw new Error(`No published binary for ${process.platform}/${process.arch}.`);
|
|
108
|
+
}
|
|
109
|
+
if (platform.os === 'windows') {
|
|
110
|
+
// A running .exe can't replace itself; guide the user to the installer instead.
|
|
111
|
+
printManualGuidance(release);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
const asset = assetName(release.version, platform);
|
|
115
|
+
const archiveUrl = release.assets.get(asset);
|
|
116
|
+
const sumsUrl = release.assets.get('SHA256SUMS.txt');
|
|
117
|
+
if (!archiveUrl)
|
|
118
|
+
throw new Error(`Release ${release.tag} has no asset ${asset}.`);
|
|
119
|
+
if (!sumsUrl)
|
|
120
|
+
throw new Error(`Release ${release.tag} has no SHA256SUMS.txt to verify against.`);
|
|
121
|
+
// Work inside the install dir so the final rename is a same-filesystem atomic swap.
|
|
122
|
+
const workDir = path.join(root, `.update-${process.pid}`);
|
|
123
|
+
await rm(workDir, { recursive: true, force: true });
|
|
124
|
+
await mkdir(workDir, { recursive: true });
|
|
125
|
+
try {
|
|
126
|
+
const archivePath = path.join(workDir, asset);
|
|
127
|
+
console.log(`Downloading ${asset}…`);
|
|
128
|
+
await download(archiveUrl, archivePath);
|
|
129
|
+
const sumsPath = path.join(workDir, 'SHA256SUMS.txt');
|
|
130
|
+
await download(sumsUrl, sumsPath);
|
|
131
|
+
console.log('Verifying checksum…');
|
|
132
|
+
const expected = parseSums(await readFile(sumsPath, 'utf8')).get(asset);
|
|
133
|
+
if (!expected)
|
|
134
|
+
throw new Error(`${asset} is not listed in SHA256SUMS.txt.`);
|
|
135
|
+
const actual = await sha256File(archivePath);
|
|
136
|
+
if (actual !== expected) {
|
|
137
|
+
throw new Error(`Checksum mismatch for ${asset}:\n expected ${expected}\n got ${actual}`);
|
|
138
|
+
}
|
|
139
|
+
console.log(' ✓ sha256 verified');
|
|
140
|
+
console.log('Extracting…');
|
|
141
|
+
await execFileAsync('tar', ['xzf', archivePath, '-C', workDir]);
|
|
142
|
+
const archiveRoot = await findArchiveRoot(workDir);
|
|
143
|
+
const newBinary = await findBinary(archiveRoot);
|
|
144
|
+
const newWeb = path.join(archiveRoot, 'web');
|
|
145
|
+
if (!(await exists(newWeb)))
|
|
146
|
+
throw new Error('Extracted archive is missing web/.');
|
|
147
|
+
// Swap: replace the running binary (atomic rename over the same inode path)
|
|
148
|
+
// and the adjacent web/ directory.
|
|
149
|
+
await chmod(newBinary, 0o755);
|
|
150
|
+
await rename(newBinary, targetBinary);
|
|
151
|
+
await rm(path.join(root, 'web'), { recursive: true, force: true });
|
|
152
|
+
await rename(newWeb, path.join(root, 'web'));
|
|
153
|
+
// Best-effort: clear macOS quarantine so Gatekeeper doesn't flag the swap.
|
|
154
|
+
if (process.platform === 'darwin') {
|
|
155
|
+
await execFileAsync('xattr', ['-dr', 'com.apple.quarantine', root]).catch(() => { });
|
|
156
|
+
}
|
|
157
|
+
console.log('');
|
|
158
|
+
console.log(`✓ Updated to ${release.version}. Run \`dvalincode --version\` to confirm.`);
|
|
159
|
+
}
|
|
160
|
+
finally {
|
|
161
|
+
await rm(workDir, { recursive: true, force: true });
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
// ── npm: delegate to the package manager ─────────────────────────────────────
|
|
165
|
+
async function applyNpmUpdate(release) {
|
|
166
|
+
const spec = `dvalincode@${release.version}`;
|
|
167
|
+
const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
168
|
+
console.log(`Running: npm install -g ${spec}`);
|
|
169
|
+
const code = await new Promise((resolve, reject) => {
|
|
170
|
+
const child = spawn(npm, ['install', '-g', spec], { stdio: 'inherit' });
|
|
171
|
+
child.on('error', reject);
|
|
172
|
+
child.on('close', c => resolve(c ?? 1));
|
|
173
|
+
});
|
|
174
|
+
if (code !== 0)
|
|
175
|
+
throw new Error(`npm exited with code ${code}.`);
|
|
176
|
+
console.log(`✓ Updated to ${release.version}.`);
|
|
177
|
+
}
|
|
178
|
+
function printSourceGuidance(install, release) {
|
|
179
|
+
console.log('This looks like a source checkout — update it with git:');
|
|
180
|
+
console.log(` git -C ${install.root} pull`);
|
|
181
|
+
console.log(` npm install && npm run build # rebuild at ${release.version}`);
|
|
182
|
+
}
|
|
183
|
+
function printManualGuidance(release) {
|
|
184
|
+
console.log('Update by re-running the installer:');
|
|
185
|
+
console.log(' curl -fsSL https://raw.githubusercontent.com/' +
|
|
186
|
+
RELEASE_REPO +
|
|
187
|
+
'/main/scripts/install.sh | bash');
|
|
188
|
+
console.log('');
|
|
189
|
+
console.log(`Or download ${release.version} manually: ${release.htmlUrl}`);
|
|
190
|
+
}
|
|
191
|
+
// ── helpers ──────────────────────────────────────────────────────────────────
|
|
192
|
+
async function download(url, dest) {
|
|
193
|
+
const res = await fetch(url, {
|
|
194
|
+
headers: { 'User-Agent': 'dvalincode-update' },
|
|
195
|
+
redirect: 'follow',
|
|
196
|
+
signal: AbortSignal.timeout(120_000),
|
|
197
|
+
});
|
|
198
|
+
if (!res.ok || !res.body) {
|
|
199
|
+
throw new Error(`Download failed (${res.status} ${res.statusText}) for ${url}`);
|
|
200
|
+
}
|
|
201
|
+
await pipeline(Readable.fromWeb(res.body), createWriteStream(dest));
|
|
202
|
+
}
|
|
203
|
+
async function findArchiveRoot(dir) {
|
|
204
|
+
const entries = await readdir(dir, { withFileTypes: true });
|
|
205
|
+
const match = entries.find(e => e.isDirectory() && e.name.startsWith('dvalincode-'));
|
|
206
|
+
if (!match)
|
|
207
|
+
throw new Error('Could not find the extracted dvalincode-* directory.');
|
|
208
|
+
return path.join(dir, match.name);
|
|
209
|
+
}
|
|
210
|
+
async function findBinary(archiveRoot) {
|
|
211
|
+
const entries = await readdir(archiveRoot, { withFileTypes: true });
|
|
212
|
+
const bin = entries.find(e => e.isFile() && e.name.startsWith('dvalincode-') && !e.name.endsWith('.sh') && !e.name.endsWith('.bat'));
|
|
213
|
+
if (!bin)
|
|
214
|
+
throw new Error('Could not find the binary inside the extracted archive.');
|
|
215
|
+
return path.join(archiveRoot, bin.name);
|
|
216
|
+
}
|
|
217
|
+
async function exists(p) {
|
|
218
|
+
try {
|
|
219
|
+
await stat(p);
|
|
220
|
+
return true;
|
|
221
|
+
}
|
|
222
|
+
catch {
|
|
223
|
+
return false;
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
async function confirm(question) {
|
|
227
|
+
if (!process.stdin.isTTY)
|
|
228
|
+
return false;
|
|
229
|
+
const rl = createInterface({ input: process.stdin, output: process.stdout });
|
|
230
|
+
try {
|
|
231
|
+
const answer = (await rl.question(`${question} [y/N] `)).trim().toLowerCase();
|
|
232
|
+
return answer === 'y' || answer === 'yes';
|
|
233
|
+
}
|
|
234
|
+
finally {
|
|
235
|
+
rl.close();
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
package/dist/core/context.d.ts
CHANGED
|
@@ -12,6 +12,8 @@ export type DvalinContextOptions = {
|
|
|
12
12
|
audit?: AuditSink;
|
|
13
13
|
/** Resolved org policy. Defaults to permissive (identical to having no policy file). */
|
|
14
14
|
policy?: ResolvedPolicy;
|
|
15
|
+
/** Optional cancellation signal for the active agent turn. */
|
|
16
|
+
signal?: AbortSignal;
|
|
15
17
|
};
|
|
16
18
|
export type DvalinContext = {
|
|
17
19
|
cwd: string;
|
|
@@ -24,5 +26,7 @@ export type DvalinContext = {
|
|
|
24
26
|
audit?: AuditSink;
|
|
25
27
|
/** Resolved org policy, enforced at the tool chokepoint. */
|
|
26
28
|
policy: ResolvedPolicy;
|
|
29
|
+
/** Optional cancellation signal for the active agent turn. */
|
|
30
|
+
signal?: AbortSignal;
|
|
27
31
|
};
|
|
28
32
|
export declare function createDvalinContext(options?: DvalinContextOptions): DvalinContext;
|
package/dist/core/context.js
CHANGED
|
@@ -21,9 +21,16 @@ export function createDvalinContext(options = {}) {
|
|
|
21
21
|
allowExecute,
|
|
22
22
|
maxBytes: options.maxBytes ?? 256_000,
|
|
23
23
|
approvalMode: mode ?? 'full-auto',
|
|
24
|
-
|
|
24
|
+
// Bypass is a runtime-wide auto-approval mode, not merely permission to
|
|
25
|
+
// use write/execute tools. Keep this at the shared context chokepoint so
|
|
26
|
+
// current and future approval sources cannot accidentally surface a
|
|
27
|
+
// per-action prompt (including unrestricted shell network access).
|
|
28
|
+
requestApproval: mode === 'bypass'
|
|
29
|
+
? async () => true
|
|
30
|
+
: options.requestApproval,
|
|
25
31
|
audit: options.audit,
|
|
26
32
|
policy: options.policy ?? permissivePolicy(),
|
|
33
|
+
signal: options.signal,
|
|
27
34
|
};
|
|
28
35
|
}
|
|
29
36
|
//# sourceMappingURL=context.js.map
|
package/dist/core/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,aAAa,CAAC;AAkCpE,MAAM,UAAU,mBAAmB,CAAC,UAAgC,EAAE;IACpE,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;IAElC,IAAI,UAAmB,CAAC;IACxB,IAAI,YAAqB,CAAC;IAC1B,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,UAAU,GAAG,KAAK,CAAC;QACnB,YAAY,GAAG,KAAK,CAAC;IACvB,CAAC;SAAM,IAAI,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7E,UAAU,GAAG,IAAI,CAAC;QAClB,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC;QACzC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;QACjC,UAAU;QACV,YAAY;QACZ,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO;QACrC,YAAY,EAAE,IAAI,IAAI,WAAW;QACjC,wEAAwE;QACxE,yEAAyE;QACzE,oEAAoE;QACpE,mEAAmE;QACnE,eAAe,EAAE,IAAI,KAAK,QAAQ;YAChC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI;YAClB,CAAC,CAAC,OAAO,CAAC,eAAe;QAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,gBAAgB,EAAE;QAC5C,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC;AACJ,CAAC"}
|