@tachu/extensions 1.0.0-alpha.3 → 1.0.0-alpha.5
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 +81 -0
- package/README.md +30 -3
- package/README_ZH.md +29 -3
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +2 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +2 -1
- package/dist/providers/openai.js.map +1 -1
- package/dist/tools/apply-patch/executor.d.ts.map +1 -1
- package/dist/tools/apply-patch/executor.js +47 -0
- 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/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.map +1 -1
- package/dist/tools/index.js +360 -3
- package/dist/tools/index.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 +46 -2
- 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 +89 -6
- 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 +45 -24
- package/dist/tools/search-code/executor.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/package.json +2 -2
|
@@ -12,9 +12,20 @@ interface RunShellOutput {
|
|
|
12
12
|
exitCode: number;
|
|
13
13
|
durationMs: number;
|
|
14
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* B1: 环境变量白名单可配置。
|
|
17
|
+
* 默认包含常用开发工具所需变量;可通过 TACHU_SHELL_ENV_ALLOWLIST 环境变量完全覆盖。
|
|
18
|
+
*/
|
|
19
|
+
declare const resolveEnvAllowlist: () => readonly string[];
|
|
20
|
+
/**
|
|
21
|
+
* B2: Session 级持久 cwd。
|
|
22
|
+
* 键为 sessionId,值为上次使用的工作目录。
|
|
23
|
+
*/
|
|
24
|
+
declare const sessionCwdMap: Map<string, string>;
|
|
25
|
+
declare const checkDenyPatterns: (command: string) => void;
|
|
15
26
|
/**
|
|
16
27
|
* 执行 shell Tool 执行器。
|
|
17
28
|
*/
|
|
18
29
|
export declare const runShellExecutor: ToolExecutor<RunShellInput, RunShellOutput>;
|
|
19
|
-
export {};
|
|
30
|
+
export { sessionCwdMap, resolveEnvAllowlist, checkDenyPatterns };
|
|
20
31
|
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/run-shell/executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/run-shell/executor.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD;;;GAGG;AACH,QAAA,MAAM,mBAAmB,QAAO,SAAS,MAAM,EAoB9C,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,aAAa,qBAA4B,CAAC;AAahD,QAAA,MAAM,iBAAiB,GAAI,SAAS,MAAM,KAAG,IAc5C,CAAC;AA4BF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,aAAa,EAAE,cAAc,CAwFxE,CAAC;AAGF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,CAAC"}
|
|
@@ -1,14 +1,67 @@
|
|
|
1
|
+
import { resolve as pathResolve } from "node:path";
|
|
2
|
+
import { stat } from "node:fs/promises";
|
|
1
3
|
import { ValidationError } from "@tachu/core";
|
|
2
4
|
import { resolveAllowedPath } from "../../common/path";
|
|
3
5
|
import { readStreamWithLimit, terminateProcess } from "../../common/process";
|
|
4
6
|
import { assertNotAborted, resolveSandboxPolicy } from "../shared";
|
|
5
7
|
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
6
8
|
const STREAM_LIMIT_BYTES = 1024 * 1024;
|
|
7
|
-
const DEFAULT_ENV_ALLOWLIST = ["PATH", "HOME", "LANG"];
|
|
8
9
|
const SHELL_SYNTAX_PATTERN = /[\s'"`|&;<>*$(){}[\]\\]/;
|
|
10
|
+
/**
|
|
11
|
+
* B1: 环境变量白名单可配置。
|
|
12
|
+
* 默认包含常用开发工具所需变量;可通过 TACHU_SHELL_ENV_ALLOWLIST 环境变量完全覆盖。
|
|
13
|
+
*/
|
|
14
|
+
const resolveEnvAllowlist = () => {
|
|
15
|
+
const envOverride = process.env.TACHU_SHELL_ENV_ALLOWLIST;
|
|
16
|
+
if (envOverride && envOverride.trim().length > 0) {
|
|
17
|
+
return envOverride
|
|
18
|
+
.split(",")
|
|
19
|
+
.map((s) => s.trim())
|
|
20
|
+
.filter(Boolean);
|
|
21
|
+
}
|
|
22
|
+
return [
|
|
23
|
+
"PATH",
|
|
24
|
+
"HOME",
|
|
25
|
+
"LANG",
|
|
26
|
+
"TERM",
|
|
27
|
+
"USER",
|
|
28
|
+
"SHELL",
|
|
29
|
+
"NODE_ENV",
|
|
30
|
+
"BUN_INSTALL",
|
|
31
|
+
"PNPM_HOME",
|
|
32
|
+
"NPM_CONFIG_PREFIX",
|
|
33
|
+
];
|
|
34
|
+
};
|
|
35
|
+
/**
|
|
36
|
+
* B2: Session 级持久 cwd。
|
|
37
|
+
* 键为 sessionId,值为上次使用的工作目录。
|
|
38
|
+
*/
|
|
39
|
+
const sessionCwdMap = new Map();
|
|
40
|
+
/**
|
|
41
|
+
* B3: 危险命令黑名单。
|
|
42
|
+
*/
|
|
43
|
+
const BUILTIN_DENY_PATTERNS = [
|
|
44
|
+
/^rm\s+(-[a-zA-Z]*f[a-zA-Z]*\s+)?(-[a-zA-Z]*r[a-zA-Z]*\s+)?\/(\s|$)/,
|
|
45
|
+
/\|\s*sh\b/,
|
|
46
|
+
/\|\s*bash\b/,
|
|
47
|
+
/>\s*\/dev\/sd[a-z]/,
|
|
48
|
+
/mkfs\b/,
|
|
49
|
+
];
|
|
50
|
+
const checkDenyPatterns = (command) => {
|
|
51
|
+
const extraPatterns = (process.env.TACHU_SHELL_DENY_PATTERNS ?? "")
|
|
52
|
+
.split("||")
|
|
53
|
+
.filter(Boolean)
|
|
54
|
+
.map((s) => new RegExp(s));
|
|
55
|
+
const all = [...BUILTIN_DENY_PATTERNS, ...extraPatterns];
|
|
56
|
+
for (const re of all) {
|
|
57
|
+
if (re.test(command)) {
|
|
58
|
+
throw new ValidationError("SHELL_COMMAND_DENIED", `命令被安全策略拒绝(匹配黑名单):${command}`);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
};
|
|
9
62
|
const buildSandboxedEnv = (extra) => {
|
|
10
63
|
const env = {};
|
|
11
|
-
for (const key of
|
|
64
|
+
for (const key of resolveEnvAllowlist()) {
|
|
12
65
|
const value = process.env[key];
|
|
13
66
|
if (typeof value === "string") {
|
|
14
67
|
env[key] = value;
|
|
@@ -38,15 +91,43 @@ export const runShellExecutor = async (input, context) => {
|
|
|
38
91
|
if (!input.command || input.command.trim().length === 0) {
|
|
39
92
|
throw new ValidationError("VALIDATION_EMPTY_COMMAND", "command 不能为空");
|
|
40
93
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
94
|
+
// B3: 危险命令检查
|
|
95
|
+
checkDenyPatterns(input.command);
|
|
96
|
+
const sessionId = context.session.id;
|
|
97
|
+
// B2: 确定本次 cwd
|
|
98
|
+
let effectiveCwd;
|
|
99
|
+
if (input.cwd) {
|
|
100
|
+
effectiveCwd = resolveAllowedPath(input.cwd, resolveSandboxPolicy(context));
|
|
101
|
+
sessionCwdMap.set(sessionId, effectiveCwd);
|
|
102
|
+
}
|
|
103
|
+
else if (sessionCwdMap.has(sessionId)) {
|
|
104
|
+
effectiveCwd = sessionCwdMap.get(sessionId);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
effectiveCwd = context.workspaceRoot;
|
|
108
|
+
}
|
|
109
|
+
// B2: cd 命令特殊处理
|
|
110
|
+
const cdMatch = /^cd\s+(.+)$/.exec(input.command.trim());
|
|
111
|
+
if (cdMatch) {
|
|
112
|
+
const target = cdMatch[1].trim().replace(/^['"]|['"]$/g, "");
|
|
113
|
+
const nextCwd = pathResolve(effectiveCwd, target);
|
|
114
|
+
try {
|
|
115
|
+
const s = await stat(nextCwd);
|
|
116
|
+
if (s.isDirectory()) {
|
|
117
|
+
sessionCwdMap.set(sessionId, nextCwd);
|
|
118
|
+
return { stdout: "", stderr: "", exitCode: 0, durationMs: 0 };
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
// 目录不存在,让 spawn 自然报错
|
|
123
|
+
}
|
|
124
|
+
}
|
|
44
125
|
const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
45
126
|
const startedAt = Date.now();
|
|
46
127
|
const cmd = buildSpawnCommand(input);
|
|
47
128
|
const processRef = Bun.spawn({
|
|
48
129
|
cmd,
|
|
49
|
-
cwd,
|
|
130
|
+
cwd: effectiveCwd,
|
|
50
131
|
env: buildSandboxedEnv(input.env),
|
|
51
132
|
stdout: "pipe",
|
|
52
133
|
stderr: "pipe",
|
|
@@ -86,4 +167,6 @@ export const runShellExecutor = async (input, context) => {
|
|
|
86
167
|
context.abortSignal.removeEventListener("abort", onAbort);
|
|
87
168
|
}
|
|
88
169
|
};
|
|
170
|
+
// Export for testing
|
|
171
|
+
export { sessionCwdMap, resolveEnvAllowlist, checkDenyPatterns };
|
|
89
172
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/run-shell/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAiBnE,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,CAAC;AACvC,MAAM,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/run-shell/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { ToolExecutor } from "../shared";
|
|
2
|
+
interface RunTestsInput {
|
|
3
|
+
cwd?: string;
|
|
4
|
+
filter?: string;
|
|
5
|
+
file?: string;
|
|
6
|
+
maxFailures?: number;
|
|
7
|
+
timeout?: number;
|
|
8
|
+
}
|
|
9
|
+
interface TestFailure {
|
|
10
|
+
name: string;
|
|
11
|
+
file?: string;
|
|
12
|
+
message: string;
|
|
13
|
+
stack?: string;
|
|
14
|
+
}
|
|
15
|
+
interface RunTestsOutput {
|
|
16
|
+
passed: boolean;
|
|
17
|
+
total: number;
|
|
18
|
+
passedCount: number;
|
|
19
|
+
failedCount: number;
|
|
20
|
+
skippedCount: number;
|
|
21
|
+
durationMs: number;
|
|
22
|
+
failures: TestFailure[];
|
|
23
|
+
truncated: boolean;
|
|
24
|
+
rawOutput?: string;
|
|
25
|
+
}
|
|
26
|
+
export declare const runTestsExecutor: ToolExecutor<RunTestsInput, RunTestsOutput>;
|
|
27
|
+
export {};
|
|
28
|
+
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/run-tests/executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9C,UAAU,aAAa;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,cAAc;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkGD,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,aAAa,EAAE,cAAc,CAuFxE,CAAC"}
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { resolve, join } from "node:path";
|
|
2
|
+
import { readFile, access } from "node:fs/promises";
|
|
3
|
+
import { assertNotAborted, resolveSandboxPolicy } from "../shared";
|
|
4
|
+
import { resolveAllowedPath } from "../../common/path";
|
|
5
|
+
const fileExists = async (p) => {
|
|
6
|
+
try {
|
|
7
|
+
await access(p);
|
|
8
|
+
return true;
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
return false;
|
|
12
|
+
}
|
|
13
|
+
};
|
|
14
|
+
const hasTestScript = async (cwd) => {
|
|
15
|
+
try {
|
|
16
|
+
const content = await readFile(join(cwd, "package.json"), "utf8");
|
|
17
|
+
const pkg = JSON.parse(content);
|
|
18
|
+
return typeof pkg.scripts?.test === "string";
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
const hasBunLockfile = async (cwd) => {
|
|
25
|
+
return ((await fileExists(join(cwd, "bun.lockb"))) ||
|
|
26
|
+
(await fileExists(join(cwd, "bun.lock"))) ||
|
|
27
|
+
(await fileExists(join(cwd, "bunfig.toml"))));
|
|
28
|
+
};
|
|
29
|
+
// Parse bun test summary line like "5 pass, 2 fail, 1 skip"
|
|
30
|
+
// Also handle individual lines like "5 pass" / "2 fail" / "1 skip"
|
|
31
|
+
const parseBunTestSummary = (output) => {
|
|
32
|
+
let passedCount = 0;
|
|
33
|
+
let failedCount = 0;
|
|
34
|
+
let skippedCount = 0;
|
|
35
|
+
const passMatch = output.match(/(\d+)\s+pass/);
|
|
36
|
+
const failMatch = output.match(/(\d+)\s+fail/);
|
|
37
|
+
const skipMatch = output.match(/(\d+)\s+skip/);
|
|
38
|
+
if (passMatch)
|
|
39
|
+
passedCount = parseInt(passMatch[1], 10);
|
|
40
|
+
if (failMatch)
|
|
41
|
+
failedCount = parseInt(failMatch[1], 10);
|
|
42
|
+
if (skipMatch)
|
|
43
|
+
skippedCount = parseInt(skipMatch[1], 10);
|
|
44
|
+
return { passedCount, failedCount, skippedCount };
|
|
45
|
+
};
|
|
46
|
+
// Parse test failures from bun test output
|
|
47
|
+
// bun prints: "✗ test name" followed by error details
|
|
48
|
+
const parseFailures = (output, maxFailures) => {
|
|
49
|
+
const failures = [];
|
|
50
|
+
const lines = output.split("\n");
|
|
51
|
+
let i = 0;
|
|
52
|
+
while (i < lines.length && failures.length < maxFailures) {
|
|
53
|
+
const line = lines[i];
|
|
54
|
+
// bun uses "✗" or "×" for failures, or "FAIL" prefix
|
|
55
|
+
if (line.includes("✗ ") || line.includes("× ") || line.match(/^\s*FAIL\s/)) {
|
|
56
|
+
const nameMatch = line.match(/[✗×]\s+(.+)$/) || line.match(/FAIL\s+(.+)$/);
|
|
57
|
+
const name = nameMatch ? nameMatch[1].trim() : line.trim();
|
|
58
|
+
const messageLines = [];
|
|
59
|
+
i++;
|
|
60
|
+
// Collect following indented lines as message/stack
|
|
61
|
+
while (i < lines.length && (lines[i].startsWith(" ") || lines[i].startsWith("\t") || lines[i].trim().length === 0)) {
|
|
62
|
+
if (lines[i].trim().length > 0) {
|
|
63
|
+
messageLines.push(lines[i]);
|
|
64
|
+
}
|
|
65
|
+
i++;
|
|
66
|
+
}
|
|
67
|
+
const fullMessage = messageLines.join("\n");
|
|
68
|
+
const message = fullMessage.slice(0, 1024);
|
|
69
|
+
const stack = fullMessage.length > 1024 ? fullMessage.slice(0, 2048) : undefined;
|
|
70
|
+
const failure = { name, message };
|
|
71
|
+
if (stack)
|
|
72
|
+
failure.stack = stack;
|
|
73
|
+
failures.push(failure);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
i++;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
// Count remaining failures in output to detect truncation
|
|
80
|
+
let remainingFailures = 0;
|
|
81
|
+
while (i < lines.length) {
|
|
82
|
+
const line = lines[i];
|
|
83
|
+
if (line.includes("✗ ") || line.includes("× ") || line.match(/^\s*FAIL\s/)) {
|
|
84
|
+
remainingFailures++;
|
|
85
|
+
}
|
|
86
|
+
i++;
|
|
87
|
+
}
|
|
88
|
+
return { failures, truncated: remainingFailures > 0 };
|
|
89
|
+
};
|
|
90
|
+
export const runTestsExecutor = async (input, context) => {
|
|
91
|
+
assertNotAborted(context.abortSignal);
|
|
92
|
+
const policy = resolveSandboxPolicy(context);
|
|
93
|
+
const cwd = input.cwd ? resolveAllowedPath(input.cwd, policy) : resolve(context.workspaceRoot);
|
|
94
|
+
const maxFailures = input.maxFailures ?? 20;
|
|
95
|
+
const timeoutMs = input.timeout ?? 60000;
|
|
96
|
+
const useTestScript = await hasTestScript(cwd);
|
|
97
|
+
const useBunLockfile = !useTestScript && (await hasBunLockfile(cwd));
|
|
98
|
+
if (!useTestScript && !useBunLockfile) {
|
|
99
|
+
return {
|
|
100
|
+
passed: false,
|
|
101
|
+
total: 0,
|
|
102
|
+
passedCount: 0,
|
|
103
|
+
failedCount: 0,
|
|
104
|
+
skippedCount: 0,
|
|
105
|
+
durationMs: 0,
|
|
106
|
+
failures: [],
|
|
107
|
+
truncated: false,
|
|
108
|
+
rawOutput: "未能自动识别测试命令,请通过 run-shell 手动执行",
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
const cmd = useTestScript ? [process.execPath, "run", "test"] : [process.execPath, "test"];
|
|
112
|
+
if (input.filter) {
|
|
113
|
+
cmd.push("--test-name-pattern", input.filter);
|
|
114
|
+
}
|
|
115
|
+
if (input.file) {
|
|
116
|
+
cmd.push(input.file);
|
|
117
|
+
}
|
|
118
|
+
const startedAt = Date.now();
|
|
119
|
+
const proc = Bun.spawn({ cmd, cwd, stdout: "pipe", stderr: "pipe" });
|
|
120
|
+
const timeout = setTimeout(() => {
|
|
121
|
+
if (proc.pid) {
|
|
122
|
+
void proc.kill();
|
|
123
|
+
}
|
|
124
|
+
}, timeoutMs);
|
|
125
|
+
let stdout = "";
|
|
126
|
+
let stderr = "";
|
|
127
|
+
let exitCode = 0;
|
|
128
|
+
try {
|
|
129
|
+
[stdout, stderr, exitCode] = await Promise.all([
|
|
130
|
+
new Response(proc.stdout).text(),
|
|
131
|
+
new Response(proc.stderr).text(),
|
|
132
|
+
proc.exited,
|
|
133
|
+
]);
|
|
134
|
+
}
|
|
135
|
+
finally {
|
|
136
|
+
clearTimeout(timeout);
|
|
137
|
+
}
|
|
138
|
+
assertNotAborted(context.abortSignal);
|
|
139
|
+
const durationMs = Date.now() - startedAt;
|
|
140
|
+
const combined = [stdout, stderr].filter((s) => s.trim().length > 0).join("\n");
|
|
141
|
+
const { passedCount, failedCount, skippedCount } = parseBunTestSummary(combined);
|
|
142
|
+
const { failures, truncated } = parseFailures(combined, maxFailures);
|
|
143
|
+
const total = passedCount + failedCount + skippedCount;
|
|
144
|
+
const passed = exitCode === 0 && failedCount === 0;
|
|
145
|
+
const result = {
|
|
146
|
+
passed,
|
|
147
|
+
total,
|
|
148
|
+
passedCount,
|
|
149
|
+
failedCount,
|
|
150
|
+
skippedCount,
|
|
151
|
+
durationMs,
|
|
152
|
+
failures,
|
|
153
|
+
truncated,
|
|
154
|
+
};
|
|
155
|
+
// Include rawOutput if we couldn't parse anything meaningful
|
|
156
|
+
if (total === 0 && combined.trim().length > 0) {
|
|
157
|
+
result.rawOutput = combined.slice(0, 4096);
|
|
158
|
+
}
|
|
159
|
+
return result;
|
|
160
|
+
};
|
|
161
|
+
//# sourceMappingURL=executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/run-tests/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { ToolExecutor } from "../shared";
|
|
2
|
+
interface RunTypecheckInput {
|
|
3
|
+
cwd?: string;
|
|
4
|
+
tsconfig?: string;
|
|
5
|
+
maxErrors?: number;
|
|
6
|
+
}
|
|
7
|
+
interface TypecheckError {
|
|
8
|
+
file: string;
|
|
9
|
+
line: number;
|
|
10
|
+
col: number;
|
|
11
|
+
code: string;
|
|
12
|
+
message: string;
|
|
13
|
+
severity: "error" | "warning";
|
|
14
|
+
}
|
|
15
|
+
interface RunTypecheckOutput {
|
|
16
|
+
passed: boolean;
|
|
17
|
+
errorCount: number;
|
|
18
|
+
warningCount: number;
|
|
19
|
+
errors: TypecheckError[];
|
|
20
|
+
truncated: boolean;
|
|
21
|
+
rawOutput?: string;
|
|
22
|
+
}
|
|
23
|
+
export declare const runTypecheckExecutor: ToolExecutor<RunTypecheckInput, RunTypecheckOutput>;
|
|
24
|
+
export {};
|
|
25
|
+
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/tools/run-typecheck/executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9C,UAAU,iBAAiB;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAqED,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,iBAAiB,EAAE,kBAAkB,CAsCpF,CAAC"}
|
|
@@ -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"}
|
|
@@ -2,6 +2,38 @@ import { readdir, readFile } from "node:fs/promises";
|
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { assertNotAborted, resolveSandboxPolicy } from "../shared";
|
|
4
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);
|
|
@@ -30,30 +62,12 @@ export const searchCodeExecutor = async (input, context) => {
|
|
|
30
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,7 +81,14 @@ 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) => {
|
|
@@ -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,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAqBhF,MAAM,aAAa,GAAG,CACpB,MAAc,EACd,UAAkB,EACkC,EAAE;IACtD,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACtC,SAAS;QACX,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;YAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;YAC3C,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;SAC7B,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;YACjC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QACtC,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AACvC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAoD,KAAK,EACtF,KAAK,EACL,OAAO,EACP,EAAE;IACF,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC;IAE3C,IAAI,CAAC;QACH,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/tools/search-code/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|