dvalincode 0.23.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.
- package/README.md +51 -12
- package/README.zh-CN.md +43 -11
- package/dist/agent/compact.js +9 -1
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +9 -1
- package/dist/agent/loop.js +56 -12
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.js +7 -0
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +2 -1
- package/dist/agent/runner.js +180 -32
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +21 -0
- package/dist/agent/session.js +71 -33
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/toolFollowups.d.ts +13 -0
- package/dist/agent/toolFollowups.js +50 -0
- package/dist/agent/toolFollowups.js.map +1 -0
- package/dist/agent/types.d.ts +3 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +41 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/minimize.js +2 -1
- package/dist/audit/minimize.js.map +1 -1
- package/dist/audit/taps.js +10 -1
- package/dist/audit/taps.js.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/checkpoint.d.ts +3 -0
- package/dist/commands/checkpoint.js +34 -0
- package/dist/commands/checkpoint.js.map +1 -0
- package/dist/commands/run.d.ts +1 -0
- package/dist/commands/run.js +46 -18
- package/dist/commands/run.js.map +1 -1
- package/dist/core/checkpoint.d.ts +41 -0
- package/dist/core/checkpoint.js +159 -0
- package/dist/core/checkpoint.js.map +1 -0
- package/dist/core/context.d.ts +7 -0
- package/dist/core/context.js +1 -0
- package/dist/core/context.js.map +1 -1
- package/dist/core/gitRead.d.ts +20 -0
- package/dist/core/gitRead.js +97 -0
- package/dist/core/gitRead.js.map +1 -0
- package/dist/core/ignorefile.d.ts +2 -0
- package/dist/core/ignorefile.js +8 -0
- package/dist/core/ignorefile.js.map +1 -1
- package/dist/core/policy.d.ts +4 -0
- package/dist/core/policy.js +8 -6
- package/dist/core/policy.js.map +1 -1
- package/dist/core/redactSecrets.d.ts +14 -0
- package/dist/core/redactSecrets.js +35 -0
- package/dist/core/redactSecrets.js.map +1 -0
- package/dist/core/trust.d.ts +5 -0
- package/dist/core/trust.js +12 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/core/webEgress.d.ts +66 -0
- package/dist/core/webEgress.js +281 -0
- package/dist/core/webEgress.js.map +1 -0
- package/dist/evidence/compliance.js +1 -1
- package/dist/evidence/compliance.js.map +1 -1
- package/dist/harness/run.d.ts +4 -0
- package/dist/harness/run.js +20 -15
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/register.js +4 -1
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -2
- package/dist/mcp/server.js +28 -9
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +16 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/chatImages.d.ts +21 -0
- package/dist/providers/chatImages.js +18 -0
- package/dist/providers/chatImages.js.map +1 -0
- package/dist/providers/egress.js +7 -0
- package/dist/providers/egress.js.map +1 -1
- package/dist/providers/openaiCompatible.js +19 -1
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.js +2 -0
- package/dist/providers/retry.js.map +1 -1
- package/dist/providers/runBudget.d.ts +11 -0
- package/dist/providers/runBudget.js +74 -0
- package/dist/providers/runBudget.js.map +1 -0
- package/dist/providers/types.d.ts +6 -0
- package/dist/server/auth.d.ts +33 -0
- package/dist/server/auth.js +53 -0
- package/dist/server/auth.js.map +1 -0
- package/dist/server/configStore.d.ts +10 -0
- package/dist/server/configStore.js +9 -0
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/index.d.ts +5 -0
- package/dist/server/index.js +73 -5
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/config.js +37 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/sessions.js +2 -1
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/wsHandler.js +23 -12
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/sessions/journal.d.ts +2 -0
- package/dist/sessions/journal.js.map +1 -1
- package/dist/sessions/store.d.ts +6 -0
- package/dist/sessions/store.js +11 -0
- package/dist/sessions/store.js.map +1 -1
- package/dist/tools/applyPatch.d.ts +13 -0
- package/dist/tools/applyPatch.js +144 -0
- package/dist/tools/applyPatch.js.map +1 -0
- package/dist/tools/askUser.d.ts +3 -0
- package/dist/tools/askUser.js +23 -0
- package/dist/tools/askUser.js.map +1 -0
- package/dist/tools/checkDiagnostics.d.ts +8 -0
- package/dist/tools/checkDiagnostics.js +48 -0
- package/dist/tools/checkDiagnostics.js.map +1 -0
- package/dist/tools/editFile.d.ts +8 -2
- package/dist/tools/editFile.js +95 -26
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/gitBlame.d.ts +11 -0
- package/dist/tools/gitBlame.js +43 -0
- package/dist/tools/gitBlame.js.map +1 -0
- package/dist/tools/gitDiff.js +13 -24
- package/dist/tools/gitDiff.js.map +1 -1
- package/dist/tools/gitLog.d.ts +11 -0
- package/dist/tools/gitLog.js +39 -0
- package/dist/tools/gitLog.js.map +1 -0
- package/dist/tools/gitShow.d.ts +11 -0
- package/dist/tools/gitShow.js +41 -0
- package/dist/tools/gitShow.js.map +1 -0
- package/dist/tools/gitStatus.js +2 -5
- package/dist/tools/gitStatus.js.map +1 -1
- package/dist/tools/htmlText.d.ts +19 -0
- package/dist/tools/htmlText.js +104 -0
- package/dist/tools/htmlText.js.map +1 -0
- package/dist/tools/readFile.js +84 -1
- package/dist/tools/readFile.js.map +1 -1
- package/dist/tools/registry.d.ts +2 -1
- package/dist/tools/registry.js +29 -3
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rollbackRun.d.ts +5 -0
- package/dist/tools/rollbackRun.js +142 -0
- package/dist/tools/rollbackRun.js.map +1 -0
- package/dist/tools/runCheck.js +10 -1
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/searchText.d.ts +10 -0
- package/dist/tools/searchText.js +193 -19
- package/dist/tools/searchText.js.map +1 -1
- package/dist/tools/updatePlan.d.ts +38 -0
- package/dist/tools/updatePlan.js +81 -0
- package/dist/tools/updatePlan.js.map +1 -0
- package/dist/tools/webFetch.d.ts +8 -0
- package/dist/tools/webFetch.js +103 -0
- package/dist/tools/webFetch.js.map +1 -0
- package/dist/tools/webSearch.d.ts +26 -0
- package/dist/tools/webSearch.js +157 -0
- package/dist/tools/webSearch.js.map +1 -0
- package/dist/tools/writeFile.js +4 -1
- package/dist/tools/writeFile.js.map +1 -1
- package/dist/tui/app.js +22 -1
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.js +7 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,281 @@
|
|
|
1
|
+
import dns from 'node:dns';
|
|
2
|
+
import { isIP } from 'node:net';
|
|
3
|
+
import { checkEgress, PolicyViolationError } from './policy.js';
|
|
4
|
+
import { VERSION } from '../version.js';
|
|
5
|
+
/**
|
|
6
|
+
* The one network path for the built-in web tools (web_search, web_fetch).
|
|
7
|
+
*
|
|
8
|
+
* Every request, and every redirect hop, is checked against org policy and
|
|
9
|
+
* refused when its host is, or resolves to, a non-public address. Each hop is
|
|
10
|
+
* audited by origin only: never the path, query, headers or body, which carry
|
|
11
|
+
* search terms and API keys.
|
|
12
|
+
*
|
|
13
|
+
* The DNS check runs before connecting and fetch resolves the name again, so a
|
|
14
|
+
* rebinding server could still swap addresses between the two lookups. The
|
|
15
|
+
* check stops the common cases (localhost aliases, intranet names, cloud
|
|
16
|
+
* metadata endpoints); it is not a network-level boundary.
|
|
17
|
+
*/
|
|
18
|
+
export const WEB_USER_AGENT = `Mozilla/5.0 (compatible; DvalinCode/${VERSION}; +https://dvalincode.dev)`;
|
|
19
|
+
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
20
|
+
const MAX_REDIRECTS = 5;
|
|
21
|
+
const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
|
|
22
|
+
/** Parse a URL the web tools may request: http(s) only, no embedded credentials. */
|
|
23
|
+
export function parseWebUrl(raw) {
|
|
24
|
+
let url;
|
|
25
|
+
try {
|
|
26
|
+
url = new URL(raw);
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
throw new Error(`Not a valid absolute URL: ${raw}`);
|
|
30
|
+
}
|
|
31
|
+
if (url.protocol !== 'https:' && url.protocol !== 'http:') {
|
|
32
|
+
throw new Error(`Only http and https URLs are supported, not ${url.protocol}`);
|
|
33
|
+
}
|
|
34
|
+
if (url.username || url.password) {
|
|
35
|
+
throw new Error('URLs with embedded credentials are not allowed');
|
|
36
|
+
}
|
|
37
|
+
return url;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Admission for one request target: org policy first, then the public-address
|
|
41
|
+
* check. Both refusals are audited. Callers that ask a person before a request
|
|
42
|
+
* run this first, so nobody is asked to approve a request that would be refused.
|
|
43
|
+
*/
|
|
44
|
+
export async function assertWebTargetAllowed(url, tool, context) {
|
|
45
|
+
const decision = checkEgress(context.policy, false);
|
|
46
|
+
if (!decision.allowed) {
|
|
47
|
+
context.audit?.append({ type: 'web_request', tool, origin: url.origin, outcome: 'blocked', durationMs: 0 });
|
|
48
|
+
context.audit?.append({ type: 'policy_violation', rule: decision.rule, tool, target: url.origin });
|
|
49
|
+
throw new PolicyViolationError(tool, decision.rule, url.origin);
|
|
50
|
+
}
|
|
51
|
+
const started = Date.now();
|
|
52
|
+
try {
|
|
53
|
+
await assertPublicHost(url);
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
context.audit?.append({ type: 'web_request', tool, origin: url.origin, outcome: 'blocked', durationMs: Date.now() - started });
|
|
57
|
+
throw error;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
/** Make one governed request, following redirects that stay on the same host. */
|
|
61
|
+
export async function governedWebRequest(target, options) {
|
|
62
|
+
const { tool, context } = options;
|
|
63
|
+
let url = parseWebUrl(target);
|
|
64
|
+
let method = options.method ?? 'GET';
|
|
65
|
+
let body = options.body;
|
|
66
|
+
for (let hop = 0;; hop++) {
|
|
67
|
+
await assertWebTargetAllowed(url, tool, context);
|
|
68
|
+
const started = Date.now();
|
|
69
|
+
let audited = false;
|
|
70
|
+
const audit = (outcome, statusCode) => {
|
|
71
|
+
audited = true;
|
|
72
|
+
context.audit?.append({
|
|
73
|
+
type: 'web_request',
|
|
74
|
+
tool,
|
|
75
|
+
origin: url.origin,
|
|
76
|
+
outcome,
|
|
77
|
+
durationMs: Date.now() - started,
|
|
78
|
+
...(statusCode === undefined ? {} : { statusCode }),
|
|
79
|
+
});
|
|
80
|
+
};
|
|
81
|
+
const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
82
|
+
const controller = new AbortController();
|
|
83
|
+
let timedOut = false;
|
|
84
|
+
const timer = setTimeout(() => {
|
|
85
|
+
timedOut = true;
|
|
86
|
+
controller.abort();
|
|
87
|
+
}, timeoutMs);
|
|
88
|
+
const onAbort = () => controller.abort();
|
|
89
|
+
if (context.signal?.aborted)
|
|
90
|
+
controller.abort();
|
|
91
|
+
context.signal?.addEventListener('abort', onAbort, { once: true });
|
|
92
|
+
try {
|
|
93
|
+
const response = await fetch(url, {
|
|
94
|
+
method,
|
|
95
|
+
headers: options.headers,
|
|
96
|
+
body,
|
|
97
|
+
redirect: 'manual',
|
|
98
|
+
signal: controller.signal,
|
|
99
|
+
});
|
|
100
|
+
if (REDIRECT_STATUSES.has(response.status)) {
|
|
101
|
+
await response.body?.cancel().catch(() => undefined);
|
|
102
|
+
audit('ok', response.status);
|
|
103
|
+
const location = response.headers.get('location');
|
|
104
|
+
if (!location)
|
|
105
|
+
throw new Error(`${url.origin} answered HTTP ${response.status} without a Location header`);
|
|
106
|
+
const next = parseWebUrl(new URL(location, url).href);
|
|
107
|
+
if (options.sameOriginOnly ? url.origin !== next.origin : !sameSite(url, next))
|
|
108
|
+
return { kind: 'redirect', url, status: response.status, location: next };
|
|
109
|
+
if (hop >= MAX_REDIRECTS)
|
|
110
|
+
throw new Error(`Stopped after ${MAX_REDIRECTS} redirects at ${url.origin}`);
|
|
111
|
+
if (response.status === 303 || ((response.status === 301 || response.status === 302) && method === 'POST')) {
|
|
112
|
+
method = 'GET';
|
|
113
|
+
body = undefined;
|
|
114
|
+
}
|
|
115
|
+
url = next;
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
const contentType = response.headers.get('content-type') ?? '';
|
|
119
|
+
if (options.acceptContentType && !options.acceptContentType(contentType)) {
|
|
120
|
+
await response.body?.cancel().catch(() => undefined);
|
|
121
|
+
audit('error', response.status);
|
|
122
|
+
throw new Error(`${url.href} is ${contentType.split(';')[0]}, which ${tool} cannot read as text`);
|
|
123
|
+
}
|
|
124
|
+
const { bytes, truncated } = await readCapped(response, options.maxBytes);
|
|
125
|
+
audit(response.ok ? 'ok' : 'error', response.status);
|
|
126
|
+
return {
|
|
127
|
+
kind: 'response',
|
|
128
|
+
url,
|
|
129
|
+
status: response.status,
|
|
130
|
+
contentType,
|
|
131
|
+
text: decodeBody(bytes, contentType),
|
|
132
|
+
bytes: bytes.byteLength,
|
|
133
|
+
truncated,
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
if (!audited)
|
|
138
|
+
audit('error');
|
|
139
|
+
if (timedOut)
|
|
140
|
+
throw new Error(`${url.origin} did not respond within ${Math.round(timeoutMs / 1000)}s`);
|
|
141
|
+
if (context.signal?.aborted)
|
|
142
|
+
throw new Error('interrupted');
|
|
143
|
+
throw error;
|
|
144
|
+
}
|
|
145
|
+
finally {
|
|
146
|
+
clearTimeout(timer);
|
|
147
|
+
context.signal?.removeEventListener('abort', onAbort);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* True for an address on the public internet. Loopback, private, link-local,
|
|
153
|
+
* CGNAT (which includes Tailscale), multicast and reserved ranges are refused,
|
|
154
|
+
* as are IPv6 forms that embed one of them (IPv4-mapped, NAT64, 6to4).
|
|
155
|
+
*
|
|
156
|
+
* 198.18.0.0/15 is allowed on purpose: proxy tools in fake-IP mode (Clash,
|
|
157
|
+
* Surge) answer every DNS query from that range, and refusing it would break
|
|
158
|
+
* web access for everyone behind one.
|
|
159
|
+
*/
|
|
160
|
+
export function isPublicAddress(address) {
|
|
161
|
+
const ip = address.replace(/^\[(.*)\]$/, '$1');
|
|
162
|
+
const family = isIP(ip);
|
|
163
|
+
if (family === 4)
|
|
164
|
+
return isPublicIpv4(ip.split('.').map(Number));
|
|
165
|
+
if (family === 6)
|
|
166
|
+
return isPublicIpv6(ip);
|
|
167
|
+
return false;
|
|
168
|
+
}
|
|
169
|
+
function isPublicIpv4([a, b, c]) {
|
|
170
|
+
if (a === 0 || a === 10 || a === 127 || a >= 224)
|
|
171
|
+
return false; // this network, private, loopback, multicast/reserved
|
|
172
|
+
if (a === 100 && b >= 64 && b <= 127)
|
|
173
|
+
return false; // CGNAT, Tailscale
|
|
174
|
+
if (a === 169 && b === 254)
|
|
175
|
+
return false; // link-local, cloud metadata
|
|
176
|
+
if (a === 172 && b >= 16 && b <= 31)
|
|
177
|
+
return false; // private
|
|
178
|
+
if (a === 192 && b === 168)
|
|
179
|
+
return false; // private
|
|
180
|
+
if (a === 192 && b === 0 && (c === 0 || c === 2))
|
|
181
|
+
return false; // IETF assignments, TEST-NET-1
|
|
182
|
+
if (a === 198 && b === 51 && c === 100)
|
|
183
|
+
return false; // TEST-NET-2
|
|
184
|
+
if (a === 203 && b === 0 && c === 113)
|
|
185
|
+
return false; // TEST-NET-3
|
|
186
|
+
return true;
|
|
187
|
+
}
|
|
188
|
+
function isPublicIpv6(ip) {
|
|
189
|
+
const h = ipv6Hextets(ip);
|
|
190
|
+
if (!h)
|
|
191
|
+
return false;
|
|
192
|
+
const embeddedIpv4 = (i) => [h[i] >> 8, h[i] & 0xff, h[i + 1] >> 8, h[i + 1] & 0xff];
|
|
193
|
+
if (h.slice(0, 5).every(x => x === 0) && h[5] === 0xffff)
|
|
194
|
+
return isPublicIpv4(embeddedIpv4(6)); // IPv4-mapped
|
|
195
|
+
if (h[0] === 0x64 && h[1] === 0xff9b)
|
|
196
|
+
return isPublicIpv4(embeddedIpv4(6)); // NAT64
|
|
197
|
+
if (h[0] === 0x2002)
|
|
198
|
+
return isPublicIpv4(embeddedIpv4(1)); // 6to4
|
|
199
|
+
if ((h[0] & 0xe000) !== 0x2000)
|
|
200
|
+
return false; // outside global unicast: ::, ::1, fc00::/7, fe80::/10, ff00::/8
|
|
201
|
+
if (h[0] === 0x2001 && (h[1] === 0 || h[1] === 0xdb8))
|
|
202
|
+
return false; // Teredo, documentation
|
|
203
|
+
return true;
|
|
204
|
+
}
|
|
205
|
+
function ipv6Hextets(ip) {
|
|
206
|
+
let text = ip.toLowerCase().split('%')[0];
|
|
207
|
+
const dotted = /(\d+)\.(\d+)\.(\d+)\.(\d+)$/.exec(text);
|
|
208
|
+
if (dotted) {
|
|
209
|
+
const [a, b, c, d] = dotted.slice(1).map(Number);
|
|
210
|
+
text = `${text.slice(0, dotted.index)}${((a << 8) | b).toString(16)}:${((c << 8) | d).toString(16)}`;
|
|
211
|
+
}
|
|
212
|
+
const halves = text.split('::');
|
|
213
|
+
if (halves.length > 2)
|
|
214
|
+
return null;
|
|
215
|
+
const head = halves[0] ? halves[0].split(':') : [];
|
|
216
|
+
const tail = halves.length === 2 && halves[1] ? halves[1].split(':') : [];
|
|
217
|
+
const fill = halves.length === 2 ? 8 - head.length - tail.length : 0;
|
|
218
|
+
if (fill < 0)
|
|
219
|
+
return null;
|
|
220
|
+
const hextets = [...head, ...Array(fill).fill('0'), ...tail].map(part => Number.parseInt(part, 16));
|
|
221
|
+
return hextets.length === 8 && hextets.every(n => Number.isInteger(n) && n >= 0 && n <= 0xffff) ? hextets : null;
|
|
222
|
+
}
|
|
223
|
+
async function assertPublicHost(url) {
|
|
224
|
+
const host = url.hostname.replace(/^\[(.*)\]$/, '$1').replace(/\.$/, '').toLowerCase();
|
|
225
|
+
const refuse = () => new Error(`Blocked ${url.origin}: the web tools only reach public internet addresses, and this host is or resolves to a private, loopback, or link-local address.`);
|
|
226
|
+
if (host === 'localhost' || host.endsWith('.localhost'))
|
|
227
|
+
throw refuse();
|
|
228
|
+
if (isIP(host)) {
|
|
229
|
+
if (!isPublicAddress(host))
|
|
230
|
+
throw refuse();
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
let records;
|
|
234
|
+
try {
|
|
235
|
+
records = await dns.promises.lookup(host, { all: true, verbatim: true });
|
|
236
|
+
}
|
|
237
|
+
catch (error) {
|
|
238
|
+
const code = error.code;
|
|
239
|
+
throw new Error(`Could not resolve ${host}${code ? ` (${code})` : ''}`);
|
|
240
|
+
}
|
|
241
|
+
if (records.length === 0 || records.some(record => !isPublicAddress(record.address)))
|
|
242
|
+
throw refuse();
|
|
243
|
+
}
|
|
244
|
+
/** Same host, ignoring a leading "www." — the redirects a site makes to itself. */
|
|
245
|
+
function sameSite(a, b) {
|
|
246
|
+
const bare = (url) => url.hostname.toLowerCase().replace(/^www\./, '');
|
|
247
|
+
return bare(a) === bare(b);
|
|
248
|
+
}
|
|
249
|
+
async function readCapped(response, maxBytes) {
|
|
250
|
+
if (!response.body)
|
|
251
|
+
return { bytes: new Uint8Array(), truncated: false };
|
|
252
|
+
const reader = response.body.getReader();
|
|
253
|
+
const chunks = [];
|
|
254
|
+
let total = 0;
|
|
255
|
+
for (;;) {
|
|
256
|
+
const { done, value } = await reader.read();
|
|
257
|
+
if (done)
|
|
258
|
+
return { bytes: Buffer.concat(chunks, total), truncated: false };
|
|
259
|
+
if (total + value.byteLength > maxBytes) {
|
|
260
|
+
chunks.push(value.subarray(0, maxBytes - total));
|
|
261
|
+
await reader.cancel().catch(() => undefined);
|
|
262
|
+
return { bytes: Buffer.concat(chunks, maxBytes), truncated: true };
|
|
263
|
+
}
|
|
264
|
+
chunks.push(value);
|
|
265
|
+
total += value.byteLength;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
function decodeBody(bytes, contentType) {
|
|
269
|
+
const charset = /charset\s*=\s*["']?([\w.:-]+)/i.exec(contentType)?.[1];
|
|
270
|
+
if (charset) {
|
|
271
|
+
try {
|
|
272
|
+
// Bun types the label as a fixed union; any label works at runtime or throws.
|
|
273
|
+
return new TextDecoder(charset).decode(bytes);
|
|
274
|
+
}
|
|
275
|
+
catch {
|
|
276
|
+
// Unknown label: fall back to UTF-8, which nearly every page uses anyway.
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
return new TextDecoder().decode(bytes);
|
|
280
|
+
}
|
|
281
|
+
//# sourceMappingURL=webEgress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webEgress.js","sourceRoot":"","sources":["../../src/core/webEgress.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export const COMPLIANCE_CONTROLS = [
|
|
|
14
14
|
},
|
|
15
15
|
{
|
|
16
16
|
id: 'network-egress-enforcement',
|
|
17
|
-
control: 'Outbound network is enforced per boundary (provider, shell/subprocess, MCP) and fails closed where isolation is unavailable.',
|
|
17
|
+
control: 'Outbound network is enforced per boundary (provider, shell/subprocess, MCP, web tools) and fails closed where isolation is unavailable.',
|
|
18
18
|
section: 'trust',
|
|
19
19
|
openssf: 'Network egress control',
|
|
20
20
|
iso42001: 'A.9 operational controls',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compliance.js","sourceRoot":"","sources":["../../src/evidence/compliance.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,MAAM,mBAAmB,GAAwB;IACtD;QACE,EAAE,EAAE,sBAAsB;QAC1B,OAAO,EAAE,wHAAwH;QACjI,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,kCAAkC;QAC3C,QAAQ,EAAE,yCAAyC;KACpD;IACD;QACE,EAAE,EAAE,kBAAkB;QACtB,OAAO,EAAE,iFAAiF;QAC1F,OAAO,EAAE,QAAQ;QACjB,QAAQ,EAAE,kDAAkD;KAC7D;IACD;QACE,EAAE,EAAE,4BAA4B;QAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compliance.js","sourceRoot":"","sources":["../../src/evidence/compliance.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,MAAM,mBAAmB,GAAwB;IACtD;QACE,EAAE,EAAE,sBAAsB;QAC1B,OAAO,EAAE,wHAAwH;QACjI,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,kCAAkC;QAC3C,QAAQ,EAAE,yCAAyC;KACpD;IACD;QACE,EAAE,EAAE,kBAAkB;QACtB,OAAO,EAAE,iFAAiF;QAC1F,OAAO,EAAE,QAAQ;QACjB,QAAQ,EAAE,kDAAkD;KAC7D;IACD;QACE,EAAE,EAAE,4BAA4B;QAChC,OAAO,EAAE,yIAAyI;QAClJ,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,wBAAwB;QACjC,QAAQ,EAAE,0BAA0B;KACrC;IACD;QACE,EAAE,EAAE,yBAAyB;QAC7B,OAAO,EAAE,qGAAqG;QAC9G,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,uCAAuC;KAClD;IACD;QACE,EAAE,EAAE,sBAAsB;QAC1B,OAAO,EAAE,iGAAiG;QAC1G,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,wBAAwB;QACjC,QAAQ,EAAE,+BAA+B;KAC1C;IACD;QACE,EAAE,EAAE,oBAAoB;QACxB,OAAO,EAAE,yGAAyG;QAClH,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,0CAA0C;KACrD;CACF,CAAC;AAIF,sFAAsF;AACtF,MAAM,UAAU,kBAAkB,CAAC,IAAmD;IACpF,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,QAAQ,CAAC,CAAoB,EAAE,IAAmD;IACzF,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,KAAK,MAAM;YACT,qEAAqE;YACrE,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC"}
|
package/dist/harness/run.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type AgentEvent, type TurnStopReason } from '../agent/types.js';
|
|
2
2
|
import type { AgentMode, CodePermissionMode } from '../agent/modes.js';
|
|
3
3
|
import type { RunOrigin } from '../audit/log.js';
|
|
4
|
+
import type { CheckpointStatus } from '../core/checkpoint.js';
|
|
4
5
|
import { type UnattendedPermissionMode } from '../core/policy.js';
|
|
5
6
|
import { type HarnessVerification } from './verification.js';
|
|
6
7
|
export declare const DEFAULT_RUN_TIMEOUT_MINUTES = 25;
|
|
@@ -29,6 +30,8 @@ export type HarnessRunResult = {
|
|
|
29
30
|
output: string;
|
|
30
31
|
stopReason: HarnessStopReason;
|
|
31
32
|
error?: string;
|
|
33
|
+
/** Status of the requested workspace snapshot, when a write-capable turn ran. */
|
|
34
|
+
checkpoint?: CheckpointStatus;
|
|
32
35
|
/**
|
|
33
36
|
* What the turn's security scanning covered, and any Verified Fix Record it
|
|
34
37
|
* filed. Absent when the turn did neither — which is deliberately different
|
|
@@ -57,6 +60,7 @@ export type HarnessRunRequest = {
|
|
|
57
60
|
maxToolCalls?: number;
|
|
58
61
|
timeoutMinutes?: number;
|
|
59
62
|
reportFile?: string;
|
|
63
|
+
checkpoint?: boolean;
|
|
60
64
|
unattended?: boolean;
|
|
61
65
|
/** Additional ceiling imposed by a transport such as mcp-serve. */
|
|
62
66
|
maxPermissionMode?: UnattendedPermissionMode;
|
package/dist/harness/run.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { mkdir, stat, writeFile } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import { runAgentTurn } from '../agent/session.js';
|
|
3
|
+
import { runAgentTurn, RunSessionError } from '../agent/session.js';
|
|
4
4
|
import { DEFAULT_TURN_CONFIG } from '../agent/types.js';
|
|
5
|
+
import { redactToolText } from '../core/redactSecrets.js';
|
|
5
6
|
import { loadPolicy, narrowerUnattendedPermissionMode, PolicyViolationError, unattendedPermissionAllowed, } from '../core/policy.js';
|
|
6
|
-
import { loadSession } from '../sessions/store.js';
|
|
7
7
|
import { createVerificationCollector } from './verification.js';
|
|
8
8
|
export const DEFAULT_RUN_TIMEOUT_MINUTES = 25;
|
|
9
9
|
/** A caller error that maps to the documented deterministic usage exit code. */
|
|
@@ -28,6 +28,7 @@ export async function executeHarnessRun(request, hooks = {}) {
|
|
|
28
28
|
let iterationsUsed = 0;
|
|
29
29
|
let usage = { inputTokens: 0, outputTokens: 0 };
|
|
30
30
|
let output = '';
|
|
31
|
+
let checkpoint;
|
|
31
32
|
let verificationCollector;
|
|
32
33
|
const finish = (exitCode, stopReason, error, auditHead) => {
|
|
33
34
|
// Collected on every exit path, not only the successful one: a turn that
|
|
@@ -61,6 +62,7 @@ export async function executeHarnessRun(request, hooks = {}) {
|
|
|
61
62
|
output,
|
|
62
63
|
stopReason,
|
|
63
64
|
...(error ? { error } : {}),
|
|
65
|
+
...(checkpoint ? { checkpoint } : {}),
|
|
64
66
|
...(collected ? { verification: collected } : {}),
|
|
65
67
|
},
|
|
66
68
|
};
|
|
@@ -85,22 +87,21 @@ export async function executeHarnessRun(request, hooks = {}) {
|
|
|
85
87
|
}
|
|
86
88
|
if (!cwdStat.isDirectory())
|
|
87
89
|
throw new HarnessUsageError(`Working directory is not a directory: ${cwd}`);
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
catch (err) {
|
|
94
|
-
throw new HarnessUsageError(err instanceof Error ? err.message : String(err));
|
|
90
|
+
const loadedPolicy = loadPolicy(cwd);
|
|
91
|
+
if (request.unattended) {
|
|
92
|
+
const unusable = loadedPolicy.sources.find(source => source.error || (!source.present && (source.layer === 'runtime' || (source.layer === 'machine' && !!process.env.DVALINCODE_POLICY_FILE))));
|
|
93
|
+
if (unusable) {
|
|
94
|
+
throw new PolicyViolationError('unattended', `cannot apply ${unusable.layer} policy`, unusable.path);
|
|
95
95
|
}
|
|
96
|
-
if (!session)
|
|
97
|
-
throw new HarnessUsageError(`Session not found: ${request.sessionId}`);
|
|
98
96
|
}
|
|
99
|
-
const loadedPolicy = loadPolicy(cwd);
|
|
100
97
|
policyHash = loadedPolicy.hash;
|
|
98
|
+
const mode = request.mode ?? 'code';
|
|
101
99
|
const requestedPermission = request.permissionMode;
|
|
102
100
|
const policyCeiling = request.unattended ? loadedPolicy.policy.unattended.maxPermissionMode : undefined;
|
|
103
101
|
const permissionCeiling = narrowerUnattendedPermissionMode(request.maxPermissionMode, policyCeiling);
|
|
102
|
+
if (mode === 'cowork' && permissionCeiling === 'plan') {
|
|
103
|
+
throw new PolicyViolationError('unattended', 'cowork mode exceeds the unattended permission ceiling "plan"', mode);
|
|
104
|
+
}
|
|
104
105
|
if (requestedPermission && permissionCeiling && !unattendedPermissionAllowed(requestedPermission, permissionCeiling)) {
|
|
105
106
|
throw new PolicyViolationError('unattended', `permission mode "${requestedPermission}" exceeds unattended ceiling "${permissionCeiling}"`, requestedPermission);
|
|
106
107
|
}
|
|
@@ -135,12 +136,15 @@ export async function executeHarnessRun(request, hooks = {}) {
|
|
|
135
136
|
content: request.content,
|
|
136
137
|
cwd,
|
|
137
138
|
sessionId: request.sessionId,
|
|
138
|
-
|
|
139
|
+
bindSessionToWorkspace: true,
|
|
140
|
+
mode,
|
|
139
141
|
codePermissionMode: permissionMode,
|
|
140
142
|
providerOverride: request.provider,
|
|
141
143
|
modelOverride: request.model,
|
|
142
144
|
profileOverride: request.profile,
|
|
143
145
|
turnConfig: config,
|
|
146
|
+
loadedPolicy,
|
|
147
|
+
checkpoint: request.checkpoint,
|
|
144
148
|
origin: request.origin ?? 'cli',
|
|
145
149
|
signal,
|
|
146
150
|
}, {
|
|
@@ -157,6 +161,7 @@ export async function executeHarnessRun(request, hooks = {}) {
|
|
|
157
161
|
policyHash = details.policyHash;
|
|
158
162
|
hooks.onRunStart?.({ type: 'run_start', ...details });
|
|
159
163
|
},
|
|
164
|
+
onCheckpoint: status => { checkpoint = status; },
|
|
160
165
|
onEvent: event => {
|
|
161
166
|
if (event.type === 'tool_call')
|
|
162
167
|
toolCalls++;
|
|
@@ -189,8 +194,8 @@ export async function executeHarnessRun(request, hooks = {}) {
|
|
|
189
194
|
return execution;
|
|
190
195
|
}
|
|
191
196
|
catch (err) {
|
|
192
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
193
|
-
if (err instanceof HarnessUsageError)
|
|
197
|
+
const message = redactToolText(err instanceof Error ? err.message : String(err)).text;
|
|
198
|
+
if (err instanceof HarnessUsageError || err instanceof RunSessionError)
|
|
194
199
|
return finish(2, 'error', message);
|
|
195
200
|
if (err instanceof PolicyViolationError)
|
|
196
201
|
return finish(3, 'error', message);
|
package/dist/harness/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/harness/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/harness/run.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/register.js
CHANGED
|
@@ -26,7 +26,7 @@ export function mcpToolToTool(serverId, def, client) {
|
|
|
26
26
|
access: accessFor(def),
|
|
27
27
|
inputSchema: z.unknown(),
|
|
28
28
|
parametersSchema: def.inputSchema ?? { type: 'object' },
|
|
29
|
-
isConcurrencySafe: () =>
|
|
29
|
+
isConcurrencySafe: () => false,
|
|
30
30
|
async run(input, context) {
|
|
31
31
|
// Egress + audit are bound to the live per-run context here, so every
|
|
32
32
|
// tools/call is checked against policy and recorded in this run's chain.
|
|
@@ -103,6 +103,9 @@ export async function registerMcpServers(registry, servers, ctx) {
|
|
|
103
103
|
summaries.push({ id: server.id, status: blocked ? 'blocked' : 'error', tools: 0, transport: 'stdio', reason: errMsg(err) });
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
+
for (const summary of summaries) {
|
|
107
|
+
ctx.audit?.append({ type: 'mcp_discovery', server: summary.id, transport: summary.transport, outcome: summary.status, tools: summary.tools });
|
|
108
|
+
}
|
|
106
109
|
return { summaries, dispose };
|
|
107
110
|
}
|
|
108
111
|
function errMsg(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,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAOxF,wFAAwF;AACxF,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,QAAgB;IAClE,OAAO,QAAQ,QAAQ,KAAK,QAAQ,EAAE,CAAC;AACzC,CAAC;AAED,6GAA6G;AAC7G,SAAS,SAAS,CAAC,GAAe;IAChC,OAAO,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5D,CAAC;AAED,SAAS,aAAa,CAAC,MAAqB;IAC1C,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACrG,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IACrC,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,8CAA8C,CAAC,CAAC,CAAC,cAAc,CAAC;AAC1F,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,GAAe,EAAE,MAAqB;IACpF,OAAO;QACL,IAAI,EAAE,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC;QAC3C,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,aAAa,GAAG,CAAC,IAAI,kBAAkB,QAAQ,GAAG;QAClF,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC;QACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;QACxB,gBAAgB,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;QACvD,iBAAiB,EAAE,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/mcp/register.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/server.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Readable, Writable } from 'node:stream';
|
|
2
|
+
import { listRuns, readRecords } from '../audit/log.js';
|
|
2
3
|
import { type HarnessRunExecution, type HarnessRunHooks, type HarnessRunRequest } from '../harness/run.js';
|
|
3
4
|
import type { UnattendedPermissionMode } from '../core/policy.js';
|
|
4
5
|
import { type DvalinScannerDescriptor, type DvalinScannerId, type DvalinScanSuiteResult } from '../remediation/scannerSuite.js';
|
|
@@ -30,8 +31,8 @@ export type McpServerDependencies = {
|
|
|
30
31
|
scope?: DiffScope;
|
|
31
32
|
}) => Promise<DvalinScanSuiteResult>;
|
|
32
33
|
loadSession: (id: string) => Promise<Session | null>;
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
readAuditRecords: typeof readRecords;
|
|
35
|
+
listAuditRuns: typeof listRuns;
|
|
35
36
|
createWorkflow: typeof createSecurityWorkflow;
|
|
36
37
|
loadWorkflow: typeof loadSecurityWorkflow;
|
|
37
38
|
verifyWorkflow: typeof verifySecurityWorkflow;
|
package/dist/mcp/server.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { realpath } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { createInterface } from 'node:readline';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { listRuns, readRecords } from '../audit/log.js';
|
|
5
|
+
import { renderRecords } from '../audit/report.js';
|
|
6
6
|
import { executeHarnessRun, } from '../harness/run.js';
|
|
7
7
|
import { DVALIN_SCANNER_IDS, listDvalinScanners, runDvalinScanSuite, } from '../remediation/scannerSuite.js';
|
|
8
8
|
import { resolveDiffScope } from '../remediation/diffScope.js';
|
|
@@ -81,7 +81,7 @@ const MCP_TOOLS = [
|
|
|
81
81
|
},
|
|
82
82
|
{
|
|
83
83
|
name: 'dvalin_get_evidence',
|
|
84
|
-
description: 'Render
|
|
84
|
+
description: 'Render Markdown audit evidence for a DvalinCode run in an allowed workspace (defaults to the latest allowed run).',
|
|
85
85
|
inputSchema: {
|
|
86
86
|
type: 'object',
|
|
87
87
|
properties: { run_id: { type: 'string' } },
|
|
@@ -156,8 +156,8 @@ export async function createMcpServer(options, overrides = {}) {
|
|
|
156
156
|
executeRun: executeHarnessRun,
|
|
157
157
|
runScan: runDvalinScanSuite,
|
|
158
158
|
loadSession,
|
|
159
|
-
|
|
160
|
-
|
|
159
|
+
readAuditRecords: readRecords,
|
|
160
|
+
listAuditRuns: listRuns,
|
|
161
161
|
createWorkflow: createSecurityWorkflow,
|
|
162
162
|
loadWorkflow: loadSecurityWorkflow,
|
|
163
163
|
verifyWorkflow: verifySecurityWorkflow,
|
|
@@ -337,10 +337,13 @@ async function callTool(name, args, context) {
|
|
|
337
337
|
}
|
|
338
338
|
if (name === 'dvalin_get_evidence') {
|
|
339
339
|
const requestedRunId = optionalString(args.run_id, 'run_id');
|
|
340
|
-
const
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
340
|
+
const { readAuditRecords, listAuditRuns } = context.deps;
|
|
341
|
+
for (const runId of requestedRunId === undefined ? listAuditRuns() : [requestedRunId]) {
|
|
342
|
+
const records = await readAllowedAuditRun(runId, readAuditRecords, context.allowedWorkspaces);
|
|
343
|
+
if (records)
|
|
344
|
+
return toolResult(renderRecords(runId, records));
|
|
345
|
+
}
|
|
346
|
+
throw new Error('No matching audit run in an allowed workspace.');
|
|
344
347
|
}
|
|
345
348
|
if (name === 'dvalin_get_finding') {
|
|
346
349
|
const workflowId = requireString(args.workflow_id, 'workflow_id');
|
|
@@ -416,6 +419,22 @@ async function callTool(name, args, context) {
|
|
|
416
419
|
}
|
|
417
420
|
throw new Error(`Unknown tool: ${name}`);
|
|
418
421
|
}
|
|
422
|
+
async function readAllowedAuditRun(runId, readAuditRecords, allowed) {
|
|
423
|
+
if (!/^[a-zA-Z0-9_-]{1,128}$/.test(runId))
|
|
424
|
+
return undefined;
|
|
425
|
+
try {
|
|
426
|
+
const records = readAuditRecords(runId);
|
|
427
|
+
const start = records[0];
|
|
428
|
+
if (start?.type === 'run_start' && typeof start.cwd === 'string' && path.isAbsolute(start.cwd)) {
|
|
429
|
+
await resolveAllowedWorkspace(start.cwd, allowed);
|
|
430
|
+
return records;
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
catch {
|
|
434
|
+
// Unreadable and out-of-scope logs have the same public response.
|
|
435
|
+
}
|
|
436
|
+
return undefined;
|
|
437
|
+
}
|
|
419
438
|
async function resolveAllowedWorkspace(candidate, allowed) {
|
|
420
439
|
let resolved;
|
|
421
440
|
try {
|