@namzu/sdk 1.4.0 → 2.0.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/CHANGELOG.md +19 -0
- package/dist/registry/tool/execute.d.ts.map +1 -1
- package/dist/registry/tool/execute.js +40 -10
- package/dist/registry/tool/execute.js.map +1 -1
- package/dist/registry/tool/execute.test.js +93 -7
- package/dist/registry/tool/execute.test.js.map +1 -1
- package/dist/registry/toolset/catalog.d.ts.map +1 -1
- package/dist/registry/toolset/catalog.js +17 -4
- package/dist/registry/toolset/catalog.js.map +1 -1
- package/dist/registry/toolset/catalog.test.js +101 -0
- package/dist/registry/toolset/catalog.test.js.map +1 -1
- package/dist/runtime/query/__tests__/capability-negotiation.test.js +79 -0
- package/dist/runtime/query/__tests__/capability-negotiation.test.js.map +1 -1
- package/dist/runtime/query/__tests__/deferred-tools.test.js +100 -0
- package/dist/runtime/query/__tests__/deferred-tools.test.js.map +1 -1
- package/dist/runtime/query/__tests__/long-document-flow.test.js +12 -12
- package/dist/runtime/query/__tests__/long-document-flow.test.js.map +1 -1
- package/dist/runtime/query/__tests__/stream-recovery.test.js +1 -1
- package/dist/runtime/query/__tests__/stream-recovery.test.js.map +1 -1
- package/dist/runtime/query/executor.js +2 -2
- package/dist/runtime/query/executor.js.map +1 -1
- package/dist/runtime/query/iteration/index.d.ts.map +1 -1
- package/dist/runtime/query/iteration/index.js +10 -0
- package/dist/runtime/query/iteration/index.js.map +1 -1
- package/dist/tools/builtins/__tests__/edit.test.js +206 -54
- package/dist/tools/builtins/__tests__/edit.test.js.map +1 -1
- package/dist/tools/builtins/__tests__/payload-budget.test.js +30 -16
- package/dist/tools/builtins/__tests__/payload-budget.test.js.map +1 -1
- package/dist/tools/builtins/__tests__/write-file.test.js +37 -13
- package/dist/tools/builtins/__tests__/write-file.test.js.map +1 -1
- package/dist/tools/builtins/atomic-write-file.d.ts +13 -0
- package/dist/tools/builtins/atomic-write-file.d.ts.map +1 -0
- package/dist/tools/builtins/atomic-write-file.js +46 -0
- package/dist/tools/builtins/atomic-write-file.js.map +1 -0
- package/dist/tools/builtins/bash.js +2 -2
- package/dist/tools/builtins/bash.js.map +1 -1
- package/dist/tools/builtins/edit.d.ts +2 -5
- package/dist/tools/builtins/edit.d.ts.map +1 -1
- package/dist/tools/builtins/edit.js +107 -125
- package/dist/tools/builtins/edit.js.map +1 -1
- package/dist/tools/builtins/file-mutation-lock.d.ts +7 -0
- package/dist/tools/builtins/file-mutation-lock.d.ts.map +1 -0
- package/dist/tools/builtins/file-mutation-lock.js +25 -0
- package/dist/tools/builtins/file-mutation-lock.js.map +1 -0
- package/dist/tools/builtins/index.js +2 -2
- package/dist/tools/builtins/index.js.map +1 -1
- package/dist/tools/builtins/write-file.d.ts +1 -2
- package/dist/tools/builtins/write-file.d.ts.map +1 -1
- package/dist/tools/builtins/write-file.js +66 -40
- package/dist/tools/builtins/write-file.js.map +1 -1
- package/dist/tools/defineTool.d.ts +2 -0
- package/dist/tools/defineTool.d.ts.map +1 -1
- package/dist/tools/defineTool.js +2 -0
- package/dist/tools/defineTool.js.map +1 -1
- package/dist/types/provider/chat.d.ts +9 -0
- package/dist/types/provider/chat.d.ts.map +1 -1
- package/dist/types/sandbox/index.d.ts +4 -0
- package/dist/types/sandbox/index.d.ts.map +1 -1
- package/dist/types/sandbox/index.js.map +1 -1
- package/dist/types/tool/index.d.ts +14 -0
- package/dist/types/tool/index.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/registry/tool/execute.test.ts +107 -7
- package/src/registry/tool/execute.ts +45 -10
- package/src/registry/toolset/catalog.test.ts +118 -0
- package/src/registry/toolset/catalog.ts +26 -4
- package/src/runtime/query/__tests__/capability-negotiation.test.ts +88 -0
- package/src/runtime/query/__tests__/deferred-tools.test.ts +111 -0
- package/src/runtime/query/__tests__/long-document-flow.test.ts +12 -12
- package/src/runtime/query/__tests__/stream-recovery.test.ts +1 -1
- package/src/runtime/query/executor.ts +2 -2
- package/src/runtime/query/iteration/index.ts +15 -0
- package/src/tools/builtins/__tests__/edit.test.ts +248 -64
- package/src/tools/builtins/__tests__/payload-budget.test.ts +40 -20
- package/src/tools/builtins/__tests__/write-file.test.ts +52 -13
- package/src/tools/builtins/atomic-write-file.ts +58 -0
- package/src/tools/builtins/bash.ts +2 -2
- package/src/tools/builtins/edit.ts +117 -163
- package/src/tools/builtins/file-mutation-lock.ts +27 -0
- package/src/tools/builtins/index.ts +2 -2
- package/src/tools/builtins/write-file.ts +68 -44
- package/src/tools/defineTool.ts +4 -0
- package/src/types/provider/chat.ts +14 -1
- package/src/types/sandbox/index.ts +4 -0
- package/src/types/tool/index.ts +14 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/runtime/query/executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/runtime/query/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,6BAA6B,CAAA;AAQvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAMzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,qBAAa,qBAAqB;IACjC,OAAO,CAAC,GAAG,CAAkB;gBAEjB,GAAG,EAAE,gBAAgB;IAI1B,OAAO,IAAI,cAAc,CAAC,QAAQ,CAAC;IA8W1C,OAAO,CAAC,oBAAoB;YAOd,oBAAoB;CAwElC"}
|
|
@@ -95,6 +95,7 @@ export class IterationOrchestrator {
|
|
|
95
95
|
// risks a 400 because the history still carries
|
|
96
96
|
// tool_use/tool_result blocks.
|
|
97
97
|
const openAITools = this.ctx.tools.toLLMTools(this.ctx.allowedTools);
|
|
98
|
+
const enforceToolInputSchema = enforcedModelInputToolNames(this.ctx.tools, openAITools);
|
|
98
99
|
const messages = forceFinalize
|
|
99
100
|
? [
|
|
100
101
|
...runMgr.messages,
|
|
@@ -118,6 +119,7 @@ export class IterationOrchestrator {
|
|
|
118
119
|
model,
|
|
119
120
|
messages,
|
|
120
121
|
tools: openAITools.length > 0 ? openAITools : undefined,
|
|
122
|
+
enforceToolInputSchema,
|
|
121
123
|
toolChoice: forceFinalize && openAITools.length > 0 ? 'none' : undefined,
|
|
122
124
|
temperature: runConfig.temperature,
|
|
123
125
|
maxTokens: runConfig.maxResponseTokens,
|
|
@@ -336,10 +338,12 @@ export class IterationOrchestrator {
|
|
|
336
338
|
// tools param identical to prior iterations (cache prefix intact,
|
|
337
339
|
// no 400 on tool blocks in history) and forbid use via tool_choice.
|
|
338
340
|
const finalTools = this.ctx.tools.toLLMTools(this.ctx.allowedTools);
|
|
341
|
+
const enforceToolInputSchema = enforcedModelInputToolNames(this.ctx.tools, finalTools);
|
|
339
342
|
const response = await collect(this.ctx.provider.chatStream({
|
|
340
343
|
model,
|
|
341
344
|
messages: finalMessages,
|
|
342
345
|
tools: finalTools.length > 0 ? finalTools : undefined,
|
|
346
|
+
enforceToolInputSchema,
|
|
343
347
|
toolChoice: finalTools.length > 0 ? 'none' : undefined,
|
|
344
348
|
temperature: this.ctx.runConfig.temperature,
|
|
345
349
|
maxTokens: this.ctx.runConfig.maxResponseTokens,
|
|
@@ -375,4 +379,10 @@ export class IterationOrchestrator {
|
|
|
375
379
|
}
|
|
376
380
|
}
|
|
377
381
|
}
|
|
382
|
+
function enforcedModelInputToolNames(registry, tools) {
|
|
383
|
+
const names = tools
|
|
384
|
+
.map((tool) => tool.function.name)
|
|
385
|
+
.filter((name) => registry.get(name)?.enforceModelInput === true);
|
|
386
|
+
return names.length > 0 ? names : undefined;
|
|
387
|
+
}
|
|
378
388
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
|
|
1
|
+
import { existsSync, mkdtempSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { tmpdir } from 'node:os';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { describe, expect, it } from 'vitest';
|
|
5
|
-
import { zodToJsonSchema } from 'zod-to-json-schema';
|
|
6
5
|
import { ToolRegistry } from '../../../registry/tool/execute.js';
|
|
6
|
+
import { atomicWriteFile } from '../atomic-write-file.js';
|
|
7
7
|
import { EditTool } from '../edit.js';
|
|
8
8
|
function makeContext(workingDirectory) {
|
|
9
9
|
return {
|
|
@@ -15,78 +15,230 @@ function makeContext(workingDirectory) {
|
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
describe('EditTool', () => {
|
|
18
|
-
it('
|
|
18
|
+
it('publishes one closed canonical replacement contract', () => {
|
|
19
|
+
const schema = EditTool.modelInputSchema;
|
|
20
|
+
expect(schema).toEqual({
|
|
21
|
+
type: 'object',
|
|
22
|
+
properties: {
|
|
23
|
+
path: {
|
|
24
|
+
type: 'string',
|
|
25
|
+
description: 'Path to the file to edit. Must not be empty.',
|
|
26
|
+
},
|
|
27
|
+
old_string: {
|
|
28
|
+
type: 'string',
|
|
29
|
+
description: 'Exact unique text from the file, without read-tool line-number prefixes. Must not be empty.',
|
|
30
|
+
},
|
|
31
|
+
new_string: {
|
|
32
|
+
type: 'string',
|
|
33
|
+
description: 'Exact replacement text. May be empty to delete old_string. Keep under 12000 characters.',
|
|
34
|
+
},
|
|
35
|
+
replace_all: {
|
|
36
|
+
type: 'boolean',
|
|
37
|
+
description: 'Replace every occurrence instead of requiring one unique match.',
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
required: ['path', 'old_string', 'new_string'],
|
|
41
|
+
additionalProperties: false,
|
|
42
|
+
});
|
|
43
|
+
expect(EditTool.inputSchema.safeParse({
|
|
44
|
+
path: 'doc.md',
|
|
45
|
+
old_string: 'old',
|
|
46
|
+
new_string: 'new',
|
|
47
|
+
replace_all: true,
|
|
48
|
+
}).success).toBe(true);
|
|
49
|
+
for (const legacy of [
|
|
50
|
+
{ path: 'doc.md', oldStr: 'old', newStr: 'new' },
|
|
51
|
+
{ path: 'doc.md', insertLine: 'end', new_string: 'append' },
|
|
52
|
+
{
|
|
53
|
+
path: 'doc.md',
|
|
54
|
+
old_string: 'old',
|
|
55
|
+
new_string: 'new',
|
|
56
|
+
newStr: 'legacy',
|
|
57
|
+
},
|
|
58
|
+
]) {
|
|
59
|
+
expect(EditTool.inputSchema.safeParse(legacy).success, JSON.stringify(legacy)).toBe(false);
|
|
60
|
+
}
|
|
61
|
+
expect(EditTool.inputSchema.safeParse({
|
|
62
|
+
path: ' ',
|
|
63
|
+
old_string: 'old',
|
|
64
|
+
new_string: 'new',
|
|
65
|
+
}).success).toBe(false);
|
|
66
|
+
});
|
|
67
|
+
it('replaces one exact unique string', async () => {
|
|
19
68
|
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
20
69
|
writeFileSync(join(dir, 'doc.md'), 'alpha\nbeta\n');
|
|
21
|
-
const result = await EditTool.execute({
|
|
70
|
+
const result = await EditTool.execute({
|
|
71
|
+
path: 'doc.md',
|
|
72
|
+
old_string: 'beta',
|
|
73
|
+
new_string: 'gamma',
|
|
74
|
+
replace_all: false,
|
|
75
|
+
}, makeContext(dir));
|
|
22
76
|
expect(result.success).toBe(true);
|
|
23
77
|
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\ngamma\n');
|
|
24
78
|
});
|
|
25
|
-
it('
|
|
79
|
+
it('validates a path without rewriting edge whitespace', async () => {
|
|
26
80
|
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
27
|
-
writeFileSync(join(dir, 'doc.md'), 'alpha\
|
|
28
|
-
const result = await EditTool.execute({
|
|
81
|
+
writeFileSync(join(dir, ' doc.md '), 'alpha\n');
|
|
82
|
+
const result = await EditTool.execute({
|
|
83
|
+
path: ' doc.md ',
|
|
84
|
+
old_string: 'alpha',
|
|
85
|
+
new_string: 'beta',
|
|
86
|
+
replace_all: false,
|
|
87
|
+
}, makeContext(dir));
|
|
29
88
|
expect(result.success).toBe(true);
|
|
30
|
-
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('
|
|
89
|
+
expect(readFileSync(join(dir, ' doc.md '), 'utf-8')).toBe('beta\n');
|
|
90
|
+
expect(existsSync(join(dir, 'doc.md'))).toBe(false);
|
|
31
91
|
});
|
|
32
|
-
it('
|
|
92
|
+
it('allows deletion with an empty new_string', async () => {
|
|
33
93
|
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
34
|
-
writeFileSync(join(dir, 'doc.md'), 'alpha\n');
|
|
35
|
-
const result = await EditTool.execute({
|
|
94
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\nremove me\nomega\n');
|
|
95
|
+
const result = await EditTool.execute({
|
|
96
|
+
path: 'doc.md',
|
|
97
|
+
old_string: 'remove me\n',
|
|
98
|
+
new_string: '',
|
|
99
|
+
replace_all: false,
|
|
100
|
+
}, makeContext(dir));
|
|
36
101
|
expect(result.success).toBe(true);
|
|
37
102
|
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\nomega\n');
|
|
38
103
|
});
|
|
39
|
-
it('
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
insertLine,
|
|
52
|
-
newStr: 'inserted',
|
|
53
|
-
});
|
|
54
|
-
expect(parsed.success, JSON.stringify(insertLine)).toBe(true);
|
|
55
|
-
}
|
|
56
|
-
const json = zodToJsonSchema(EditTool.inputSchema, {
|
|
57
|
-
target: 'jsonSchema7',
|
|
58
|
-
$refStrategy: 'none',
|
|
59
|
-
});
|
|
60
|
-
expect(json.properties?.insertLine?.anyOf).toEqual([
|
|
61
|
-
{ type: 'integer', minimum: 0 },
|
|
62
|
-
{ type: 'string', const: 'end' },
|
|
63
|
-
]);
|
|
104
|
+
it('replaces every exact occurrence only when replace_all is true', async () => {
|
|
105
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
106
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha alpha alpha');
|
|
107
|
+
const result = await EditTool.execute({
|
|
108
|
+
path: 'doc.md',
|
|
109
|
+
old_string: 'alpha',
|
|
110
|
+
new_string: 'beta',
|
|
111
|
+
replace_all: true,
|
|
112
|
+
}, makeContext(dir));
|
|
113
|
+
expect(result.success).toBe(true);
|
|
114
|
+
expect(result.data).toMatchObject({ replacements: 3 });
|
|
115
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('beta beta beta');
|
|
64
116
|
});
|
|
65
|
-
it('refuses
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
117
|
+
it('refuses ambiguous exact matches instead of guessing', async () => {
|
|
118
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
119
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\nalpha\n');
|
|
120
|
+
const result = await EditTool.execute({
|
|
121
|
+
path: 'doc.md',
|
|
122
|
+
old_string: 'alpha',
|
|
123
|
+
new_string: 'beta',
|
|
124
|
+
replace_all: false,
|
|
125
|
+
}, makeContext(dir));
|
|
126
|
+
expect(result.success).toBe(false);
|
|
127
|
+
expect(result.error).toContain('old_string is not unique');
|
|
128
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\nalpha\n');
|
|
129
|
+
});
|
|
130
|
+
it('normalizes consistent CRLF/LF boundaries without fuzzy matching', async () => {
|
|
131
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
132
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\r\nbeta\r\nomega\r\n');
|
|
133
|
+
const result = await EditTool.execute({
|
|
134
|
+
path: 'doc.md',
|
|
135
|
+
old_string: 'alpha\nbeta',
|
|
136
|
+
new_string: 'gamma\ndelta',
|
|
137
|
+
replace_all: false,
|
|
138
|
+
}, makeContext(dir));
|
|
139
|
+
expect(result.success).toBe(true);
|
|
140
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('gamma\r\ndelta\r\nomega\r\n');
|
|
141
|
+
});
|
|
142
|
+
it('rejects legacy and extra fields even when execute is called directly', async () => {
|
|
143
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
144
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\n');
|
|
145
|
+
for (const input of [
|
|
146
|
+
{ path: 'doc.md', oldStr: 'alpha', newStr: 'beta' },
|
|
147
|
+
{
|
|
70
148
|
path: 'doc.md',
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
},
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
expect(
|
|
149
|
+
old_string: 'alpha',
|
|
150
|
+
new_string: 'beta',
|
|
151
|
+
insertLine: 'end',
|
|
152
|
+
},
|
|
153
|
+
]) {
|
|
154
|
+
const result = await EditTool.execute(input, makeContext(dir));
|
|
155
|
+
expect(result.success, JSON.stringify(input)).toBe(false);
|
|
156
|
+
expect(result.error).toContain('Invalid edit input');
|
|
78
157
|
}
|
|
158
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\n');
|
|
79
159
|
});
|
|
80
|
-
it('returns
|
|
160
|
+
it('returns one canonical recovery shape after registry validation fails', async () => {
|
|
81
161
|
const registry = new ToolRegistry();
|
|
82
162
|
registry.register(EditTool);
|
|
83
|
-
const result = await registry.execute('edit', { insertLine: '
|
|
163
|
+
const result = await registry.execute('edit', { insertLine: '"end"', newStr: 'content' }, makeContext('/tmp'));
|
|
84
164
|
expect(result.success).toBe(false);
|
|
85
165
|
expect(result.error).toContain('Validation failed for "edit":');
|
|
86
|
-
expect(result.error).toContain('
|
|
87
|
-
expect(result.error).toContain('
|
|
88
|
-
expect(result.error).toContain('
|
|
89
|
-
|
|
166
|
+
expect(result.error).toContain('Required: path: string');
|
|
167
|
+
expect(result.error).toContain('{"path":"file.md","old_string":"exact unique text","new_string":"replacement text"}');
|
|
168
|
+
expect(result.error).not.toContain('Accepted shapes');
|
|
169
|
+
});
|
|
170
|
+
it('serializes independent EditTool read-modify-write cycles for one sandbox path', async () => {
|
|
171
|
+
let body = Buffer.from('alpha');
|
|
172
|
+
let reads = 0;
|
|
173
|
+
let writes = 0;
|
|
174
|
+
let releaseFirstWrite = () => { };
|
|
175
|
+
let markFirstWriteStarted = () => { };
|
|
176
|
+
const firstWriteStarted = new Promise((resolve) => {
|
|
177
|
+
markFirstWriteStarted = resolve;
|
|
178
|
+
});
|
|
179
|
+
const firstWriteGate = new Promise((resolve) => {
|
|
180
|
+
releaseFirstWrite = resolve;
|
|
181
|
+
});
|
|
182
|
+
const sandbox = {
|
|
183
|
+
id: 'sbx_edit_lock',
|
|
184
|
+
status: 'ready',
|
|
185
|
+
rootDir: '/workspace',
|
|
186
|
+
environment: 'basic',
|
|
187
|
+
async readFile() {
|
|
188
|
+
reads += 1;
|
|
189
|
+
return Buffer.from(body);
|
|
190
|
+
},
|
|
191
|
+
async writeFile(_path, content) {
|
|
192
|
+
writes += 1;
|
|
193
|
+
if (writes === 1) {
|
|
194
|
+
markFirstWriteStarted();
|
|
195
|
+
await firstWriteGate;
|
|
196
|
+
}
|
|
197
|
+
body = Buffer.isBuffer(content) ? Buffer.from(content) : Buffer.from(content);
|
|
198
|
+
},
|
|
199
|
+
async exec() {
|
|
200
|
+
throw new Error('not used');
|
|
201
|
+
},
|
|
202
|
+
async listFiles() {
|
|
203
|
+
return [];
|
|
204
|
+
},
|
|
205
|
+
async destroy() { },
|
|
206
|
+
};
|
|
207
|
+
const firstContext = { ...makeContext('/workspace'), sandbox };
|
|
208
|
+
const secondContext = { ...makeContext('/workspace'), sandbox };
|
|
209
|
+
const first = EditTool.execute({
|
|
210
|
+
path: 'doc.md',
|
|
211
|
+
old_string: 'alpha',
|
|
212
|
+
new_string: 'beta',
|
|
213
|
+
replace_all: false,
|
|
214
|
+
}, firstContext);
|
|
215
|
+
await firstWriteStarted;
|
|
216
|
+
const second = EditTool.execute({
|
|
217
|
+
path: 'doc.md',
|
|
218
|
+
old_string: 'beta',
|
|
219
|
+
new_string: 'gamma',
|
|
220
|
+
replace_all: false,
|
|
221
|
+
}, secondContext);
|
|
222
|
+
await Promise.resolve();
|
|
223
|
+
expect(reads).toBe(1);
|
|
224
|
+
releaseFirstWrite();
|
|
225
|
+
const results = await Promise.all([first, second]);
|
|
226
|
+
expect(results.every((result) => result.success)).toBe(true);
|
|
227
|
+
expect(reads).toBe(2);
|
|
228
|
+
expect(writes).toBe(2);
|
|
229
|
+
expect(body.toString('utf-8')).toBe('gamma');
|
|
230
|
+
});
|
|
231
|
+
it('leaves the original intact when an atomic local write fails before commit', async () => {
|
|
232
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-atomic-write-'));
|
|
233
|
+
const filePath = join(dir, 'doc.md');
|
|
234
|
+
writeFileSync(filePath, 'original');
|
|
235
|
+
await expect(atomicWriteFile(filePath, 'replacement', {
|
|
236
|
+
beforeCommit: async () => {
|
|
237
|
+
throw new Error('injected pre-commit failure');
|
|
238
|
+
},
|
|
239
|
+
})).rejects.toThrow('injected pre-commit failure');
|
|
240
|
+
expect(readFileSync(filePath, 'utf-8')).toBe('original');
|
|
241
|
+
expect(readdirSync(dir).filter((entry) => entry.includes('.namzu-'))).toEqual([]);
|
|
90
242
|
});
|
|
91
243
|
});
|
|
92
244
|
//# sourceMappingURL=edit.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.test.js","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/edit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"edit.test.js","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/edit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ describe('filesystem tool payload budgeting', () => {
|
|
|
11
11
|
expect(() => WriteFileTool.inputSchema.parse({ path: 'outputs/long.md', content: oversized })).not.toThrow();
|
|
12
12
|
expect(() => EditTool.inputSchema.parse({
|
|
13
13
|
path: 'outputs/long.md',
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
old_string: '{{SECTION}}',
|
|
15
|
+
new_string: oversized,
|
|
16
16
|
replace_all: false,
|
|
17
17
|
})).not.toThrow();
|
|
18
18
|
});
|
|
@@ -21,7 +21,7 @@ describe('filesystem tool payload budgeting', () => {
|
|
|
21
21
|
expect(names).toContain('edit');
|
|
22
22
|
expect(names).not.toContain('append');
|
|
23
23
|
});
|
|
24
|
-
it('assembles long documents
|
|
24
|
+
it('assembles replay-safe long documents by advancing an exact marker', async () => {
|
|
25
25
|
const dir = mkdtempSync(join(tmpdir(), 'namzu-long-doc-'));
|
|
26
26
|
const ctx = {
|
|
27
27
|
runId: 'run_test',
|
|
@@ -30,12 +30,12 @@ describe('filesystem tool payload budgeting', () => {
|
|
|
30
30
|
env: {},
|
|
31
31
|
log: () => { },
|
|
32
32
|
};
|
|
33
|
-
const opening = '# Long document regression\n\n{{
|
|
33
|
+
const opening = '# Long document regression\n\n{{CHUNK_001}}\n';
|
|
34
34
|
const chunks = Array.from({ length: 6 }, (_, sectionIndex) => {
|
|
35
35
|
const lines = Array.from({ length: 45 }, (_, lineIndex) => {
|
|
36
36
|
const section = sectionIndex + 1;
|
|
37
37
|
const line = lineIndex + 1;
|
|
38
|
-
return `Section ${section}.${line}: this bounded paragraph proves long-form output grows through
|
|
38
|
+
return `Section ${section}.${line}: this bounded paragraph proves long-form output grows through exact marker edits rather than one oversized JSON tool argument.`;
|
|
39
39
|
});
|
|
40
40
|
const chunk = [`## Section ${sectionIndex + 1}`, ...lines, ''].join('\n');
|
|
41
41
|
expect(chunk.length).toBeLessThan(12_000);
|
|
@@ -43,24 +43,38 @@ describe('filesystem tool payload budgeting', () => {
|
|
|
43
43
|
});
|
|
44
44
|
const writeResult = await WriteFileTool.execute({ path: 'outputs/regression-long-document.md', content: opening }, ctx);
|
|
45
45
|
expect(writeResult.success).toBe(true);
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
newStr: chunks[0],
|
|
50
|
-
replace_all: false,
|
|
51
|
-
}, ctx);
|
|
52
|
-
expect(firstEdit.success).toBe(true);
|
|
53
|
-
for (const chunk of chunks.slice(1)) {
|
|
46
|
+
for (const [index, chunk] of chunks.entries()) {
|
|
47
|
+
const currentMarker = `{{CHUNK_${String(index + 1).padStart(3, '0')}}}`;
|
|
48
|
+
const nextMarker = `{{CHUNK_${String(index + 2).padStart(3, '0')}}}`;
|
|
54
49
|
const result = await EditTool.execute({
|
|
55
50
|
path: 'outputs/regression-long-document.md',
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
old_string: currentMarker,
|
|
52
|
+
new_string: `${chunk}\n${nextMarker}`,
|
|
58
53
|
replace_all: false,
|
|
59
54
|
}, ctx);
|
|
60
55
|
expect(result.success).toBe(true);
|
|
56
|
+
if (index === 0) {
|
|
57
|
+
const beforeReplay = readFileSync(join(dir, 'outputs/regression-long-document.md'), 'utf-8');
|
|
58
|
+
const replay = await EditTool.execute({
|
|
59
|
+
path: 'outputs/regression-long-document.md',
|
|
60
|
+
old_string: currentMarker,
|
|
61
|
+
new_string: `${chunk}\n${nextMarker}`,
|
|
62
|
+
replace_all: false,
|
|
63
|
+
}, ctx);
|
|
64
|
+
expect(replay.success).toBe(false);
|
|
65
|
+
expect(readFileSync(join(dir, 'outputs/regression-long-document.md'), 'utf-8')).toBe(beforeReplay);
|
|
66
|
+
}
|
|
61
67
|
}
|
|
68
|
+
const finalMarker = `{{CHUNK_${String(chunks.length + 1).padStart(3, '0')}}}`;
|
|
69
|
+
const finalize = await EditTool.execute({
|
|
70
|
+
path: 'outputs/regression-long-document.md',
|
|
71
|
+
old_string: finalMarker,
|
|
72
|
+
new_string: '',
|
|
73
|
+
replace_all: false,
|
|
74
|
+
}, ctx);
|
|
75
|
+
expect(finalize.success).toBe(true);
|
|
62
76
|
const final = readFileSync(join(dir, 'outputs/regression-long-document.md'), 'utf-8');
|
|
63
|
-
expect(final).not.toContain('{{
|
|
77
|
+
expect(final).not.toContain('{{CHUNK_');
|
|
64
78
|
expect(final.split('\n').length).toBeGreaterThan(250);
|
|
65
79
|
expect(final).toContain('## Section 1');
|
|
66
80
|
expect(final).toContain('## Section 6');
|