@pentoshi/clai 0.5.9 → 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 +120 -65
- 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/context/manager.d.ts +4 -0
- package/dist/context/manager.js +48 -0
- package/dist/context/manager.js.map +1 -0
- package/dist/llm/http.js +11 -1
- package/dist/llm/http.js.map +1 -1
- 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/prompts/index.js +6 -0
- package/dist/prompts/index.js.map +1 -1
- package/dist/repl.js +89 -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
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":"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"}
|
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 {};
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
let lastSnapshot;
|
|
4
|
+
let expanded = false;
|
|
5
|
+
let renderedLines = 0;
|
|
6
|
+
function stripAnsi(text) {
|
|
7
|
+
return text.replace(/\x1b\[[0-9;]*m/g, "");
|
|
8
|
+
}
|
|
9
|
+
function countRows(text) {
|
|
10
|
+
if (!text)
|
|
11
|
+
return 0;
|
|
12
|
+
return text.split("\n").length;
|
|
13
|
+
}
|
|
14
|
+
function eraseRenderedBlock() {
|
|
15
|
+
if (!process.stdout.isTTY || renderedLines === 0) {
|
|
16
|
+
renderedLines = 0;
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
for (let i = 0; i < renderedLines; i += 1) {
|
|
20
|
+
process.stdout.write("\r\x1b[2K");
|
|
21
|
+
if (i < renderedLines - 1)
|
|
22
|
+
process.stdout.write("\x1b[1A");
|
|
23
|
+
}
|
|
24
|
+
renderedLines = 0;
|
|
25
|
+
}
|
|
26
|
+
function formatHint(snapshot, next = "show") {
|
|
27
|
+
const suffix = snapshot.artifactPath
|
|
28
|
+
? chalk.dim(` saved: ${snapshot.artifactPath}`)
|
|
29
|
+
: "";
|
|
30
|
+
return chalk.dim(` Ctrl+O ${next} full output`) + suffix;
|
|
31
|
+
}
|
|
32
|
+
async function loadFullOutput(snapshot) {
|
|
33
|
+
if (snapshot.artifactPath) {
|
|
34
|
+
return readFile(snapshot.artifactPath, "utf8");
|
|
35
|
+
}
|
|
36
|
+
return snapshot.fullText ?? "";
|
|
37
|
+
}
|
|
38
|
+
function renderExpandedBlock(snapshot, fullOutput) {
|
|
39
|
+
const summary = snapshot.summary?.trim() || "AI summary is not available yet.";
|
|
40
|
+
return [
|
|
41
|
+
chalk.dim(`--- full output: ${snapshot.label} ---`),
|
|
42
|
+
chalk.dim(fullOutput.trimEnd()),
|
|
43
|
+
chalk.dim(`--- summary ---`),
|
|
44
|
+
summary,
|
|
45
|
+
formatHint(snapshot, "hide"),
|
|
46
|
+
"",
|
|
47
|
+
].join("\n");
|
|
48
|
+
}
|
|
49
|
+
export function rememberToolOutput(snapshot) {
|
|
50
|
+
eraseRenderedBlock();
|
|
51
|
+
lastSnapshot = snapshot;
|
|
52
|
+
expanded = false;
|
|
53
|
+
}
|
|
54
|
+
export function updateLastToolSummary(summary) {
|
|
55
|
+
if (!lastSnapshot)
|
|
56
|
+
return;
|
|
57
|
+
lastSnapshot = { ...lastSnapshot, summary };
|
|
58
|
+
}
|
|
59
|
+
export function renderToolOutputHint() {
|
|
60
|
+
return lastSnapshot ? formatHint(lastSnapshot) : "";
|
|
61
|
+
}
|
|
62
|
+
export function hasToolOutputSnapshot() {
|
|
63
|
+
return Boolean(lastSnapshot);
|
|
64
|
+
}
|
|
65
|
+
export async function toggleLastToolOutput() {
|
|
66
|
+
if (!lastSnapshot) {
|
|
67
|
+
process.stdout.write(chalk.dim("\n No tool output to show.\n"));
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
if (expanded) {
|
|
71
|
+
eraseRenderedBlock();
|
|
72
|
+
expanded = false;
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
eraseRenderedBlock();
|
|
76
|
+
const full = await loadFullOutput(lastSnapshot);
|
|
77
|
+
const block = renderExpandedBlock(lastSnapshot, full);
|
|
78
|
+
process.stdout.write(`\n${block}`);
|
|
79
|
+
renderedLines = countRows(stripAnsi(`\n${block}`));
|
|
80
|
+
expanded = true;
|
|
81
|
+
}
|
|
82
|
+
export function createToolLivePane(label, maxRows = 10) {
|
|
83
|
+
if (!process.stdout.isTTY) {
|
|
84
|
+
return {
|
|
85
|
+
append: () => { },
|
|
86
|
+
finish: () => { },
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
let lines = [];
|
|
90
|
+
let partial = "";
|
|
91
|
+
let liveRows = 0;
|
|
92
|
+
const erase = () => {
|
|
93
|
+
if (liveRows === 0)
|
|
94
|
+
return;
|
|
95
|
+
for (let i = 0; i < liveRows; i += 1) {
|
|
96
|
+
process.stdout.write("\r\x1b[2K");
|
|
97
|
+
if (i < liveRows - 1)
|
|
98
|
+
process.stdout.write("\x1b[1A");
|
|
99
|
+
}
|
|
100
|
+
liveRows = 0;
|
|
101
|
+
};
|
|
102
|
+
const render = () => {
|
|
103
|
+
erase();
|
|
104
|
+
const width = Math.max(40, Math.min(process.stdout.columns ?? 100, 180));
|
|
105
|
+
const visible = [...lines, partial]
|
|
106
|
+
.filter((line) => line.length > 0)
|
|
107
|
+
.slice(-maxRows)
|
|
108
|
+
.map((line) => line.length > width - 4 ? `${line.slice(0, width - 5)}...` : line);
|
|
109
|
+
const body = [
|
|
110
|
+
chalk.dim(` running ${label}`),
|
|
111
|
+
...visible.map((line) => chalk.dim(` ${line}`)),
|
|
112
|
+
].join("\n");
|
|
113
|
+
process.stdout.write(body);
|
|
114
|
+
liveRows = countRows(body);
|
|
115
|
+
};
|
|
116
|
+
return {
|
|
117
|
+
append(chunk) {
|
|
118
|
+
const normalized = chunk.replace(/\r/g, "");
|
|
119
|
+
const parts = normalized.split("\n");
|
|
120
|
+
partial += parts.shift() ?? "";
|
|
121
|
+
if (parts.length > 0) {
|
|
122
|
+
lines.push(partial);
|
|
123
|
+
lines.push(...parts.slice(0, -1));
|
|
124
|
+
partial = parts[parts.length - 1] ?? "";
|
|
125
|
+
}
|
|
126
|
+
if (lines.length > maxRows * 4)
|
|
127
|
+
lines = lines.slice(-maxRows * 2);
|
|
128
|
+
render();
|
|
129
|
+
},
|
|
130
|
+
finish() {
|
|
131
|
+
erase();
|
|
132
|
+
},
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=tool-output.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-output.js","sourceRoot":"","sources":["../../src/ui/tool-output.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED