@tachu/extensions 1.0.0-beta.1 → 1.0.0-rc.1
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 +48 -65
- package/README.md +83 -708
- package/README_ZH.md +82 -696
- package/dist/backends/file.d.ts +6 -6
- package/dist/backends/file.d.ts.map +1 -1
- package/dist/backends/file.js +27 -11
- package/dist/backends/file.js.map +1 -1
- package/dist/backends/terminal.d.ts +6 -6
- package/dist/backends/terminal.d.ts.map +1 -1
- package/dist/backends/terminal.js +31 -7
- package/dist/backends/terminal.js.map +1 -1
- package/dist/backends/web.d.ts +6 -6
- package/dist/backends/web.d.ts.map +1 -1
- package/dist/backends/web.js +10 -8
- package/dist/backends/web.js.map +1 -1
- package/dist/common/net.d.ts +8 -0
- package/dist/common/net.d.ts.map +1 -1
- package/dist/common/net.js +39 -24
- package/dist/common/net.js.map +1 -1
- package/dist/common/path.d.ts +38 -5
- package/dist/common/path.d.ts.map +1 -1
- package/dist/common/path.js +55 -13
- package/dist/common/path.js.map +1 -1
- package/dist/common/process.js.map +1 -1
- package/dist/index.d.ts +7 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -3
- package/dist/index.js.map +1 -1
- package/dist/mcp/sse-adapter.d.ts +45 -33
- package/dist/mcp/sse-adapter.d.ts.map +1 -1
- package/dist/mcp/sse-adapter.js +59 -34
- package/dist/mcp/sse-adapter.js.map +1 -1
- package/dist/mcp/stdio-adapter.d.ts +45 -33
- package/dist/mcp/stdio-adapter.d.ts.map +1 -1
- package/dist/mcp/stdio-adapter.js +59 -34
- package/dist/mcp/stdio-adapter.js.map +1 -1
- package/dist/memory/fs-memory-system.d.ts +288 -0
- package/dist/memory/fs-memory-system.d.ts.map +1 -0
- package/dist/memory/fs-memory-system.js +482 -0
- package/dist/memory/fs-memory-system.js.map +1 -0
- package/dist/memory/index.d.ts +5 -0
- package/dist/memory/index.d.ts.map +1 -0
- package/dist/memory/index.js +5 -0
- package/dist/memory/index.js.map +1 -0
- package/dist/memory/projection-outbox.d.ts +69 -0
- package/dist/memory/projection-outbox.d.ts.map +1 -0
- package/dist/memory/projection-outbox.js +187 -0
- package/dist/memory/projection-outbox.js.map +1 -0
- package/dist/memory/projection-projector.d.ts +16 -0
- package/dist/memory/projection-projector.d.ts.map +1 -0
- package/dist/memory/projection-projector.js +56 -0
- package/dist/memory/projection-projector.js.map +1 -0
- package/dist/memory/projection-worker.d.ts +28 -0
- package/dist/memory/projection-worker.d.ts.map +1 -0
- package/dist/memory/projection-worker.js +84 -0
- package/dist/memory/projection-worker.js.map +1 -0
- package/dist/observability/jsonl-emitter.d.ts +25 -25
- package/dist/observability/jsonl-emitter.d.ts.map +1 -1
- package/dist/observability/jsonl-emitter.js +25 -25
- package/dist/observability/jsonl-emitter.js.map +1 -1
- package/dist/observability/otel-emitter.d.ts +23 -23
- package/dist/observability/otel-emitter.d.ts.map +1 -1
- package/dist/observability/otel-emitter.js +39 -30
- package/dist/observability/otel-emitter.js.map +1 -1
- package/dist/providers/anthropic.d.ts +51 -32
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +293 -58
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/gemini.d.ts +115 -0
- package/dist/providers/gemini.d.ts.map +1 -0
- package/dist/providers/gemini.js +901 -0
- package/dist/providers/gemini.js.map +1 -0
- package/dist/providers/index.d.ts +2 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +2 -0
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/mock.d.ts +67 -24
- package/dist/providers/mock.d.ts.map +1 -1
- package/dist/providers/mock.js +122 -41
- package/dist/providers/mock.js.map +1 -1
- package/dist/providers/openai.d.ts +70 -35
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +330 -50
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/qwen.d.ts +146 -0
- package/dist/providers/qwen.d.ts.map +1 -0
- package/dist/providers/qwen.js +672 -0
- package/dist/providers/qwen.js.map +1 -0
- package/dist/safety/default-gate.d.ts +112 -0
- package/dist/safety/default-gate.d.ts.map +1 -0
- package/dist/safety/default-gate.js +188 -0
- package/dist/safety/default-gate.js.map +1 -0
- package/dist/safety/index.d.ts +2 -0
- package/dist/safety/index.d.ts.map +1 -0
- package/dist/safety/index.js +2 -0
- package/dist/safety/index.js.map +1 -0
- package/dist/tools/_shared/web-client.d.ts +18 -0
- package/dist/tools/_shared/web-client.d.ts.map +1 -0
- package/dist/tools/_shared/web-client.js +46 -0
- package/dist/tools/_shared/web-client.js.map +1 -0
- package/dist/tools/apply-patch/executor.d.ts.map +1 -1
- package/dist/tools/apply-patch/executor.js +54 -4
- package/dist/tools/apply-patch/executor.js.map +1 -1
- package/dist/tools/edit-file/executor.d.ts +32 -0
- package/dist/tools/edit-file/executor.d.ts.map +1 -0
- package/dist/tools/edit-file/executor.js +84 -0
- package/dist/tools/edit-file/executor.js.map +1 -0
- package/dist/tools/fetch-url/descriptor.md +6 -0
- package/dist/tools/fetch-url/executor.d.ts +8 -0
- package/dist/tools/fetch-url/executor.d.ts.map +1 -1
- package/dist/tools/fetch-url/executor.js +83 -2
- package/dist/tools/fetch-url/executor.js.map +1 -1
- package/dist/tools/git-blame/executor.d.ts +24 -0
- package/dist/tools/git-blame/executor.d.ts.map +1 -0
- package/dist/tools/git-blame/executor.js +76 -0
- package/dist/tools/git-blame/executor.js.map +1 -0
- package/dist/tools/git-branch/executor.d.ts +22 -0
- package/dist/tools/git-branch/executor.d.ts.map +1 -0
- package/dist/tools/git-branch/executor.js +81 -0
- package/dist/tools/git-branch/executor.js.map +1 -0
- package/dist/tools/git-diff/executor.d.ts +37 -0
- package/dist/tools/git-diff/executor.d.ts.map +1 -0
- package/dist/tools/git-diff/executor.js +156 -0
- package/dist/tools/git-diff/executor.js.map +1 -0
- package/dist/tools/git-log/executor.d.ts +31 -0
- package/dist/tools/git-log/executor.d.ts.map +1 -0
- package/dist/tools/git-log/executor.js +65 -0
- package/dist/tools/git-log/executor.js.map +1 -0
- package/dist/tools/git-show/executor.d.ts +22 -0
- package/dist/tools/git-show/executor.d.ts.map +1 -0
- package/dist/tools/git-show/executor.js +74 -0
- package/dist/tools/git-show/executor.js.map +1 -0
- package/dist/tools/git-status/executor.d.ts +25 -0
- package/dist/tools/git-status/executor.d.ts.map +1 -0
- package/dist/tools/git-status/executor.js +120 -0
- package/dist/tools/git-status/executor.js.map +1 -0
- package/dist/tools/glob/executor.d.ts +18 -0
- package/dist/tools/glob/executor.d.ts.map +1 -0
- package/dist/tools/glob/executor.js +47 -0
- package/dist/tools/glob/executor.js.map +1 -0
- package/dist/tools/index.d.ts +1 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +459 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/list-dir/executor.d.ts.map +1 -1
- package/dist/tools/list-dir/executor.js +5 -3
- package/dist/tools/list-dir/executor.js.map +1 -1
- package/dist/tools/multi-edit/executor.d.ts +29 -0
- package/dist/tools/multi-edit/executor.d.ts.map +1 -0
- package/dist/tools/multi-edit/executor.js +37 -0
- package/dist/tools/multi-edit/executor.js.map +1 -0
- package/dist/tools/read-file/executor.d.ts +5 -0
- package/dist/tools/read-file/executor.d.ts.map +1 -1
- package/dist/tools/read-file/executor.js +49 -5
- package/dist/tools/read-file/executor.js.map +1 -1
- package/dist/tools/run-shell/executor.d.ts +12 -1
- package/dist/tools/run-shell/executor.d.ts.map +1 -1
- package/dist/tools/run-shell/executor.js +105 -9
- package/dist/tools/run-shell/executor.js.map +1 -1
- package/dist/tools/run-tests/executor.d.ts +28 -0
- package/dist/tools/run-tests/executor.d.ts.map +1 -0
- package/dist/tools/run-tests/executor.js +161 -0
- package/dist/tools/run-tests/executor.js.map +1 -0
- package/dist/tools/run-typecheck/executor.d.ts +25 -0
- package/dist/tools/run-typecheck/executor.d.ts.map +1 -0
- package/dist/tools/run-typecheck/executor.js +83 -0
- package/dist/tools/run-typecheck/executor.js.map +1 -0
- package/dist/tools/search-code/executor.d.ts.map +1 -1
- package/dist/tools/search-code/executor.js +60 -30
- package/dist/tools/search-code/executor.js.map +1 -1
- package/dist/tools/shared.d.ts +26 -0
- package/dist/tools/shared.d.ts.map +1 -1
- package/dist/tools/shared.js +15 -0
- package/dist/tools/shared.js.map +1 -1
- package/dist/tools/todo-read/executor.d.ts +20 -0
- package/dist/tools/todo-read/executor.d.ts.map +1 -0
- package/dist/tools/todo-read/executor.js +26 -0
- package/dist/tools/todo-read/executor.js.map +1 -0
- package/dist/tools/todo-write/executor.d.ts +21 -0
- package/dist/tools/todo-write/executor.d.ts.map +1 -0
- package/dist/tools/todo-write/executor.js +38 -0
- package/dist/tools/todo-write/executor.js.map +1 -0
- package/dist/tools/web-fetch/descriptor.md +198 -0
- package/dist/tools/web-fetch/errors.d.ts +32 -0
- package/dist/tools/web-fetch/errors.d.ts.map +1 -0
- package/dist/tools/web-fetch/errors.js +91 -0
- package/dist/tools/web-fetch/errors.js.map +1 -0
- package/dist/tools/web-fetch/executor.d.ts +10 -0
- package/dist/tools/web-fetch/executor.d.ts.map +1 -0
- package/dist/tools/web-fetch/executor.js +191 -0
- package/dist/tools/web-fetch/executor.js.map +1 -0
- package/dist/tools/web-fetch/index.d.ts +4 -0
- package/dist/tools/web-fetch/index.d.ts.map +1 -0
- package/dist/tools/web-fetch/index.js +3 -0
- package/dist/tools/web-fetch/index.js.map +1 -0
- package/dist/tools/web-fetch/types.d.ts +157 -0
- package/dist/tools/web-fetch/types.d.ts.map +1 -0
- package/dist/tools/web-fetch/types.js +7 -0
- package/dist/tools/web-fetch/types.js.map +1 -0
- package/dist/tools/web-search/descriptor.md +89 -0
- package/dist/tools/web-search/errors.d.ts +33 -0
- package/dist/tools/web-search/errors.d.ts.map +1 -0
- package/dist/tools/web-search/errors.js +45 -0
- package/dist/tools/web-search/errors.js.map +1 -0
- package/dist/tools/web-search/executor.d.ts +10 -0
- package/dist/tools/web-search/executor.d.ts.map +1 -0
- package/dist/tools/web-search/executor.js +185 -0
- package/dist/tools/web-search/executor.js.map +1 -0
- package/dist/tools/web-search/index.d.ts +4 -0
- package/dist/tools/web-search/index.d.ts.map +1 -0
- package/dist/tools/web-search/index.js +3 -0
- package/dist/tools/web-search/index.js.map +1 -0
- package/dist/tools/web-search/types.d.ts +86 -0
- package/dist/tools/web-search/types.d.ts.map +1 -0
- package/dist/tools/web-search/types.js +7 -0
- package/dist/tools/web-search/types.js.map +1 -0
- package/dist/tools/write-file/executor.js +3 -3
- package/dist/tools/write-file/executor.js.map +1 -1
- package/dist/transformers/document-to-text.d.ts +11 -11
- package/dist/transformers/document-to-text.d.ts.map +1 -1
- package/dist/transformers/document-to-text.js +11 -11
- package/dist/transformers/document-to-text.js.map +1 -1
- package/dist/transformers/image-to-text.d.ts +15 -15
- package/dist/transformers/image-to-text.d.ts.map +1 -1
- package/dist/transformers/image-to-text.js +22 -21
- package/dist/transformers/image-to-text.js.map +1 -1
- package/dist/vector/index.d.ts +4 -2
- package/dist/vector/index.d.ts.map +1 -1
- package/dist/vector/index.js +2 -2
- package/dist/vector/index.js.map +1 -1
- package/dist/vector/local-fs-index.d.ts +59 -0
- package/dist/vector/local-fs-index.d.ts.map +1 -0
- package/dist/vector/local-fs-index.js +216 -0
- package/dist/vector/local-fs-index.js.map +1 -0
- package/dist/vector/qdrant.d.ts +11 -52
- package/dist/vector/qdrant.d.ts.map +1 -1
- package/dist/vector/qdrant.js +39 -105
- package/dist/vector/qdrant.js.map +1 -1
- package/package.json +27 -6
- package/dist/vector/local-fs.d.ts +0 -76
- package/dist/vector/local-fs.d.ts.map +0 -1
- package/dist/vector/local-fs.js +0 -153
- package/dist/vector/local-fs.js.map +0 -1
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { resolve, join } from "node:path";
|
|
2
|
+
import { readFile } from "node:fs/promises";
|
|
3
|
+
import { assertNotAborted, resolveSandboxPolicy } from "../shared";
|
|
4
|
+
import { resolveAllowedPath } from "../../common/path";
|
|
5
|
+
// Matches: file.ts(10,5): error TS2345: some message
|
|
6
|
+
const TSC_LINE_RE = /^(.+)\((\d+),(\d+)\):\s+(error|warning)\s+(TS\d+):\s+(.+)$/;
|
|
7
|
+
const parseTscOutput = (output, maxErrors) => {
|
|
8
|
+
const lines = output.split("\n");
|
|
9
|
+
const allErrors = [];
|
|
10
|
+
let parseSuccess = false;
|
|
11
|
+
for (const line of lines) {
|
|
12
|
+
const m = line.match(TSC_LINE_RE);
|
|
13
|
+
if (m) {
|
|
14
|
+
parseSuccess = true;
|
|
15
|
+
const severity = m[4];
|
|
16
|
+
allErrors.push({
|
|
17
|
+
file: m[1],
|
|
18
|
+
line: parseInt(m[2], 10),
|
|
19
|
+
col: parseInt(m[3], 10),
|
|
20
|
+
code: m[5],
|
|
21
|
+
message: m[6],
|
|
22
|
+
severity,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
// Sort: errors before warnings
|
|
27
|
+
allErrors.sort((a, b) => {
|
|
28
|
+
if (a.severity === b.severity)
|
|
29
|
+
return 0;
|
|
30
|
+
return a.severity === "error" ? -1 : 1;
|
|
31
|
+
});
|
|
32
|
+
const errorCount = allErrors.filter((e) => e.severity === "error").length;
|
|
33
|
+
const warningCount = allErrors.filter((e) => e.severity === "warning").length;
|
|
34
|
+
const truncated = allErrors.length > maxErrors;
|
|
35
|
+
const errors = truncated ? allErrors.slice(0, maxErrors) : allErrors;
|
|
36
|
+
const result = { errors, errorCount, warningCount, truncated };
|
|
37
|
+
if (!parseSuccess && output.trim().length > 0) {
|
|
38
|
+
result.rawOutput = output.slice(0, 4096);
|
|
39
|
+
}
|
|
40
|
+
return result;
|
|
41
|
+
};
|
|
42
|
+
const hasTypecheckScript = async (cwd) => {
|
|
43
|
+
try {
|
|
44
|
+
const pkgPath = join(cwd, "package.json");
|
|
45
|
+
const content = await readFile(pkgPath, "utf8");
|
|
46
|
+
const pkg = JSON.parse(content);
|
|
47
|
+
return typeof pkg.scripts?.typecheck === "string";
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
export const runTypecheckExecutor = async (input, context) => {
|
|
54
|
+
assertNotAborted(context.abortSignal);
|
|
55
|
+
const policy = resolveSandboxPolicy(context);
|
|
56
|
+
const cwd = input.cwd ? resolveAllowedPath(input.cwd, policy) : resolve(context.workspaceRoot);
|
|
57
|
+
const maxErrors = input.maxErrors ?? 50;
|
|
58
|
+
const usePackageScript = await hasTypecheckScript(cwd);
|
|
59
|
+
let cmd;
|
|
60
|
+
if (usePackageScript) {
|
|
61
|
+
cmd = [process.execPath, "run", "typecheck"];
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
cmd = [process.execPath, "x", "tsc", "--noEmit"];
|
|
65
|
+
if (input.tsconfig) {
|
|
66
|
+
cmd.push("--project", input.tsconfig);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
const proc = Bun.spawn({ cmd, cwd, stdout: "pipe", stderr: "pipe" });
|
|
70
|
+
const [stdout, stderr, exitCode] = await Promise.all([
|
|
71
|
+
new Response(proc.stdout).text(),
|
|
72
|
+
new Response(proc.stderr).text(),
|
|
73
|
+
proc.exited,
|
|
74
|
+
]);
|
|
75
|
+
assertNotAborted(context.abortSignal);
|
|
76
|
+
const combined = [stdout, stderr].filter((s) => s.trim().length > 0).join("\n");
|
|
77
|
+
const parsed = parseTscOutput(combined, maxErrors);
|
|
78
|
+
return {
|
|
79
|
+
passed: exitCode === 0,
|
|
80
|
+
...parsed,
|
|
81
|
+
};
|
|
82
|
+
};
|
|
83
|
+
//# sourceMappingURL=executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/run-typecheck/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/search-code/executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9C,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/search-code/executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9C,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;CACpB;AAmED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,eAAe,EAAE,gBAAgB,CAsF9E,CAAC"}
|
|
@@ -1,7 +1,39 @@
|
|
|
1
1
|
import { readdir, readFile } from "node:fs/promises";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
-
import { assertNotAborted } from "../shared";
|
|
4
|
-
import {
|
|
3
|
+
import { assertNotAborted, resolveSandboxPolicy } from "../shared";
|
|
4
|
+
import { resolveAllowedPath, toWorkspaceRelativePath } from "../../common/path";
|
|
5
|
+
const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
6
|
+
const isRegexSyntaxError = (stderr) => /(regex parse error|invalid regular expression|unclosed group|missing \))/i.test(stderr);
|
|
7
|
+
const runRgSearch = async (input, root, maxResults, useFixedStrings) => {
|
|
8
|
+
const args = [
|
|
9
|
+
"--line-number",
|
|
10
|
+
"--no-heading",
|
|
11
|
+
"--color",
|
|
12
|
+
"never",
|
|
13
|
+
input.caseSensitive ? "--case-sensitive" : "--ignore-case",
|
|
14
|
+
"--max-count",
|
|
15
|
+
String(maxResults),
|
|
16
|
+
];
|
|
17
|
+
if (useFixedStrings) {
|
|
18
|
+
args.push("--fixed-strings");
|
|
19
|
+
}
|
|
20
|
+
if (input.fileGlob) {
|
|
21
|
+
args.push("--glob", input.fileGlob);
|
|
22
|
+
}
|
|
23
|
+
args.push(input.pattern, root);
|
|
24
|
+
const process = Bun.spawn({
|
|
25
|
+
cmd: ["rg", ...args],
|
|
26
|
+
stdout: "pipe",
|
|
27
|
+
stderr: "pipe",
|
|
28
|
+
cwd: root,
|
|
29
|
+
});
|
|
30
|
+
const [stdout, stderr] = await Promise.all([
|
|
31
|
+
new Response(process.stdout).text(),
|
|
32
|
+
new Response(process.stderr).text(),
|
|
33
|
+
]);
|
|
34
|
+
const code = await process.exited;
|
|
35
|
+
return { code, stdout, stderr };
|
|
36
|
+
};
|
|
5
37
|
const parseRgOutput = (output, maxResults) => {
|
|
6
38
|
const matches = [];
|
|
7
39
|
const lines = output.split("\n").filter((line) => line.length > 0);
|
|
@@ -27,33 +59,15 @@ const parseRgOutput = (output, maxResults) => {
|
|
|
27
59
|
*/
|
|
28
60
|
export const searchCodeExecutor = async (input, context) => {
|
|
29
61
|
assertNotAborted(context.abortSignal);
|
|
30
|
-
const root =
|
|
62
|
+
const root = resolveAllowedPath(input.path ?? ".", resolveSandboxPolicy(context));
|
|
31
63
|
const maxResults = input.maxResults ?? 100;
|
|
32
64
|
try {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
input.caseSensitive ? "--case-sensitive" : "--ignore-case",
|
|
39
|
-
"--max-count",
|
|
40
|
-
String(maxResults),
|
|
41
|
-
];
|
|
42
|
-
if (input.fileGlob) {
|
|
43
|
-
args.push("--glob", input.fileGlob);
|
|
65
|
+
let { code, stdout, stderr } = await runRgSearch(input, root, maxResults, false);
|
|
66
|
+
if (code === 2 && isRegexSyntaxError(stderr)) {
|
|
67
|
+
// 常见场景:LLM 把字面量(如 JSON.stringify()当正则传入导致解析失败。
|
|
68
|
+
// 自动降级为 fixed-string 搜索,减少一次失败-重试往返。
|
|
69
|
+
({ code, stdout, stderr } = await runRgSearch(input, root, maxResults, true));
|
|
44
70
|
}
|
|
45
|
-
args.push(input.pattern, root);
|
|
46
|
-
const process = Bun.spawn({
|
|
47
|
-
cmd: ["rg", ...args],
|
|
48
|
-
stdout: "pipe",
|
|
49
|
-
stderr: "pipe",
|
|
50
|
-
cwd: root,
|
|
51
|
-
});
|
|
52
|
-
const [stdout, stderr] = await Promise.all([
|
|
53
|
-
new Response(process.stdout).text(),
|
|
54
|
-
new Response(process.stderr).text(),
|
|
55
|
-
]);
|
|
56
|
-
const code = await process.exited;
|
|
57
71
|
if (code !== 0 && code !== 1) {
|
|
58
72
|
throw new Error(stderr || `rg exited with code ${code}`);
|
|
59
73
|
}
|
|
@@ -67,12 +81,23 @@ export const searchCodeExecutor = async (input, context) => {
|
|
|
67
81
|
};
|
|
68
82
|
}
|
|
69
83
|
catch {
|
|
70
|
-
|
|
84
|
+
let matcher;
|
|
85
|
+
try {
|
|
86
|
+
matcher = new RegExp(input.pattern, input.caseSensitive ? "g" : "gi");
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
// JS 回退路径同样兼容非法正则:转义后按字面量匹配。
|
|
90
|
+
matcher = new RegExp(escapeRegExp(input.pattern), input.caseSensitive ? "g" : "gi");
|
|
91
|
+
}
|
|
71
92
|
const matches = [];
|
|
72
93
|
let truncated = false;
|
|
73
94
|
const walk = async (dir) => {
|
|
95
|
+
// :进入新目录前先检查取消,避免在大型仓库里无休止递归。
|
|
96
|
+
assertNotAborted(context.abortSignal);
|
|
74
97
|
const children = await readdir(dir, { withFileTypes: true });
|
|
75
98
|
for (const child of children) {
|
|
99
|
+
// 每个子条目都做一次取消检查,粒度足够细而开销极低。
|
|
100
|
+
assertNotAborted(context.abortSignal);
|
|
76
101
|
if (matches.length >= maxResults) {
|
|
77
102
|
truncated = true;
|
|
78
103
|
return;
|
|
@@ -90,11 +115,16 @@ export const searchCodeExecutor = async (input, context) => {
|
|
|
90
115
|
}
|
|
91
116
|
const content = await readFile(target, "utf8").catch(() => "");
|
|
92
117
|
const lines = content.split("\n");
|
|
93
|
-
lines.
|
|
118
|
+
for (let index = 0; index < lines.length; index += 1) {
|
|
119
|
+
// 大文件按行遍历时同样做细粒度取消检查。
|
|
120
|
+
if (index % 256 === 0) {
|
|
121
|
+
assertNotAborted(context.abortSignal);
|
|
122
|
+
}
|
|
94
123
|
if (matches.length >= maxResults) {
|
|
95
124
|
truncated = true;
|
|
96
|
-
|
|
125
|
+
break;
|
|
97
126
|
}
|
|
127
|
+
const line = lines[index] ?? "";
|
|
98
128
|
if (matcher.test(line)) {
|
|
99
129
|
matches.push({
|
|
100
130
|
file: toWorkspaceRelativePath(context.workspaceRoot, target),
|
|
@@ -103,7 +133,7 @@ export const searchCodeExecutor = async (input, context) => {
|
|
|
103
133
|
});
|
|
104
134
|
}
|
|
105
135
|
matcher.lastIndex = 0;
|
|
106
|
-
}
|
|
136
|
+
}
|
|
107
137
|
}
|
|
108
138
|
};
|
|
109
139
|
await walk(root);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/search-code/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/search-code/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/shared.d.ts
CHANGED
|
@@ -1,10 +1,26 @@
|
|
|
1
1
|
import type { Session } from "@tachu/core";
|
|
2
2
|
/**
|
|
3
3
|
* Tool 执行时上下文。
|
|
4
|
+
*
|
|
5
|
+
* 字段语义:
|
|
6
|
+
* - `workspaceRoot`:工作区根目录(绝对路径)。向后兼容保留,路径校验不再
|
|
7
|
+
* 直接依赖它,而是以 {@link allowedRoots} 为准。
|
|
8
|
+
* - `allowedRoots`:允许读写的根目录列表;由宿主在 engine-factory 层组装,
|
|
9
|
+
* 通常包含 `workspaceRoot`、平台临时目录(`os.tmpdir()`),以及用户通过
|
|
10
|
+
* `safety.allowedWriteRoots` 配置扩展的路径。长度 ≥ 1。
|
|
11
|
+
* - `sandboxWaived`:本次调用是否豁免沙箱(审批已通过)。见
|
|
12
|
+
* `@tachu/core` 的 `TaskNode.metadata.approvalGranted`:宿主在审批通过后
|
|
13
|
+
* 把它翻译成这里的布尔值。
|
|
14
|
+
* - `session`:当前会话引用。
|
|
15
|
+
*
|
|
16
|
+
* 兼容性:历史代码读 `workspaceRoot` 仍然可用;新代码请走 {@link resolveAllowedPath}
|
|
17
|
+
* + `allowedRoots` + `sandboxWaived` 三件套。
|
|
4
18
|
*/
|
|
5
19
|
export interface ToolExecutionContext {
|
|
6
20
|
abortSignal: AbortSignal;
|
|
7
21
|
workspaceRoot: string;
|
|
22
|
+
allowedRoots?: readonly string[];
|
|
23
|
+
sandboxWaived?: boolean;
|
|
8
24
|
session: Session;
|
|
9
25
|
}
|
|
10
26
|
/**
|
|
@@ -18,4 +34,14 @@ export type ToolExecutor<TInput = unknown, TOutput = unknown> = (input: TInput,
|
|
|
18
34
|
* @throws Error 当已中断
|
|
19
35
|
*/
|
|
20
36
|
export declare const assertNotAborted: (signal: AbortSignal) => void;
|
|
37
|
+
/**
|
|
38
|
+
* 从 `ToolExecutionContext` 推导出本次工具调用的沙箱策略。
|
|
39
|
+
*
|
|
40
|
+
* 老版本 context 只有 `workspaceRoot`;本函数做一次规范化,让工具执行器
|
|
41
|
+
* 不必关心调用方是否已经迁移到新字段。
|
|
42
|
+
*/
|
|
43
|
+
export declare const resolveSandboxPolicy: (context: ToolExecutionContext) => {
|
|
44
|
+
allowedRoots: readonly string[];
|
|
45
|
+
sandboxWaived: boolean;
|
|
46
|
+
};
|
|
21
47
|
//# sourceMappingURL=shared.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,CAC9D,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,QAAQ,WAAW,KAAG,IAItD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,SAAS,oBAAoB,KAC5B;IAAE,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAQ3D,CAAC"}
|
package/dist/tools/shared.js
CHANGED
|
@@ -9,4 +9,19 @@ export const assertNotAborted = (signal) => {
|
|
|
9
9
|
throw signal.reason ?? new Error("aborted");
|
|
10
10
|
}
|
|
11
11
|
};
|
|
12
|
+
/**
|
|
13
|
+
* 从 `ToolExecutionContext` 推导出本次工具调用的沙箱策略。
|
|
14
|
+
*
|
|
15
|
+
* 老版本 context 只有 `workspaceRoot`;本函数做一次规范化,让工具执行器
|
|
16
|
+
* 不必关心调用方是否已经迁移到新字段。
|
|
17
|
+
*/
|
|
18
|
+
export const resolveSandboxPolicy = (context) => {
|
|
19
|
+
const roots = context.allowedRoots && context.allowedRoots.length > 0
|
|
20
|
+
? context.allowedRoots
|
|
21
|
+
: [context.workspaceRoot];
|
|
22
|
+
return {
|
|
23
|
+
allowedRoots: roots,
|
|
24
|
+
sandboxWaived: context.sandboxWaived === true,
|
|
25
|
+
};
|
|
26
|
+
};
|
|
12
27
|
//# sourceMappingURL=shared.js.map
|
package/dist/tools/shared.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAmCA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAmB,EAAQ,EAAE;IAC5D,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,MAAM,CAAC,MAAM,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAA6B,EACgC,EAAE;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;QACnE,CAAC,CAAC,OAAO,CAAC,YAAY;QACtB,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5B,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,aAAa,EAAE,OAAO,CAAC,aAAa,KAAK,IAAI;KAC9C,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { ToolExecutor } from "../shared";
|
|
2
|
+
type TodoStatus = "pending" | "in_progress" | "completed" | "cancelled";
|
|
3
|
+
interface TodoItem {
|
|
4
|
+
id: string;
|
|
5
|
+
content: string;
|
|
6
|
+
status: TodoStatus;
|
|
7
|
+
}
|
|
8
|
+
interface TodoReadInput {
|
|
9
|
+
status?: TodoStatus | "all";
|
|
10
|
+
}
|
|
11
|
+
interface TodoReadOutput {
|
|
12
|
+
todos: TodoItem[];
|
|
13
|
+
total: number;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Todo 读取 Tool 执行器。
|
|
17
|
+
*/
|
|
18
|
+
export declare const todoReadExecutor: ToolExecutor<TodoReadInput, TodoReadOutput>;
|
|
19
|
+
export {};
|
|
20
|
+
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/todo-read/executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,KAAK,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,WAAW,CAAC;AAExE,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC;CAC7B;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAKD;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,aAAa,EAAE,cAAc,CAwBxE,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { assertNotAborted } from "../shared";
|
|
4
|
+
const getTodosPath = (workspaceRoot, sessionId) => join(workspaceRoot, ".tachu", "sessions", sessionId, "todos.json");
|
|
5
|
+
/**
|
|
6
|
+
* Todo 读取 Tool 执行器。
|
|
7
|
+
*/
|
|
8
|
+
export const todoReadExecutor = async (input, context) => {
|
|
9
|
+
assertNotAborted(context.abortSignal);
|
|
10
|
+
const path = getTodosPath(context.workspaceRoot, context.session.id);
|
|
11
|
+
let todos = [];
|
|
12
|
+
try {
|
|
13
|
+
const raw = await readFile(path, "utf8");
|
|
14
|
+
const parsed = JSON.parse(raw);
|
|
15
|
+
todos = Array.isArray(parsed) ? parsed : [];
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
todos = [];
|
|
19
|
+
}
|
|
20
|
+
const filterStatus = input.status;
|
|
21
|
+
const filtered = filterStatus === undefined || filterStatus === "all"
|
|
22
|
+
? todos
|
|
23
|
+
: todos.filter((t) => t.status === filterStatus);
|
|
24
|
+
return { todos: filtered, total: filtered.length };
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/todo-read/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAmB7C,MAAM,YAAY,GAAG,CAAC,aAAqB,EAAE,SAAiB,EAAU,EAAE,CACxE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAgD,KAAK,EAChF,KAAK,EACL,OAAO,EACP,EAAE;IACF,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAErE,IAAI,KAAK,GAAe,EAAE,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,MAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,KAAK,GAAG,EAAE,CAAC;IACb,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC;IAClC,MAAM,QAAQ,GACZ,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,KAAK;QAClD,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;IAErD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;AACrD,CAAC,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { ToolExecutor } from "../shared";
|
|
2
|
+
type TodoStatus = "pending" | "in_progress" | "completed" | "cancelled";
|
|
3
|
+
interface TodoItem {
|
|
4
|
+
id: string;
|
|
5
|
+
content: string;
|
|
6
|
+
status: TodoStatus;
|
|
7
|
+
}
|
|
8
|
+
interface TodoWriteInput {
|
|
9
|
+
todos: TodoItem[];
|
|
10
|
+
merge?: boolean;
|
|
11
|
+
}
|
|
12
|
+
interface TodoWriteOutput {
|
|
13
|
+
total: number;
|
|
14
|
+
written: number;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Todo 写入 Tool 执行器。
|
|
18
|
+
*/
|
|
19
|
+
export declare const todoWriteExecutor: ToolExecutor<TodoWriteInput, TodoWriteOutput>;
|
|
20
|
+
export {};
|
|
21
|
+
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/todo-write/executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,KAAK,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,WAAW,CAAC;AAExE,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAeD;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,cAAc,EAAE,eAAe,CAyB3E,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { assertNotAborted } from "../shared";
|
|
4
|
+
const getTodosPath = (workspaceRoot, sessionId) => join(workspaceRoot, ".tachu", "sessions", sessionId, "todos.json");
|
|
5
|
+
const readExisting = async (path) => {
|
|
6
|
+
try {
|
|
7
|
+
const raw = await readFile(path, "utf8");
|
|
8
|
+
const parsed = JSON.parse(raw);
|
|
9
|
+
return Array.isArray(parsed) ? parsed : [];
|
|
10
|
+
}
|
|
11
|
+
catch {
|
|
12
|
+
return [];
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Todo 写入 Tool 执行器。
|
|
17
|
+
*/
|
|
18
|
+
export const todoWriteExecutor = async (input, context) => {
|
|
19
|
+
assertNotAborted(context.abortSignal);
|
|
20
|
+
const path = getTodosPath(context.workspaceRoot, context.session.id);
|
|
21
|
+
await mkdir(join(path, ".."), { recursive: true });
|
|
22
|
+
const merge = input.merge !== false;
|
|
23
|
+
let final;
|
|
24
|
+
if (merge) {
|
|
25
|
+
const existing = await readExisting(path);
|
|
26
|
+
const map = new Map(existing.map((t) => [t.id, t]));
|
|
27
|
+
for (const todo of input.todos) {
|
|
28
|
+
map.set(todo.id, todo);
|
|
29
|
+
}
|
|
30
|
+
final = [...map.values()];
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
final = [...input.todos];
|
|
34
|
+
}
|
|
35
|
+
await writeFile(path, JSON.stringify(final, null, 2), "utf8");
|
|
36
|
+
return { total: final.length, written: input.todos.length };
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/todo-write/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAoB7C,MAAM,YAAY,GAAG,CAAC,aAAqB,EAAE,SAAiB,EAAU,EAAE,CACxE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;AAErE,MAAM,YAAY,GAAG,KAAK,EAAE,IAAY,EAAuB,EAAE;IAC/D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,MAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAkD,KAAK,EACnF,KAAK,EACL,OAAO,EACP,EAAE;IACF,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC;IAEpC,IAAI,KAAiB,CAAC;IACtB,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAmB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9D,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;AAC9D,CAAC,CAAC"}
|