dvalincode 0.22.0 → 0.24.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.
Files changed (195) hide show
  1. package/README.md +103 -35
  2. package/README.zh-CN.md +86 -30
  3. package/dist/agent/compact.js +9 -1
  4. package/dist/agent/compact.js.map +1 -1
  5. package/dist/agent/loop.d.ts +9 -1
  6. package/dist/agent/loop.js +58 -14
  7. package/dist/agent/loop.js.map +1 -1
  8. package/dist/agent/modes.js +7 -0
  9. package/dist/agent/modes.js.map +1 -1
  10. package/dist/agent/runner.d.ts +13 -1
  11. package/dist/agent/runner.js +198 -33
  12. package/dist/agent/runner.js.map +1 -1
  13. package/dist/agent/session.d.ts +21 -0
  14. package/dist/agent/session.js +76 -36
  15. package/dist/agent/session.js.map +1 -1
  16. package/dist/agent/toolFollowups.d.ts +13 -0
  17. package/dist/agent/toolFollowups.js +50 -0
  18. package/dist/agent/toolFollowups.js.map +1 -0
  19. package/dist/agent/types.d.ts +3 -1
  20. package/dist/agent/types.js.map +1 -1
  21. package/dist/audit/log.d.ts +41 -1
  22. package/dist/audit/log.js.map +1 -1
  23. package/dist/audit/minimize.js +2 -1
  24. package/dist/audit/minimize.js.map +1 -1
  25. package/dist/audit/taps.js +10 -1
  26. package/dist/audit/taps.js.map +1 -1
  27. package/dist/cli.js +4 -0
  28. package/dist/cli.js.map +1 -1
  29. package/dist/commands/agents.d.ts +11 -0
  30. package/dist/commands/agents.js +223 -0
  31. package/dist/commands/agents.js.map +1 -0
  32. package/dist/commands/checkpoint.d.ts +3 -0
  33. package/dist/commands/checkpoint.js +34 -0
  34. package/dist/commands/checkpoint.js.map +1 -0
  35. package/dist/commands/mcpInstall.d.ts +24 -0
  36. package/dist/commands/mcpInstall.js +62 -17
  37. package/dist/commands/mcpInstall.js.map +1 -1
  38. package/dist/commands/provider.js +4 -1
  39. package/dist/commands/provider.js.map +1 -1
  40. package/dist/commands/run.d.ts +1 -0
  41. package/dist/commands/run.js +46 -18
  42. package/dist/commands/run.js.map +1 -1
  43. package/dist/commands/security.d.ts +13 -0
  44. package/dist/commands/security.js +47 -10
  45. package/dist/commands/security.js.map +1 -1
  46. package/dist/core/checkpoint.d.ts +41 -0
  47. package/dist/core/checkpoint.js +159 -0
  48. package/dist/core/checkpoint.js.map +1 -0
  49. package/dist/core/context.d.ts +7 -0
  50. package/dist/core/context.js +1 -0
  51. package/dist/core/context.js.map +1 -1
  52. package/dist/core/gitRead.d.ts +20 -0
  53. package/dist/core/gitRead.js +97 -0
  54. package/dist/core/gitRead.js.map +1 -0
  55. package/dist/core/ignorefile.d.ts +2 -0
  56. package/dist/core/ignorefile.js +8 -0
  57. package/dist/core/ignorefile.js.map +1 -1
  58. package/dist/core/policy.d.ts +4 -0
  59. package/dist/core/policy.js +8 -6
  60. package/dist/core/policy.js.map +1 -1
  61. package/dist/core/redactSecrets.d.ts +14 -0
  62. package/dist/core/redactSecrets.js +35 -0
  63. package/dist/core/redactSecrets.js.map +1 -0
  64. package/dist/core/trust.d.ts +5 -0
  65. package/dist/core/trust.js +12 -0
  66. package/dist/core/trust.js.map +1 -1
  67. package/dist/core/webEgress.d.ts +66 -0
  68. package/dist/core/webEgress.js +281 -0
  69. package/dist/core/webEgress.js.map +1 -0
  70. package/dist/dvalinCli.js +2 -0
  71. package/dist/dvalinCli.js.map +1 -1
  72. package/dist/evidence/compliance.js +1 -1
  73. package/dist/evidence/compliance.js.map +1 -1
  74. package/dist/harness/run.d.ts +4 -0
  75. package/dist/harness/run.js +20 -15
  76. package/dist/harness/run.js.map +1 -1
  77. package/dist/mcp/agents.d.ts +41 -0
  78. package/dist/mcp/agents.js +129 -0
  79. package/dist/mcp/agents.js.map +1 -0
  80. package/dist/mcp/install.d.ts +43 -6
  81. package/dist/mcp/install.js +104 -1
  82. package/dist/mcp/install.js.map +1 -1
  83. package/dist/mcp/register.js +4 -1
  84. package/dist/mcp/register.js.map +1 -1
  85. package/dist/mcp/server.d.ts +3 -2
  86. package/dist/mcp/server.js +33 -9
  87. package/dist/mcp/server.js.map +1 -1
  88. package/dist/providers/anthropic.js +16 -1
  89. package/dist/providers/anthropic.js.map +1 -1
  90. package/dist/providers/chatImages.d.ts +21 -0
  91. package/dist/providers/chatImages.js +18 -0
  92. package/dist/providers/chatImages.js.map +1 -0
  93. package/dist/providers/egress.js +7 -0
  94. package/dist/providers/egress.js.map +1 -1
  95. package/dist/providers/openaiCompatible.js +19 -1
  96. package/dist/providers/openaiCompatible.js.map +1 -1
  97. package/dist/providers/retry.js +2 -0
  98. package/dist/providers/retry.js.map +1 -1
  99. package/dist/providers/runBudget.d.ts +11 -0
  100. package/dist/providers/runBudget.js +74 -0
  101. package/dist/providers/runBudget.js.map +1 -0
  102. package/dist/providers/trustedBaseUrls.js +1 -1
  103. package/dist/providers/trustedBaseUrls.js.map +1 -1
  104. package/dist/providers/types.d.ts +6 -0
  105. package/dist/remediation/cases.d.ts +1 -0
  106. package/dist/remediation/cases.js +1 -0
  107. package/dist/remediation/cases.js.map +1 -1
  108. package/dist/remediation/codexSecurity.d.ts +54 -0
  109. package/dist/remediation/codexSecurity.js +366 -0
  110. package/dist/remediation/codexSecurity.js.map +1 -0
  111. package/dist/remediation/sarif.d.ts +10 -0
  112. package/dist/remediation/sarif.js +2 -2
  113. package/dist/remediation/sarif.js.map +1 -1
  114. package/dist/remediation/scannerSuite.d.ts +1 -0
  115. package/dist/remediation/scannerSuite.js +1 -1
  116. package/dist/remediation/scannerSuite.js.map +1 -1
  117. package/dist/server/auth.d.ts +33 -0
  118. package/dist/server/auth.js +53 -0
  119. package/dist/server/auth.js.map +1 -0
  120. package/dist/server/configStore.d.ts +10 -0
  121. package/dist/server/configStore.js +9 -0
  122. package/dist/server/configStore.js.map +1 -1
  123. package/dist/server/index.d.ts +5 -0
  124. package/dist/server/index.js +73 -5
  125. package/dist/server/index.js.map +1 -1
  126. package/dist/server/routes/config.js +37 -0
  127. package/dist/server/routes/config.js.map +1 -1
  128. package/dist/server/routes/sessions.js +2 -1
  129. package/dist/server/routes/sessions.js.map +1 -1
  130. package/dist/server/wsHandler.js +23 -12
  131. package/dist/server/wsHandler.js.map +1 -1
  132. package/dist/sessions/journal.d.ts +2 -0
  133. package/dist/sessions/journal.js.map +1 -1
  134. package/dist/sessions/store.d.ts +6 -0
  135. package/dist/sessions/store.js +11 -0
  136. package/dist/sessions/store.js.map +1 -1
  137. package/dist/tools/applyPatch.d.ts +13 -0
  138. package/dist/tools/applyPatch.js +144 -0
  139. package/dist/tools/applyPatch.js.map +1 -0
  140. package/dist/tools/askUser.d.ts +3 -0
  141. package/dist/tools/askUser.js +23 -0
  142. package/dist/tools/askUser.js.map +1 -0
  143. package/dist/tools/checkDiagnostics.d.ts +8 -0
  144. package/dist/tools/checkDiagnostics.js +48 -0
  145. package/dist/tools/checkDiagnostics.js.map +1 -0
  146. package/dist/tools/editFile.d.ts +8 -2
  147. package/dist/tools/editFile.js +95 -26
  148. package/dist/tools/editFile.js.map +1 -1
  149. package/dist/tools/gitBlame.d.ts +11 -0
  150. package/dist/tools/gitBlame.js +43 -0
  151. package/dist/tools/gitBlame.js.map +1 -0
  152. package/dist/tools/gitDiff.js +13 -24
  153. package/dist/tools/gitDiff.js.map +1 -1
  154. package/dist/tools/gitLog.d.ts +11 -0
  155. package/dist/tools/gitLog.js +39 -0
  156. package/dist/tools/gitLog.js.map +1 -0
  157. package/dist/tools/gitShow.d.ts +11 -0
  158. package/dist/tools/gitShow.js +41 -0
  159. package/dist/tools/gitShow.js.map +1 -0
  160. package/dist/tools/gitStatus.js +2 -5
  161. package/dist/tools/gitStatus.js.map +1 -1
  162. package/dist/tools/htmlText.d.ts +19 -0
  163. package/dist/tools/htmlText.js +104 -0
  164. package/dist/tools/htmlText.js.map +1 -0
  165. package/dist/tools/readFile.js +84 -1
  166. package/dist/tools/readFile.js.map +1 -1
  167. package/dist/tools/registry.d.ts +2 -1
  168. package/dist/tools/registry.js +29 -3
  169. package/dist/tools/registry.js.map +1 -1
  170. package/dist/tools/rollbackRun.d.ts +5 -0
  171. package/dist/tools/rollbackRun.js +142 -0
  172. package/dist/tools/rollbackRun.js.map +1 -0
  173. package/dist/tools/runCheck.js +10 -1
  174. package/dist/tools/runCheck.js.map +1 -1
  175. package/dist/tools/searchText.d.ts +10 -0
  176. package/dist/tools/searchText.js +193 -19
  177. package/dist/tools/searchText.js.map +1 -1
  178. package/dist/tools/updatePlan.d.ts +38 -0
  179. package/dist/tools/updatePlan.js +81 -0
  180. package/dist/tools/updatePlan.js.map +1 -0
  181. package/dist/tools/webFetch.d.ts +8 -0
  182. package/dist/tools/webFetch.js +103 -0
  183. package/dist/tools/webFetch.js.map +1 -0
  184. package/dist/tools/webSearch.d.ts +26 -0
  185. package/dist/tools/webSearch.js +157 -0
  186. package/dist/tools/webSearch.js.map +1 -0
  187. package/dist/tools/writeFile.js +4 -1
  188. package/dist/tools/writeFile.js.map +1 -1
  189. package/dist/tui/app.js +22 -1
  190. package/dist/tui/app.js.map +1 -1
  191. package/dist/tui/render.js +7 -1
  192. package/dist/tui/render.js.map +1 -1
  193. package/dist/version.d.ts +1 -1
  194. package/dist/version.js +1 -1
  195. package/package.json +1 -1
