dvalincode 0.23.0 → 0.25.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 +92 -12
- package/README.zh-CN.md +75 -12
- 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 +68 -17
- 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 +14 -8
- 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 +13 -0
- package/dist/server/configStore.js +9 -0
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/folderPicker.d.ts +29 -0
- package/dist/server/folderPicker.js +100 -0
- package/dist/server/folderPicker.js.map +1 -0
- 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 +57 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/projects.js +1 -30
- package/dist/server/routes/projects.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 +31 -0
- package/dist/tools/webSearch.js +244 -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
package/dist/tools/readFile.js
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { createReadStream } from 'node:fs';
|
|
1
3
|
import { readFile, stat } from 'node:fs/promises';
|
|
2
4
|
import { z } from 'zod';
|
|
3
5
|
import { resolveInsideWorkspace } from '../core/workspace.js';
|
|
4
6
|
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
5
7
|
import { sha256 } from '../audit/hash.js';
|
|
8
|
+
/** In a range read of a large file, longer lines are cut to this many characters. */
|
|
9
|
+
const MAX_RANGE_LINE_CHARS = 2_000;
|
|
6
10
|
const inputSchema = z
|
|
7
11
|
.object({
|
|
8
12
|
filePath: z.string().min(1),
|
|
@@ -32,7 +36,10 @@ export const readFileTool = {
|
|
|
32
36
|
throw new Error(`Cannot read a directory as a file: ${input.filePath}`);
|
|
33
37
|
}
|
|
34
38
|
if (info.size > context.maxBytes) {
|
|
35
|
-
|
|
39
|
+
if (input.offset === undefined && input.limit === undefined) {
|
|
40
|
+
throw new Error(`File is larger than the configured limit (${context.maxBytes} bytes); read it in parts with offset and limit (up to 1000 lines per call).`);
|
|
41
|
+
}
|
|
42
|
+
return readLineRange(resolvedPath, input.filePath, input.offset ?? 0, input.limit ?? 1000, info.size);
|
|
36
43
|
}
|
|
37
44
|
const text = await readFile(resolvedPath, 'utf8');
|
|
38
45
|
const lines = text.split(/\r?\n/);
|
|
@@ -54,4 +61,80 @@ export const readFileTool = {
|
|
|
54
61
|
};
|
|
55
62
|
},
|
|
56
63
|
};
|
|
64
|
+
/**
|
|
65
|
+
* Lines [start, start + limit) of a file too large to load whole. The file is
|
|
66
|
+
* streamed once: the requested lines are kept (long ones cut short), and the
|
|
67
|
+
* whole file is hashed and counted so the result reports the same sha256 and
|
|
68
|
+
* totalLines as a whole-file read would.
|
|
69
|
+
*/
|
|
70
|
+
async function readLineRange(resolvedPath, displayPath, start, limit, bytes) {
|
|
71
|
+
const end = start + limit;
|
|
72
|
+
const hash = createHash('sha256');
|
|
73
|
+
const decoder = new TextDecoder();
|
|
74
|
+
const selected = [];
|
|
75
|
+
let line = 0;
|
|
76
|
+
let current = '';
|
|
77
|
+
let currentLength = 0;
|
|
78
|
+
let lastChar = '';
|
|
79
|
+
let clippedLines = 0;
|
|
80
|
+
const inRange = () => line >= start && line < end;
|
|
81
|
+
const take = (piece) => {
|
|
82
|
+
if (!piece)
|
|
83
|
+
return;
|
|
84
|
+
currentLength += piece.length;
|
|
85
|
+
lastChar = piece[piece.length - 1];
|
|
86
|
+
if (current.length < MAX_RANGE_LINE_CHARS)
|
|
87
|
+
current += piece.slice(0, MAX_RANGE_LINE_CHARS - current.length);
|
|
88
|
+
};
|
|
89
|
+
const finishLine = () => {
|
|
90
|
+
if (inRange()) {
|
|
91
|
+
// A CRLF line ends in "\r": it is neither shown nor counted.
|
|
92
|
+
const length = lastChar === '\r' ? currentLength - 1 : currentLength;
|
|
93
|
+
const text = current.slice(0, Math.min(current.length, length));
|
|
94
|
+
if (length > MAX_RANGE_LINE_CHARS) {
|
|
95
|
+
clippedLines++;
|
|
96
|
+
selected.push(`${text}… [line is ${length} characters]`);
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
selected.push(text);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
current = '';
|
|
103
|
+
currentLength = 0;
|
|
104
|
+
lastChar = '';
|
|
105
|
+
line++;
|
|
106
|
+
};
|
|
107
|
+
for await (const chunk of createReadStream(resolvedPath)) {
|
|
108
|
+
const buffer = chunk;
|
|
109
|
+
hash.update(buffer);
|
|
110
|
+
const text = decoder.decode(buffer, { stream: true });
|
|
111
|
+
let from = 0;
|
|
112
|
+
for (let newline = text.indexOf('\n'); newline !== -1; newline = text.indexOf('\n', from)) {
|
|
113
|
+
if (inRange())
|
|
114
|
+
take(text.slice(from, newline));
|
|
115
|
+
finishLine();
|
|
116
|
+
from = newline + 1;
|
|
117
|
+
}
|
|
118
|
+
if (inRange())
|
|
119
|
+
take(text.slice(from));
|
|
120
|
+
}
|
|
121
|
+
const rest = decoder.decode();
|
|
122
|
+
if (inRange())
|
|
123
|
+
take(rest);
|
|
124
|
+
finishLine();
|
|
125
|
+
const numbered = selected.map((text, index) => `${String(start + index + 1).padStart(4, ' ')} | ${text}`);
|
|
126
|
+
return {
|
|
127
|
+
title: `Read ${displayPath}`,
|
|
128
|
+
output: numbered.join('\n'),
|
|
129
|
+
metadata: {
|
|
130
|
+
path: displayPath,
|
|
131
|
+
bytes,
|
|
132
|
+
totalLines: line,
|
|
133
|
+
offset: start,
|
|
134
|
+
returnedLines: selected.length,
|
|
135
|
+
sha256: hash.digest('hex'),
|
|
136
|
+
clippedLines,
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
}
|
|
57
140
|
//# sourceMappingURL=readFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readFile.js","sourceRoot":"","sources":["../../src/tools/readFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IACjD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;CACxD,CAAC;KACD,MAAM,EAAE,CAAC;AAIZ,MAAM,CAAC,MAAM,YAAY,GAAgB;IACvC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,mDAAmD;IAChE,MAAM,EAAE,MAAM;IACd,WAAW;IACX,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC7B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO;QACtB,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7D,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;YACrC,IACE,KAAK,CAAC,QAAQ,KAAK,OAAO;gBAC1B,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,OAAO,CAAC;gBACtC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,OAAO,GAAG,GAAG,CAAC;gBAC5C,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC,EACxC,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sCAAsC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,6CAA6C,OAAO,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"readFile.js","sourceRoot":"","sources":["../../src/tools/readFile.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/registry.d.ts
CHANGED
|
@@ -27,7 +27,8 @@ export declare class ToolRegistry {
|
|
|
27
27
|
register<Input>(tool: Tool<Input>): void;
|
|
28
28
|
list(): Tool<unknown>[];
|
|
29
29
|
get(name: string): Tool<unknown> | undefined;
|
|
30
|
-
|
|
30
|
+
isConcurrentRead(name: string, rawInput: unknown): boolean;
|
|
31
|
+
run(name: string, rawInput: unknown, context: DvalinContext, before?: () => Promise<void>): Promise<ToolResult>;
|
|
31
32
|
/** Record a policy denial in the audit trail and throw a structured error. */
|
|
32
33
|
private denyByPolicy;
|
|
33
34
|
}
|
package/dist/tools/registry.js
CHANGED
|
@@ -3,8 +3,13 @@ import { randomUUID } from 'node:crypto';
|
|
|
3
3
|
import { checkTool, checkCommand, checkPath, PolicyViolationError } from '../core/policy.js';
|
|
4
4
|
import { emitToolAudit } from '../audit/taps.js';
|
|
5
5
|
import { minimizedDescriptor } from '../audit/minimize.js';
|
|
6
|
+
import { applyPatchTool } from './applyPatch.js';
|
|
7
|
+
import { askUserTool } from './askUser.js';
|
|
6
8
|
import { editFileTool } from './editFile.js';
|
|
9
|
+
import { gitBlameTool } from './gitBlame.js';
|
|
7
10
|
import { gitDiffTool } from './gitDiff.js';
|
|
11
|
+
import { gitLogTool } from './gitLog.js';
|
|
12
|
+
import { gitShowTool } from './gitShow.js';
|
|
8
13
|
import { listFilesTool } from './listFiles.js';
|
|
9
14
|
import { memoryDeleteTool } from './memoryDelete.js';
|
|
10
15
|
import { memoryImportTool } from './memoryImport.js';
|
|
@@ -22,6 +27,9 @@ import { runSecuritySuiteTool } from './runSecuritySuite.js';
|
|
|
22
27
|
import { runCheckTool } from './runCheck.js';
|
|
23
28
|
import { searchTextTool } from './searchText.js';
|
|
24
29
|
import { shellTool } from './shell.js';
|
|
30
|
+
import { updatePlanTool } from './updatePlan.js';
|
|
31
|
+
import { webFetchTool } from './webFetch.js';
|
|
32
|
+
import { webSearchTool } from './webSearch.js';
|
|
25
33
|
import { writeFileTool } from './writeFile.js';
|
|
26
34
|
import { deleteFileTool } from './deleteFile.js';
|
|
27
35
|
import { gitStatusTool } from './gitStatus.js';
|
|
@@ -106,7 +114,14 @@ export class ToolRegistry {
|
|
|
106
114
|
return undefined;
|
|
107
115
|
return this.tools.get(name);
|
|
108
116
|
}
|
|
109
|
-
|
|
117
|
+
isConcurrentRead(name, rawInput) {
|
|
118
|
+
const tool = this.get(name);
|
|
119
|
+
if (tool?.access !== 'read' || !tool.isConcurrencySafe)
|
|
120
|
+
return false;
|
|
121
|
+
const parsed = tool.inputSchema.safeParse(rawInput);
|
|
122
|
+
return parsed.success && tool.isConcurrencySafe(parsed.data);
|
|
123
|
+
}
|
|
124
|
+
async run(name, rawInput, context, before) {
|
|
110
125
|
const tool = this.get(name);
|
|
111
126
|
if (!tool) {
|
|
112
127
|
throw new Error(`Unknown tool: ${name}`);
|
|
@@ -126,9 +141,9 @@ export class ToolRegistry {
|
|
|
126
141
|
}
|
|
127
142
|
}
|
|
128
143
|
// In auto-edit mode every non-read tool requires explicit user approval
|
|
129
|
-
if (context.approvalMode === 'auto-edit' && tool.access !== 'read'
|
|
144
|
+
if (context.approvalMode === 'auto-edit' && tool.access !== 'read') {
|
|
130
145
|
const approvalId = `apv_${Date.now()}_${randomUUID().replace(/-/g, '').slice(0, 12)}`;
|
|
131
|
-
const approved = await context.requestApproval(approvalId, name, input);
|
|
146
|
+
const approved = await context.requestApproval?.(approvalId, name, input) === true;
|
|
132
147
|
context.audit?.append({ type: 'approval', toolName: name, approved });
|
|
133
148
|
if (!approved) {
|
|
134
149
|
throw new Error(`User rejected: ${name}`);
|
|
@@ -138,6 +153,9 @@ export class ToolRegistry {
|
|
|
138
153
|
// All taps are no-ops when no audit sink is attached to the context.
|
|
139
154
|
const started = Date.now();
|
|
140
155
|
try {
|
|
156
|
+
await before?.();
|
|
157
|
+
if (context.signal?.aborted)
|
|
158
|
+
throw new Error('interrupted');
|
|
141
159
|
const result = await tool.run(input, context);
|
|
142
160
|
emitToolAudit(context, tool.access, name, input, result, 'ok', Date.now() - started);
|
|
143
161
|
return result;
|
|
@@ -155,8 +173,13 @@ export class ToolRegistry {
|
|
|
155
173
|
}
|
|
156
174
|
export function createDefaultToolRegistry() {
|
|
157
175
|
const registry = new ToolRegistry();
|
|
176
|
+
registry.register(applyPatchTool);
|
|
177
|
+
registry.register(askUserTool);
|
|
158
178
|
registry.register(editFileTool);
|
|
179
|
+
registry.register(gitBlameTool);
|
|
159
180
|
registry.register(gitDiffTool);
|
|
181
|
+
registry.register(gitLogTool);
|
|
182
|
+
registry.register(gitShowTool);
|
|
160
183
|
registry.register(gitStatusTool);
|
|
161
184
|
registry.register(listFilesTool);
|
|
162
185
|
registry.register(listRemediationCasesTool);
|
|
@@ -175,6 +198,9 @@ export function createDefaultToolRegistry() {
|
|
|
175
198
|
registry.register(runSecuritySuiteTool);
|
|
176
199
|
registry.register(searchTextTool);
|
|
177
200
|
registry.register(shellTool);
|
|
201
|
+
registry.register(updatePlanTool);
|
|
202
|
+
registry.register(webFetchTool);
|
|
203
|
+
registry.register(webSearchTool);
|
|
178
204
|
registry.register(writeFileTool);
|
|
179
205
|
registry.register(deleteFileTool);
|
|
180
206
|
return registry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { chmod, lstat, mkdir, rename, rmdir, unlink, writeFile } from 'node:fs/promises';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
import { checkpointPath, loadCheckpoint, readCheckpointBlob, readCheckpointFile, sameFileState } from '../core/checkpoint.js';
|
|
6
|
+
import { isIgnoredPath, loadIgnorePatterns } from '../core/ignorefile.js';
|
|
7
|
+
import { resolveWorkspaceRoot } from '../core/workspace.js';
|
|
8
|
+
import { ToolRegistry } from './registry.js';
|
|
9
|
+
const inputSchema = z.object({ runId: z.string() }).strict();
|
|
10
|
+
const activeRollbacks = new Set();
|
|
11
|
+
async function restoreCheckpoint(runId, manifest, context) {
|
|
12
|
+
const root = await resolveWorkspaceRoot(context.cwd);
|
|
13
|
+
if (root !== manifest.root)
|
|
14
|
+
throw new Error('Checkpoint belongs to another workspace');
|
|
15
|
+
const ignore = await loadIgnorePatterns(root);
|
|
16
|
+
const staged = [];
|
|
17
|
+
const temporary = new Set();
|
|
18
|
+
const committed = [];
|
|
19
|
+
const recovery = [];
|
|
20
|
+
const createdDirectories = new Set();
|
|
21
|
+
const stage = async (target, bytes, mode) => {
|
|
22
|
+
const directory = await existingParent(path.dirname(target), root);
|
|
23
|
+
const file = path.join(directory, `.dvalin-rollback-${randomUUID()}`);
|
|
24
|
+
await writeFile(file, bytes, { flag: 'wx', mode: 0o600 });
|
|
25
|
+
temporary.add(file);
|
|
26
|
+
await chmod(file, mode);
|
|
27
|
+
return file;
|
|
28
|
+
};
|
|
29
|
+
const paths = new Set();
|
|
30
|
+
try {
|
|
31
|
+
for (const change of manifest.changes) {
|
|
32
|
+
const target = await checkpointPath(root, change.filePath);
|
|
33
|
+
if (paths.has(target) || path.relative(root, target).split(path.sep).join('/') !== change.filePath ||
|
|
34
|
+
isIgnoredPath(change.filePath, ignore))
|
|
35
|
+
throw new Error(`Checkpoint path is unavailable: ${change.filePath}`);
|
|
36
|
+
paths.add(target);
|
|
37
|
+
const current = await readCheckpointFile(target);
|
|
38
|
+
if (!sameFileState(current?.state ?? null, change.after))
|
|
39
|
+
throw new Error(`Rollback conflict: ${change.filePath}`);
|
|
40
|
+
const item = { change, target };
|
|
41
|
+
if (change.before)
|
|
42
|
+
item.restore = await stage(target, await readCheckpointBlob(runId, change.before), change.before.mode);
|
|
43
|
+
if (current)
|
|
44
|
+
item.backup = await stage(target, current.bytes, current.state.mode);
|
|
45
|
+
staged.push(item);
|
|
46
|
+
}
|
|
47
|
+
for (const item of staged) {
|
|
48
|
+
if (context.signal?.aborted)
|
|
49
|
+
throw new Error('interrupted');
|
|
50
|
+
const target = await checkpointPath(root, item.change.filePath);
|
|
51
|
+
if (!sameFileState((await readCheckpointFile(target))?.state ?? null, item.change.after)) {
|
|
52
|
+
throw new Error(`Rollback conflict: ${item.change.filePath}`);
|
|
53
|
+
}
|
|
54
|
+
if (item.restore) {
|
|
55
|
+
const parent = path.dirname(target);
|
|
56
|
+
const existing = await existingParent(parent, root);
|
|
57
|
+
let directory = existing;
|
|
58
|
+
if (parent !== existing) {
|
|
59
|
+
for (const part of path.relative(existing, parent).split(path.sep)) {
|
|
60
|
+
directory = path.join(directory, part);
|
|
61
|
+
await mkdir(directory);
|
|
62
|
+
createdDirectories.add(directory);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
await checkpointPath(root, item.change.filePath);
|
|
66
|
+
await rename(item.restore, target);
|
|
67
|
+
}
|
|
68
|
+
else if (item.change.after) {
|
|
69
|
+
await unlink(target);
|
|
70
|
+
}
|
|
71
|
+
committed.push(item);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
for (const item of committed.reverse()) {
|
|
76
|
+
try {
|
|
77
|
+
const target = await checkpointPath(root, item.change.filePath);
|
|
78
|
+
if (!sameFileState((await readCheckpointFile(target))?.state ?? null, item.change.before))
|
|
79
|
+
throw new Error('Conflict');
|
|
80
|
+
if (item.backup)
|
|
81
|
+
await rename(item.backup, target);
|
|
82
|
+
else if (item.change.before)
|
|
83
|
+
await unlink(target);
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
recovery.push(item.backup ?? item.target);
|
|
87
|
+
if (item.backup)
|
|
88
|
+
temporary.delete(item.backup);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
for (const directory of [...createdDirectories].reverse())
|
|
92
|
+
await rmdir(directory).catch(() => undefined);
|
|
93
|
+
if (recovery.length)
|
|
94
|
+
throw new Error(`Rollback was interrupted. Inspect recovery paths: ${recovery.join(', ')}`);
|
|
95
|
+
throw error;
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
await Promise.allSettled([...temporary].map(file => unlink(file)));
|
|
99
|
+
}
|
|
100
|
+
context.audit?.append({ type: 'run_rollback', sourceRunId: runId, files: committed.length });
|
|
101
|
+
return { title: 'Run rollback', output: `Restored ${committed.length} file(s) from run ${runId}.` };
|
|
102
|
+
}
|
|
103
|
+
export async function createRollbackRegistry(runId) {
|
|
104
|
+
const manifest = await loadCheckpoint(runId);
|
|
105
|
+
const registry = new ToolRegistry();
|
|
106
|
+
registry.register({
|
|
107
|
+
name: 'rollback_run',
|
|
108
|
+
description: 'Restore covered files from a previous workspace checkpoint when they still match the end of that run.',
|
|
109
|
+
access: 'write',
|
|
110
|
+
inputSchema: inputSchema.refine(input => input.runId === runId, 'Checkpoint ID mismatch'),
|
|
111
|
+
policyTargets: () => manifest.changes.map(({ filePath }) => ({ kind: 'path', value: filePath })),
|
|
112
|
+
async run(_input, context) {
|
|
113
|
+
const root = await resolveWorkspaceRoot(context.cwd);
|
|
114
|
+
if (activeRollbacks.has(root))
|
|
115
|
+
throw new Error('A rollback is already in progress for this workspace');
|
|
116
|
+
activeRollbacks.add(root);
|
|
117
|
+
try {
|
|
118
|
+
return await restoreCheckpoint(runId, manifest, context);
|
|
119
|
+
}
|
|
120
|
+
finally {
|
|
121
|
+
activeRollbacks.delete(root);
|
|
122
|
+
}
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
return { registry, root: manifest.root };
|
|
126
|
+
}
|
|
127
|
+
async function existingParent(directory, root) {
|
|
128
|
+
while (directory !== root) {
|
|
129
|
+
try {
|
|
130
|
+
if (!(await lstat(directory)).isDirectory())
|
|
131
|
+
throw new Error('Checkpoint parent must be a regular directory');
|
|
132
|
+
return directory;
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
if (error.code !== 'ENOENT')
|
|
136
|
+
throw error;
|
|
137
|
+
directory = path.dirname(directory);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return root;
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=rollbackRun.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rollbackRun.js","sourceRoot":"","sources":["../../src/tools/rollbackRun.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/runCheck.js
CHANGED
|
@@ -5,6 +5,7 @@ import { detectScripts } from './projectScripts.js';
|
|
|
5
5
|
import { checkCommand, PolicyViolationError } from '../core/policy.js';
|
|
6
6
|
import { runGovernedProcess } from '../core/subprocessSandbox.js';
|
|
7
7
|
import { minimizedDescriptor } from '../audit/minimize.js';
|
|
8
|
+
import { parseCheckDiagnostics } from './checkDiagnostics.js';
|
|
8
9
|
const inputSchema = z
|
|
9
10
|
.object({
|
|
10
11
|
kind: z.enum(['test', 'typecheck', 'build', 'lint', 'custom']),
|
|
@@ -20,6 +21,9 @@ export const runCheckTool = {
|
|
|
20
21
|
inputSchema,
|
|
21
22
|
isConcurrencySafe: () => false,
|
|
22
23
|
isUndoable: () => false,
|
|
24
|
+
policyTargets: input => input.kind === 'custom' && input.command
|
|
25
|
+
? [{ kind: 'command', value: [input.command, ...input.args].join(' ') }]
|
|
26
|
+
: [],
|
|
23
27
|
async run(input, context) {
|
|
24
28
|
const picked = input.kind === 'custom'
|
|
25
29
|
? pickCustom(input)
|
|
@@ -53,11 +57,16 @@ export const runCheckTool = {
|
|
|
53
57
|
preferSandboxWhenUnrestricted: true,
|
|
54
58
|
signal: context.signal,
|
|
55
59
|
});
|
|
60
|
+
const diagnostics = parseCheckDiagnostics(result.output, context.cwd);
|
|
61
|
+
const locations = diagnostics.map(item => `${item.file}:${item.line}${item.column ? `:${item.column}` : ''} ${item.message}`);
|
|
56
62
|
return {
|
|
57
63
|
title: `run_check ${input.kind}`,
|
|
58
|
-
output:
|
|
64
|
+
output: locations.length
|
|
65
|
+
? `Diagnostics:\n${locations.join('\n')}\n\n${result.output}`
|
|
66
|
+
: result.output || '(no output)',
|
|
59
67
|
metadata: {
|
|
60
68
|
kind: input.kind,
|
|
69
|
+
diagnostics,
|
|
61
70
|
command: picked.command,
|
|
62
71
|
args: picked.args,
|
|
63
72
|
argsCount: picked.args.length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCheck.js","sourceRoot":"","sources":["../../src/tools/runCheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"runCheck.js","sourceRoot":"","sources":["../../src/tools/runCheck.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,20 @@ import { z } from 'zod';
|
|
|
2
2
|
import type { Tool } from './types.js';
|
|
3
3
|
declare const inputSchema: z.ZodObject<{
|
|
4
4
|
query: z.ZodString;
|
|
5
|
+
regex: z.ZodDefault<z.ZodBoolean>;
|
|
5
6
|
pattern: z.ZodDefault<z.ZodString>;
|
|
6
7
|
caseSensitive: z.ZodDefault<z.ZodBoolean>;
|
|
8
|
+
context: z.ZodDefault<z.ZodNumber>;
|
|
9
|
+
filesOnly: z.ZodDefault<z.ZodBoolean>;
|
|
7
10
|
limit: z.ZodDefault<z.ZodNumber>;
|
|
8
11
|
}, z.core.$strict>;
|
|
9
12
|
type Input = z.infer<typeof inputSchema>;
|
|
10
13
|
export declare const searchTextTool: Tool<Input>;
|
|
14
|
+
/**
|
|
15
|
+
* Refuse a regex with a repeated group that itself contains a repeat, such as
|
|
16
|
+
* (a+)+ or (\w*){2,}. That shape can backtrack exponentially, and the search
|
|
17
|
+
* runs inside the agent's process, so one bad pattern would freeze it. A
|
|
18
|
+
* heuristic (the classic "star height" check), not a proof of safety.
|
|
19
|
+
*/
|
|
20
|
+
export declare function assertSafeRegex(source: string): void;
|
|
11
21
|
export {};
|