maestro-agent-sdk 0.1.8 → 0.1.11
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/dist/core/is-abort-error.d.ts +8 -0
- package/dist/core/is-abort-error.d.ts.map +1 -0
- package/dist/core/is-abort-error.js +17 -0
- package/dist/core/is-abort-error.js.map +1 -0
- package/dist/core/loop.d.ts.map +1 -1
- package/dist/core/loop.js +37 -1
- package/dist/core/loop.js.map +1 -1
- package/dist/platform/version.d.ts +1 -1
- package/dist/platform/version.d.ts.map +1 -1
- package/dist/platform/version.js +1 -1
- package/dist/platform/version.js.map +1 -1
- package/dist/provider.d.ts +2 -1
- package/dist/provider.d.ts.map +1 -1
- package/dist/provider.js +7 -10
- package/dist/provider.js.map +1 -1
- package/dist/registry.js +6 -6
- package/dist/registry.js.map +1 -1
- package/dist/sub-agent/runner.d.ts +1 -1
- package/dist/sub-agent/runner.d.ts.map +1 -1
- package/dist/sub-agent/runner.js +34 -23
- package/dist/sub-agent/runner.js.map +1 -1
- package/dist/tools/builtin/agent.d.ts +19 -7
- package/dist/tools/builtin/agent.d.ts.map +1 -1
- package/dist/tools/builtin/agent.js +13 -4
- package/dist/tools/builtin/agent.js.map +1 -1
- package/dist/tools/builtin/bash.d.ts +68 -3
- package/dist/tools/builtin/bash.d.ts.map +1 -1
- package/dist/tools/builtin/bash.js +224 -94
- package/dist/tools/builtin/bash.js.map +1 -1
- package/dist/tools/builtin/edit.d.ts.map +1 -1
- package/dist/tools/builtin/edit.js +8 -2
- package/dist/tools/builtin/edit.js.map +1 -1
- package/dist/tools/builtin/glob.d.ts +8 -4
- package/dist/tools/builtin/glob.d.ts.map +1 -1
- package/dist/tools/builtin/glob.js +105 -17
- package/dist/tools/builtin/glob.js.map +1 -1
- package/dist/tools/builtin/multi_edit.d.ts +16 -0
- package/dist/tools/builtin/multi_edit.d.ts.map +1 -0
- package/dist/tools/builtin/multi_edit.js +292 -0
- package/dist/tools/builtin/multi_edit.js.map +1 -0
- package/dist/tools/builtin/write.d.ts.map +1 -1
- package/dist/tools/builtin/write.js +8 -2
- package/dist/tools/builtin/write.js.map +1 -1
- package/dist/tools/file-state.d.ts +1 -1
- package/dist/tools/file-state.d.ts.map +1 -1
- package/dist/tools/file-state.js.map +1 -1
- package/dist/tools/path-guard.d.ts +23 -0
- package/dist/tools/path-guard.d.ts.map +1 -0
- package/dist/tools/path-guard.js +52 -0
- package/dist/tools/path-guard.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { readdirSync, statSync } from "node:fs";
|
|
2
|
-
import { isAbsolute, join, relative, sep } from "node:path";
|
|
2
|
+
import { isAbsolute, join, normalize, relative, sep } from "node:path";
|
|
3
3
|
/**
|
|
4
4
|
* `Glob` builtin — claude-SDK parity file-pattern matcher.
|
|
5
5
|
*
|
|
@@ -41,19 +41,21 @@ export const globTool = {
|
|
|
41
41
|
schema: {
|
|
42
42
|
name: "Glob",
|
|
43
43
|
description: "Fast file pattern matching. Supports `*` (within-segment wildcard), " +
|
|
44
|
-
"`**` (cross-segment wildcard), `?` (one char)
|
|
45
|
-
"
|
|
46
|
-
"
|
|
47
|
-
"
|
|
44
|
+
"`**` (cross-segment wildcard), `?` (one char), `[abc]` / `[a-z]` / `[!abc]` " +
|
|
45
|
+
"character classes, and `{a,b}` brace expansion (nestable). Returns " +
|
|
46
|
+
"absolute paths sorted by modification time descending — recently-touched " +
|
|
47
|
+
"files first. Does NOT skip dotfiles or build dirs; the model's pattern is " +
|
|
48
|
+
"authoritative. Caps results at 10,000 entries (truncates with a note when exceeded).",
|
|
48
49
|
input_schema: {
|
|
49
50
|
type: "object",
|
|
50
51
|
properties: {
|
|
51
52
|
pattern: {
|
|
52
53
|
type: "string",
|
|
53
|
-
description: "Glob pattern. Examples: `**/*.ts`, `src/**/*.tsx`,
|
|
54
|
-
"`config/*.json`. May also embed
|
|
55
|
-
"`/abs/path/**/*.ts`) — in that case
|
|
56
|
-
"the fixed prefix and the trailing
|
|
54
|
+
description: "Glob pattern. Examples: `**/*.ts`, `src/**/*.{js,ts,tsx}`, " +
|
|
55
|
+
"`file[0-9].log`, `README.md`, `config/*.json`. May also embed " +
|
|
56
|
+
"the absolute root (e.g. `/abs/path/**/*.ts`) — in that case " +
|
|
57
|
+
"`path` is auto-derived from the fixed prefix and the trailing " +
|
|
58
|
+
"portion becomes the matcher.",
|
|
57
59
|
},
|
|
58
60
|
path: {
|
|
59
61
|
type: "string",
|
|
@@ -81,7 +83,8 @@ export const globTool = {
|
|
|
81
83
|
error: `Glob: 'path' must be absolute, got '${rawPath}'`,
|
|
82
84
|
});
|
|
83
85
|
}
|
|
84
|
-
root
|
|
86
|
+
// normalize() collapses `..` so the walk root can't escape via e.g. /safe/../../../etc.
|
|
87
|
+
root = normalize(rawPath);
|
|
85
88
|
}
|
|
86
89
|
else if (isAbsolute(rawPattern)) {
|
|
87
90
|
// claude-SDK parity: when the caller embeds the absolute root inside
|
|
@@ -91,7 +94,8 @@ export const globTool = {
|
|
|
91
94
|
// *relative* paths and returns zero — a footgun we hit often when the
|
|
92
95
|
// model copy-pastes absolute paths it just got from Read/Grep.
|
|
93
96
|
const split = splitAbsolutePattern(rawPattern);
|
|
94
|
-
|
|
97
|
+
// normalize here too — brace patterns can embed `..` in the fixed prefix.
|
|
98
|
+
root = normalize(split.root);
|
|
95
99
|
pattern = split.pattern;
|
|
96
100
|
}
|
|
97
101
|
else {
|
|
@@ -203,15 +207,23 @@ export const globTool = {
|
|
|
203
207
|
* path (anchored at both ends).
|
|
204
208
|
*
|
|
205
209
|
* Handled tokens:
|
|
206
|
-
* `**\/`
|
|
207
|
-
* `**`
|
|
208
|
-
* `*`
|
|
209
|
-
* `?`
|
|
210
|
+
* `**\/` → `(?:.*\/)?` — zero or more path segments (greedy across `/`)
|
|
211
|
+
* `**` → `.*` — anything including `/`
|
|
212
|
+
* `*` → `[^/]*` — anything except `/` within one segment
|
|
213
|
+
* `?` → `[^/]` — single char within one segment
|
|
214
|
+
* `[abc]` → `[abc]` — character class (POSIX `[!abc]` → `[^abc]`)
|
|
215
|
+
* `{a,b}` → `(?:a|b)` — brace expansion (nestable, body recursively
|
|
216
|
+
* compiled so wildcards / classes inside each
|
|
217
|
+
* alternative still work)
|
|
210
218
|
*
|
|
211
219
|
* Other regex metacharacters are escaped so literals like `.` in `foo.ts`
|
|
212
220
|
* don't accidentally turn into "any char".
|
|
213
221
|
*/
|
|
214
222
|
export function compileGlob(pattern) {
|
|
223
|
+
return new RegExp(`^${compileGlobBody(pattern)}$`);
|
|
224
|
+
}
|
|
225
|
+
/** Build the regex body (no anchors) so brace alternatives can recurse. */
|
|
226
|
+
function compileGlobBody(pattern) {
|
|
215
227
|
let s = "";
|
|
216
228
|
let i = 0;
|
|
217
229
|
while (i < pattern.length) {
|
|
@@ -237,6 +249,41 @@ export function compileGlob(pattern) {
|
|
|
237
249
|
s += "[^/]";
|
|
238
250
|
i += 1;
|
|
239
251
|
}
|
|
252
|
+
else if (c === "[") {
|
|
253
|
+
// Character class `[abc]`, `[a-z]`, `[!abc]`. Find the closing `]`;
|
|
254
|
+
// if missing, treat the `[` as a literal (matches bash defensively).
|
|
255
|
+
const end = pattern.indexOf("]", i + 1);
|
|
256
|
+
if (end === -1) {
|
|
257
|
+
s += "\\[";
|
|
258
|
+
i += 1;
|
|
259
|
+
}
|
|
260
|
+
else {
|
|
261
|
+
let cls = pattern.slice(i + 1, end);
|
|
262
|
+
if (cls.startsWith("!"))
|
|
263
|
+
cls = `^${cls.slice(1)}`; // POSIX negation
|
|
264
|
+
s += `[${cls}]`;
|
|
265
|
+
i = end + 1;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
else if (c === "{") {
|
|
269
|
+
// Brace expansion `{a,b,c}`. Find the matching `}` accounting for
|
|
270
|
+
// nesting (`{a,{b,c}}`). On unbalanced braces we treat the `{` as a
|
|
271
|
+
// literal — bash does the same.
|
|
272
|
+
const close = matchingBraceClose(pattern, i);
|
|
273
|
+
if (close === -1) {
|
|
274
|
+
s += "\\{";
|
|
275
|
+
i += 1;
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
const body = pattern.slice(i + 1, close);
|
|
279
|
+
const parts = splitTopLevel(body, ",");
|
|
280
|
+
// Recursively compile each alternative so a brace can carry full
|
|
281
|
+
// glob syntax inside (`{*.ts,src/**/*.tsx}` works).
|
|
282
|
+
const alts = parts.map((p) => compileGlobBody(p));
|
|
283
|
+
s += `(?:${alts.join("|")})`;
|
|
284
|
+
i = close + 1;
|
|
285
|
+
}
|
|
286
|
+
}
|
|
240
287
|
else if (REGEX_META.includes(c)) {
|
|
241
288
|
s += `\\${c}`;
|
|
242
289
|
i += 1;
|
|
@@ -246,9 +293,50 @@ export function compileGlob(pattern) {
|
|
|
246
293
|
i += 1;
|
|
247
294
|
}
|
|
248
295
|
}
|
|
249
|
-
return
|
|
296
|
+
return s;
|
|
297
|
+
}
|
|
298
|
+
/**
|
|
299
|
+
* Locate the `}` that closes the `{` at `openIdx`, respecting nesting.
|
|
300
|
+
* Returns -1 if the brace is unbalanced (caller falls back to literal).
|
|
301
|
+
*/
|
|
302
|
+
function matchingBraceClose(pattern, openIdx) {
|
|
303
|
+
let depth = 1;
|
|
304
|
+
for (let j = openIdx + 1; j < pattern.length; j++) {
|
|
305
|
+
const ch = pattern[j];
|
|
306
|
+
if (ch === "{")
|
|
307
|
+
depth++;
|
|
308
|
+
else if (ch === "}") {
|
|
309
|
+
depth--;
|
|
310
|
+
if (depth === 0)
|
|
311
|
+
return j;
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
return -1;
|
|
315
|
+
}
|
|
316
|
+
/**
|
|
317
|
+
* Split `body` by `sep` only when the separator appears at the top level
|
|
318
|
+
* (depth-0 with respect to `{}` nesting). `{a,{b,c}}` splits into
|
|
319
|
+
* `["a", "{b,c}"]` — not `["a", "{b", "c}"]`.
|
|
320
|
+
*/
|
|
321
|
+
function splitTopLevel(body, sep) {
|
|
322
|
+
const parts = [];
|
|
323
|
+
let depth = 0;
|
|
324
|
+
let start = 0;
|
|
325
|
+
for (let k = 0; k < body.length; k++) {
|
|
326
|
+
const ch = body[k];
|
|
327
|
+
if (ch === "{")
|
|
328
|
+
depth++;
|
|
329
|
+
else if (ch === "}")
|
|
330
|
+
depth--;
|
|
331
|
+
else if (ch === sep && depth === 0) {
|
|
332
|
+
parts.push(body.slice(start, k));
|
|
333
|
+
start = k + 1;
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
parts.push(body.slice(start));
|
|
337
|
+
return parts;
|
|
250
338
|
}
|
|
251
|
-
const REGEX_META = ".+^$()
|
|
339
|
+
const REGEX_META = ".+^$()|\\";
|
|
252
340
|
/**
|
|
253
341
|
* Split an absolute glob pattern into (root, relativePattern).
|
|
254
342
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../src/tools/builtin/glob.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAc,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../src/tools/builtin/glob.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { FileStateTracker } from "../../tools/file-state.js";
|
|
2
|
+
import type { ToolHandler } from "../../tools/registry.js";
|
|
3
|
+
export interface MultiEditToolOptions {
|
|
4
|
+
/**
|
|
5
|
+
* Per-session file-state tracker. When provided, MultiEdit enforces the
|
|
6
|
+
* Read-before-Edit invariant: the path must have been Read in this session
|
|
7
|
+
* AND its mtime/size must still match the recorded values.
|
|
8
|
+
*/
|
|
9
|
+
tracker?: FileStateTracker;
|
|
10
|
+
}
|
|
11
|
+
export declare function createMultiEditTool(opts?: MultiEditToolOptions): ToolHandler;
|
|
12
|
+
/** Backwards-compatible singleton (no tracker — Read-before-Edit gate off). */
|
|
13
|
+
export declare const multiEditTool: ToolHandler;
|
|
14
|
+
export declare const __MAX_FILE_BYTES: number;
|
|
15
|
+
export declare const __MAX_EDITS = 64;
|
|
16
|
+
//# sourceMappingURL=multi_edit.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi_edit.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/multi_edit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAqDpD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,oBAAyB,GAAG,WAAW,CA0NhF;AAED,+EAA+E;AAC/E,eAAO,MAAM,aAAa,EAAE,WAAmC,CAAC;AA8BhE,eAAO,MAAM,gBAAgB,QAAiB,CAAC;AAC/C,eAAO,MAAM,WAAW,KAAY,CAAC"}
|
|
@@ -0,0 +1,292 @@
|
|
|
1
|
+
import { existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { isAbsolute, normalize } from "node:path";
|
|
3
|
+
import { countOccurrences } from "../../tools/builtin/edit.js";
|
|
4
|
+
import { checkBlockedPath } from "../../tools/path-guard.js";
|
|
5
|
+
/**
|
|
6
|
+
* MultiEdit builtin — claude SDK `MultiEdit` tool parity for maestro.
|
|
7
|
+
*
|
|
8
|
+
* Applies an ordered list of (old_string, new_string) replacements to a
|
|
9
|
+
* single file **atomically**. The contract that makes this tool valuable:
|
|
10
|
+
*
|
|
11
|
+
* 1. Read the file once.
|
|
12
|
+
* 2. Apply edits sequentially to the in-memory buffer — each edit sees
|
|
13
|
+
* the state left by the previous one (so a follow-up edit can target
|
|
14
|
+
* text inserted by the previous step).
|
|
15
|
+
* 3. If ANY edit fails (`old_string` not found, ambiguous match without
|
|
16
|
+
* `replace_all`, no-op replacement) we abort BEFORE writing. The
|
|
17
|
+
* file on disk is left untouched. The model then sees a structured
|
|
18
|
+
* `failedAt: <index>` payload it can react to without having to
|
|
19
|
+
* reason about which earlier edits did or didn't land.
|
|
20
|
+
* 4. Only after all edits succeed do we write once.
|
|
21
|
+
*
|
|
22
|
+
* Why a separate tool (rather than have the model call `Edit` in a loop):
|
|
23
|
+
*
|
|
24
|
+
* - Halves API round-trips for the common "fix N spots in one file"
|
|
25
|
+
* refactor — the model emits one tool call instead of N.
|
|
26
|
+
* - Atomic-by-default eliminates a real class of bug where edit #3 of
|
|
27
|
+
* 5 fails and the file is left with edits 1–2 applied but the model
|
|
28
|
+
* thinks the whole batch is done.
|
|
29
|
+
* - The Read-before-Edit gate fires once for the whole batch instead
|
|
30
|
+
* of forcing a re-Read between each step.
|
|
31
|
+
*
|
|
32
|
+
* Same constraints as Edit:
|
|
33
|
+
* - file_path must be absolute.
|
|
34
|
+
* - File must exist (MultiEdit never creates — use Write for that).
|
|
35
|
+
* - Each edit's `old_string` must occur exactly once in the current
|
|
36
|
+
* buffer unless `replace_all: true` is passed for that edit.
|
|
37
|
+
* - `old_string === new_string` is rejected as a no-op.
|
|
38
|
+
* - 10MB cap on file size (matches Edit / Read).
|
|
39
|
+
*
|
|
40
|
+
* Returns a short summary (`File edited: <path> (N edits, M total replacements)`)
|
|
41
|
+
* followed by a line-numbered preview of the region around the first edit's
|
|
42
|
+
* new_string — same shape Edit returns post-edit, kept consistent so the
|
|
43
|
+
* model's verification instinct transfers.
|
|
44
|
+
*/
|
|
45
|
+
const MAX_FILE_BYTES = 10 * 1024 * 1024; // 10MB — same cap as Read / Edit
|
|
46
|
+
const MAX_EDITS = 64; // ceiling on edits per call; prevents pathological batches
|
|
47
|
+
const PREVIEW_LINES_AROUND = 3;
|
|
48
|
+
export function createMultiEditTool(opts = {}) {
|
|
49
|
+
const { tracker } = opts;
|
|
50
|
+
return {
|
|
51
|
+
schema: {
|
|
52
|
+
name: "MultiEdit",
|
|
53
|
+
description: "Apply multiple find-and-replace edits to a single file atomically. " +
|
|
54
|
+
"Each `edits[i].old_string` is matched against the buffer state left " +
|
|
55
|
+
"by the previous edit, so chained edits can target inserted text. " +
|
|
56
|
+
"If any edit fails (not found, ambiguous, or no-op) the file is left " +
|
|
57
|
+
"untouched and a `failedAt` index is returned. file_path must be " +
|
|
58
|
+
"absolute and the file must already exist (use Write for new files).",
|
|
59
|
+
input_schema: {
|
|
60
|
+
type: "object",
|
|
61
|
+
properties: {
|
|
62
|
+
file_path: {
|
|
63
|
+
type: "string",
|
|
64
|
+
description: "Absolute path to the file. MultiEdit never creates new files.",
|
|
65
|
+
},
|
|
66
|
+
edits: {
|
|
67
|
+
type: "array",
|
|
68
|
+
description: "Ordered list of edits to apply. Capped at 64 entries per call. " +
|
|
69
|
+
"Each edit obeys the same uniqueness contract as the single-Edit tool " +
|
|
70
|
+
"unless its own `replace_all: true` is set.",
|
|
71
|
+
items: {
|
|
72
|
+
type: "object",
|
|
73
|
+
properties: {
|
|
74
|
+
old_string: {
|
|
75
|
+
type: "string",
|
|
76
|
+
description: "Exact text to find in the current buffer. Must be non-empty.",
|
|
77
|
+
},
|
|
78
|
+
new_string: {
|
|
79
|
+
type: "string",
|
|
80
|
+
description: "Replacement text. Must differ from old_string.",
|
|
81
|
+
},
|
|
82
|
+
replace_all: {
|
|
83
|
+
type: "boolean",
|
|
84
|
+
description: "When true, replace every occurrence in the current buffer. " +
|
|
85
|
+
"Default false (unique-match required).",
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
required: ["old_string", "new_string"],
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
},
|
|
92
|
+
required: ["file_path", "edits"],
|
|
93
|
+
},
|
|
94
|
+
},
|
|
95
|
+
async execute(input) {
|
|
96
|
+
// normalize() collapses `..` segments before the isAbsolute guard so
|
|
97
|
+
// that path traversal (e.g. /safe/../etc/passwd) cannot bypass it.
|
|
98
|
+
const filePath = normalize(typeof input.file_path === "string" ? input.file_path : "");
|
|
99
|
+
if (!filePath) {
|
|
100
|
+
return JSON.stringify({ error: "MultiEdit: missing 'file_path' argument" });
|
|
101
|
+
}
|
|
102
|
+
if (!isAbsolute(filePath)) {
|
|
103
|
+
return JSON.stringify({
|
|
104
|
+
error: `MultiEdit: file_path must be absolute, got '${filePath}'`,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
const blockErr = checkBlockedPath("MultiEdit", filePath);
|
|
108
|
+
if (blockErr)
|
|
109
|
+
return JSON.stringify({ error: blockErr });
|
|
110
|
+
// Read-before-Edit gate. Fires once for the whole batch.
|
|
111
|
+
if (tracker) {
|
|
112
|
+
const gateErr = tracker.checkBeforeMutate(filePath, "MultiEdit");
|
|
113
|
+
if (gateErr) {
|
|
114
|
+
return JSON.stringify({ error: gateErr });
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
const rawEdits = input.edits;
|
|
118
|
+
if (!Array.isArray(rawEdits) || rawEdits.length === 0) {
|
|
119
|
+
return JSON.stringify({
|
|
120
|
+
error: "MultiEdit: 'edits' must be a non-empty array",
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
if (rawEdits.length > MAX_EDITS) {
|
|
124
|
+
return JSON.stringify({
|
|
125
|
+
error: `MultiEdit: 'edits' length ${rawEdits.length} exceeds cap of ${MAX_EDITS}. Split into multiple calls.`,
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
// Validate every edit up-front so we don't perform a partial dry-run
|
|
129
|
+
// before realising one edit is malformed. The validation block only
|
|
130
|
+
// checks shape — the per-edit `old_string` existence check happens
|
|
131
|
+
// during the apply loop because it depends on prior edits.
|
|
132
|
+
const edits = [];
|
|
133
|
+
for (let i = 0; i < rawEdits.length; i++) {
|
|
134
|
+
const e = rawEdits[i];
|
|
135
|
+
if (e === null || typeof e !== "object" || Array.isArray(e)) {
|
|
136
|
+
return JSON.stringify({
|
|
137
|
+
error: `MultiEdit: edit[${i}] must be an object`,
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
const rec = e;
|
|
141
|
+
if (typeof rec.old_string !== "string") {
|
|
142
|
+
return JSON.stringify({
|
|
143
|
+
error: `MultiEdit: edit[${i}].old_string must be a string, got ${typeof rec.old_string}`,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
if (typeof rec.new_string !== "string") {
|
|
147
|
+
return JSON.stringify({
|
|
148
|
+
error: `MultiEdit: edit[${i}].new_string must be a string, got ${typeof rec.new_string}`,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
if (rec.old_string.length === 0) {
|
|
152
|
+
return JSON.stringify({
|
|
153
|
+
error: `MultiEdit: edit[${i}].old_string must be non-empty`,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
if (rec.old_string === rec.new_string) {
|
|
157
|
+
return JSON.stringify({
|
|
158
|
+
error: `MultiEdit: edit[${i}] is a no-op (old_string === new_string)`,
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
edits.push({
|
|
162
|
+
old_string: rec.old_string,
|
|
163
|
+
new_string: rec.new_string,
|
|
164
|
+
replace_all: Boolean(rec.replace_all),
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
if (!existsSync(filePath)) {
|
|
168
|
+
return JSON.stringify({
|
|
169
|
+
error: `MultiEdit: file does not exist: ${filePath}. Use Write to create new files.`,
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
let stat;
|
|
173
|
+
try {
|
|
174
|
+
stat = statSync(filePath);
|
|
175
|
+
}
|
|
176
|
+
catch (e) {
|
|
177
|
+
return JSON.stringify({
|
|
178
|
+
error: `MultiEdit: stat failed: ${e instanceof Error ? e.message : String(e)}`,
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
if (stat.isDirectory()) {
|
|
182
|
+
return JSON.stringify({
|
|
183
|
+
error: `MultiEdit: '${filePath}' is a directory, not a file.`,
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
if (stat.size > MAX_FILE_BYTES) {
|
|
187
|
+
return JSON.stringify({
|
|
188
|
+
error: `MultiEdit: file size ${stat.size} exceeds 10MB cap. Use bash sed/awk for large files.`,
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
let raw;
|
|
192
|
+
try {
|
|
193
|
+
raw = readFileSync(filePath, "utf-8");
|
|
194
|
+
}
|
|
195
|
+
catch (e) {
|
|
196
|
+
return JSON.stringify({
|
|
197
|
+
error: `MultiEdit: read failed: ${e instanceof Error ? e.message : String(e)}`,
|
|
198
|
+
});
|
|
199
|
+
}
|
|
200
|
+
// Apply edits sequentially to an in-memory buffer. Each edit sees the
|
|
201
|
+
// state left by the previous one. Any failure aborts the whole batch —
|
|
202
|
+
// the file on disk is untouched and we return `failedAt: <index>` so
|
|
203
|
+
// the model can pinpoint where the cascade broke.
|
|
204
|
+
let buffer = raw;
|
|
205
|
+
let totalReplacements = 0;
|
|
206
|
+
let firstEditNewString = null;
|
|
207
|
+
for (let i = 0; i < edits.length; i++) {
|
|
208
|
+
const { old_string, new_string, replace_all } = edits[i];
|
|
209
|
+
const occurrences = countOccurrences(buffer, old_string);
|
|
210
|
+
if (occurrences === 0) {
|
|
211
|
+
return JSON.stringify({
|
|
212
|
+
error: `MultiEdit: edit[${i}].old_string not found in current buffer ` +
|
|
213
|
+
"(may have been consumed by an earlier edit, or never present).",
|
|
214
|
+
failedAt: i,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
if (!replace_all && occurrences > 1) {
|
|
218
|
+
return JSON.stringify({
|
|
219
|
+
error: `MultiEdit: edit[${i}].old_string appears ${occurrences} times. ` +
|
|
220
|
+
"Enlarge old_string for uniqueness, or set replace_all=true on this edit.",
|
|
221
|
+
failedAt: i,
|
|
222
|
+
occurrences,
|
|
223
|
+
});
|
|
224
|
+
}
|
|
225
|
+
if (replace_all) {
|
|
226
|
+
buffer = buffer.split(old_string).join(new_string);
|
|
227
|
+
totalReplacements += occurrences;
|
|
228
|
+
}
|
|
229
|
+
else {
|
|
230
|
+
const idx = buffer.indexOf(old_string);
|
|
231
|
+
buffer = buffer.slice(0, idx) + new_string + buffer.slice(idx + old_string.length);
|
|
232
|
+
totalReplacements += 1;
|
|
233
|
+
}
|
|
234
|
+
if (firstEditNewString === null && new_string.length > 0) {
|
|
235
|
+
firstEditNewString = new_string;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
try {
|
|
239
|
+
writeFileSync(filePath, buffer, "utf-8");
|
|
240
|
+
}
|
|
241
|
+
catch (e) {
|
|
242
|
+
return JSON.stringify({
|
|
243
|
+
error: `MultiEdit: write failed: ${e instanceof Error ? e.message : String(e)}`,
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
tracker?.forget(filePath);
|
|
247
|
+
const preview = firstEditNewString
|
|
248
|
+
? buildPreview(buffer, firstEditNewString)
|
|
249
|
+
: "[change preview unavailable]";
|
|
250
|
+
const editCount = edits.length;
|
|
251
|
+
return [
|
|
252
|
+
`File edited: ${filePath} (${editCount} edit${editCount === 1 ? "" : "s"}, ` +
|
|
253
|
+
`${totalReplacements} total replacement${totalReplacements === 1 ? "" : "s"})`,
|
|
254
|
+
"",
|
|
255
|
+
preview,
|
|
256
|
+
].join("\n");
|
|
257
|
+
},
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
/** Backwards-compatible singleton (no tracker — Read-before-Edit gate off). */
|
|
261
|
+
export const multiEditTool = createMultiEditTool();
|
|
262
|
+
/**
|
|
263
|
+
* Build a line-numbered preview of the buffer around the first occurrence
|
|
264
|
+
* of `marker`. Same shape as Edit's post-edit preview so the model's
|
|
265
|
+
* verification habit transfers.
|
|
266
|
+
*/
|
|
267
|
+
function buildPreview(buffer, marker) {
|
|
268
|
+
const idx = buffer.indexOf(marker);
|
|
269
|
+
if (idx < 0)
|
|
270
|
+
return "";
|
|
271
|
+
const allLines = buffer.split("\n");
|
|
272
|
+
let acc = 0;
|
|
273
|
+
let changedLine = 0;
|
|
274
|
+
for (let i = 0; i < allLines.length; i++) {
|
|
275
|
+
const next = acc + allLines[i].length + 1; // +1 for the dropped \n
|
|
276
|
+
if (next > idx) {
|
|
277
|
+
changedLine = i;
|
|
278
|
+
break;
|
|
279
|
+
}
|
|
280
|
+
acc = next;
|
|
281
|
+
}
|
|
282
|
+
const start = Math.max(0, changedLine - PREVIEW_LINES_AROUND);
|
|
283
|
+
const end = Math.min(allLines.length, changedLine + PREVIEW_LINES_AROUND + 1);
|
|
284
|
+
return allLines
|
|
285
|
+
.slice(start, end)
|
|
286
|
+
.map((line, i) => `${String(start + i + 1).padStart(6, " ")}\t${line}`)
|
|
287
|
+
.join("\n");
|
|
288
|
+
}
|
|
289
|
+
// Internal exports for tests.
|
|
290
|
+
export const __MAX_FILE_BYTES = MAX_FILE_BYTES;
|
|
291
|
+
export const __MAX_EDITS = MAX_EDITS;
|
|
292
|
+
//# sourceMappingURL=multi_edit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi_edit.js","sourceRoot":"","sources":["../../../src/tools/builtin/multi_edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/write.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/write.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,wBAAgB,eAAe,CAAC,IAAI,GAAE,gBAAqB,GAAG,WAAW,CAsExE;AAED,mDAAmD;AACnD,eAAO,MAAM,SAAS,EAAE,WAA+B,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { mkdirSync, writeFileSync } from "node:fs";
|
|
2
|
-
import { dirname, isAbsolute } from "node:path";
|
|
2
|
+
import { dirname, isAbsolute, normalize } from "node:path";
|
|
3
|
+
import { checkBlockedPath } from "../../tools/path-guard.js";
|
|
3
4
|
export function createWriteTool(opts = {}) {
|
|
4
5
|
const { tracker } = opts;
|
|
5
6
|
return {
|
|
@@ -24,7 +25,9 @@ export function createWriteTool(opts = {}) {
|
|
|
24
25
|
},
|
|
25
26
|
},
|
|
26
27
|
async execute(input) {
|
|
27
|
-
|
|
28
|
+
// normalize() collapses `..` segments before the isAbsolute + blocklist
|
|
29
|
+
// guards so that path traversal cannot bypass either check.
|
|
30
|
+
const filePath = normalize(typeof input.file_path === "string" ? input.file_path : "");
|
|
28
31
|
if (!filePath) {
|
|
29
32
|
return JSON.stringify({ error: "Write: missing 'file_path' argument" });
|
|
30
33
|
}
|
|
@@ -33,6 +36,9 @@ export function createWriteTool(opts = {}) {
|
|
|
33
36
|
error: `Write: file_path must be absolute, got '${filePath}'`,
|
|
34
37
|
});
|
|
35
38
|
}
|
|
39
|
+
const blockErr = checkBlockedPath("Write", filePath);
|
|
40
|
+
if (blockErr)
|
|
41
|
+
return JSON.stringify({ error: blockErr });
|
|
36
42
|
// gate: Read-before-Write — when the file already exists the model
|
|
37
43
|
// must have read it first (line-numbered view) to avoid blind overwrites.
|
|
38
44
|
if (tracker) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../src/tools/builtin/write.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../src/tools/builtin/write.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,7 +78,7 @@ export declare class FileStateTracker {
|
|
|
78
78
|
* "file does not exist, use Write to create". Read-before-Mutate is about
|
|
79
79
|
* content drift, not existence.
|
|
80
80
|
*/
|
|
81
|
-
checkBeforeMutate(absPath: string, tool: "Edit" | "Write"): string | null;
|
|
81
|
+
checkBeforeMutate(absPath: string, tool: "Edit" | "Write" | "MultiEdit"): string | null;
|
|
82
82
|
/** Used by tests + diagnostics. Not part of the per-turn contract. */
|
|
83
83
|
has(absPath: string): boolean;
|
|
84
84
|
/** Total number of tracked paths. Diagnostic. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-state.d.ts","sourceRoot":"","sources":["../../src/tools/file-state.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,MAAM,WAAW,cAAc;IAC7B,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAE7D;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9D;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;;;;;;;;;;;;;;OAiBG;IACH,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"file-state.d.ts","sourceRoot":"","sources":["../../src/tools/file-state.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,MAAM,WAAW,cAAc;IAC7B,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAE7D;;;;;OAKG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9D;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;;;;;;;;;;;;;;OAiBG;IACH,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI;IAiDvF,sEAAsE;IACtE,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI7B,iDAAiD;IACjD,IAAI,IAAI,MAAM;CAGf;AAiBD,+CAA+C;AAC/C,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAOvE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE5D;AAED,sCAAsC;AACtC,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,MAAM,CAEvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-state.js","sourceRoot":"","sources":["../../src/tools/file-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA2C/C;;;;;GAKG;AACH,MAAM,OAAO,gBAAgB;IACV,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IAE7D;;;;;OAKG;IACH,UAAU,CAAC,OAAe,EAAE,KAAa,EAAE,IAAY;QACrD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACjE,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,OAAe;QACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,iBAAiB,CAAC,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"file-state.js","sourceRoot":"","sources":["../../src/tools/file-state.ts"],"names":[],"mappings":"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"}
|