@@ -0,0 +1,11 @@
1
+ import type { Command } from 'commander';
2
+ import { type AgentId, type DetectedAgent } from '../mcp/agents.js';
3
+ export declare function registerAgentsCommand(program: Command): void;
4
+ /**
5
+ * The agents a `connect` covers: the ones named, or else every installed agent
6
+ * that has no Dvalin entry anywhere yet. CC Switch is only ever connected by
7
+ * name, because connecting it opens a dialog in another application.
8
+ */
9
+ export declare function selectAgents(found: DetectedAgent[], requested: string[]): AgentId[];
10
+ /** The installed agents CC Switch can sync an MCP server into. */
11
+ export declare function ccSwitchTargets(found: DetectedAgent[]): DetectedAgent[];
@@ -0,0 +1,223 @@
1
+ import { execFile } from 'node:child_process';
2
+ import { homedir } from 'node:os';
3
+ import path from 'node:path';
4
+ import { promisify } from 'node:util';
5
+ import { EXIT, UsageError } from '../core/exitCodes.js';
6
+ import { AGENT_IDS, agentName, detectAgents } from '../mcp/agents.js';
7
+ import { CC_SWITCH_APPS, ccSwitchImportLink, codexMcpAddArgs } from '../mcp/install.js';
8
+ import { installCodex, planJsonInstall, shellWord, writeJsonInstall } from './mcpInstall.js';
9
+ const execFileAsync = promisify(execFile);
10
+ export function registerAgentsCommand(program) {
11
+ const agents = program
12
+ .command('agents')
13
+ .description('Find the coding agents on this machine and connect Dvalin to them');
14
+ agents
15
+ .command('list', { isDefault: true })
16
+ .description('Show the coding agents found here and where Dvalin is connected')
17
+ .option('--json', 'print the result as JSON')
18
+ .option('--name <name>', 'server entry name to look for', 'dvalin')
19
+ .action(async (options) => {
20
+ const root = process.cwd();
21
+ const found = await detectAgents({ root, serverName: options.name });
22
+ if (options.json) {
23
+ console.log(JSON.stringify(found, null, 2));
24
+ return;
25
+ }
26
+ printAgents(found, root);
27
+ });
28
+ agents
29
+ .command('connect')
30
+ .description('Plan connecting Dvalin to the agents found here; apply it only with --yes')
31
+ .argument('[agents...]', `agents to connect (default: every one found without Dvalin): ${AGENT_IDS.join(', ')}`)
32
+ .option('--yes', 'apply the plan')
33
+ .option('--global', "use each agent's user-level config instead of the project's (Codex and CC Switch are always user-level)")
34
+ .option('--workspace <dir>', 'workspace the server is allowed to read', '.')
35
+ .option('--name <name>', 'name for the server entry', 'dvalin')
36
+ .action(async (requested, options) => {
37
+ const root = process.cwd();
38
+ const found = await detectAgents({ root, serverName: options.name });
39
+ const ids = selectAgents(found, requested);
40
+ if (ids.length === 0) {
41
+ const installed = found.filter(agent => agent.installed && agent.id !== 'cc-switch');
42
+ console.log(installed.length
43
+ ? 'Dvalin is already connected to every agent found here. `dvalin agents` shows where.'
44
+ : `No supported coding agent was found on this machine. Name one to configure it anyway: dvalin agents connect <${AGENT_IDS.join('|')}>`);
45
+ printCcSwitchHint(found, ids);
46
+ return;
47
+ }
48
+ const steps = [];
49
+ for (const id of ids)
50
+ steps.push(await planStep(id, found, options, root));
51
+ console.log(options.yes ? 'Connecting Dvalin:' : 'Plan (nothing is written yet):');
52
+ for (const step of steps) {
53
+ const agent = found.find(candidate => candidate.id === step.id);
54
+ const missing = agent?.installed ? '' : ' (not found on this machine)';
55
+ console.log(` ${agentName(step.id).padEnd(12)} ${step.summary}${missing}`);
56
+ for (const line of step.details ?? [])
57
+ console.log(` ${''.padEnd(12)} ${line}`);
58
+ }
59
+ if (!options.yes) {
60
+ console.log('\nReview it, then rerun with --yes to apply it.');
61
+ printCcSwitchHint(found, ids);
62
+ return;
63
+ }
64
+ let failed = 0;
65
+ for (const step of steps) {
66
+ if (!step.apply)
67
+ continue;
68
+ console.log('');
69
+ try {
70
+ for (const line of await step.apply())
71
+ console.log(line);
72
+ }
73
+ catch (error) {
74
+ failed += 1;
75
+ console.error(`✗ ${agentName(step.id)}: ${message(error)}`);
76
+ }
77
+ }
78
+ printCcSwitchHint(found, ids);
79
+ if (failed)
80
+ process.exitCode = EXIT.runtimeError;
81
+ });
82
+ }
83
+ /**
84
+ * The agents a `connect` covers: the ones named, or else every installed agent
85
+ * that has no Dvalin entry anywhere yet. CC Switch is only ever connected by
86
+ * name, because connecting it opens a dialog in another application.
87
+ */
88
+ export function selectAgents(found, requested) {
89
+ if (requested.length)
90
+ return [...new Set(requested.map(parseAgentId))];
91
+ return found
92
+ .filter(agent => agent.installed && agent.id !== 'cc-switch' && agent.configured.length === 0)
93
+ .map(agent => agent.id);
94
+ }
95
+ /** The installed agents CC Switch can sync an MCP server into. */
96
+ export function ccSwitchTargets(found) {
97
+ return found.filter(agent => agent.installed && ccSwitchApp(agent.id) !== undefined);
98
+ }
99
+ function ccSwitchApp(id) {
100
+ return id === 'cc-switch' ? undefined : CC_SWITCH_APPS[id];
101
+ }
102
+ async function planStep(id, found, options, root) {
103
+ if (id === 'cc-switch')
104
+ return planCcSwitch(found, options);
105
+ if (id === 'codex') {
106
+ const command = ['codex', ...codexMcpAddArgs(options.workspace, options.name)].map(shellWord).join(' ');
107
+ return {
108
+ id,
109
+ summary: `run ${command} (Codex's own config writer; user-level)`,
110
+ apply: async () => {
111
+ await installCodex({ workspace: options.workspace, name: options.name });
112
+ return [];
113
+ },
114
+ };
115
+ }
116
+ try {
117
+ const plan = await planJsonInstall(id, {
118
+ root,
119
+ global: Boolean(options.global),
120
+ workspace: options.workspace,
121
+ name: options.name,
122
+ });
123
+ const file = displayPath(plan.file, root);
124
+ if (plan.action === 'unchanged')
125
+ return { id, summary: `already connected: ${file}` };
126
+ return {
127
+ id,
128
+ summary: plan.action === 'added' ? `add '${options.name}' to ${file}` : `replace '${options.name}' in ${file}`,
129
+ apply: async () => {
130
+ await writeJsonInstall(plan);
131
+ const verb = plan.action === 'added' ? 'Added' : 'Replaced';
132
+ return [`${verb} '${options.name}' in ${plan.file}`, ...(plan.client.followUp ? [plan.client.followUp] : [])];
133
+ },
134
+ };
135
+ }
136
+ catch (error) {
137
+ return { id, summary: `skipped: ${message(error)}` };
138
+ }
139
+ }
140
+ function planCcSwitch(found, options) {
141
+ const targets = ccSwitchTargets(found);
142
+ if (targets.length === 0) {
143
+ return {
144
+ id: 'cc-switch',
145
+ summary: 'skipped: none of the agents CC Switch syncs MCP into (Claude Code, Codex, Gemini CLI, OpenCode) was found',
146
+ };
147
+ }
148
+ const apps = targets.map(agent => ccSwitchApp(agent.id));
149
+ const link = ccSwitchImportLink(apps, options.workspace, options.name);
150
+ return {
151
+ id: 'cc-switch',
152
+ summary: `open CC Switch's import dialog for ${targets.map(agent => agent.name).join(', ')}; CC Switch asks before it writes anything`,
153
+ details: [link],
154
+ apply: async () => {
155
+ try {
156
+ await openUrl(link);
157
+ }
158
+ catch (error) {
159
+ throw new Error(`could not open the link (${message(error)}). Open it yourself, with the CC Switch desktop app installed:\n${link}`);
160
+ }
161
+ return ['Opened CC Switch. Confirm the import there; it then writes Dvalin into each app it listed.'];
162
+ },
163
+ };
164
+ }
165
+ function printAgents(found, root) {
166
+ console.log('Coding agents on this machine');
167
+ for (const agent of found) {
168
+ console.log(` ${agent.installed ? '✓' : '·'} ${agent.name.padEnd(12)} ${agent.installed ? agent.evidence.join(', ') : 'not found'}`);
169
+ if (agent.id === 'cc-switch') {
170
+ if (agent.installed)
171
+ console.log(' can sync Dvalin into the agents it manages: dvalin agents connect cc-switch');
172
+ continue;
173
+ }
174
+ if (agent.configured.length) {
175
+ console.log(` Dvalin: ${agent.configured.map(entry => `${entry.scope} ${displayPath(entry.file, root)}`).join(', ')}`);
176
+ }
177
+ else if (agent.installed) {
178
+ console.log(' Dvalin: not connected');
179
+ }
180
+ if (agent.unreadable.length) {
181
+ console.log(` could not read: ${agent.unreadable.map(file => displayPath(file, root)).join(', ')}`);
182
+ }
183
+ }
184
+ const pending = selectAgents(found, []);
185
+ console.log('');
186
+ console.log(pending.length
187
+ ? `Next: \`dvalin agents connect\` plans Dvalin for ${pending.map(agentName).join(', ')}.`
188
+ : 'Nothing to connect: every agent found here already has Dvalin.');
189
+ }
190
+ function printCcSwitchHint(found, ids) {
191
+ const ccSwitch = found.find(agent => agent.id === 'cc-switch');
192
+ if (!ccSwitch?.installed || ids.includes('cc-switch'))
193
+ return;
194
+ console.log('CC Switch is installed. To manage Dvalin from CC Switch instead, run `dvalin agents connect cc-switch`.');
195
+ }
196
+ function parseAgentId(value) {
197
+ if (AGENT_IDS.includes(value))
198
+ return value;
199
+ throw new UsageError(`Unknown agent '${value}'. Expected one of: ${AGENT_IDS.join(', ')}.`);
200
+ }
201
+ /** Relative to the project when inside it, `~/...` when under home, absolute otherwise. */
202
+ function displayPath(file, root) {
203
+ for (const [base, prefix] of [[root, ''], [homedir(), '~/']]) {
204
+ const relative = path.relative(base, file);
205
+ if (relative && !relative.startsWith('..') && !path.isAbsolute(relative)) {
206
+ return `${prefix}${relative.split(path.sep).join('/')}`;
207
+ }
208
+ }
209
+ return file;
210
+ }
211
+ async function openUrl(url) {
212
+ if (process.platform === 'darwin')
213
+ await execFileAsync('open', [url]);
214
+ // Not `cmd /c start`: cmd would split the link at its `&`s.
215
+ else if (process.platform === 'win32')
216
+ await execFileAsync('rundll32', ['url.dll,FileProtocolHandler', url]);
217
+ else
218
+ await execFileAsync('xdg-open', [url]);
219
+ }
220
+ function message(error) {
221
+ return error instanceof Error ? error.message : String(error);
222
+ }
223
+ //# sourceMappingURL=agents.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/commands/agents.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import type { Command } from 'commander';
2
+ export declare function registerCheckpointCommands(program: Command): void;
3
+ export declare function executeRollback(runId: string, cwd: string): Promise<string>;
@@ -0,0 +1,34 @@
1
+ import { AuditSink, newRunId } from '../audit/log.js';
2
+ import { listCheckpoints } from '../core/checkpoint.js';
3
+ import { createDvalinContext } from '../core/context.js';
4
+ import { loadPolicy } from '../core/policy.js';
5
+ import { createRollbackRegistry } from '../tools/rollbackRun.js';
6
+ export function registerCheckpointCommands(program) {
7
+ program.command('checkpoint').description('Manage local run checkpoints')
8
+ .command('list').description('List available run snapshots')
9
+ .action(async () => {
10
+ const checkpoints = await listCheckpoints();
11
+ for (const { runId, root, changed } of checkpoints)
12
+ console.log(`${runId}\t${changed}\t${root}`);
13
+ });
14
+ program.command('rollback <run-id>').description('Restore files from a run checkpoint')
15
+ .action(async (runId) => console.log(await executeRollback(runId, process.cwd())));
16
+ }
17
+ export async function executeRollback(runId, cwd) {
18
+ const { registry } = await createRollbackRegistry(runId);
19
+ const loaded = loadPolicy(cwd);
20
+ if (loaded.sources.some(source => source.error))
21
+ throw new Error('Rollback requires a readable workspace policy');
22
+ const audit = new AuditSink(newRunId());
23
+ audit.append({ type: 'run_start', task: 'rollback', mode: 'rollback', provider: 'none', model: 'none', cwd, gitHead: null, policyHash: loaded.hash });
24
+ try {
25
+ const result = await registry.run('rollback_run', { runId }, createDvalinContext({ cwd, allowWrite: true, policy: loaded.policy, audit }));
26
+ audit.append({ type: 'run_end', status: 'done', iterations: 0 });
27
+ return result.output;
28
+ }
29
+ catch (error) {
30
+ audit.append({ type: 'run_end', status: 'error', iterations: 0 });
31
+ throw error;
32
+ }
33
+ }
34
+ //# sourceMappingURL=checkpoint.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/commands/checkpoint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,UAAU,0BAA0B,CAAC,OAAgB;IACzD,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,8BAA8B,CAAC;SACtE,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,8BAA8B,CAAC;SAC3D,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,WAAW,GAAG,MAAM,eAAe,EAAE,CAAC;QAC5C,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,WAAW;YAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,OAAO,KAAK,IAAI,EAAE,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;IACL,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,WAAW,CAAC,qCAAqC,CAAC;SACpF,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,KAAa,EAAE,GAAW;IAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAClH,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACtJ,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,EAAE,mBAAmB,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3I,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QAClE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
@@ -1,2 +1,26 @@
1
1
  import type { Command } from 'commander';
