dvalincode 0.14.0 → 0.15.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 +159 -60
- package/README.zh-CN.md +169 -72
- package/THIRD_PARTY_NOTICES.md +295 -147
- package/dist/agent/loop.d.ts +8 -0
- package/dist/agent/loop.js +8 -1
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.d.ts +1 -0
- package/dist/agent/runner.js +10 -1
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +23 -1
- package/dist/agent/session.js +63 -11
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +2 -0
- package/dist/audit/log.d.ts +3 -0
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/report.js +2 -0
- package/dist/audit/report.js.map +1 -1
- package/dist/cli.js +24 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/dvalin.js +12 -0
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/mcpServe.d.ts +2 -0
- package/dist/commands/mcpServe.js +36 -0
- package/dist/commands/mcpServe.js.map +1 -0
- package/dist/commands/policy.js +12 -0
- package/dist/commands/policy.js.map +1 -1
- package/dist/commands/run.d.ts +30 -0
- package/dist/commands/run.js +229 -0
- package/dist/commands/run.js.map +1 -0
- package/dist/core/policy.d.ts +21 -0
- package/dist/core/policy.js +32 -0
- package/dist/core/policy.js.map +1 -1
- package/dist/core/subprocessSandbox.d.ts +49 -6
- package/dist/core/subprocessSandbox.js +175 -64
- package/dist/core/subprocessSandbox.js.map +1 -1
- package/dist/core/trust.js +12 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/harness/run.d.ts +70 -0
- package/dist/harness/run.js +185 -0
- package/dist/harness/run.js.map +1 -0
- package/dist/mcp/client.d.ts +12 -0
- package/dist/mcp/client.js +2 -2
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/config.d.ts +33 -3
- package/dist/mcp/config.js +32 -3
- package/dist/mcp/config.js.map +1 -1
- package/dist/mcp/register.d.ts +23 -6
- package/dist/mcp/register.js +42 -8
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +35 -0
- package/dist/mcp/server.js +230 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/mcp/stdio.d.ts +34 -0
- package/dist/mcp/stdio.js +183 -0
- package/dist/mcp/stdio.js.map +1 -0
- package/dist/remediation/sarifExport.d.ts +7 -0
- package/dist/remediation/sarifExport.js +102 -0
- package/dist/remediation/sarifExport.js.map +1 -0
- package/dist/remediation/scannerSuite.js +11 -1
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/server/configStore.d.ts +2 -8
- package/dist/server/configStore.js +12 -7
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/wsHandler.js +8 -0
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/tools/shell.js +1 -1
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/app.js +4 -1
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.d.ts +1 -0
- package/dist/tui/render.js +11 -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 +4 -3
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import { mkdir, stat, writeFile } from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { runAgentTurn } from '../agent/session.js';
|
|
4
|
+
import { DEFAULT_TURN_CONFIG } from '../agent/types.js';
|
|
5
|
+
import { loadPolicy, narrowerUnattendedPermissionMode, PolicyViolationError, unattendedPermissionAllowed, } from '../core/policy.js';
|
|
6
|
+
import { loadSession } from '../sessions/store.js';
|
|
7
|
+
export const DEFAULT_RUN_TIMEOUT_MINUTES = 25;
|
|
8
|
+
/** A caller error that maps to the documented deterministic usage exit code. */
|
|
9
|
+
export class HarnessUsageError extends Error {
|
|
10
|
+
constructor(message) {
|
|
11
|
+
super(message);
|
|
12
|
+
this.name = 'HarnessUsageError';
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Execute one bounded, non-interactive governed turn. This is the shared
|
|
17
|
+
* primitive used by both `dvalincode run` and the task-level MCP server.
|
|
18
|
+
*/
|
|
19
|
+
export async function executeHarnessRun(request, hooks = {}) {
|
|
20
|
+
const startedAt = Date.now();
|
|
21
|
+
let sessionId = request.sessionId;
|
|
22
|
+
let runId;
|
|
23
|
+
let policyHash;
|
|
24
|
+
let provider;
|
|
25
|
+
let model;
|
|
26
|
+
let toolCalls = 0;
|
|
27
|
+
let iterationsUsed = 0;
|
|
28
|
+
let usage = { inputTokens: 0, outputTokens: 0 };
|
|
29
|
+
let output = '';
|
|
30
|
+
const finish = (exitCode, stopReason, error, auditHead) => ({
|
|
31
|
+
exitCode,
|
|
32
|
+
result: {
|
|
33
|
+
ok: exitCode === 0,
|
|
34
|
+
sessionId,
|
|
35
|
+
runId,
|
|
36
|
+
auditHead,
|
|
37
|
+
policyHash,
|
|
38
|
+
provider,
|
|
39
|
+
model,
|
|
40
|
+
iterationsUsed,
|
|
41
|
+
toolCalls,
|
|
42
|
+
usage,
|
|
43
|
+
wallSeconds: (Date.now() - startedAt) / 1000,
|
|
44
|
+
output,
|
|
45
|
+
stopReason,
|
|
46
|
+
...(error ? { error } : {}),
|
|
47
|
+
},
|
|
48
|
+
});
|
|
49
|
+
let timeoutSignal;
|
|
50
|
+
try {
|
|
51
|
+
validatePositiveNumber(request.maxIterations, 'max iterations', true);
|
|
52
|
+
validatePositiveNumber(request.maxToolCalls, 'max tool calls', true);
|
|
53
|
+
validatePositiveNumber(request.timeoutMinutes, 'timeout', false);
|
|
54
|
+
if (!request.content.trim())
|
|
55
|
+
throw new HarnessUsageError('Prompt must not be empty.');
|
|
56
|
+
if (request.permissionMode === 'ask') {
|
|
57
|
+
throw new HarnessUsageError('Permission mode "ask" is interactive and cannot be used with a headless run.');
|
|
58
|
+
}
|
|
59
|
+
const cwd = path.resolve(request.cwd);
|
|
60
|
+
let cwdStat;
|
|
61
|
+
try {
|
|
62
|
+
cwdStat = await stat(cwd);
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
throw new HarnessUsageError(`Working directory does not exist: ${cwd}`);
|
|
66
|
+
}
|
|
67
|
+
if (!cwdStat.isDirectory())
|
|
68
|
+
throw new HarnessUsageError(`Working directory is not a directory: ${cwd}`);
|
|
69
|
+
if (request.sessionId) {
|
|
70
|
+
let session;
|
|
71
|
+
try {
|
|
72
|
+
session = await loadSession(request.sessionId);
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
throw new HarnessUsageError(err instanceof Error ? err.message : String(err));
|
|
76
|
+
}
|
|
77
|
+
if (!session)
|
|
78
|
+
throw new HarnessUsageError(`Session not found: ${request.sessionId}`);
|
|
79
|
+
}
|
|
80
|
+
const loadedPolicy = loadPolicy(cwd);
|
|
81
|
+
policyHash = loadedPolicy.hash;
|
|
82
|
+
const requestedPermission = request.permissionMode;
|
|
83
|
+
const policyCeiling = request.unattended ? loadedPolicy.policy.unattended.maxPermissionMode : undefined;
|
|
84
|
+
const permissionCeiling = narrowerUnattendedPermissionMode(request.maxPermissionMode, policyCeiling);
|
|
85
|
+
if (requestedPermission && permissionCeiling && !unattendedPermissionAllowed(requestedPermission, permissionCeiling)) {
|
|
86
|
+
throw new PolicyViolationError('unattended', `permission mode "${requestedPermission}" exceeds unattended ceiling "${permissionCeiling}"`, requestedPermission);
|
|
87
|
+
}
|
|
88
|
+
let permissionMode = request.permissionMode ?? 'auto';
|
|
89
|
+
if (!request.permissionMode &&
|
|
90
|
+
permissionCeiling &&
|
|
91
|
+
!unattendedPermissionAllowed('auto', permissionCeiling)) {
|
|
92
|
+
permissionMode = permissionCeiling;
|
|
93
|
+
}
|
|
94
|
+
const iterationCap = request.unattended ? loadedPolicy.policy.unattended.maxIterations : undefined;
|
|
95
|
+
if (request.maxIterations !== undefined && iterationCap !== undefined && request.maxIterations > iterationCap) {
|
|
96
|
+
throw new PolicyViolationError('unattended', `max iterations ${request.maxIterations} exceeds unattended cap ${iterationCap}`, String(request.maxIterations));
|
|
97
|
+
}
|
|
98
|
+
const maxIterations = request.maxIterations ?? Math.min(DEFAULT_TURN_CONFIG.maxIterations, iterationCap ?? Infinity);
|
|
99
|
+
const wallCap = request.unattended ? loadedPolicy.policy.unattended.maxWallMinutes : undefined;
|
|
100
|
+
if (request.timeoutMinutes !== undefined && wallCap !== undefined && request.timeoutMinutes > wallCap) {
|
|
101
|
+
throw new PolicyViolationError('unattended', `timeout ${request.timeoutMinutes} minutes exceeds unattended cap ${wallCap}`, String(request.timeoutMinutes));
|
|
102
|
+
}
|
|
103
|
+
const timeoutMinutes = request.timeoutMinutes ?? Math.min(DEFAULT_RUN_TIMEOUT_MINUTES, wallCap ?? Infinity);
|
|
104
|
+
timeoutSignal = AbortSignal.timeout(timeoutMinutes * 60_000);
|
|
105
|
+
const signal = request.signal ? AbortSignal.any([request.signal, timeoutSignal]) : timeoutSignal;
|
|
106
|
+
const config = { maxIterations };
|
|
107
|
+
if (request.maxToolCalls !== undefined)
|
|
108
|
+
config.maxToolCallsPerTurn = request.maxToolCalls;
|
|
109
|
+
const turn = await runAgentTurn({
|
|
110
|
+
content: request.content,
|
|
111
|
+
cwd,
|
|
112
|
+
sessionId: request.sessionId,
|
|
113
|
+
mode: request.mode ?? 'code',
|
|
114
|
+
codePermissionMode: permissionMode,
|
|
115
|
+
providerOverride: request.provider,
|
|
116
|
+
modelOverride: request.model,
|
|
117
|
+
profileOverride: request.profile,
|
|
118
|
+
turnConfig: config,
|
|
119
|
+
origin: request.origin ?? 'cli',
|
|
120
|
+
signal,
|
|
121
|
+
}, {
|
|
122
|
+
onSessionId: id => {
|
|
123
|
+
sessionId = id;
|
|
124
|
+
},
|
|
125
|
+
onProviderSelected: (providerId, selectedModel) => {
|
|
126
|
+
provider = providerId;
|
|
127
|
+
model = selectedModel;
|
|
128
|
+
hooks.onProviderSelected?.(providerId, selectedModel);
|
|
129
|
+
},
|
|
130
|
+
onRunStart: details => {
|
|
131
|
+
runId = details.runId;
|
|
132
|
+
policyHash = details.policyHash;
|
|
133
|
+
hooks.onRunStart?.({ type: 'run_start', ...details });
|
|
134
|
+
},
|
|
135
|
+
onEvent: event => {
|
|
136
|
+
if (event.type === 'tool_call')
|
|
137
|
+
toolCalls++;
|
|
138
|
+
if (event.type === 'llm_iteration')
|
|
139
|
+
iterationsUsed = event.iteration;
|
|
140
|
+
hooks.onEvent?.(event);
|
|
141
|
+
},
|
|
142
|
+
// A headless surface has no human approval channel. Any tool path that
|
|
143
|
+
// requires a confirmation must fail promptly and be audited as denied.
|
|
144
|
+
requestApproval: async () => false,
|
|
145
|
+
});
|
|
146
|
+
sessionId = turn.sessionId;
|
|
147
|
+
runId = turn.result.runId;
|
|
148
|
+
policyHash = turn.policyHash;
|
|
149
|
+
provider = turn.providerId;
|
|
150
|
+
model = turn.model;
|
|
151
|
+
iterationsUsed = turn.result.iterationsUsed;
|
|
152
|
+
usage = turn.result.usage ?? usage;
|
|
153
|
+
output = turn.result.output;
|
|
154
|
+
if (request.reportFile) {
|
|
155
|
+
if (!turn.reportMarkdown)
|
|
156
|
+
throw new Error('Run report was not available.');
|
|
157
|
+
const reportPath = path.resolve(request.reportFile);
|
|
158
|
+
await mkdir(path.dirname(reportPath), { recursive: true });
|
|
159
|
+
await writeFile(reportPath, turn.reportMarkdown, 'utf8');
|
|
160
|
+
}
|
|
161
|
+
const execution = finish(0, turn.result.stopReason ?? 'done', undefined, turn.result.auditHead);
|
|
162
|
+
execution.reportMarkdown = turn.reportMarkdown;
|
|
163
|
+
return execution;
|
|
164
|
+
}
|
|
165
|
+
catch (err) {
|
|
166
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
167
|
+
if (err instanceof HarnessUsageError)
|
|
168
|
+
return finish(2, 'error', message);
|
|
169
|
+
if (err instanceof PolicyViolationError)
|
|
170
|
+
return finish(3, 'error', message);
|
|
171
|
+
if (request.signal?.aborted)
|
|
172
|
+
return finish(4, 'interrupted', message);
|
|
173
|
+
if (timeoutSignal?.aborted)
|
|
174
|
+
return finish(4, 'timeout', message);
|
|
175
|
+
return finish(1, 'error', message);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
function validatePositiveNumber(value, label, integer) {
|
|
179
|
+
if (value === undefined)
|
|
180
|
+
return;
|
|
181
|
+
if (!Number.isFinite(value) || value <= 0 || (integer && !Number.isInteger(value))) {
|
|
182
|
+
throw new HarnessUsageError(`${label} must be a positive ${integer ? 'integer' : 'number'}.`);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
//# sourceMappingURL=run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/harness/run.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/client.d.ts
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
1
|
import { type McpEgressContext } from './governedFetch.js';
|
|
2
|
+
/**
|
|
3
|
+
* A minimal, hand-rolled MCP client over the Streamable HTTP transport — no SDK,
|
|
4
|
+
* to preserve DvalinCode's zero-runtime-deps posture. It speaks only the three
|
|
5
|
+
* JSON-RPC methods v1 needs (`initialize`, `tools/list`, `tools/call`) and reads
|
|
6
|
+
* responses whether the server replies with `application/json` or a
|
|
7
|
+
* `text/event-stream` (SSE) body. All network I/O goes through `governedMcpFetch`.
|
|
8
|
+
*/
|
|
9
|
+
export declare const PROTOCOL_VERSION = "2025-06-18";
|
|
10
|
+
export declare const CLIENT_INFO: {
|
|
11
|
+
name: string;
|
|
12
|
+
version: string;
|
|
13
|
+
};
|
|
2
14
|
export type McpToolAnnotations = {
|
|
3
15
|
readOnlyHint?: boolean;
|
|
4
16
|
destructiveHint?: boolean;
|
package/dist/mcp/client.js
CHANGED
|
@@ -6,8 +6,8 @@ import { governedMcpFetch } from './governedFetch.js';
|
|
|
6
6
|
* responses whether the server replies with `application/json` or a
|
|
7
7
|
* `text/event-stream` (SSE) body. All network I/O goes through `governedMcpFetch`.
|
|
8
8
|
*/
|
|
9
|
-
const PROTOCOL_VERSION = '2025-06-18';
|
|
10
|
-
const CLIENT_INFO = { name: 'dvalincode', version: '0.9.0' };
|
|
9
|
+
export const PROTOCOL_VERSION = '2025-06-18';
|
|
10
|
+
export const CLIENT_INFO = { name: 'dvalincode', version: '0.9.0' };
|
|
11
11
|
export class McpClient {
|
|
12
12
|
server;
|
|
13
13
|
authHeaders;
|
package/dist/mcp/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAyB,MAAM,oBAAoB,CAAC;AAE7E;;;;;;GAMG;AAEH,MAAM,gBAAgB,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/config.d.ts
CHANGED
|
@@ -1,4 +1,32 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const remoteMcpServerConfigSchema: z.ZodObject<{
|
|
3
|
+
id: z.ZodString;
|
|
4
|
+
url: z.ZodURL;
|
|
5
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
6
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
7
|
+
}, z.core.$strict>;
|
|
8
|
+
export declare const localMcpServerConfigSchema: z.ZodObject<{
|
|
9
|
+
id: z.ZodString;
|
|
10
|
+
command: z.ZodString;
|
|
11
|
+
args: z.ZodArray<z.ZodString>;
|
|
12
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
13
|
+
}, z.core.$strict>;
|
|
14
|
+
export declare const mcpServerConfigSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
15
|
+
id: z.ZodString;
|
|
16
|
+
url: z.ZodURL;
|
|
17
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
18
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
19
|
+
}, z.core.$strict>, z.ZodObject<{
|
|
20
|
+
id: z.ZodString;
|
|
21
|
+
command: z.ZodString;
|
|
22
|
+
args: z.ZodArray<z.ZodString>;
|
|
23
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
24
|
+
}, z.core.$strict>]>;
|
|
25
|
+
export type RemoteMcpServerConfig = z.infer<typeof remoteMcpServerConfigSchema>;
|
|
26
|
+
export type LocalMcpServerConfig = z.infer<typeof localMcpServerConfigSchema>;
|
|
27
|
+
export type McpServerConfig = z.infer<typeof mcpServerConfigSchema>;
|
|
28
|
+
/** Parse one remote or local MCP config entry at the configuration boundary. */
|
|
29
|
+
export declare function parseMcpServerConfig(input: unknown): McpServerConfig;
|
|
2
30
|
/**
|
|
3
31
|
* Resolve `${ENV}` placeholders in header values from the process environment.
|
|
4
32
|
* Secrets therefore live in the environment, never in DvalinCode's config file
|
|
@@ -6,5 +34,7 @@ import type { McpServerConfig } from '../server/configStore.js';
|
|
|
6
34
|
* will fail auth loudly rather than silently sending a literal `${VAR}`).
|
|
7
35
|
*/
|
|
8
36
|
export declare function resolveHeaders(headers: Record<string, string> | undefined): Record<string, string>;
|
|
9
|
-
/**
|
|
10
|
-
export declare function
|
|
37
|
+
/** Remote servers that are explicitly enabled. Disabled/omitted servers are never connected. */
|
|
38
|
+
export declare function enabledRemoteServers(servers: McpServerConfig[] | undefined): RemoteMcpServerConfig[];
|
|
39
|
+
/** Local stdio servers that are explicitly enabled. */
|
|
40
|
+
export declare function enabledLocalServers(servers: McpServerConfig[] | undefined): LocalMcpServerConfig[];
|
package/dist/mcp/config.js
CHANGED
|
@@ -1,3 +1,28 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export const remoteMcpServerConfigSchema = z
|
|
3
|
+
.object({
|
|
4
|
+
id: z.string().trim().min(1, 'MCP server id must not be empty'),
|
|
5
|
+
url: z.url('MCP server url must be a valid URL'),
|
|
6
|
+
headers: z.record(z.string(), z.string()).optional(),
|
|
7
|
+
enabled: z.boolean().optional(),
|
|
8
|
+
})
|
|
9
|
+
.strict();
|
|
10
|
+
export const localMcpServerConfigSchema = z
|
|
11
|
+
.object({
|
|
12
|
+
id: z.string().trim().min(1, 'MCP server id must not be empty'),
|
|
13
|
+
command: z.string().trim().min(1, 'MCP server command must not be empty'),
|
|
14
|
+
args: z.array(z.string()),
|
|
15
|
+
enabled: z.boolean().optional(),
|
|
16
|
+
})
|
|
17
|
+
.strict();
|
|
18
|
+
export const mcpServerConfigSchema = z.union([
|
|
19
|
+
remoteMcpServerConfigSchema,
|
|
20
|
+
localMcpServerConfigSchema,
|
|
21
|
+
]);
|
|
22
|
+
/** Parse one remote or local MCP config entry at the configuration boundary. */
|
|
23
|
+
export function parseMcpServerConfig(input) {
|
|
24
|
+
return mcpServerConfigSchema.parse(input);
|
|
25
|
+
}
|
|
1
26
|
/**
|
|
2
27
|
* Resolve `${ENV}` placeholders in header values from the process environment.
|
|
3
28
|
* Secrets therefore live in the environment, never in DvalinCode's config file
|
|
@@ -11,8 +36,12 @@ export function resolveHeaders(headers) {
|
|
|
11
36
|
}
|
|
12
37
|
return out;
|
|
13
38
|
}
|
|
14
|
-
/**
|
|
15
|
-
export function
|
|
16
|
-
return (servers ?? []).filter(
|
|
39
|
+
/** Remote servers that are explicitly enabled. Disabled/omitted servers are never connected. */
|
|
40
|
+
export function enabledRemoteServers(servers) {
|
|
41
|
+
return (servers ?? []).filter((server) => server.enabled === true && 'url' in server);
|
|
42
|
+
}
|
|
43
|
+
/** Local stdio servers that are explicitly enabled. */
|
|
44
|
+
export function enabledLocalServers(servers) {
|
|
45
|
+
return (servers ?? []).filter((server) => server.enabled === true && 'command' in server);
|
|
17
46
|
}
|
|
18
47
|
//# sourceMappingURL=config.js.map
|
package/dist/mcp/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/mcp/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/mcp/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC;KACzC,MAAM,CAAC;IACN,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,iCAAiC,CAAC;IAC/D,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,oCAAoC,CAAC;IAChD,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpD,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,iCAAiC,CAAC;IAC/D,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,sCAAsC,CAAC;IACzE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC3C,2BAA2B;IAC3B,0BAA0B;CAC3B,CAAC,CAAC;AAMH,gFAAgF;AAChF,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,OAAO,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,OAA2C;IACxE,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,gGAAgG;AAChG,MAAM,UAAU,oBAAoB,CAAC,OAAsC;IACzE,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAC3B,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,KAAK,IAAI,MAAM,CACxF,CAAC;AACJ,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,mBAAmB,CAAC,OAAsC;IACxE,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAC3B,CAAC,MAAM,EAAkC,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,SAAS,IAAI,MAAM,CAC3F,CAAC;AACJ,CAAC"}
|
package/dist/mcp/register.d.ts
CHANGED
|
@@ -2,25 +2,42 @@ import { type ResolvedPolicy } from '../core/policy.js';
|
|
|
2
2
|
import type { AuditSink } from '../audit/log.js';
|
|
3
3
|
import type { Tool } from '../tools/types.js';
|
|
4
4
|
import type { ToolRegistry } from '../tools/registry.js';
|
|
5
|
-
import type { McpServerConfig } from '
|
|
6
|
-
import {
|
|
5
|
+
import type { McpServerConfig } from './config.js';
|
|
6
|
+
import { type McpToolDef, type McpCallResult } from './client.js';
|
|
7
|
+
import type { McpEgressContext } from './governedFetch.js';
|
|
8
|
+
/** What a registered MCP tool needs from its transport, remote or local. */
|
|
9
|
+
export type McpToolCaller = {
|
|
10
|
+
callTool(name: string, args: unknown, ctx: McpEgressContext): Promise<McpCallResult>;
|
|
11
|
+
};
|
|
7
12
|
/** Namespaced tool name — collision-proof and provenance-visible in the audit trail. */
|
|
8
13
|
export declare function mcpNamespacedName(serverId: string, toolName: string): string;
|
|
9
14
|
/** Adapt one discovered MCP tool into a DvalinCode `Tool` that proxies `tools/call`. */
|
|
10
|
-
export declare function mcpToolToTool(serverId: string, def: McpToolDef, client:
|
|
15
|
+
export declare function mcpToolToTool(serverId: string, def: McpToolDef, client: McpToolCaller): Tool<unknown>;
|
|
11
16
|
export type McpServerStatus = 'connected' | 'denied' | 'blocked' | 'error';
|
|
12
17
|
export type McpConnectionSummary = {
|
|
13
18
|
id: string;
|
|
14
19
|
status: McpServerStatus;
|
|
15
20
|
tools: number;
|
|
21
|
+
/** Which transport carried the connection — local servers never touch the network. */
|
|
22
|
+
transport: 'http' | 'stdio';
|
|
16
23
|
reason?: string;
|
|
17
24
|
};
|
|
25
|
+
export type McpRegistration = {
|
|
26
|
+
summaries: McpConnectionSummary[];
|
|
27
|
+
/** Stop every local server started for this run. Always call it when the turn ends. */
|
|
28
|
+
dispose: () => void;
|
|
29
|
+
};
|
|
18
30
|
/**
|
|
19
31
|
* Connect to each enabled + policy-permitted MCP server, discover its tools, and
|
|
20
|
-
* register them into the registry.
|
|
21
|
-
*
|
|
32
|
+
* register them into the registry.
|
|
33
|
+
*
|
|
34
|
+
* Remote servers are admitted by `checkMcpServer` and their egress is enforced by
|
|
35
|
+
* the governed fetch. Local stdio servers are admitted by `checkMcpServer` *and*
|
|
36
|
+
* `checkCommand` (in `McpStdioClient`), and run under the subprocess sandbox.
|
|
37
|
+
* Either way, per-tool calls are enforced and audited against the live run later.
|
|
22
38
|
*/
|
|
23
39
|
export declare function registerMcpServers(registry: ToolRegistry, servers: McpServerConfig[] | undefined, ctx: {
|
|
24
40
|
policy: ResolvedPolicy;
|
|
25
41
|
audit?: AuditSink;
|
|
26
|
-
|
|
42
|
+
cwd: string;
|
|
43
|
+
}): Promise<McpRegistration>;
|
package/dist/mcp/register.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { checkMcpServer, PolicyViolationError } from '../core/policy.js';
|
|
3
3
|
import { McpClient } from './client.js';
|
|
4
|
-
import {
|
|
4
|
+
import { McpStdioClient } from './stdio.js';
|
|
5
|
+
import { resolveHeaders, enabledRemoteServers, enabledLocalServers } from './config.js';
|
|
5
6
|
/** Namespaced tool name — collision-proof and provenance-visible in the audit trail. */
|
|
6
7
|
export function mcpNamespacedName(serverId, toolName) {
|
|
7
8
|
return `mcp__${serverId}__${toolName}`;
|
|
@@ -44,15 +45,25 @@ export function mcpToolToTool(serverId, def, client) {
|
|
|
44
45
|
}
|
|
45
46
|
/**
|
|
46
47
|
* Connect to each enabled + policy-permitted MCP server, discover its tools, and
|
|
47
|
-
* register them into the registry.
|
|
48
|
-
*
|
|
48
|
+
* register them into the registry.
|
|
49
|
+
*
|
|
50
|
+
* Remote servers are admitted by `checkMcpServer` and their egress is enforced by
|
|
51
|
+
* the governed fetch. Local stdio servers are admitted by `checkMcpServer` *and*
|
|
52
|
+
* `checkCommand` (in `McpStdioClient`), and run under the subprocess sandbox.
|
|
53
|
+
* Either way, per-tool calls are enforced and audited against the live run later.
|
|
49
54
|
*/
|
|
50
55
|
export async function registerMcpServers(registry, servers, ctx) {
|
|
51
56
|
const summaries = [];
|
|
52
|
-
|
|
57
|
+
const started = [];
|
|
58
|
+
const dispose = () => {
|
|
59
|
+
for (const client of started)
|
|
60
|
+
client.close();
|
|
61
|
+
started.length = 0;
|
|
62
|
+
};
|
|
63
|
+
for (const server of enabledRemoteServers(servers)) {
|
|
53
64
|
const decision = checkMcpServer(ctx.policy, server.id);
|
|
54
65
|
if (!decision.allowed) {
|
|
55
|
-
summaries.push({ id: server.id, status: 'denied', tools: 0, reason: decision.rule });
|
|
66
|
+
summaries.push({ id: server.id, status: 'denied', tools: 0, transport: 'http', reason: decision.rule });
|
|
56
67
|
continue;
|
|
57
68
|
}
|
|
58
69
|
const client = new McpClient({ id: server.id, url: server.url }, resolveHeaders(server.headers));
|
|
@@ -62,14 +73,37 @@ export async function registerMcpServers(registry, servers, ctx) {
|
|
|
62
73
|
const tools = await client.listTools(egress);
|
|
63
74
|
for (const def of tools)
|
|
64
75
|
registry.register(mcpToolToTool(server.id, def, client));
|
|
65
|
-
summaries.push({ id: server.id, status: 'connected', tools: tools.length });
|
|
76
|
+
summaries.push({ id: server.id, status: 'connected', tools: tools.length, transport: 'http' });
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
const blocked = err instanceof PolicyViolationError;
|
|
80
|
+
summaries.push({ id: server.id, status: blocked ? 'blocked' : 'error', tools: 0, transport: 'http', reason: errMsg(err) });
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
for (const server of enabledLocalServers(servers)) {
|
|
84
|
+
const decision = checkMcpServer(ctx.policy, server.id);
|
|
85
|
+
if (!decision.allowed) {
|
|
86
|
+
summaries.push({ id: server.id, status: 'denied', tools: 0, transport: 'stdio', reason: decision.rule });
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
const client = new McpStdioClient({ id: server.id, command: server.command, args: server.args }, ctx.cwd);
|
|
90
|
+
const egress = { policy: ctx.policy, audit: ctx.audit, serverId: server.id };
|
|
91
|
+
try {
|
|
92
|
+
await client.initialize(egress);
|
|
93
|
+
started.push(client);
|
|
94
|
+
const tools = await client.listTools(egress);
|
|
95
|
+
for (const def of tools)
|
|
96
|
+
registry.register(mcpToolToTool(server.id, def, client));
|
|
97
|
+
summaries.push({ id: server.id, status: 'connected', tools: tools.length, transport: 'stdio' });
|
|
66
98
|
}
|
|
67
99
|
catch (err) {
|
|
100
|
+
// A server that failed mid-handshake may still have a live process.
|
|
101
|
+
client.close();
|
|
68
102
|
const blocked = err instanceof PolicyViolationError;
|
|
69
|
-
summaries.push({ id: server.id, status: blocked ? 'blocked' : 'error', tools: 0, reason: errMsg(err) });
|
|
103
|
+
summaries.push({ id: server.id, status: blocked ? 'blocked' : 'error', tools: 0, transport: 'stdio', reason: errMsg(err) });
|
|
70
104
|
}
|
|
71
105
|
}
|
|
72
|
-
return summaries;
|
|
106
|
+
return { summaries, dispose };
|
|
73
107
|
}
|
|
74
108
|
function errMsg(err) {
|
|
75
109
|
return err instanceof Error ? err.message : String(err);
|
package/dist/mcp/register.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/mcp/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAuB,MAAM,mBAAmB,CAAC;AAK9F,OAAO,EAAE,SAAS,EAAuC,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/mcp/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import type { Readable, Writable } from 'node:stream';
|
|
2
|
+
import { type HarnessRunExecution, type HarnessRunHooks, type HarnessRunRequest } from '../harness/run.js';
|
|
3
|
+
import type { UnattendedPermissionMode } from '../core/policy.js';
|
|
4
|
+
import { type Session } from '../sessions/store.js';
|
|
5
|
+
type JsonRpcId = string | number | null;
|
|
6
|
+
type JsonRpcResponse = {
|
|
7
|
+
jsonrpc: '2.0';
|
|
8
|
+
id: JsonRpcId;
|
|
9
|
+
result?: unknown;
|
|
10
|
+
error?: {
|
|
11
|
+
code: number;
|
|
12
|
+
message: string;
|
|
13
|
+
data?: unknown;
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
export type McpServerOptions = {
|
|
17
|
+
cwd: string;
|
|
18
|
+
workspaces: string[];
|
|
19
|
+
maxPermissionMode: UnattendedPermissionMode;
|
|
20
|
+
};
|
|
21
|
+
export type McpServerDependencies = {
|
|
22
|
+
executeRun: (request: HarnessRunRequest, hooks?: HarnessRunHooks) => Promise<HarnessRunExecution>;
|
|
23
|
+
loadSession: (id: string) => Promise<Session | null>;
|
|
24
|
+
renderReport: (runId: string) => string;
|
|
25
|
+
latestRun: () => string | null;
|
|
26
|
+
};
|
|
27
|
+
export type DvalinMcpServer = {
|
|
28
|
+
handleLine(line: string): Promise<JsonRpcResponse | null>;
|
|
29
|
+
};
|
|
30
|
+
export declare function createMcpServer(options: McpServerOptions, overrides?: Partial<McpServerDependencies>): Promise<DvalinMcpServer>;
|
|
31
|
+
export declare function runMcpStdio(options: McpServerOptions, io?: {
|
|
32
|
+
input: Readable;
|
|
33
|
+
output: Writable;
|
|
34
|
+
}): Promise<void>;
|
|
35
|
+
export {};
|