@namzu/sdk 3.0.0 → 3.2.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 +223 -0
- package/dist/advisory/__tests__/consultation-context.test.d.ts +2 -0
- package/dist/advisory/__tests__/consultation-context.test.d.ts.map +1 -0
- package/dist/advisory/__tests__/consultation-context.test.js +124 -0
- package/dist/advisory/__tests__/consultation-context.test.js.map +1 -0
- package/dist/advisory/context.d.ts +25 -0
- package/dist/advisory/context.d.ts.map +1 -1
- package/dist/advisory/context.js +18 -0
- package/dist/advisory/context.js.map +1 -1
- package/dist/advisory/executor.d.ts.map +1 -1
- package/dist/advisory/executor.js +25 -3
- package/dist/advisory/executor.js.map +1 -1
- package/dist/compaction/__tests__/context-reducer.test.d.ts +2 -0
- package/dist/compaction/__tests__/context-reducer.test.d.ts.map +1 -0
- package/dist/compaction/__tests__/context-reducer.test.js +197 -0
- package/dist/compaction/__tests__/context-reducer.test.js.map +1 -0
- package/dist/compaction/factory.d.ts +7 -0
- package/dist/compaction/factory.d.ts.map +1 -1
- package/dist/compaction/factory.js +7 -0
- package/dist/compaction/factory.js.map +1 -1
- package/dist/compaction/index.d.ts +2 -0
- package/dist/compaction/index.d.ts.map +1 -1
- package/dist/compaction/index.js +1 -0
- package/dist/compaction/index.js.map +1 -1
- package/dist/compaction/interface.d.ts +13 -0
- package/dist/compaction/interface.d.ts.map +1 -1
- package/dist/compaction/managers/null.d.ts +3 -0
- package/dist/compaction/managers/null.d.ts.map +1 -1
- package/dist/compaction/managers/null.js +3 -0
- package/dist/compaction/managers/null.js.map +1 -1
- package/dist/compaction/managers/slidingWindow.d.ts +6 -0
- package/dist/compaction/managers/slidingWindow.d.ts.map +1 -1
- package/dist/compaction/managers/slidingWindow.js +6 -0
- package/dist/compaction/managers/slidingWindow.js.map +1 -1
- package/dist/compaction/managers/structured.d.ts +10 -0
- package/dist/compaction/managers/structured.d.ts.map +1 -1
- package/dist/compaction/managers/structured.js +10 -0
- package/dist/compaction/managers/structured.js.map +1 -1
- package/dist/compaction/reducer.d.ts +86 -0
- package/dist/compaction/reducer.d.ts.map +1 -0
- package/dist/compaction/reducer.js +77 -0
- package/dist/compaction/reducer.js.map +1 -0
- package/dist/connector/builtins/__tests__/oauth2-auth.test.d.ts +2 -0
- package/dist/connector/builtins/__tests__/oauth2-auth.test.d.ts.map +1 -0
- package/dist/connector/builtins/__tests__/oauth2-auth.test.js +54 -0
- package/dist/connector/builtins/__tests__/oauth2-auth.test.js.map +1 -0
- package/dist/connector/builtins/http.d.ts.map +1 -1
- package/dist/connector/builtins/http.js +24 -2
- package/dist/connector/builtins/http.js.map +1 -1
- package/dist/connector/builtins/http.test.js +18 -2
- package/dist/connector/builtins/http.test.js.map +1 -1
- package/dist/connector/index.d.ts +2 -2
- package/dist/connector/index.d.ts.map +1 -1
- package/dist/connector/index.js +1 -1
- package/dist/connector/index.js.map +1 -1
- package/dist/connector/mcp/__tests__/prompts-and-lifecycle.test.d.ts +2 -0
- package/dist/connector/mcp/__tests__/prompts-and-lifecycle.test.d.ts.map +1 -0
- package/dist/connector/mcp/__tests__/prompts-and-lifecycle.test.js +214 -0
- package/dist/connector/mcp/__tests__/prompts-and-lifecycle.test.js.map +1 -0
- package/dist/connector/mcp/client.d.ts +52 -1
- package/dist/connector/mcp/client.d.ts.map +1 -1
- package/dist/connector/mcp/client.js +86 -0
- package/dist/connector/mcp/client.js.map +1 -1
- package/dist/connector/mcp/discovery.d.ts +12 -1
- package/dist/connector/mcp/discovery.d.ts.map +1 -1
- package/dist/connector/mcp/discovery.js +19 -4
- package/dist/connector/mcp/discovery.js.map +1 -1
- package/dist/connector/mcp/index.d.ts +2 -2
- package/dist/connector/mcp/index.d.ts.map +1 -1
- package/dist/connector/mcp/index.js +1 -1
- package/dist/connector/mcp/index.js.map +1 -1
- package/dist/connector/mcp/server.d.ts +42 -1
- package/dist/connector/mcp/server.d.ts.map +1 -1
- package/dist/connector/mcp/server.js +77 -4
- package/dist/connector/mcp/server.js.map +1 -1
- package/dist/manager/agent/__tests__/depth-limit-authority.test.d.ts +2 -0
- package/dist/manager/agent/__tests__/depth-limit-authority.test.d.ts.map +1 -0
- package/dist/manager/agent/__tests__/depth-limit-authority.test.js +58 -0
- package/dist/manager/agent/__tests__/depth-limit-authority.test.js.map +1 -0
- package/dist/plugin/__tests__/discovery-scopes.test.d.ts +2 -0
- package/dist/plugin/__tests__/discovery-scopes.test.d.ts.map +1 -0
- package/dist/plugin/__tests__/discovery-scopes.test.js +97 -0
- package/dist/plugin/__tests__/discovery-scopes.test.js.map +1 -0
- package/dist/plugin/__tests__/enable-contributions.test.js +5 -1
- package/dist/plugin/__tests__/enable-contributions.test.js.map +1 -1
- package/dist/plugin/__tests__/mcp-admission.test.d.ts +2 -0
- package/dist/plugin/__tests__/mcp-admission.test.d.ts.map +1 -0
- package/dist/plugin/__tests__/mcp-admission.test.js +192 -0
- package/dist/plugin/__tests__/mcp-admission.test.js.map +1 -0
- package/dist/plugin/lifecycle.d.ts +41 -0
- package/dist/plugin/lifecycle.d.ts.map +1 -1
- package/dist/plugin/lifecycle.js +29 -1
- package/dist/plugin/lifecycle.js.map +1 -1
- package/dist/plugin/loader.d.ts +39 -3
- package/dist/plugin/loader.d.ts.map +1 -1
- package/dist/plugin/loader.js +37 -4
- package/dist/plugin/loader.js.map +1 -1
- package/dist/public-runtime.d.ts +5 -3
- package/dist/public-runtime.d.ts.map +1 -1
- package/dist/public-runtime.js +11 -3
- package/dist/public-runtime.js.map +1 -1
- package/dist/public-types.d.ts +2 -2
- package/dist/public-types.d.ts.map +1 -1
- package/dist/rag/__tests__/namespace-isolation.test.d.ts +2 -0
- package/dist/rag/__tests__/namespace-isolation.test.d.ts.map +1 -0
- package/dist/rag/__tests__/namespace-isolation.test.js +80 -0
- package/dist/rag/__tests__/namespace-isolation.test.js.map +1 -0
- package/dist/rag/ingestion.d.ts.map +1 -1
- package/dist/rag/ingestion.js +1 -0
- package/dist/rag/ingestion.js.map +1 -1
- package/dist/rag/retriever.d.ts.map +1 -1
- package/dist/rag/retriever.js +2 -0
- package/dist/rag/retriever.js.map +1 -1
- package/dist/rag/vector-store.d.ts.map +1 -1
- package/dist/rag/vector-store.js +6 -0
- package/dist/rag/vector-store.js.map +1 -1
- package/dist/registry/tool/execute.d.ts.map +1 -1
- package/dist/registry/tool/execute.js +113 -109
- package/dist/registry/tool/execute.js.map +1 -1
- package/dist/runtime/query/__tests__/capability-negotiation.test.js +59 -0
- package/dist/runtime/query/__tests__/capability-negotiation.test.js.map +1 -1
- package/dist/runtime/query/__tests__/per-step-skills.test.d.ts +10 -0
- package/dist/runtime/query/__tests__/per-step-skills.test.d.ts.map +1 -0
- package/dist/runtime/query/__tests__/per-step-skills.test.js +122 -0
- package/dist/runtime/query/__tests__/per-step-skills.test.js.map +1 -0
- package/dist/runtime/query/__tests__/per-step-tool-choice.test.d.ts +2 -0
- package/dist/runtime/query/__tests__/per-step-tool-choice.test.d.ts.map +1 -0
- package/dist/runtime/query/__tests__/per-step-tool-choice.test.js +153 -0
- package/dist/runtime/query/__tests__/per-step-tool-choice.test.js.map +1 -0
- package/dist/runtime/query/__tests__/resume-run.test.d.ts +2 -0
- package/dist/runtime/query/__tests__/resume-run.test.d.ts.map +1 -0
- package/dist/runtime/query/__tests__/resume-run.test.js +211 -0
- package/dist/runtime/query/__tests__/resume-run.test.js.map +1 -0
- package/dist/runtime/query/executor.d.ts +1 -0
- package/dist/runtime/query/executor.d.ts.map +1 -1
- package/dist/runtime/query/executor.js +10 -1
- package/dist/runtime/query/executor.js.map +1 -1
- package/dist/runtime/query/index.d.ts +10 -0
- package/dist/runtime/query/index.d.ts.map +1 -1
- package/dist/runtime/query/index.js +26 -0
- package/dist/runtime/query/index.js.map +1 -1
- package/dist/runtime/query/iteration/index.d.ts.map +1 -1
- package/dist/runtime/query/iteration/index.js +118 -34
- package/dist/runtime/query/iteration/index.js.map +1 -1
- package/dist/runtime/query/iteration/phases/compaction-model-routing.test.d.ts +2 -0
- package/dist/runtime/query/iteration/phases/compaction-model-routing.test.d.ts.map +1 -0
- package/dist/runtime/query/iteration/phases/compaction-model-routing.test.js +96 -0
- package/dist/runtime/query/iteration/phases/compaction-model-routing.test.js.map +1 -0
- package/dist/runtime/query/iteration/phases/compaction.d.ts.map +1 -1
- package/dist/runtime/query/iteration/phases/compaction.js +95 -5
- package/dist/runtime/query/iteration/phases/compaction.js.map +1 -1
- package/dist/runtime/query/iteration/phases/context-reducer-dispatch.test.d.ts +2 -0
- package/dist/runtime/query/iteration/phases/context-reducer-dispatch.test.d.ts.map +1 -0
- package/dist/runtime/query/iteration/phases/context-reducer-dispatch.test.js +180 -0
- package/dist/runtime/query/iteration/phases/context-reducer-dispatch.test.js.map +1 -0
- package/dist/runtime/query/iteration/phases/context.d.ts +9 -0
- package/dist/runtime/query/iteration/phases/context.d.ts.map +1 -1
- package/dist/runtime/query/iteration/phases/context.js.map +1 -1
- package/dist/runtime/query/resume-run.d.ts +70 -0
- package/dist/runtime/query/resume-run.d.ts.map +1 -0
- package/dist/runtime/query/resume-run.js +46 -0
- package/dist/runtime/query/resume-run.js.map +1 -0
- package/dist/telemetry/__tests__/model-call-span.test.d.ts +2 -0
- package/dist/telemetry/__tests__/model-call-span.test.d.ts.map +1 -0
- package/dist/telemetry/__tests__/model-call-span.test.js +147 -0
- package/dist/telemetry/__tests__/model-call-span.test.js.map +1 -0
- package/dist/telemetry/__tests__/span-closure.test.d.ts +2 -0
- package/dist/telemetry/__tests__/span-closure.test.d.ts.map +1 -0
- package/dist/telemetry/__tests__/span-closure.test.js +124 -0
- package/dist/telemetry/__tests__/span-closure.test.js.map +1 -0
- package/dist/tools/advisory/index.js +1 -1
- package/dist/tools/advisory/index.js.map +1 -1
- package/dist/tools/builtins/__tests__/edit-commits-atomically.test.d.ts +2 -0
- package/dist/tools/builtins/__tests__/edit-commits-atomically.test.d.ts.map +1 -0
- package/dist/tools/builtins/__tests__/edit-commits-atomically.test.js +78 -0
- package/dist/tools/builtins/__tests__/edit-commits-atomically.test.js.map +1 -0
- package/dist/tools/builtins/__tests__/edit.test.js +242 -1
- package/dist/tools/builtins/__tests__/edit.test.js.map +1 -1
- package/dist/tools/builtins/__tests__/stale-file-refusal.test.d.ts +2 -0
- package/dist/tools/builtins/__tests__/stale-file-refusal.test.d.ts.map +1 -0
- package/dist/tools/builtins/__tests__/stale-file-refusal.test.js +187 -0
- package/dist/tools/builtins/__tests__/stale-file-refusal.test.js.map +1 -0
- package/dist/tools/builtins/atomic-write-file.d.ts +1 -1
- package/dist/tools/builtins/atomic-write-file.d.ts.map +1 -1
- package/dist/tools/builtins/atomic-write-file.js +31 -2
- package/dist/tools/builtins/atomic-write-file.js.map +1 -1
- package/dist/tools/builtins/content-fingerprint.d.ts +23 -0
- package/dist/tools/builtins/content-fingerprint.d.ts.map +1 -0
- package/dist/tools/builtins/content-fingerprint.js +30 -0
- package/dist/tools/builtins/content-fingerprint.js.map +1 -0
- package/dist/tools/builtins/edit.d.ts.map +1 -1
- package/dist/tools/builtins/edit.js +172 -31
- package/dist/tools/builtins/edit.js.map +1 -1
- package/dist/tools/builtins/read-file.d.ts.map +1 -1
- package/dist/tools/builtins/read-file.js +5 -2
- package/dist/tools/builtins/read-file.js.map +1 -1
- package/dist/tools/builtins/write-file.d.ts.map +1 -1
- package/dist/tools/builtins/write-file.js +75 -27
- package/dist/tools/builtins/write-file.js.map +1 -1
- package/dist/tools/coordinator/__tests__/ask-user-question.test.js +55 -0
- package/dist/tools/coordinator/__tests__/ask-user-question.test.js.map +1 -1
- package/dist/tools/coordinator/__tests__/plan-dependencies.test.d.ts +2 -0
- package/dist/tools/coordinator/__tests__/plan-dependencies.test.d.ts.map +1 -0
- package/dist/tools/coordinator/__tests__/plan-dependencies.test.js +126 -0
- package/dist/tools/coordinator/__tests__/plan-dependencies.test.js.map +1 -0
- package/dist/tools/coordinator/index.d.ts.map +1 -1
- package/dist/tools/coordinator/index.js +75 -5
- package/dist/tools/coordinator/index.js.map +1 -1
- package/dist/tools/coordinator/plan-dependencies.d.ts +43 -0
- package/dist/tools/coordinator/plan-dependencies.d.ts.map +1 -0
- package/dist/tools/coordinator/plan-dependencies.js +148 -0
- package/dist/tools/coordinator/plan-dependencies.js.map +1 -0
- package/dist/types/agent/supervisor.d.ts +15 -0
- package/dist/types/agent/supervisor.d.ts.map +1 -1
- package/dist/types/connector/core.d.ts +34 -0
- package/dist/types/connector/core.d.ts.map +1 -1
- package/dist/types/connector/definition.d.ts +10 -0
- package/dist/types/connector/definition.d.ts.map +1 -1
- package/dist/types/connector/mcp.d.ts +13 -0
- package/dist/types/connector/mcp.d.ts.map +1 -1
- package/dist/types/rag/retrieval.d.ts +16 -0
- package/dist/types/rag/retrieval.d.ts.map +1 -1
- package/dist/types/rag/storage.d.ts +9 -0
- package/dist/types/rag/storage.d.ts.map +1 -1
- package/dist/types/rag/vector.d.ts +11 -0
- package/dist/types/rag/vector.d.ts.map +1 -1
- package/dist/types/router/task-router.d.ts +19 -0
- package/dist/types/router/task-router.d.ts.map +1 -1
- package/dist/types/run/prepare-step.d.ts +56 -3
- package/dist/types/run/prepare-step.d.ts.map +1 -1
- package/dist/types/tool/index.d.ts +17 -1
- package/dist/types/tool/index.d.ts.map +1 -1
- package/dist/types/tool/index.js.map +1 -1
- package/dist/types/toolset/index.d.ts +22 -0
- package/dist/types/toolset/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/advisory/__tests__/consultation-context.test.ts +191 -0
- package/src/advisory/context.ts +32 -0
- package/src/advisory/executor.ts +30 -3
- package/src/compaction/__tests__/context-reducer.test.ts +239 -0
- package/src/compaction/factory.ts +7 -0
- package/src/compaction/index.ts +8 -0
- package/src/compaction/interface.ts +13 -0
- package/src/compaction/managers/null.ts +3 -0
- package/src/compaction/managers/slidingWindow.ts +6 -0
- package/src/compaction/managers/structured.ts +10 -0
- package/src/compaction/reducer.ts +154 -0
- package/src/connector/builtins/__tests__/oauth2-auth.test.ts +73 -0
- package/src/connector/builtins/http.test.ts +28 -2
- package/src/connector/builtins/http.ts +26 -2
- package/src/connector/index.ts +6 -2
- package/src/connector/mcp/__tests__/prompts-and-lifecycle.test.ts +286 -0
- package/src/connector/mcp/client.ts +95 -0
- package/src/connector/mcp/discovery.ts +19 -4
- package/src/connector/mcp/index.ts +6 -2
- package/src/connector/mcp/server.ts +101 -3
- package/src/manager/agent/__tests__/depth-limit-authority.test.ts +74 -0
- package/src/plugin/__tests__/discovery-scopes.test.ts +133 -0
- package/src/plugin/__tests__/enable-contributions.test.ts +5 -1
- package/src/plugin/__tests__/mcp-admission.test.ts +242 -0
- package/src/plugin/lifecycle.ts +57 -1
- package/src/plugin/loader.ts +57 -3
- package/src/public-runtime.ts +16 -1
- package/src/public-types.ts +5 -0
- package/src/rag/__tests__/namespace-isolation.test.ts +109 -0
- package/src/rag/ingestion.ts +1 -0
- package/src/rag/retriever.ts +2 -0
- package/src/rag/vector-store.ts +5 -0
- package/src/registry/tool/execute.ts +123 -119
- package/src/runtime/query/__tests__/capability-negotiation.test.ts +69 -0
- package/src/runtime/query/__tests__/per-step-skills.test.ts +154 -0
- package/src/runtime/query/__tests__/per-step-tool-choice.test.ts +180 -0
- package/src/runtime/query/__tests__/resume-run.test.ts +262 -0
- package/src/runtime/query/executor.ts +9 -1
- package/src/runtime/query/index.ts +39 -0
- package/src/runtime/query/iteration/index.ts +130 -34
- package/src/runtime/query/iteration/phases/compaction-model-routing.test.ts +125 -0
- package/src/runtime/query/iteration/phases/compaction.ts +106 -5
- package/src/runtime/query/iteration/phases/context-reducer-dispatch.test.ts +238 -0
- package/src/runtime/query/iteration/phases/context.ts +11 -0
- package/src/runtime/query/resume-run.ts +93 -0
- package/src/telemetry/__tests__/model-call-span.test.ts +189 -0
- package/src/telemetry/__tests__/span-closure.test.ts +153 -0
- package/src/tools/advisory/index.ts +1 -1
- package/src/tools/builtins/__tests__/edit-commits-atomically.test.ts +103 -0
- package/src/tools/builtins/__tests__/edit.test.ts +324 -1
- package/src/tools/builtins/__tests__/stale-file-refusal.test.ts +258 -0
- package/src/tools/builtins/atomic-write-file.ts +30 -2
- package/src/tools/builtins/content-fingerprint.ts +33 -0
- package/src/tools/builtins/edit.ts +188 -36
- package/src/tools/builtins/read-file.ts +5 -2
- package/src/tools/builtins/write-file.ts +79 -28
- package/src/tools/coordinator/__tests__/ask-user-question.test.ts +68 -0
- package/src/tools/coordinator/__tests__/plan-dependencies.test.ts +186 -0
- package/src/tools/coordinator/index.ts +116 -42
- package/src/tools/coordinator/plan-dependencies.ts +175 -0
- package/src/types/agent/supervisor.ts +15 -0
- package/src/types/connector/core.ts +34 -0
- package/src/types/connector/definition.ts +10 -0
- package/src/types/connector/mcp.ts +14 -0
- package/src/types/rag/retrieval.ts +16 -0
- package/src/types/rag/storage.ts +9 -0
- package/src/types/rag/vector.ts +11 -0
- package/src/types/router/task-router.ts +19 -0
- package/src/types/run/prepare-step.ts +58 -3
- package/src/types/tool/index.ts +17 -1
- package/src/types/toolset/index.ts +22 -0
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
/**
|
|
4
|
+
* A span that never ends is a trace that never closes, and the export is
|
|
5
|
+
* incomplete for exactly the run that failed.
|
|
6
|
+
*
|
|
7
|
+
* Both sites had the same shape: an `end()` call at every exit the author
|
|
8
|
+
* could see. The iteration loop had seventeen of them and the tool executor
|
|
9
|
+
* three plus a `finally` that opened below them. That is a rule every future
|
|
10
|
+
* edit has to remember, and it was already broken — anything throwing between
|
|
11
|
+
* the span's creation and the `try` left it open, and a generator abandoned
|
|
12
|
+
* by its consumer reached no exit at all.
|
|
13
|
+
*/
|
|
14
|
+
const ended = [];
|
|
15
|
+
const started = [];
|
|
16
|
+
function fakeSpan(name) {
|
|
17
|
+
return {
|
|
18
|
+
setAttributes: () => undefined,
|
|
19
|
+
setAttribute: () => undefined,
|
|
20
|
+
setStatus: () => undefined,
|
|
21
|
+
recordException: () => undefined,
|
|
22
|
+
addEvent: () => undefined,
|
|
23
|
+
end: () => ended.push(name),
|
|
24
|
+
spanContext: () => ({ traceId: 't', spanId: 's', traceFlags: 1 }),
|
|
25
|
+
isRecording: () => true,
|
|
26
|
+
updateName: () => undefined,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
vi.mock('../runtime-accessors.js', () => ({
|
|
30
|
+
getTracer: () => ({
|
|
31
|
+
startSpan: (name) => {
|
|
32
|
+
started.push(name);
|
|
33
|
+
return fakeSpan(name);
|
|
34
|
+
},
|
|
35
|
+
startActiveSpan: (name, _opts, _ctx, fn) => {
|
|
36
|
+
started.push(name);
|
|
37
|
+
return fn(fakeSpan(name));
|
|
38
|
+
},
|
|
39
|
+
}),
|
|
40
|
+
getMeter: () => ({
|
|
41
|
+
createCounter: () => ({ add: () => undefined }),
|
|
42
|
+
createHistogram: () => ({ record: () => undefined }),
|
|
43
|
+
}),
|
|
44
|
+
}));
|
|
45
|
+
function toolContext() {
|
|
46
|
+
return {
|
|
47
|
+
runId: 'run_span',
|
|
48
|
+
workingDirectory: '.',
|
|
49
|
+
abortSignal: new AbortController().signal,
|
|
50
|
+
env: {},
|
|
51
|
+
log: () => undefined,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
beforeEach(() => {
|
|
55
|
+
started.length = 0;
|
|
56
|
+
ended.length = 0;
|
|
57
|
+
});
|
|
58
|
+
afterEach(() => {
|
|
59
|
+
vi.clearAllMocks();
|
|
60
|
+
});
|
|
61
|
+
describe('a tool span closes however the call leaves', () => {
|
|
62
|
+
it('closes on the ordinary path', async () => {
|
|
63
|
+
const { ToolRegistry } = await import('../../registry/tool/execute.js');
|
|
64
|
+
const tools = new ToolRegistry();
|
|
65
|
+
tools.register({
|
|
66
|
+
name: 'echo',
|
|
67
|
+
description: 'echo',
|
|
68
|
+
inputSchema: z.object({}),
|
|
69
|
+
execute: async () => ({ success: true, output: 'ok' }),
|
|
70
|
+
});
|
|
71
|
+
await tools.execute('echo', {}, toolContext());
|
|
72
|
+
expect(started).toHaveLength(1);
|
|
73
|
+
expect(ended).toEqual(started);
|
|
74
|
+
});
|
|
75
|
+
it('closes when the tool throws', async () => {
|
|
76
|
+
const { ToolRegistry } = await import('../../registry/tool/execute.js');
|
|
77
|
+
const tools = new ToolRegistry();
|
|
78
|
+
tools.register({
|
|
79
|
+
name: 'boom',
|
|
80
|
+
description: 'boom',
|
|
81
|
+
inputSchema: z.object({}),
|
|
82
|
+
execute: async () => {
|
|
83
|
+
throw new Error('kaboom');
|
|
84
|
+
},
|
|
85
|
+
});
|
|
86
|
+
await tools.execute('boom', {}, toolContext());
|
|
87
|
+
expect(ended).toEqual(started);
|
|
88
|
+
});
|
|
89
|
+
it('closes when input validation refuses the call', async () => {
|
|
90
|
+
const { ToolRegistry } = await import('../../registry/tool/execute.js');
|
|
91
|
+
const tools = new ToolRegistry();
|
|
92
|
+
tools.register({
|
|
93
|
+
name: 'strict',
|
|
94
|
+
description: 'strict',
|
|
95
|
+
inputSchema: z.object({ required: z.string() }),
|
|
96
|
+
execute: async () => ({ success: true, output: 'ok' }),
|
|
97
|
+
});
|
|
98
|
+
await tools.execute('strict', { wrong: 1 }, toolContext());
|
|
99
|
+
expect(ended).toEqual(started);
|
|
100
|
+
});
|
|
101
|
+
it('closes when the tool is not active', async () => {
|
|
102
|
+
const { ToolRegistry } = await import('../../registry/tool/execute.js');
|
|
103
|
+
const tools = new ToolRegistry();
|
|
104
|
+
tools.register({
|
|
105
|
+
name: 'later',
|
|
106
|
+
description: 'later',
|
|
107
|
+
inputSchema: z.object({}),
|
|
108
|
+
execute: async () => ({ success: true, output: 'ok' }),
|
|
109
|
+
}, 'deferred');
|
|
110
|
+
await tools.execute('later', {}, toolContext());
|
|
111
|
+
expect(ended).toEqual(started);
|
|
112
|
+
});
|
|
113
|
+
it('closes when the registry does not hold the name at all', async () => {
|
|
114
|
+
const { ToolRegistry } = await import('../../registry/tool/execute.js');
|
|
115
|
+
const tools = new ToolRegistry();
|
|
116
|
+
// `getOrThrow` sat OUTSIDE the try that owned the finally, so this
|
|
117
|
+
// path — the one where the model invents a tool name — opened a span
|
|
118
|
+
// and never closed it.
|
|
119
|
+
await expect(tools.execute('nonexistent', {}, toolContext())).rejects.toThrow();
|
|
120
|
+
expect(started).toHaveLength(1);
|
|
121
|
+
expect(ended).toEqual(started);
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
//# sourceMappingURL=span-closure.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"span-closure.test.js","sourceRoot":"","sources":["../../../src/telemetry/__tests__/span-closure.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ export function buildAdvisoryTools(opts) {
|
|
|
83
83
|
error: 'Advisor resolution failed',
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
-
const executionResult = await advisoryCtx.executor.consult(advisor, { advisorId: advisor.id, question, domain, urgency, includeContext: include_context },
|
|
86
|
+
const executionResult = await advisoryCtx.executor.consult(advisor, { advisorId: advisor.id, question, domain, urgency, includeContext: include_context }, advisoryCtx.callContext());
|
|
87
87
|
advisoryCtx.recordCall({
|
|
88
88
|
advisorId: advisor.id,
|
|
89
89
|
request: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/advisory/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/advisory/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edit-commits-atomically.test.d.ts","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/edit-commits-atomically.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { tmpdir } from 'node:os';
|
|
3
|
+
import { join, resolve } from 'node:path';
|
|
4
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
5
|
+
/**
|
|
6
|
+
* That the atomic writer works is tested next door. This tests the thing
|
|
7
|
+
* that actually regressed: whether the TOOL goes through it.
|
|
8
|
+
*
|
|
9
|
+
* `edit` and `write` were reverted to a bare `writeFile`, and the existing
|
|
10
|
+
* atomicity test kept passing because it called `atomicWriteFile` directly —
|
|
11
|
+
* proving the module, never the caller. A write that fails partway then
|
|
12
|
+
* truncates the user's file, which is the one outcome `edit` exists to
|
|
13
|
+
* avoid.
|
|
14
|
+
*/
|
|
15
|
+
const atomicWriteFile = vi.fn(async () => { });
|
|
16
|
+
vi.mock('../atomic-write-file.js', () => ({ atomicWriteFile }));
|
|
17
|
+
function makeContext(workingDirectory) {
|
|
18
|
+
return {
|
|
19
|
+
runId: 'run_atomic',
|
|
20
|
+
workingDirectory,
|
|
21
|
+
abortSignal: new AbortController().signal,
|
|
22
|
+
env: {},
|
|
23
|
+
log: () => { },
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
describe('the file-mutating tools commit through the atomic writer', () => {
|
|
27
|
+
it('edit routes its local write through it', async () => {
|
|
28
|
+
const { EditTool } = await import('../edit.js');
|
|
29
|
+
atomicWriteFile.mockClear();
|
|
30
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-atomic-tool-'));
|
|
31
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\nbeta\n');
|
|
32
|
+
const result = await EditTool.execute({ path: 'doc.md', old_string: 'beta', new_string: 'gamma', replace_all: false }, makeContext(dir));
|
|
33
|
+
expect(result.success).toBe(true);
|
|
34
|
+
expect(atomicWriteFile).toHaveBeenCalledTimes(1);
|
|
35
|
+
expect(atomicWriteFile).toHaveBeenCalledWith(resolve(dir, 'doc.md'), 'alpha\ngamma\n');
|
|
36
|
+
// The mock swallowed the write, so the file is untouched — which is
|
|
37
|
+
// itself the proof that nothing else wrote it.
|
|
38
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\nbeta\n');
|
|
39
|
+
});
|
|
40
|
+
it('write routes its local write through it', async () => {
|
|
41
|
+
const { WriteFileTool } = await import('../write-file.js');
|
|
42
|
+
atomicWriteFile.mockClear();
|
|
43
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-atomic-tool-'));
|
|
44
|
+
const result = await WriteFileTool.execute({ path: 'out.md', content: 'a complete body' }, makeContext(dir));
|
|
45
|
+
expect(result.success).toBe(true);
|
|
46
|
+
expect(atomicWriteFile).toHaveBeenCalledTimes(1);
|
|
47
|
+
expect(atomicWriteFile).toHaveBeenCalledWith(resolve(dir, 'out.md'), 'a complete body');
|
|
48
|
+
});
|
|
49
|
+
it('edit does not use it for a sandboxed write, which the sandbox owns', async () => {
|
|
50
|
+
const { EditTool } = await import('../edit.js');
|
|
51
|
+
atomicWriteFile.mockClear();
|
|
52
|
+
let body = 'alpha\nbeta\n';
|
|
53
|
+
const sandbox = {
|
|
54
|
+
id: 'sbx',
|
|
55
|
+
status: 'ready',
|
|
56
|
+
rootDir: '/workspace',
|
|
57
|
+
environment: 'basic',
|
|
58
|
+
async readFile() {
|
|
59
|
+
return Buffer.from(body);
|
|
60
|
+
},
|
|
61
|
+
async writeFile(_path, content) {
|
|
62
|
+
body = content.toString();
|
|
63
|
+
},
|
|
64
|
+
async exec() {
|
|
65
|
+
throw new Error('not used');
|
|
66
|
+
},
|
|
67
|
+
async listFiles() {
|
|
68
|
+
return [];
|
|
69
|
+
},
|
|
70
|
+
async destroy() { },
|
|
71
|
+
};
|
|
72
|
+
const result = await EditTool.execute({ path: 'doc.md', old_string: 'beta', new_string: 'gamma', replace_all: false }, { ...makeContext('/workspace'), sandbox });
|
|
73
|
+
expect(result.success).toBe(true);
|
|
74
|
+
expect(body).toBe('alpha\ngamma\n');
|
|
75
|
+
expect(atomicWriteFile).not.toHaveBeenCalled();
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=edit-commits-atomically.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edit-commits-atomically.test.js","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/edit-commits-atomically.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +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 { ToolRegistry } from '../../../registry/tool/execute.js';
|
|
6
|
+
import { atomicWriteFile } from '../atomic-write-file.js';
|
|
5
7
|
import { EditTool } from '../edit.js';
|
|
6
8
|
function makeContext(workingDirectory) {
|
|
7
9
|
return {
|
|
@@ -13,6 +15,245 @@ function makeContext(workingDirectory) {
|
|
|
13
15
|
};
|
|
14
16
|
}
|
|
15
17
|
describe('EditTool', () => {
|
|
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
|
+
// The MODEL schema above is the closed canonical one. The HOST schema
|
|
50
|
+
// is wider on purpose — aliases and line insertion are declared — and
|
|
51
|
+
// the point of `.strict()` is that wider still is not open.
|
|
52
|
+
for (const supported of [
|
|
53
|
+
{ path: 'doc.md', oldStr: 'old', newStr: 'new' },
|
|
54
|
+
{ path: 'doc.md', insertLine: 'end', new_string: 'append' },
|
|
55
|
+
{ path: 'doc.md', old_string: 'old', new_string: 'new', newStr: 'legacy' },
|
|
56
|
+
]) {
|
|
57
|
+
expect(EditTool.inputSchema.safeParse(supported).success, JSON.stringify(supported)).toBe(true);
|
|
58
|
+
}
|
|
59
|
+
for (const unknown of [
|
|
60
|
+
{ path: 'doc.md', old_str: 'old', new_string: 'new' },
|
|
61
|
+
{ path: 'doc.md', old_string: 'old', new_string: 'new', replaceAll: true },
|
|
62
|
+
]) {
|
|
63
|
+
expect(EditTool.inputSchema.safeParse(unknown).success, JSON.stringify(unknown)).toBe(false);
|
|
64
|
+
}
|
|
65
|
+
expect(EditTool.inputSchema.safeParse({
|
|
66
|
+
path: ' ',
|
|
67
|
+
old_string: 'old',
|
|
68
|
+
new_string: 'new',
|
|
69
|
+
}).success).toBe(false);
|
|
70
|
+
});
|
|
71
|
+
it('replaces one exact unique string', async () => {
|
|
72
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
73
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\nbeta\n');
|
|
74
|
+
const result = await EditTool.execute({
|
|
75
|
+
path: 'doc.md',
|
|
76
|
+
old_string: 'beta',
|
|
77
|
+
new_string: 'gamma',
|
|
78
|
+
replace_all: false,
|
|
79
|
+
}, makeContext(dir));
|
|
80
|
+
expect(result.success).toBe(true);
|
|
81
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\ngamma\n');
|
|
82
|
+
});
|
|
83
|
+
it('validates a path without rewriting edge whitespace', async () => {
|
|
84
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
85
|
+
writeFileSync(join(dir, ' doc.md '), 'alpha\n');
|
|
86
|
+
const result = await EditTool.execute({
|
|
87
|
+
path: ' doc.md ',
|
|
88
|
+
old_string: 'alpha',
|
|
89
|
+
new_string: 'beta',
|
|
90
|
+
replace_all: false,
|
|
91
|
+
}, makeContext(dir));
|
|
92
|
+
expect(result.success).toBe(true);
|
|
93
|
+
expect(readFileSync(join(dir, ' doc.md '), 'utf-8')).toBe('beta\n');
|
|
94
|
+
expect(existsSync(join(dir, 'doc.md'))).toBe(false);
|
|
95
|
+
});
|
|
96
|
+
it('allows deletion with an empty new_string', async () => {
|
|
97
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
98
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\nremove me\nomega\n');
|
|
99
|
+
const result = await EditTool.execute({
|
|
100
|
+
path: 'doc.md',
|
|
101
|
+
old_string: 'remove me\n',
|
|
102
|
+
new_string: '',
|
|
103
|
+
replace_all: false,
|
|
104
|
+
}, makeContext(dir));
|
|
105
|
+
expect(result.success).toBe(true);
|
|
106
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\nomega\n');
|
|
107
|
+
});
|
|
108
|
+
it('replaces every exact occurrence only when replace_all is true', async () => {
|
|
109
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
110
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha alpha alpha');
|
|
111
|
+
const result = await EditTool.execute({
|
|
112
|
+
path: 'doc.md',
|
|
113
|
+
old_string: 'alpha',
|
|
114
|
+
new_string: 'beta',
|
|
115
|
+
replace_all: true,
|
|
116
|
+
}, makeContext(dir));
|
|
117
|
+
expect(result.success).toBe(true);
|
|
118
|
+
expect(result.data).toMatchObject({ replacements: 3 });
|
|
119
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('beta beta beta');
|
|
120
|
+
});
|
|
121
|
+
it('refuses ambiguous exact matches instead of guessing', async () => {
|
|
122
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
123
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\nalpha\n');
|
|
124
|
+
const result = await EditTool.execute({
|
|
125
|
+
path: 'doc.md',
|
|
126
|
+
old_string: 'alpha',
|
|
127
|
+
new_string: 'beta',
|
|
128
|
+
replace_all: false,
|
|
129
|
+
}, makeContext(dir));
|
|
130
|
+
expect(result.success).toBe(false);
|
|
131
|
+
expect(result.error).toContain('is not unique');
|
|
132
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\nalpha\n');
|
|
133
|
+
});
|
|
134
|
+
it('normalizes consistent CRLF/LF boundaries without fuzzy matching', async () => {
|
|
135
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
136
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\r\nbeta\r\nomega\r\n');
|
|
137
|
+
const result = await EditTool.execute({
|
|
138
|
+
path: 'doc.md',
|
|
139
|
+
old_string: 'alpha\nbeta',
|
|
140
|
+
new_string: 'gamma\ndelta',
|
|
141
|
+
replace_all: false,
|
|
142
|
+
}, makeContext(dir));
|
|
143
|
+
expect(result.success).toBe(true);
|
|
144
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('gamma\r\ndelta\r\nomega\r\n');
|
|
145
|
+
});
|
|
146
|
+
it('rejects a field it does not accept, even when execute is called directly', async () => {
|
|
147
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
148
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\n');
|
|
149
|
+
// Without `.strict()` zod STRIPS an unrecognised key, so each of these
|
|
150
|
+
// would run as if the caller had never written it — a misspelling
|
|
151
|
+
// becomes a silent no-op rather than an error anyone can act on.
|
|
152
|
+
for (const input of [
|
|
153
|
+
{ path: 'doc.md', old_str: 'alpha', new_string: 'beta' },
|
|
154
|
+
{ path: 'doc.md', old_string: 'alpha', new_string: 'beta', overwrite: true },
|
|
155
|
+
{ path: 'doc.md', old_string: 'alpha', new_string: 'beta', replaceAll: true },
|
|
156
|
+
]) {
|
|
157
|
+
const result = await EditTool.execute(input, makeContext(dir));
|
|
158
|
+
expect(result.success, JSON.stringify(input)).toBe(false);
|
|
159
|
+
expect(result.error).toContain('Invalid edit input');
|
|
160
|
+
}
|
|
161
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('alpha\n');
|
|
162
|
+
});
|
|
163
|
+
it('accepts the host aliases the schema does declare', async () => {
|
|
164
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
165
|
+
writeFileSync(join(dir, 'doc.md'), 'alpha\n');
|
|
166
|
+
// The contract is closed, not narrow. `oldStr`/`newStr` and
|
|
167
|
+
// `insertLine` are in the schema for hosts that speak those names, so
|
|
168
|
+
// strictness must reject the unknown without rejecting these.
|
|
169
|
+
const result = await EditTool.execute({ path: 'doc.md', oldStr: 'alpha', newStr: 'beta' }, makeContext(dir));
|
|
170
|
+
expect(result.success).toBe(true);
|
|
171
|
+
expect(readFileSync(join(dir, 'doc.md'), 'utf-8')).toBe('beta\n');
|
|
172
|
+
});
|
|
173
|
+
it('returns one canonical recovery shape after registry validation fails', async () => {
|
|
174
|
+
const registry = new ToolRegistry();
|
|
175
|
+
registry.register(EditTool);
|
|
176
|
+
const result = await registry.execute('edit', { insertLine: '"end"', newStr: 'content' }, makeContext('/tmp'));
|
|
177
|
+
expect(result.success).toBe(false);
|
|
178
|
+
expect(result.error).toContain('Validation failed for "edit":');
|
|
179
|
+
expect(result.error).toContain('Required: path: string');
|
|
180
|
+
expect(result.error).toContain('{"path":"file.md","old_string":"exact unique text","new_string":"replacement text"}');
|
|
181
|
+
expect(result.error).not.toContain('Accepted shapes');
|
|
182
|
+
});
|
|
183
|
+
it('serializes independent EditTool read-modify-write cycles for one sandbox path', async () => {
|
|
184
|
+
let body = Buffer.from('alpha');
|
|
185
|
+
let reads = 0;
|
|
186
|
+
let writes = 0;
|
|
187
|
+
let releaseFirstWrite = () => { };
|
|
188
|
+
let markFirstWriteStarted = () => { };
|
|
189
|
+
const firstWriteStarted = new Promise((resolve) => {
|
|
190
|
+
markFirstWriteStarted = resolve;
|
|
191
|
+
});
|
|
192
|
+
const firstWriteGate = new Promise((resolve) => {
|
|
193
|
+
releaseFirstWrite = resolve;
|
|
194
|
+
});
|
|
195
|
+
const sandbox = {
|
|
196
|
+
id: 'sbx_edit_lock',
|
|
197
|
+
status: 'ready',
|
|
198
|
+
rootDir: '/workspace',
|
|
199
|
+
environment: 'basic',
|
|
200
|
+
async readFile() {
|
|
201
|
+
reads += 1;
|
|
202
|
+
return Buffer.from(body);
|
|
203
|
+
},
|
|
204
|
+
async writeFile(_path, content) {
|
|
205
|
+
writes += 1;
|
|
206
|
+
if (writes === 1) {
|
|
207
|
+
markFirstWriteStarted();
|
|
208
|
+
await firstWriteGate;
|
|
209
|
+
}
|
|
210
|
+
body = Buffer.isBuffer(content) ? Buffer.from(content) : Buffer.from(content);
|
|
211
|
+
},
|
|
212
|
+
async exec() {
|
|
213
|
+
throw new Error('not used');
|
|
214
|
+
},
|
|
215
|
+
async listFiles() {
|
|
216
|
+
return [];
|
|
217
|
+
},
|
|
218
|
+
async destroy() { },
|
|
219
|
+
};
|
|
220
|
+
const firstContext = { ...makeContext('/workspace'), sandbox };
|
|
221
|
+
const secondContext = { ...makeContext('/workspace'), sandbox };
|
|
222
|
+
const first = EditTool.execute({
|
|
223
|
+
path: 'doc.md',
|
|
224
|
+
old_string: 'alpha',
|
|
225
|
+
new_string: 'beta',
|
|
226
|
+
replace_all: false,
|
|
227
|
+
}, firstContext);
|
|
228
|
+
await firstWriteStarted;
|
|
229
|
+
const second = EditTool.execute({
|
|
230
|
+
path: 'doc.md',
|
|
231
|
+
old_string: 'beta',
|
|
232
|
+
new_string: 'gamma',
|
|
233
|
+
replace_all: false,
|
|
234
|
+
}, secondContext);
|
|
235
|
+
await Promise.resolve();
|
|
236
|
+
expect(reads).toBe(1);
|
|
237
|
+
releaseFirstWrite();
|
|
238
|
+
const results = await Promise.all([first, second]);
|
|
239
|
+
expect(results.every((result) => result.success)).toBe(true);
|
|
240
|
+
expect(reads).toBe(2);
|
|
241
|
+
expect(writes).toBe(2);
|
|
242
|
+
expect(body.toString('utf-8')).toBe('gamma');
|
|
243
|
+
});
|
|
244
|
+
it('leaves the original intact when an atomic local write fails before commit', async () => {
|
|
245
|
+
const dir = mkdtempSync(join(tmpdir(), 'namzu-atomic-write-'));
|
|
246
|
+
const filePath = join(dir, 'doc.md');
|
|
247
|
+
writeFileSync(filePath, 'original');
|
|
248
|
+
await expect(atomicWriteFile(filePath, 'replacement', {
|
|
249
|
+
beforeCommit: async () => {
|
|
250
|
+
throw new Error('injected pre-commit failure');
|
|
251
|
+
},
|
|
252
|
+
})).rejects.toThrow('injected pre-commit failure');
|
|
253
|
+
expect(readFileSync(filePath, 'utf-8')).toBe('original');
|
|
254
|
+
expect(readdirSync(dir).filter((entry) => entry.includes('.namzu-'))).toEqual([]);
|
|
255
|
+
});
|
|
256
|
+
// ── the alias + insertion surface this build adds on top ──────────
|
|
16
257
|
it('accepts oldStr/newStr aliases for string replacement', async () => {
|
|
17
258
|
const dir = mkdtempSync(join(tmpdir(), 'namzu-edit-'));
|
|
18
259
|
writeFileSync(join(dir, 'doc.md'), 'alpha\nbeta\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.test.js","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/edit.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"edit.test.js","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/edit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC3F,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,SAAS,WAAW,CAAC,gBAAwB;IAC5C,OAAO;QACN,KAAK,EAAE,UAAkC;QACzC,gBAAgB;QAChB,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC,MAAM;QACzC,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;KACb,CAAA;AACF,CAAC;AAED,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CAAA;QACxC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACtB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACX,IAAI,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,8CAA8C;iBAC3D;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,QAAQ;oBACd,WAAW,EACV,6FAA6F;iBAC9F;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,QAAQ;oBACd,WAAW,EACV,yFAAyF;iBAC1F;gBACD,WAAW,EAAE;oBACZ,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,iEAAiE;iBAC9E;aACD;YACD,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC;YAC9C,oBAAoB,EAAE,KAAK;SAC3B,CAAC,CAAA;QAEF,MAAM,CACL,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC;YAC9B,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;YACjB,WAAW,EAAE,IAAI;SACjB,CAAC,CAAC,OAAO,CACV,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEZ,sEAAsE;QACtE,sEAAsE;QACtE,4DAA4D;QAC5D,KAAK,MAAM,SAAS,IAAI;YACvB,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;YAChD,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE;YAC3D,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE;SAC1E,EAAE,CAAC;YACH,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACxF,IAAI,CACJ,CAAA;QACF,CAAC;QAED,KAAK,MAAM,OAAO,IAAI;YACrB,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;YACrD,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;SAC1E,EAAE,CAAC;YACH,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7F,CAAC;QACD,MAAM,CACL,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC;YAC9B,IAAI,EAAE,KAAK;YACX,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC,OAAO,CACV,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACd,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,OAAO;YACnB,WAAW,EAAE,KAAK;SAClB,EACD,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,SAAS,CAAC,CAAA;QAE/C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC;YACC,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,OAAO;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,KAAK;SAClB,EACD,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,2BAA2B,CAAC,CAAA;QAE/D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,KAAK;SAClB,EACD,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,mBAAmB,CAAC,CAAA;QAEvD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,OAAO;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,IAAI;SACjB,EACD,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAA;QAEpD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,OAAO;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,KAAK;SAClB,EACD,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QAC/C,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,4BAA4B,CAAC,CAAA;QAEhE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,cAAc;YAC1B,WAAW,EAAE,KAAK;SAClB,EACD,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;IACvF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAA;QAE7C,uEAAuE;QACvE,kEAAkE;QAClE,iEAAiE;QACjE,KAAK,MAAM,KAAK,IAAI;YACnB,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE;YACxD,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;YAC5E,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE;SAC7E,EAAE,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,KAAc,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;YACvE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACzD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;QACrD,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACnE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAA;QAE7C,4DAA4D;QAC5D,sEAAsE;QACtE,8DAA8D;QAC9D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,EAC5D,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAClE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACrF,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAA;QACnC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAE3B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC,MAAM,EACN,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,EAC1C,WAAW,CAAC,MAAM,CAAC,CACnB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,+BAA+B,CAAC,CAAA;QAC/D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAA;QACxD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAC7B,qFAAqF,CACrF,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC9F,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/B,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,IAAI,iBAAiB,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;QAChC,IAAI,qBAAqB,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;QACpC,MAAM,iBAAiB,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACvD,qBAAqB,GAAG,OAAO,CAAA;QAChC,CAAC,CAAC,CAAA;QACF,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACpD,iBAAiB,GAAG,OAAO,CAAA;QAC5B,CAAC,CAAC,CAAA;QACF,MAAM,OAAO,GAAG;YACf,EAAE,EAAE,eAAe;YACnB,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,YAAY;YACrB,WAAW,EAAE,OAAO;YACpB,KAAK,CAAC,QAAQ;gBACb,KAAK,IAAI,CAAC,CAAA;gBACV,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzB,CAAC;YACD,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,OAAwB;gBACtD,MAAM,IAAI,CAAC,CAAA;gBACX,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;oBAClB,qBAAqB,EAAE,CAAA;oBACvB,MAAM,cAAc,CAAA;gBACrB,CAAC;gBACD,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC9E,CAAC;YACD,KAAK,CAAC,IAAI;gBACT,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;YAC5B,CAAC;YACD,KAAK,CAAC,SAAS;gBACd,OAAO,EAAE,CAAA;YACV,CAAC;YACD,KAAK,CAAC,OAAO,KAAI,CAAC;SACP,CAAA;QACZ,MAAM,YAAY,GAAG,EAAE,GAAG,WAAW,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAA;QAC9D,MAAM,aAAa,GAAG,EAAE,GAAG,WAAW,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,CAAA;QAE/D,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAC7B;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,OAAO;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,KAAK;SAClB,EACD,YAAY,CACZ,CAAA;QACD,MAAM,iBAAiB,CAAA;QACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAC9B;YACC,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,OAAO;YACnB,WAAW,EAAE,KAAK;SAClB,EACD,aAAa,CACb,CAAA;QACD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QACvB,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAErB,iBAAiB,EAAE,CAAA;QACnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;QAClD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5D,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QAC1F,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACpC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAEnC,MAAM,MAAM,CACX,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE;YACxC,YAAY,EAAE,KAAK,IAAI,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAC/C,CAAC;SACD,CAAC,CACF,CAAC,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;QAEhD,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACxD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAClF,CAAC,CAAC,CAAA;IAEF,qEAAqE;IAErE,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,EACvE,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,EACzE,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAA;QAE7C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CACpC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,EAC1E,WAAW,CAAC,GAAG,CAAC,CAChB,CAAA;QAED,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stale-file-refusal.test.d.ts","sourceRoot":"","sources":["../../../../src/tools/builtins/__tests__/stale-file-refusal.test.ts"],"names":[],"mappings":""}
|