2
+ import { type JsonMcpClient, type JsonMcpClientId, type MergeOutcome } from '../mcp/install.js';
3
+ type Options = {
4
+ global?: boolean;
5
+ print?: boolean;
6
+ workspace: string;
7
+ name: string;
8
+ };
2
9
  export declare function registerMcpInstallCommand(program: Command): void;
10
+ export type JsonInstallPlan = {
11
+ client: JsonMcpClient;
12
+ file: string;
13
+ action: MergeOutcome['action'];
14
+ rendered: string;
15
+ };
16
+ /** What installing into a JSON-configured client would write, without writing it. */
17
+ export declare function planJsonInstall(id: JsonMcpClientId, options: {
18
+ root: string;
19
+ global: boolean;
20
+ workspace: string;
21
+ name: string;
22
+ }): Promise<JsonInstallPlan>;
23
+ export declare function writeJsonInstall(plan: JsonInstallPlan): Promise<void>;
24
+ export declare function installCodex(options: Pick<Options, 'print' | 'workspace' | 'name'>): Promise<void>;
25
+ export declare function shellWord(value: string): string;
26
+ export {};
@@ -1,41 +1,86 @@
1
1
  import { mkdir, readFile, writeFile } from 'node:fs/promises';
2
+ import { execFile } from 'node:child_process';
2
3
  import path from 'node:path';
