@pentoshi/clai 0.5.10 → 0.6.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/README.md +17 -9
- package/dist/agent/runner.js +49 -62
- package/dist/agent/runner.js.map +1 -1
- package/dist/commands/doctor.js +1 -1
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/update.js +1 -1
- package/dist/commands/update.js.map +1 -1
- package/dist/context/manager.d.ts +4 -0
- package/dist/context/manager.js +48 -0
- package/dist/context/manager.js.map +1 -0
- package/dist/llm/router.js +23 -8
- package/dist/llm/router.js.map +1 -1
- package/dist/modes/ask.js +4 -3
- package/dist/modes/ask.js.map +1 -1
- package/dist/repl.js +27 -2
- package/dist/repl.js.map +1 -1
- package/dist/safety/classifier.js +76 -7
- package/dist/safety/classifier.js.map +1 -1
- package/dist/safety/patterns.js +6 -23
- package/dist/safety/patterns.js.map +1 -1
- package/dist/store/config.d.ts +2 -0
- package/dist/store/config.js +2 -0
- package/dist/store/config.js.map +1 -1
- package/dist/store/keys.js +2 -2
- package/dist/store/keys.js.map +1 -1
- package/dist/store/project.js +3 -1
- package/dist/store/project.js.map +1 -1
- package/dist/tools/artifacts.d.ts +9 -0
- package/dist/tools/artifacts.js +38 -0
- package/dist/tools/artifacts.js.map +1 -0
- package/dist/tools/fs.js +94 -28
- package/dist/tools/fs.js.map +1 -1
- package/dist/tools/http.d.ts +1 -0
- package/dist/tools/http.js +34 -4
- package/dist/tools/http.js.map +1 -1
- package/dist/tools/registry.js +51 -14
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/shell.d.ts +4 -0
- package/dist/tools/shell.js +96 -9
- package/dist/tools/shell.js.map +1 -1
- package/dist/types.d.ts +16 -0
- package/dist/ui/tool-output.d.ts +18 -0
- package/dist/ui/tool-output.js +135 -0
- package/dist/ui/tool-output.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/tools/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAG1C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAEvD,SAAS,KAAK;IACZ,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,SAAS,GAAG,KAAK;IAC7D,OAAO,IAAI,CAAC,UAAU,EAAE,GAAG,KAAK,EAAE,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,MAAc,EACd,SAAS,GAAG,KAAK;IAEjB,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9C,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,SAAS,GAAG,KAAK;IAEjB,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9C,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1E,OAAO;QACL,IAAI;QACJ,MAAM;QACN,MAAM,EAAE,GAAG,EAAE;YACX,IAAI,CAAC;gBACH,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAChC,CAAC;YAAC,MAAM,CAAC;gBACP,uBAAuB;YACzB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/tools/fs.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { readFile, readdir, writeFile } from "node:fs/promises";
|
|
2
|
-
import { relative, resolve } from "node:path";
|
|
1
|
+
import { open, readFile, readdir, stat, writeFile } from "node:fs/promises";
|
|
2
|
+
import { isAbsolute, relative, resolve } from "node:path";
|
|
3
3
|
import { homedir } from "node:os";
|
|
4
4
|
import { execa } from "execa";
|
|
5
5
|
import { getConfig } from "../store/config.js";
|
|
6
|
+
import { redactSecrets } from "../llm/provider.js";
|
|
6
7
|
function expandHome(path) {
|
|
7
8
|
if (path === "~")
|
|
8
9
|
return homedir();
|
|
@@ -11,30 +12,82 @@ function expandHome(path) {
|
|
|
11
12
|
}
|
|
12
13
|
return path;
|
|
13
14
|
}
|
|
14
|
-
/** Resolve path with tilde expansion — no sandbox check (read-only callers) */
|
|
15
15
|
function resolvePath(path) {
|
|
16
16
|
return resolve(expandHome(path));
|
|
17
17
|
}
|
|
18
|
-
|
|
18
|
+
function configuredRoots() {
|
|
19
|
+
return [
|
|
20
|
+
...getConfig().sandboxRoots.map((root) => resolve(expandHome(root))),
|
|
21
|
+
resolve(process.cwd()),
|
|
22
|
+
];
|
|
23
|
+
}
|
|
24
|
+
function isWithinRoots(resolved, roots) {
|
|
25
|
+
return roots.some((root) => {
|
|
26
|
+
const rel = relative(root, resolved);
|
|
27
|
+
return rel === "" || (!rel.startsWith("..") && !isAbsolute(rel));
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
function isForbiddenSecretPath(resolved) {
|
|
31
|
+
const lower = resolved.toLowerCase().replace(/\\/g, "/");
|
|
32
|
+
const home = resolve(homedir()).toLowerCase().replace(/\\/g, "/");
|
|
33
|
+
const relativeHome = lower.startsWith(home) ? lower.slice(home.length) : lower;
|
|
34
|
+
const secretSegments = [
|
|
35
|
+
"/.ssh/",
|
|
36
|
+
"/.gnupg/",
|
|
37
|
+
"/.aws/",
|
|
38
|
+
"/.kube/",
|
|
39
|
+
"/.docker/",
|
|
40
|
+
"/.config/gcloud/",
|
|
41
|
+
"/.clai/keys.json",
|
|
42
|
+
];
|
|
43
|
+
if (secretSegments.some((segment) => relativeHome.includes(segment)))
|
|
44
|
+
return true;
|
|
45
|
+
return /(^|\/)(\.env(?:\..*)?|\.npmrc|\.pypirc|id_rsa|id_dsa|id_ecdsa|id_ed25519|.*\.pem|.*\.key)$/i.test(lower);
|
|
46
|
+
}
|
|
47
|
+
function ensureReadAllowed(path) {
|
|
48
|
+
const resolved = resolvePath(path);
|
|
49
|
+
if (isForbiddenSecretPath(resolved)) {
|
|
50
|
+
throw new Error(`Read blocked — path looks like a secret: ${path}`);
|
|
51
|
+
}
|
|
52
|
+
if (!isWithinRoots(resolved, configuredRoots())) {
|
|
53
|
+
throw new Error(`Read blocked — path is outside approved roots: ${path}`);
|
|
54
|
+
}
|
|
55
|
+
return resolved;
|
|
56
|
+
}
|
|
19
57
|
function ensureWriteAllowed(path) {
|
|
20
58
|
const resolved = resolvePath(path);
|
|
21
59
|
const roots = [
|
|
22
60
|
...getConfig().sandboxRoots.map((root) => resolve(expandHome(root))),
|
|
23
61
|
resolve(homedir()),
|
|
24
62
|
];
|
|
25
|
-
|
|
26
|
-
const rel = relative(root, resolved);
|
|
27
|
-
return (rel === "" || (!rel.startsWith("..") && !resolve(rel).startsWith("..")));
|
|
28
|
-
});
|
|
29
|
-
if (!allowed) {
|
|
63
|
+
if (!isWithinRoots(resolved, roots)) {
|
|
30
64
|
throw new Error(`Write blocked — path is outside approved roots: ${path}`);
|
|
31
65
|
}
|
|
32
66
|
return resolved;
|
|
33
67
|
}
|
|
34
68
|
export async function fsRead(path) {
|
|
35
|
-
const resolved =
|
|
36
|
-
const
|
|
37
|
-
|
|
69
|
+
const resolved = ensureReadAllowed(path);
|
|
70
|
+
const info = await stat(resolved);
|
|
71
|
+
const maxBytes = 128 * 1024;
|
|
72
|
+
if (info.size <= maxBytes) {
|
|
73
|
+
const content = redactSecrets(await readFile(resolved, "utf8"));
|
|
74
|
+
return { ok: true, output: content, stats: { bytesRead: info.size, bytesShown: Buffer.byteLength(content) } };
|
|
75
|
+
}
|
|
76
|
+
const handle = await open(resolved, "r");
|
|
77
|
+
try {
|
|
78
|
+
const buffer = Buffer.alloc(maxBytes);
|
|
79
|
+
const { bytesRead } = await handle.read(buffer, 0, maxBytes, 0);
|
|
80
|
+
const preview = redactSecrets(buffer.subarray(0, bytesRead).toString("utf8"));
|
|
81
|
+
return {
|
|
82
|
+
ok: true,
|
|
83
|
+
output: `${preview}\n... file truncated at ${maxBytes} bytes (size=${info.size} bytes) ...`,
|
|
84
|
+
truncated: true,
|
|
85
|
+
stats: { bytesRead: info.size, bytesShown: bytesRead, bytesDropped: Math.max(0, info.size - bytesRead) },
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
await handle.close();
|
|
90
|
+
}
|
|
38
91
|
}
|
|
39
92
|
export async function fsWrite(path, content) {
|
|
40
93
|
const resolved = ensureWriteAllowed(path);
|
|
@@ -42,29 +95,46 @@ export async function fsWrite(path, content) {
|
|
|
42
95
|
return { ok: true, output: `Wrote ${resolved}` };
|
|
43
96
|
}
|
|
44
97
|
export async function fsList(path) {
|
|
45
|
-
const resolved =
|
|
98
|
+
const resolved = ensureReadAllowed(path);
|
|
46
99
|
const entries = await readdir(resolved, { withFileTypes: true });
|
|
100
|
+
const maxEntries = 500;
|
|
101
|
+
const shown = entries.slice(0, maxEntries);
|
|
47
102
|
return {
|
|
48
103
|
ok: true,
|
|
49
|
-
output:
|
|
104
|
+
output: shown
|
|
50
105
|
.map((entry) => `${entry.isDirectory() ? "dir " : "file"} ${entry.name}`)
|
|
51
|
-
.join("\n")
|
|
106
|
+
.join("\n") +
|
|
107
|
+
(entries.length > maxEntries
|
|
108
|
+
? `\n... ${entries.length - maxEntries} entries omitted ...`
|
|
109
|
+
: ""),
|
|
110
|
+
truncated: entries.length > maxEntries,
|
|
111
|
+
stats: { linesRead: entries.length },
|
|
52
112
|
};
|
|
53
113
|
}
|
|
54
114
|
export async function fsSearch(pattern, path = process.cwd()) {
|
|
55
|
-
const resolved =
|
|
56
|
-
const maxLines =
|
|
115
|
+
const resolved = ensureReadAllowed(path);
|
|
116
|
+
const maxLines = 200;
|
|
117
|
+
const formatResult = (all, exitCode) => {
|
|
118
|
+
const lines = redactSecrets(all ?? "")
|
|
119
|
+
.split(/\r?\n/)
|
|
120
|
+
.filter(Boolean);
|
|
121
|
+
const shown = lines.slice(0, maxLines);
|
|
122
|
+
return {
|
|
123
|
+
ok: exitCode === 0,
|
|
124
|
+
output: shown.join("\n") +
|
|
125
|
+
(lines.length > maxLines ? `\n... ${lines.length - maxLines} matches omitted ...` : ""),
|
|
126
|
+
exitCode,
|
|
127
|
+
truncated: lines.length > maxLines,
|
|
128
|
+
stats: { linesRead: lines.length },
|
|
129
|
+
};
|
|
130
|
+
};
|
|
57
131
|
try {
|
|
58
|
-
const result = await execa("rg", ["--max-count", "5", "--max-filesize", "1M", "-l", pattern, resolved], {
|
|
132
|
+
const result = await execa("rg", ["--max-count", "5", "--max-filesize", "1M", "--glob", "!.git", "-l", pattern, resolved], {
|
|
59
133
|
reject: false,
|
|
60
134
|
all: true,
|
|
61
135
|
timeout: 15_000,
|
|
62
136
|
});
|
|
63
|
-
return
|
|
64
|
-
ok: result.exitCode === 0,
|
|
65
|
-
output: result.all ?? "",
|
|
66
|
-
exitCode: result.exitCode,
|
|
67
|
-
};
|
|
137
|
+
return formatResult(result.all, result.exitCode ?? 1);
|
|
68
138
|
}
|
|
69
139
|
catch {
|
|
70
140
|
const result = await execa("grep", ["-R", "-l", "-m", String(maxLines), pattern, resolved], {
|
|
@@ -72,11 +142,7 @@ export async function fsSearch(pattern, path = process.cwd()) {
|
|
|
72
142
|
all: true,
|
|
73
143
|
timeout: 15_000,
|
|
74
144
|
});
|
|
75
|
-
return
|
|
76
|
-
ok: result.exitCode === 0,
|
|
77
|
-
output: result.all ?? "",
|
|
78
|
-
exitCode: result.exitCode,
|
|
79
|
-
};
|
|
145
|
+
return formatResult(result.all, result.exitCode ?? 1);
|
|
80
146
|
}
|
|
81
147
|
}
|
|
82
148
|
//# sourceMappingURL=fs.js.map
|
package/dist/tools/fs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../src/tools/fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../src/tools/fs.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/http.d.ts
CHANGED
package/dist/tools/http.js
CHANGED
|
@@ -6,13 +6,43 @@ export async function httpFetch(url, options = {}) {
|
|
|
6
6
|
if (options.headers) {
|
|
7
7
|
init.headers = options.headers;
|
|
8
8
|
}
|
|
9
|
-
const response = await fetch(url, init);
|
|
10
|
-
const limit = options.maxBytes ??
|
|
11
|
-
const
|
|
9
|
+
const response = await fetch(url, { ...init, signal: options.signal ?? null });
|
|
10
|
+
const limit = options.maxBytes ?? 256_000;
|
|
11
|
+
const chunks = [];
|
|
12
|
+
let bytesRead = 0;
|
|
13
|
+
let truncated = false;
|
|
14
|
+
const reader = response.body?.getReader();
|
|
15
|
+
if (reader) {
|
|
16
|
+
while (bytesRead < limit) {
|
|
17
|
+
const { done, value } = await reader.read();
|
|
18
|
+
if (done)
|
|
19
|
+
break;
|
|
20
|
+
const remaining = limit - bytesRead;
|
|
21
|
+
if (value.byteLength > remaining) {
|
|
22
|
+
chunks.push(value.subarray(0, remaining));
|
|
23
|
+
bytesRead += remaining;
|
|
24
|
+
truncated = true;
|
|
25
|
+
await reader.cancel().catch(() => undefined);
|
|
26
|
+
break;
|
|
27
|
+
}
|
|
28
|
+
chunks.push(value);
|
|
29
|
+
bytesRead += value.byteLength;
|
|
30
|
+
}
|
|
31
|
+
if (bytesRead >= limit)
|
|
32
|
+
truncated = true;
|
|
33
|
+
}
|
|
34
|
+
const text = new TextDecoder().decode(Buffer.concat(chunks));
|
|
35
|
+
const headerPreview = [
|
|
36
|
+
`status=${response.status}`,
|
|
37
|
+
`content-type=${response.headers.get("content-type") ?? "unknown"}`,
|
|
38
|
+
`bytes=${bytesRead}${truncated ? "+" : ""}`,
|
|
39
|
+
].join(" ");
|
|
12
40
|
return {
|
|
13
41
|
ok: response.ok,
|
|
14
|
-
output: text
|
|
42
|
+
output: `${headerPreview}\n${text}${truncated ? `\n... response truncated at ${limit} bytes ...` : ""}`,
|
|
15
43
|
exitCode: response.status,
|
|
44
|
+
truncated,
|
|
45
|
+
stats: { bytesRead, bytesShown: bytesRead },
|
|
16
46
|
};
|
|
17
47
|
}
|
|
18
48
|
//# sourceMappingURL=http.js.map
|
package/dist/tools/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/tools/http.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAW,EACX,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/tools/http.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAW,EACX,UAMI,EAAE;IAEN,MAAM,IAAI,GAAgB;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;QAC/B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI;KAC3B,CAAC;IACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACjC,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;IAC/E,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC;IAC1C,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;IAC1C,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,SAAS,GAAG,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAChB,MAAM,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;YACpC,IAAI,KAAK,CAAC,UAAU,GAAG,SAAS,EAAE,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC1C,SAAS,IAAI,SAAS,CAAC;gBACvB,SAAS,GAAG,IAAI,CAAC;gBACjB,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC7C,MAAM;YACR,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC;QAChC,CAAC;QACD,IAAI,SAAS,IAAI,KAAK;YAAE,SAAS,GAAG,IAAI,CAAC;IAC3C,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7D,MAAM,aAAa,GAAG;QACpB,UAAU,QAAQ,CAAC,MAAM,EAAE;QAC3B,gBAAgB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,SAAS,EAAE;QACnE,SAAS,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;KAC5C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,MAAM,EAAE,GAAG,aAAa,KAAK,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,+BAA+B,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;QACvG,QAAQ,EAAE,QAAQ,CAAC,MAAM;QACzB,SAAS;QACT,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE;KAC5C,CAAC;AACJ,CAAC"}
|
package/dist/tools/registry.js
CHANGED
|
@@ -18,6 +18,37 @@ function optionalNumber(args, key) {
|
|
|
18
18
|
const value = args[key];
|
|
19
19
|
return typeof value === 'number' ? value : undefined;
|
|
20
20
|
}
|
|
21
|
+
function safeToolName(value) {
|
|
22
|
+
if (!/^[A-Za-z0-9_.+-]+$/.test(value)) {
|
|
23
|
+
throw new Error(`Unsafe package/tool name: ${value}`);
|
|
24
|
+
}
|
|
25
|
+
return value;
|
|
26
|
+
}
|
|
27
|
+
function safeTarget(value) {
|
|
28
|
+
if (!/^[A-Za-z0-9_.:-]+(?:\/\d{1,3})?$/.test(value)) {
|
|
29
|
+
throw new Error(`Unsafe target syntax: ${value}`);
|
|
30
|
+
}
|
|
31
|
+
return value;
|
|
32
|
+
}
|
|
33
|
+
function safePorts(value) {
|
|
34
|
+
if (!/^[A-Za-z0-9,:-]+$/.test(value)) {
|
|
35
|
+
throw new Error(`Unsafe port syntax: ${value}`);
|
|
36
|
+
}
|
|
37
|
+
return value;
|
|
38
|
+
}
|
|
39
|
+
function safeFlagTokens(value) {
|
|
40
|
+
if (!value.trim())
|
|
41
|
+
return [];
|
|
42
|
+
return value.trim().split(/\s+/).map((token) => {
|
|
43
|
+
if (!/^-{1,2}[A-Za-z0-9][A-Za-z0-9_.:=,+/-]*$/.test(token)) {
|
|
44
|
+
throw new Error(`Unsafe flag syntax: ${token}`);
|
|
45
|
+
}
|
|
46
|
+
return token;
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
function commandLabel(command, argv) {
|
|
50
|
+
return [command, ...argv].join(' ');
|
|
51
|
+
}
|
|
21
52
|
export const toolRegistry = {
|
|
22
53
|
async 'shell.exec'(args, options) {
|
|
23
54
|
return shellExec({ command: requireString(args, 'command'), cwd: optionalString(args, 'cwd'), timeoutMs: optionalNumber(args, 'timeoutMs'), signal: options?.signal, onOutput: options?.onOutput });
|
|
@@ -35,20 +66,20 @@ export const toolRegistry = {
|
|
|
35
66
|
return fsSearch(requireString(args, 'pattern'), optionalString(args, 'path'));
|
|
36
67
|
},
|
|
37
68
|
async 'pkg.install'(args, options) {
|
|
38
|
-
const tool = requireString(args, 'tool');
|
|
69
|
+
const tool = safeToolName(requireString(args, 'tool'));
|
|
39
70
|
const pkgmgr = await detectPackageManager();
|
|
40
71
|
return shellExec({ command: pkgmgr.installCommand(tool), signal: options?.signal, onOutput: options?.onOutput });
|
|
41
72
|
},
|
|
42
73
|
async 'net.scan'(args, options) {
|
|
43
|
-
const target = requireString(args, 'target');
|
|
74
|
+
const target = safeTarget(requireString(args, 'target'));
|
|
44
75
|
const ports = optionalString(args, 'ports');
|
|
45
|
-
const flags = optionalString(args, 'flags') ?? '';
|
|
46
|
-
const
|
|
47
|
-
?
|
|
48
|
-
:
|
|
49
|
-
return shellExec({ command, timeoutMs: 300_000, signal: options?.signal, onOutput: options?.onOutput });
|
|
76
|
+
const flags = safeFlagTokens(optionalString(args, 'flags') ?? '');
|
|
77
|
+
const argv = ports
|
|
78
|
+
? ['-p', safePorts(ports), ...flags, target]
|
|
79
|
+
: [...flags, target];
|
|
80
|
+
return shellExec({ command: 'nmap', argv, shell: false, timeoutMs: 300_000, signal: options?.signal, onOutput: options?.onOutput });
|
|
50
81
|
},
|
|
51
|
-
async 'http.fetch'(args) {
|
|
82
|
+
async 'http.fetch'(args, options) {
|
|
52
83
|
const headers = args.headers && typeof args.headers === 'object' && !Array.isArray(args.headers)
|
|
53
84
|
? args.headers
|
|
54
85
|
: undefined;
|
|
@@ -57,22 +88,28 @@ export const toolRegistry = {
|
|
|
57
88
|
body: optionalString(args, 'body'),
|
|
58
89
|
headers,
|
|
59
90
|
maxBytes: optionalNumber(args, 'maxBytes'),
|
|
91
|
+
signal: options?.signal,
|
|
60
92
|
});
|
|
61
93
|
},
|
|
62
94
|
async sysinfo() {
|
|
63
95
|
return { ok: true, output: JSON.stringify(detectSystem(), null, 2) };
|
|
64
96
|
},
|
|
65
97
|
async 'pentest.recon'(args, options) {
|
|
66
|
-
const target = requireString(args, 'target');
|
|
67
|
-
const commands = [
|
|
98
|
+
const target = safeTarget(requireString(args, 'target'));
|
|
99
|
+
const commands = [
|
|
100
|
+
{ command: 'whois', argv: [target] },
|
|
101
|
+
{ command: 'dig', argv: [target, 'ANY', '+noall', '+answer'] },
|
|
102
|
+
{ command: 'nmap', argv: ['-sV', '--top-ports', '100', target] },
|
|
103
|
+
];
|
|
68
104
|
const outputs = [];
|
|
69
|
-
for (const command of commands) {
|
|
105
|
+
for (const { command, argv } of commands) {
|
|
70
106
|
if (options?.signal?.aborted)
|
|
71
107
|
break;
|
|
72
108
|
// Announce each sub-step so users see progress through long recons.
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
109
|
+
const label = commandLabel(command, argv);
|
|
110
|
+
options?.onOutput?.(`\n$ ${label}\n`, "stdout");
|
|
111
|
+
const result = await shellExec({ command, argv, shell: false, timeoutMs: 180_000, signal: options?.signal, onOutput: options?.onOutput });
|
|
112
|
+
outputs.push(`$ ${label}\n${result.output}`);
|
|
76
113
|
if (options?.signal?.aborted)
|
|
77
114
|
break;
|
|
78
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,SAAS,aAAa,CAAC,IAA6B,EAAE,GAAW;IAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,8BAA8B,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,IAA6B,EAAE,GAAW;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAS,cAAc,CAAC,IAA6B,EAAE,GAAW;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAgC;IACvD,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO;QAC9B,OAAO,SAAS,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtM,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,IAAI;QAClB,OAAO,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,IAAI;QACnB,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,IAAI;QAClB,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,IAAI;QACpB,OAAO,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAChF,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO;QAC/B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,SAAS,aAAa,CAAC,IAA6B,EAAE,GAAW;IAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,8BAA8B,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,IAA6B,EAAE,GAAW;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAS,cAAc,CAAC,IAA6B,EAAE,GAAW;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IAC7B,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C,IAAI,CAAC,yCAAyC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,OAAe,EAAE,IAAc;IACnD,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAgC;IACvD,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO;QAC9B,OAAO,SAAS,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtM,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,IAAI;QAClB,OAAO,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,IAAI;QACnB,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,IAAI;QAClB,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,IAAI;QACpB,OAAO,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAChF,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO;QAC/B,MAAM,IAAI,GAAG,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAC5C,OAAO,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnH,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO;QAC5B,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,cAAc,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,KAAK;YAChB,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,CAAC;YAC5C,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,CAAC;QACvB,OAAO,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtI,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;YAC9F,CAAC,CAAC,IAAI,CAAC,OAAiC;YACxC,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YAC3C,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC;YACtC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;YAClC,OAAO;YACP,QAAQ,EAAE,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC;YAC1C,MAAM,EAAE,OAAO,EAAE,MAAM;SACxB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,OAAO;QACX,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO;QACjC,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG;YACf,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE;YACpC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE;YAC9D,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;SACjE,CAAC;QACF,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC;YACzC,IAAI,OAAO,EAAE,MAAM,EAAE,OAAO;gBAAE,MAAM;YACpC,oEAAoE;YACpE,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC1C,OAAO,EAAE,QAAQ,EAAE,CAAC,OAAO,KAAK,IAAI,EAAE,QAAQ,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC1I,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7C,IAAI,OAAO,EAAE,MAAM,EAAE,OAAO;gBAAE,MAAM;QACtC,CAAC;QACD,OAAO;YACL,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO;YAC7B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YAC9G,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAC7C,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAM,UAAU,kBAAkB;IAChC,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAc,EAAE,UAA0B,EAAE;IAC5E,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC"}
|
package/dist/tools/shell.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import type { ToolResult } from "../types.js";
|
|
2
2
|
export interface ShellExecArgs {
|
|
3
3
|
command: string;
|
|
4
|
+
argv?: string[] | undefined;
|
|
4
5
|
cwd?: string | undefined;
|
|
5
6
|
timeoutMs?: number | undefined;
|
|
7
|
+
maxOutputBytes?: number | undefined;
|
|
8
|
+
maxArtifactBytes?: number | undefined;
|
|
9
|
+
shell?: boolean | undefined;
|
|
6
10
|
signal?: AbortSignal | undefined;
|
|
7
11
|
onOutput?: ((chunk: string, stream: "stdout" | "stderr") => void) | undefined;
|
|
8
12
|
}
|
package/dist/tools/shell.js
CHANGED
|
@@ -1,19 +1,35 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import { redactSecrets } from "../llm/provider.js";
|
|
3
|
+
import { createArtifactStream } from "./artifacts.js";
|
|
2
4
|
export async function shellExec(args) {
|
|
3
5
|
if (args.signal?.aborted) {
|
|
4
6
|
return { ok: false, output: "Command aborted.", exitCode: 130 };
|
|
5
7
|
}
|
|
6
8
|
return new Promise((resolve, reject) => {
|
|
7
9
|
const detached = process.platform !== "win32";
|
|
8
|
-
const
|
|
10
|
+
const spawnOptions = {
|
|
9
11
|
cwd: args.cwd ?? process.cwd(),
|
|
10
12
|
detached,
|
|
11
|
-
shell:
|
|
13
|
+
shell: args.shell ?? !args.argv,
|
|
12
14
|
stdio: ["ignore", "pipe", "pipe"],
|
|
13
|
-
}
|
|
15
|
+
};
|
|
16
|
+
const child = args.argv
|
|
17
|
+
? spawn(args.command, args.argv, spawnOptions)
|
|
18
|
+
: spawn(args.command, spawnOptions);
|
|
14
19
|
let output = "";
|
|
15
20
|
let aborted = false;
|
|
16
21
|
let timedOut = false;
|
|
22
|
+
let outputTruncated = false;
|
|
23
|
+
let bytesRead = 0;
|
|
24
|
+
let bytesShown = 0;
|
|
25
|
+
let bytesDropped = 0;
|
|
26
|
+
let linesRead = 0;
|
|
27
|
+
let artifactBytes = 0;
|
|
28
|
+
let artifactLimitNoted = false;
|
|
29
|
+
const started = Date.now();
|
|
30
|
+
const maxOutputBytes = args.maxOutputBytes ?? 64_000;
|
|
31
|
+
const maxArtifactBytes = args.maxArtifactBytes ?? 10 * 1024 * 1024;
|
|
32
|
+
const artifact = createArtifactStream("shell.exec");
|
|
17
33
|
let timeout;
|
|
18
34
|
let forceKill;
|
|
19
35
|
const cleanup = () => {
|
|
@@ -23,11 +39,50 @@ export async function shellExec(args) {
|
|
|
23
39
|
clearTimeout(forceKill);
|
|
24
40
|
args.signal?.removeEventListener("abort", abort);
|
|
25
41
|
};
|
|
42
|
+
const closeArtifact = async () => {
|
|
43
|
+
await new Promise((resolve) => {
|
|
44
|
+
artifact.stream.end(resolve);
|
|
45
|
+
});
|
|
46
|
+
};
|
|
47
|
+
const writeArtifact = (text) => {
|
|
48
|
+
const bytes = Buffer.byteLength(text);
|
|
49
|
+
const remaining = maxArtifactBytes - artifactBytes;
|
|
50
|
+
if (remaining <= 0) {
|
|
51
|
+
bytesDropped += bytes;
|
|
52
|
+
if (!artifactLimitNoted) {
|
|
53
|
+
artifactLimitNoted = true;
|
|
54
|
+
artifact.stream.write(`\n... full output artifact capped at ${maxArtifactBytes} bytes ...\n`);
|
|
55
|
+
}
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const chunk = bytes > remaining ? text.slice(0, remaining) : text;
|
|
59
|
+
artifact.stream.write(chunk);
|
|
60
|
+
artifactBytes += Buffer.byteLength(chunk);
|
|
61
|
+
if (bytes > remaining) {
|
|
62
|
+
bytesDropped += bytes - remaining;
|
|
63
|
+
artifactLimitNoted = true;
|
|
64
|
+
artifact.stream.write(`\n... full output artifact capped at ${maxArtifactBytes} bytes ...\n`);
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
const appendModelOutput = (text) => {
|
|
68
|
+
const bytes = Buffer.byteLength(text);
|
|
69
|
+
const remaining = maxOutputBytes - bytesShown;
|
|
70
|
+
if (remaining <= 0) {
|
|
71
|
+
outputTruncated = true;
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
const chunk = bytes > remaining ? text.slice(0, remaining) : text;
|
|
75
|
+
output += chunk;
|
|
76
|
+
bytesShown += Buffer.byteLength(chunk);
|
|
77
|
+
if (bytes > remaining)
|
|
78
|
+
outputTruncated = true;
|
|
79
|
+
};
|
|
26
80
|
const append = (chunk, stream) => {
|
|
27
|
-
const text = chunk.toString();
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
81
|
+
const text = redactSecrets(chunk.toString());
|
|
82
|
+
bytesRead += Buffer.byteLength(text);
|
|
83
|
+
linesRead += text.split(/\r?\n/).length - 1;
|
|
84
|
+
writeArtifact(text);
|
|
85
|
+
appendModelOutput(text);
|
|
31
86
|
args.onOutput?.(text, stream);
|
|
32
87
|
};
|
|
33
88
|
const killChild = (signal) => {
|
|
@@ -63,14 +118,34 @@ export async function shellExec(args) {
|
|
|
63
118
|
reject(error);
|
|
64
119
|
}
|
|
65
120
|
});
|
|
66
|
-
child.on("close", (code) => {
|
|
121
|
+
child.on("close", async (code) => {
|
|
67
122
|
cleanup();
|
|
68
|
-
|
|
123
|
+
await closeArtifact();
|
|
124
|
+
const artifactPath = outputTruncated || bytesDropped > 0 ? artifact.path : undefined;
|
|
125
|
+
if (!artifactPath)
|
|
126
|
+
artifact.remove();
|
|
127
|
+
const truncationNote = outputTruncated
|
|
128
|
+
? `\n... model-facing output truncated at ${maxOutputBytes} bytes; full output saved to ${artifact.path} ...`
|
|
129
|
+
: "";
|
|
130
|
+
const trimmed = `${output.trim()}${truncationNote}`.trim();
|
|
131
|
+
const stats = {
|
|
132
|
+
bytesRead,
|
|
133
|
+
bytesShown,
|
|
134
|
+
bytesDropped,
|
|
135
|
+
linesRead,
|
|
136
|
+
elapsedMs: Date.now() - started,
|
|
137
|
+
};
|
|
69
138
|
if (aborted || args.signal?.aborted) {
|
|
70
139
|
resolve({
|
|
71
140
|
ok: false,
|
|
72
141
|
output: trimmed ? `${trimmed}\nCommand aborted.` : "Command aborted.",
|
|
73
142
|
exitCode: 130,
|
|
143
|
+
outputPath: artifactPath,
|
|
144
|
+
truncated: outputTruncated || bytesDropped > 0,
|
|
145
|
+
artifacts: artifactPath
|
|
146
|
+
? [{ path: artifactPath, kind: "raw", redacted: true }]
|
|
147
|
+
: undefined,
|
|
148
|
+
stats,
|
|
74
149
|
});
|
|
75
150
|
return;
|
|
76
151
|
}
|
|
@@ -79,6 +154,12 @@ export async function shellExec(args) {
|
|
|
79
154
|
ok: false,
|
|
80
155
|
output: trimmed ? `${trimmed}\nCommand timed out.` : "Command timed out.",
|
|
81
156
|
exitCode: 124,
|
|
157
|
+
outputPath: artifactPath,
|
|
158
|
+
truncated: outputTruncated || bytesDropped > 0,
|
|
159
|
+
artifacts: artifactPath
|
|
160
|
+
? [{ path: artifactPath, kind: "raw", redacted: true }]
|
|
161
|
+
: undefined,
|
|
162
|
+
stats,
|
|
82
163
|
});
|
|
83
164
|
return;
|
|
84
165
|
}
|
|
@@ -86,6 +167,12 @@ export async function shellExec(args) {
|
|
|
86
167
|
ok: code === 0,
|
|
87
168
|
output: trimmed,
|
|
88
169
|
exitCode: code ?? undefined,
|
|
170
|
+
outputPath: artifactPath,
|
|
171
|
+
truncated: outputTruncated || bytesDropped > 0,
|
|
172
|
+
artifacts: artifactPath
|
|
173
|
+
? [{ path: artifactPath, kind: "raw", redacted: true }]
|
|
174
|
+
: undefined,
|
|
175
|
+
stats,
|
|
89
176
|
});
|
|
90
177
|
});
|
|
91
178
|
args.signal?.addEventListener("abort", abort, { once: true });
|
package/dist/tools/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -45,4 +45,20 @@ export interface ToolResult {
|
|
|
45
45
|
exitCode?: number | undefined;
|
|
46
46
|
outputPath?: string | undefined;
|
|
47
47
|
truncated?: boolean | undefined;
|
|
48
|
+
modelContext?: string | undefined;
|
|
49
|
+
summary?: string | undefined;
|
|
50
|
+
artifacts?: ToolArtifact[] | undefined;
|
|
51
|
+
stats?: ToolStats | undefined;
|
|
52
|
+
}
|
|
53
|
+
export interface ToolArtifact {
|
|
54
|
+
path: string;
|
|
55
|
+
kind: "raw" | "json" | "xml" | "report";
|
|
56
|
+
redacted: boolean;
|
|
57
|
+
}
|
|
58
|
+
export interface ToolStats {
|
|
59
|
+
bytesRead?: number | undefined;
|
|
60
|
+
bytesShown?: number | undefined;
|
|
61
|
+
bytesDropped?: number | undefined;
|
|
62
|
+
linesRead?: number | undefined;
|
|
63
|
+
elapsedMs?: number | undefined;
|
|
48
64
|
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export interface ToolOutputSnapshot {
|
|
2
|
+
id: string;
|
|
3
|
+
label: string;
|
|
4
|
+
artifactPath?: string | undefined;
|
|
5
|
+
fullText?: string | undefined;
|
|
6
|
+
summary?: string | undefined;
|
|
7
|
+
}
|
|
8
|
+
interface LivePane {
|
|
9
|
+
append(chunk: string): void;
|
|
10
|
+
finish(): void;
|
|
11
|
+
}
|
|
12
|
+
export declare function rememberToolOutput(snapshot: ToolOutputSnapshot): void;
|
|
13
|
+
export declare function updateLastToolSummary(summary: string): void;
|
|
14
|
+
export declare function renderToolOutputHint(): string;
|
|
15
|
+
export declare function hasToolOutputSnapshot(): boolean;
|
|
16
|
+
export declare function toggleLastToolOutput(): Promise<void>;
|
|
17
|
+
export declare function createToolLivePane(label: string, maxRows?: number): LivePane;
|
|
18
|
+
export {};
|