4
+ import { promisify } from 'node:util';
3
5
  import { UsageError } from '../core/exitCodes.js';
4
- import { MCP_CLIENT_IDS, mergeDvalinServer, renderConfig, resolveInstallTarget, } from '../mcp/install.js';
6
+ import { MCP_CLIENT_IDS, codexMcpAddArgs, mergeDvalinServer, renderConfig, resolveInstallTarget, } from '../mcp/install.js';
7
+ const execFileAsync = promisify(execFile);
5
8
  export function registerMcpInstallCommand(program) {
6
9
  program
7
10
  .command('mcp-install')
8
11
  .description(`Write the Dvalin MCP server into an editor's config: ${MCP_CLIENT_IDS.join(', ')}`)
9
12
  .argument('<client>', `editor to configure: ${MCP_CLIENT_IDS.join(', ')}`)
10
- .option('--global', "write the user-level config instead of the project's")
13
+ .option('--global', "write the user-level config instead of the project's (Codex is always user-level)")
11
14
  .option('--print', 'show the resulting config without writing anything')
12
15
  .option('--workspace <dir>', 'workspace the server is allowed to read', '.')
13
16
  .option('--name <name>', 'name for the server entry', 'dvalin')
14
17
  .action(async (client, options) => {
15
18
  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);
19
+ if (id === 'codex') {
20
+ await installCodex(options);
21
+ return;
22
+ }
23
+ const plan = await planJsonInstall(id, {
24
+ root: process.cwd(),
25
+ global: Boolean(options.global),
26
+ workspace: options.workspace,
27
+ name: options.name,
28
+ });
21
29
  if (options.print) {
22
- console.log(`# ${target.file}`);
23
- console.log(rendered.trimEnd());
30
+ console.log(`# ${plan.file}`);
31
+ console.log(plan.rendered.trimEnd());
24
32
  return;
25
33
  }
26
- if (action === 'unchanged') {
27
- console.log(`${target.client.name} already has '${options.name}' configured: ${target.file}`);
34
+ if (plan.action === 'unchanged') {
35
+ console.log(`${plan.client.name} already has '${options.name}' configured: ${plan.file}`);
28
36
  }
29
37
  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}`);
38
+ await writeJsonInstall(plan);
39
+ const verb = plan.action === 'added' ? 'Added' : 'Replaced';
40
+ console.log(`${verb} '${options.name}' in ${plan.file}`);
34
41
  }
35
- if (target.client.followUp)
36
- console.log(`\n${target.client.followUp}`);
42
+ if (plan.client.followUp)
43
+ console.log(`\n${plan.client.followUp}`);
37
44
  });
38
45
  }
46
+ /** What installing into a JSON-configured client would write, without writing it. */
47
+ export async function planJsonInstall(id, options) {
48
+ const target = resolveInstallTarget(id, options.root, options.global);
49
+ const existing = await readJsonIfPresent(target.file);
50
+ const { config, action } = mergeDvalinServer(existing, target.client, options.workspace, options.name);
51
+ return { client: target.client, file: target.file, action, rendered: renderConfig(config) };
52
+ }
53
+ export async function writeJsonInstall(plan) {
54
+ if (plan.action === 'unchanged')
55
+ return;
56
+ await mkdir(path.dirname(plan.file), { recursive: true });
57
+ await writeFile(plan.file, plan.rendered, 'utf8');
58
+ }
59
+ export async function installCodex(options) {
60
+ const args = codexMcpAddArgs(options.workspace, options.name);
61
+ const rendered = ['codex', ...args].map(shellWord).join(' ');
62
+ if (options.print) {
63
+ console.log('# ~/.codex/config.toml (managed by the Codex CLI)');
64
+ console.log(rendered);
65
+ return;
66
+ }
67
+ try {
68
+ await execFileAsync('codex', args);
69
+ }
70
+ catch (error) {
71
+ const missing = error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT';
72
+ if (missing) {
73
+ throw new UsageError(`Codex CLI was not found. Install Codex, or run this command manually:\n${rendered}`);
74
+ }
75
+ throw new UsageError(`Codex could not add the MCP server: ${error instanceof Error ? error.message : String(error)}`);
76
+ }
77
+ console.log(`Added or updated '${options.name}' in Codex's user-level MCP configuration.`);
78
+ console.log('Verify it with: `codex mcp get ' + options.name + ' --json`');
79
+ console.log('\nStart a new Codex session, then ask it to run `dvalin_scan` on your uncommitted changes.');
80
+ }
81
+ export function shellWord(value) {
82
+ return /^[A-Za-z0-9_./:@%+=,-]+$/.test(value) ? value : `'${value.replaceAll("'", "'\\''")}'`;
83
+ }
39
84
  function parseClientId(value) {
40
85
  if (MCP_CLIENT_IDS.includes(value))
41
86
  return value;
@@ -1 +1 @@
1
- {"version":3,"file":"mcpInstall.js","sourceRoot":"","sources":["../../src/commands/mcpInstall.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcpInstall.js","sourceRoot":"","sources":["../../src/commands/mcpInstall.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,10 @@ const PROVIDER_PRESETS = {
7
7
  openai: { baseUrl: 'https://api.openai.com/v1', model: 'gpt-4o-mini', keySource: 'stored' },
8
8
  anthropic: { baseUrl: 'https://api.anthropic.com/v1', model: 'claude-sonnet-4-6', keySource: 'stored' },
9
9
  ollama: { baseUrl: 'http://localhost:11434/v1', model: 'qwen2.5-coder', keySource: 'gateway' },
10
- 'cc-switch': { baseUrl: 'http://localhost:3456/v1', model: 'deepseek-chat', keySource: 'gateway' },
10
+ // CC Switch's local routing. It serves /v1/chat/completions as its Codex app,
11
+ // so requests go to the provider Codex is routed to; start routing for Codex
12
+ // in CC Switch first. CC Switch supplies the real key.
13
+ 'cc-switch': { baseUrl: 'http://127.0.0.1:15721/v1', model: 'deepseek-chat', keySource: 'gateway' },
11
14
  gateway: { baseUrl: 'http://localhost:3456/v1', model: 'deepseek-chat', keySource: 'gateway' },
12
15
  };
13
16
  export function registerProviderCommand(program) {
@@ -1 +1 @@
1
- {"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/commands/provider.ts"],"names":[],"mappings":"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"}
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,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAEhF,MAAM,gBAAgB,GAAuE;IAC3F,QAAQ,EAAE,EAAE,OAAO,EAAE,6BAA6B,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE;IACjG,MAAM,EAAE,EAAE,OAAO,EAAE,2BAA2B,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE;IAC3F,SAAS,EAAE,EAAE,OAAO,EAAE,8BAA8B,EAAE,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,QAAQ,EAAE;IACvG,MAAM,EAAE,EAAE,OAAO,EAAE,2BAA2B,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE;IAC9F,8EAA8E;IAC9E,6EAA6E;IAC7E,uDAAuD;IACvD,WAAW,EAAE,EAAE,OAAO,EAAE,2BAA2B,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE;IACnG,OAAO,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE;CAC/F,CAAC;AAUF,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,MAAM,QAAQ,GAAG,OAAO;SACrB,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,sDAAsD,CAAC,CAAC;IAEvE,QAAQ;SACL,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,6CAA6C,CAAC;SAC1D,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAE/B,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACvC,YAAY,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,KAAK,OAAO,CAAC,QAAQ,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,6BAA6B,OAAO,CAAC,MAAM,YAAY,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,QAAQ;SACL,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,yBAAyB,CAAC;SACtC,QAAQ,CAAC,YAAY,EAAE,uDAAuD,CAAC;SAC/E,MAAM,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;SACxD,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;SAC9C,MAAM,CAAC,eAAe,EAAE,0BAA0B,CAAC;SACnD,MAAM,CAAC,cAAc,EAAE,+CAA+C,CAAC;SACvE,MAAM,CAAC,WAAW,EAAE,+DAA+D,CAAC;SACpF,MAAM,CAAC,KAAK,EAAE,UAAkB,EAAE,OAAmB,EAAE,EAAE;QACxD,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QAE/F,MAAM,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEL,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,uCAAuC,CAAC,CAAC;IAEzF,GAAG;SACA,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,sDAAsD,CAAC;SACnE,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;SACrC,MAAM,CAAC,eAAe,EAAE,0BAA0B,CAAC;SACnD,MAAM,CAAC,cAAc,EAAE,+CAA+C,CAAC;SACvE,MAAM,CAAC,WAAW,EAAE,+DAA+D,CAAC;SACpF,MAAM,CAAC,KAAK,EAAE,UAAkB,EAAE,OAAmB,EAAE,EAAE;QACxD,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,0BAA0B,UAAU,KAAK,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEL,QAAQ;SACL,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,qDAAqD,CAAC;SAClE,QAAQ,CAAC,YAAY,EAAE,8BAA8B,CAAC;SACtD,MAAM,CAAC,kBAAkB,EAAE,oBAAoB,CAAC;SAChD,MAAM,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;SAC3C,MAAM,CAAC,eAAe,EAAE,mBAAmB,CAAC;SAC5C,MAAM,CAAC,cAAc,EAAE,wCAAwC,CAAC;SAChE,MAAM,CAAC,WAAW,EAAE,6BAA6B,CAAC;SAClD,MAAM,CAAC,KAAK,EAAE,UAA8B,EAAE,OAAmB,EAAE,EAAE;QACpE,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAClC,MAAM,EAAE,GAAG,UAAU,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7C,MAAM,GAAG,GAAG,oBAAoB,CAC9B,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EACtG,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,6BAA6B,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAClD,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC;YAC1B,OAAO;YACP,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,yEAAyE;YACzE,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE;SACzB,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;YAC/D,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACf,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAkB,EAAE,UAAkB,EAAE,OAAmB;IACrF,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC;IACrD,OAAO;QACL,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QAC/F,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QACrF,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,IAAI,QAAQ;QAC1G,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;QACjD,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;KACxD,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAc,EAAE,OAAmB;IAC/D,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IACnF,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,OAAO,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;IACjF,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,OAAO,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IACpF,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,OAAiG,EAAE,MAAe;IACtI,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,cAAc,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,UAAU,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AACnD,CAAC"}
@@ -15,6 +15,7 @@ export type RunCommandOptions = {
15
15
  maxToolCalls?: string;
16
16
  timeout?: string;
17
17
  report?: string;
18
+ checkpoint?: boolean;
18
19
  quiet?: boolean;
19
20
  unattended?: boolean;
20
21
  promptFile?: string;
@@ -1,5 +1,8 @@
1
1
  import { readFile } from 'node:fs/promises';
2
2
  import path from 'node:path';
3
+ import { fingerprint } from '../audit/minimize.js';
4
+ import { redactToolText } from '../core/redactSecrets.js';
5
+ import { truncateToolOutput } from '../tools/registry.js';
3
6
  import { executeHarnessRun, HarnessUsageError, } from '../harness/run.js';
4
7
  export function registerRunCommand(program) {
5
8
  const command = program
@@ -20,6 +23,7 @@ export function registerRunCommand(program) {
20
23
  .option('--max-tool-calls <n>', 'maximum tool calls for the turn')
21
24
  .option('--timeout <minutes>', 'wall-clock timeout in minutes (default: 25)')
22
25
  .option('--report <file>', 'write the Markdown run report to a file')
26
+ .option('--checkpoint', 'snapshot covered Git workspace files for run-level rollback')
23
27
  .option('--quiet', 'suppress stderr progress lines')
24
28
  .option('--unattended', 'apply unattended policy limits even when stdin is a TTY')
25
29
  .addHelpText('after', '\nExit codes:\n 0 completed\n 1 agent/tool/provider error\n 2 usage error\n 3 policy violation\n 4 timeout or interrupt')
@@ -70,15 +74,15 @@ export async function runCommand(promptParts, options, io, execute = executeHarn
70
74
  if (outputFormat === 'stream-json') {
71
75
  if (event.type === 'token_delta' && !options.includeDeltas)
72
76
  return;
73
- writeJsonLine(event.type === 'tool_result' ? truncateToolResult(event) : event);
77
+ writeJsonLine(publicAgentEvent(event));
74
78
  return;
75
79
  }
76
80
  if (event.type === 'tool_call') {
77
81
  progressToolCalls++;
78
- progress(`[${elapsed()}] tool#${progressToolCalls} ${event.name} ${truncate(JSON.stringify(event.input ?? {}), 160)}`);
82
+ progress(`[${elapsed()}] tool#${progressToolCalls} ${event.name}`);
79
83
  }
80
84
  else if (event.type === 'tool_error') {
81
- progress(`[${elapsed()}] tool-error ${event.name}: ${truncate(event.error, 160)}`);
85
+ progress(`[${elapsed()}] tool-error ${event.name}: ${truncate(redactToolText(event.error).text, 160)}`);
82
86
  }
83
87
  else if (event.type === 'llm_iteration') {
84
88
  progress(`[${elapsed()}] iteration ${event.iteration}`);
@@ -102,6 +106,7 @@ export async function runCommand(promptParts, options, io, execute = executeHarn
102
106
  maxToolCalls,
103
107
  timeoutMinutes,
104
108
  reportFile: options.report,
109
+ checkpoint: options.checkpoint,
105
110
  unattended: !!options.unattended || !io.stdin.isTTY,
106
111
  origin: 'cli',
107
112
  signal: interrupt.signal,
@@ -138,7 +143,7 @@ export async function runCommand(promptParts, options, io, execute = executeHarn
138
143
  return execution.exitCode;
139
144
  }
140
145
  catch (err) {
141
- const error = err instanceof Error ? err.message : String(err);
146
+ const error = redactToolText(err instanceof Error ? err.message : String(err)).text;
142
147
  const result = {
143
148
  ok: false,
144
149
  iterationsUsed: 0,
@@ -206,14 +211,24 @@ function parseOptionalNumber(raw, label, integer) {
206
211
  }
207
212
  return value;
208
213
  }
209
- function truncateToolResult(event) {
210
- if (Buffer.byteLength(event.output, 'utf8') <= 4096)
211
- return event;
212
- return {
213
- ...event,
214
- output: Buffer.from(event.output, 'utf8').subarray(0, 4096).toString('utf8'),
215
- truncated: true,
216
- };
214
+ function publicAgentEvent(event) {
215
+ switch (event.type) {
216
+ case 'tool_call':
217
+ return { type: event.type, name: event.name, id: event.id, inputSummary: fingerprint(event.input) };
218
+ case 'tool_result': {
219
+ const { output, truncated } = truncateToolOutput(redactToolText(event.output).text, 4096);
220
+ return {
221
+ type: event.type, name: event.name, id: event.id, output,
222
+ ...(truncated || event.metadata?.outputTruncated === true ? { truncated: true } : {}),
223
+ };
224
+ }
225
+ case 'tool_error':
226
+ return { type: event.type, name: event.name, id: event.id, error: redactToolText(event.error).text };
227
+ case 'token_delta':
228
+ return { type: event.type, content: event.content };
229
+ case 'llm_iteration':
230
+ return { type: event.type, iteration: event.iteration };
231
+ }
217
232
  }
218
233
  function truncate(value, length) {
219
234
  return value.length > length ? value.slice(0, length) + '…' : value;
@@ -221,13 +236,26 @@ function truncate(value, length) {
221
236
  function writeTextResult(execution, io) {
222
237
  const result = execution.result;
223
238
  // A paused turn exits 0 with ok=false; its output says why, so it still prints.
224
- if (execution.exitCode !== 0)
239
+ if (execution.exitCode === 0) {
240
+ io.stdout.write(result.output + '\n\n');
241
+ io.stdout.write(`--- Session: ${result.sessionId ?? 'n/a'} | ${result.iterationsUsed > 1 ? `(${result.iterationsUsed} iterations) ` : ''}Model: ${result.provider ?? 'unknown'}/${result.model ?? 'unknown'} ---\n`);
242
+ if (result.runId)
243
+ io.stdout.write(`🔒 Audit: run ${result.runId} — \`dvalincode report --last\`\n`);
244
+ writeVerificationLines(result.verification, io);
245
+ }
246
+ const checkpoint = result.checkpoint;
247
+ if (!checkpoint)
225
248
  return;
226
- io.stdout.write(result.output + '\n\n');
227
- io.stdout.write(`--- Session: ${result.sessionId ?? 'n/a'} | ${result.iterationsUsed > 1 ? `(${result.iterationsUsed} iterations) ` : ''}Model: ${result.provider ?? 'unknown'}/${result.model ?? 'unknown'} ---\n`);
228
- if (result.runId)
229
- io.stdout.write(`🔒 Audit: run ${result.runId} — \`dvalincode report --last\`\n`);
230
- writeVerificationLines(result.verification, io);
249
+ const stream = execution.exitCode === 0 ? io.stdout : io.stderr;
250
+ if ('unavailable' in checkpoint) {
251
+ stream.write(`Checkpoint unavailable: ${checkpoint.unavailable}\n`);
252
+ }
253
+ else if (checkpoint.changed > 0 && result.runId) {
254
+ stream.write(`Checkpoint covers ${checkpoint.changed} changed file(s). To restore them, run \`dvalincode rollback ${result.runId}\` from the run workspace.\n`);
255
+ }
256
+ else {
257
+ stream.write(`Checkpoint covers ${checkpoint.changed} changed file(s).\n`);
258
+ }
231
259
  }
232
260
  /**
233
261
  * The human-readable half. `json` and `stream-json` carry the whole envelope, so