@dirgha/code 1.17.2 → 1.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +130 -45
- package/README.md +36 -25
- package/dist/cli/config.d.ts +2 -0
- package/dist/cli/config.js +16 -1
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/flows/tarball.js +26 -21
- package/dist/cli/flows/tarball.js.map +1 -1
- package/dist/cli/flows/wizard.d.ts +1 -1
- package/dist/cli/flows/wizard.js +282 -163
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +11 -3
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -9
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/models-cmd.js +18 -20
- package/dist/cli/models-cmd.js.map +1 -1
- package/dist/cli/slash/fleet.d.ts +1 -1
- package/dist/cli/slash/fleet.js +25 -16
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/fs.js +1 -3
- package/dist/cli/slash/fs.js.map +1 -1
- package/dist/cli/slash/models.js +3 -4
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.d.ts +1 -1
- package/dist/cli/slash/paste.js +87 -41
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.js +2 -2
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/session.js +4 -1
- package/dist/cli/slash/session.js.map +1 -1
- package/dist/cli/slash.js +19 -6
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/doctor.js +48 -0
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.d.ts +13 -0
- package/dist/cli/subcommands/feature-setup.js +438 -0
- package/dist/cli/subcommands/feature-setup.js.map +1 -0
- package/dist/cli/subcommands/history.d.ts +8 -0
- package/dist/cli/subcommands/history.js +45 -0
- package/dist/cli/subcommands/history.js.map +1 -0
- package/dist/cli/subcommands/index.js +4 -0
- package/dist/cli/subcommands/index.js.map +1 -1
- package/dist/cli/subcommands/scaffold.js +6 -2
- package/dist/cli/subcommands/scaffold.js.map +1 -1
- package/dist/cli/subcommands/setup.d.ts +4 -0
- package/dist/cli/subcommands/setup.js +9 -1
- package/dist/cli/subcommands/setup.js.map +1 -1
- package/dist/cli/subcommands/state.d.ts +8 -0
- package/dist/cli/subcommands/state.js +44 -0
- package/dist/cli/subcommands/state.js.map +1 -0
- package/dist/cli/subcommands/web.d.ts +1 -1
- package/dist/cli/subcommands/web.js +17 -14
- package/dist/cli/subcommands/web.js.map +1 -1
- package/dist/context/compaction.d.ts +3 -3
- package/dist/context/compaction.js +85 -37
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +5 -1
- package/dist/context/kb-init.d.ts +7 -0
- package/dist/context/kb-init.js +51 -0
- package/dist/context/kb-init.js.map +1 -0
- package/dist/context/ledger.js +3 -3
- package/dist/context/ledger.js.map +1 -1
- package/dist/context/memory.js +3 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/primer.js +2 -0
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.js +5 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.d.ts +4 -0
- package/dist/daemon/server.js +81 -29
- package/dist/daemon/server.js.map +1 -1
- package/dist/fleet/apply-back.d.ts +1 -1
- package/dist/fleet/apply-back.js +90 -48
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -2
- package/dist/fleet/cli-command.js +189 -72
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/dag.d.ts +38 -0
- package/dist/fleet/dag.js +77 -0
- package/dist/fleet/dag.js.map +1 -0
- package/dist/fleet/ledger-hook.d.ts +15 -0
- package/dist/fleet/ledger-hook.js +67 -0
- package/dist/fleet/ledger-hook.js.map +1 -0
- package/dist/fleet/runner.js +38 -5
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad-tools.d.ts +13 -0
- package/dist/fleet/scratchpad-tools.js +73 -0
- package/dist/fleet/scratchpad-tools.js.map +1 -0
- package/dist/fleet/scratchpad.d.ts +28 -0
- package/dist/fleet/scratchpad.js +93 -0
- package/dist/fleet/scratchpad.js.map +1 -0
- package/dist/fleet/state.d.ts +37 -0
- package/dist/fleet/state.js +82 -0
- package/dist/fleet/state.js.map +1 -0
- package/dist/fleet/tripleshot.d.ts +2 -2
- package/dist/fleet/tripleshot.js +61 -48
- package/dist/fleet/tripleshot.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/fleet/worktree.d.ts +5 -0
- package/dist/fleet/worktree.js +82 -11
- package/dist/fleet/worktree.js.map +1 -1
- package/dist/hooks/config-bridge.d.ts +2 -2
- package/dist/hooks/config-bridge.js +49 -19
- package/dist/hooks/config-bridge.js.map +1 -1
- package/dist/integrations/arniko-client.d.ts +1 -1
- package/dist/integrations/arniko-client.js +32 -26
- package/dist/integrations/arniko-client.js.map +1 -1
- package/dist/intelligence/cost.js +13 -7
- package/dist/intelligence/cost.js.map +1 -1
- package/dist/intelligence/failover-chain.d.ts +27 -0
- package/dist/intelligence/failover-chain.js +70 -0
- package/dist/intelligence/failover-chain.js.map +1 -0
- package/dist/intelligence/models-dev-sync.js +10 -3
- package/dist/intelligence/models-dev-sync.js.map +1 -1
- package/dist/intelligence/prices.js +1 -1
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +74 -17
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/event-stream.d.ts +7 -2
- package/dist/kernel/event-stream.js +63 -9
- package/dist/kernel/event-stream.js.map +1 -1
- package/dist/kernel/message.d.ts +2 -2
- package/dist/kernel/message.js +45 -30
- package/dist/kernel/message.js.map +1 -1
- package/dist/kernel/types.d.ts +1 -1
- package/dist/lsp/client.js +16 -7
- package/dist/lsp/client.js.map +1 -1
- package/dist/providers/deepseek.d.ts +2 -2
- package/dist/providers/deepseek.js +21 -21
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/health.d.ts +4 -1
- package/dist/providers/health.js +24 -9
- package/dist/providers/health.js.map +1 -1
- package/dist/providers/http.d.ts +2 -0
- package/dist/providers/http.js +52 -24
- package/dist/providers/http.js.map +1 -1
- package/dist/providers/openai-compat.js +30 -27
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.d.ts +2 -2
- package/dist/providers/openrouter.js +25 -16
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/approval-bus.js +1 -1
- package/dist/safety/approval-bus.js.map +1 -1
- package/dist/safety/policy.d.ts +3 -3
- package/dist/safety/policy.js +60 -47
- package/dist/safety/policy.js.map +1 -1
- package/dist/safety/sandbox/noop.d.ts +2 -2
- package/dist/safety/sandbox/noop.js +23 -15
- package/dist/safety/sandbox/noop.js.map +1 -1
- package/dist/safety/sandbox/seatbelt.d.ts +1 -1
- package/dist/safety/sandbox/seatbelt.js +16 -9
- package/dist/safety/sandbox/seatbelt.js.map +1 -1
- package/dist/state/db.d.ts +29 -0
- package/dist/state/db.js +138 -0
- package/dist/state/db.js.map +1 -0
- package/dist/state/index.d.ts +23 -0
- package/dist/state/index.js +119 -0
- package/dist/state/index.js.map +1 -0
- package/dist/subagents/delegator.d.ts +8 -0
- package/dist/subagents/delegator.js +22 -5
- package/dist/subagents/delegator.js.map +1 -1
- package/dist/telemetry/crash-report.js +111 -79
- package/dist/telemetry/crash-report.js.map +1 -1
- package/dist/tools/browser.d.ts +1 -1
- package/dist/tools/browser.js +62 -45
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.js +3 -0
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.d.ts +1 -1
- package/dist/tools/cron.js +61 -41
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/exec.js +36 -1
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.js +4 -1
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +4 -1
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.js +4 -1
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.js +4 -1
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.d.ts +1 -1
- package/dist/tools/git.js +45 -25
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +5 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/lsp-definition.js +10 -1
- package/dist/tools/lsp-definition.js.map +1 -1
- package/dist/tools/lsp-hover.js +10 -1
- package/dist/tools/lsp-hover.js.map +1 -1
- package/dist/tools/lsp-references.js +10 -1
- package/dist/tools/lsp-references.js.map +1 -1
- package/dist/tools/lsp-symbols.js +10 -1
- package/dist/tools/lsp-symbols.js.map +1 -1
- package/dist/tools/multimodal.d.ts +2 -2
- package/dist/tools/multimodal.js +141 -90
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/qmd.d.ts +15 -0
- package/dist/tools/qmd.js +107 -0
- package/dist/tools/qmd.js.map +1 -0
- package/dist/tools/registry.d.ts +5 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.d.ts +12 -0
- package/dist/tools/rtk.js +113 -0
- package/dist/tools/rtk.js.map +1 -0
- package/dist/tools/search-grep.js +1 -0
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.js +25 -16
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/approval.d.ts +1 -1
- package/dist/tui/approval.js +38 -14
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.js +85 -71
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +9 -22
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +2 -0
- package/dist/tui/ink/components/InputBox.js +9 -14
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +18 -0
- package/dist/tui/ink/components/SpinnerGlyph.js +28 -0
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -0
- package/dist/tui/ink/components/StatusBar.js +4 -22
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.js +3 -3
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +6 -26
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/ToolGroup.js +4 -14
- package/dist/tui/ink/components/ToolGroup.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.js +4 -1
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/spinner-context.d.ts +5 -0
- package/dist/tui/ink/spinner-context.js +7 -0
- package/dist/tui/ink/spinner-context.js.map +1 -0
- package/dist/tui/ink/use-event-projection.js +142 -37
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/renderer.js +9 -1
- package/dist/tui/renderer.js.map +1 -1
- package/dist/web/ledger.d.ts +1 -1
- package/dist/web/ledger.js +44 -20
- package/dist/web/ledger.js.map +1 -1
- package/dist/web/server.js +4 -3
- package/dist/web/server.js.map +1 -1
- package/package.json +21 -12
- package/vendor/qmd/VERSION +3 -0
- package/vendor/rtk/CHECKSUMS.txt +6 -0
- package/vendor/rtk/VERSION +3 -0
- package/vendor/rtk/linux-x64/rtk +0 -0
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* rtk tool — token-cheap shell command execution.
|
|
3
|
+
*
|
|
4
|
+
* Wraps shell commands through the `rtk` binary, which filters and
|
|
5
|
+
* compresses stdout to strip noise (progress bars, ANSI, verbose boilerplate).
|
|
6
|
+
* Falls back to direct execution when rtk is not installed so the tool
|
|
7
|
+
* is always usable regardless of host environment.
|
|
8
|
+
*
|
|
9
|
+
* Install rtk: https://github.com/rtk-ai/rtk
|
|
10
|
+
*/
|
|
11
|
+
import type { Tool } from "./registry.js";
|
|
12
|
+
export declare const rtkTool: Tool;
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* rtk tool — token-cheap shell command execution.
|
|
3
|
+
*
|
|
4
|
+
* Wraps shell commands through the `rtk` binary, which filters and
|
|
5
|
+
* compresses stdout to strip noise (progress bars, ANSI, verbose boilerplate).
|
|
6
|
+
* Falls back to direct execution when rtk is not installed so the tool
|
|
7
|
+
* is always usable regardless of host environment.
|
|
8
|
+
*
|
|
9
|
+
* Install rtk: https://github.com/rtk-ai/rtk
|
|
10
|
+
*/
|
|
11
|
+
import { execFile } from "node:child_process";
|
|
12
|
+
import { promisify } from "node:util";
|
|
13
|
+
import { createRequire } from "node:module";
|
|
14
|
+
import { join, dirname } from "node:path";
|
|
15
|
+
import { access, constants } from "node:fs/promises";
|
|
16
|
+
const execFileAsync = promisify(execFile);
|
|
17
|
+
// Resolve the package root: require.resolve returns the absolute path to
|
|
18
|
+
// package.json, so one dirname gives us the package root directory.
|
|
19
|
+
const _require = createRequire(import.meta.url);
|
|
20
|
+
const _pkgRoot = dirname(_require.resolve("../../package.json"));
|
|
21
|
+
// Platform key used to locate the vendored binary.
|
|
22
|
+
const _platform = `${process.platform}-${process.arch}`;
|
|
23
|
+
// Vendored binary path: vendor/rtk/<platform>/rtk (or rtk.exe on Windows).
|
|
24
|
+
const _vendoredBin = join(_pkgRoot, "vendor", "rtk", _platform, process.platform === "win32" ? "rtk.exe" : "rtk");
|
|
25
|
+
// Resolve which rtk binary to use: vendored → PATH → null.
|
|
26
|
+
async function resolveRtk() {
|
|
27
|
+
// 1. Prefer the vendored binary shipped inside the package.
|
|
28
|
+
try {
|
|
29
|
+
await access(_vendoredBin, constants.X_OK);
|
|
30
|
+
return _vendoredBin;
|
|
31
|
+
}
|
|
32
|
+
catch { /* not present for this platform */ }
|
|
33
|
+
// 2. Fall back to whatever rtk is on PATH.
|
|
34
|
+
try {
|
|
35
|
+
await execFileAsync("which", ["rtk"], { timeout: 2000 });
|
|
36
|
+
return "rtk";
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
export const rtkTool = {
|
|
43
|
+
name: "rtk",
|
|
44
|
+
description: "Run a shell command through rtk (Rust Token Killer) for token-compressed output. " +
|
|
45
|
+
"rtk strips noise (ANSI codes, progress bars, verbose boilerplate) from command output, " +
|
|
46
|
+
"making it much cheaper to process in context. Use this instead of `shell` for read-only " +
|
|
47
|
+
"commands like git status, cargo test output, ls, find, grep, etc. " +
|
|
48
|
+
"Falls back to direct execution when rtk is not installed. " +
|
|
49
|
+
"Install: https://github.com/rtk-ai/rtk",
|
|
50
|
+
inputSchema: {
|
|
51
|
+
type: "object",
|
|
52
|
+
properties: {
|
|
53
|
+
command: {
|
|
54
|
+
type: "string",
|
|
55
|
+
description: "The shell command to run (e.g. 'git status', 'cargo test', 'ls -la'). " +
|
|
56
|
+
"Do NOT include 'rtk' prefix — it is added automatically.",
|
|
57
|
+
},
|
|
58
|
+
cwd: {
|
|
59
|
+
type: "string",
|
|
60
|
+
description: "Working directory for the command. Defaults to the agent's cwd.",
|
|
61
|
+
},
|
|
62
|
+
timeoutMs: {
|
|
63
|
+
type: "number",
|
|
64
|
+
description: "Timeout in milliseconds. Defaults to 30000.",
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
required: ["command"],
|
|
68
|
+
},
|
|
69
|
+
async execute(raw, ctx) {
|
|
70
|
+
const input = raw;
|
|
71
|
+
const workDir = input.cwd ?? ctx.cwd ?? process.cwd();
|
|
72
|
+
const timeout = input.timeoutMs ?? 30_000;
|
|
73
|
+
const cmdParts = input.command.trim().split(/\s+/);
|
|
74
|
+
try {
|
|
75
|
+
const rtkBin = await resolveRtk();
|
|
76
|
+
const argv = rtkBin ? [rtkBin, ...cmdParts] : cmdParts;
|
|
77
|
+
const bin = argv[0];
|
|
78
|
+
const args = argv.slice(1);
|
|
79
|
+
const rtkUsed = rtkBin !== null;
|
|
80
|
+
const { stdout, stderr } = await execFileAsync(bin, args, {
|
|
81
|
+
cwd: workDir,
|
|
82
|
+
timeout,
|
|
83
|
+
maxBuffer: 1024 * 1024 * 4,
|
|
84
|
+
// Disable rtk's default telemetry. rtk pings telemetry.rtk-ai.app
|
|
85
|
+
// with aggregate command counts; Dirgha users have not opted in.
|
|
86
|
+
env: { ...process.env, RTK_TELEMETRY_DISABLED: "1" },
|
|
87
|
+
});
|
|
88
|
+
const out = (stdout + (stderr ? `\n[stderr]\n${stderr}` : "")).trim();
|
|
89
|
+
return {
|
|
90
|
+
content: out || "(no output)",
|
|
91
|
+
data: { command: input.command, rtkUsed, cwd: workDir },
|
|
92
|
+
isError: false,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
const e = err;
|
|
97
|
+
// Non-zero exit: return output + exit code, not a hard error (let model decide).
|
|
98
|
+
if (e.stdout !== undefined || e.stderr !== undefined) {
|
|
99
|
+
const out = ((e.stdout ?? "") + (e.stderr ? `\n[stderr]\n${e.stderr}` : "")).trim();
|
|
100
|
+
return {
|
|
101
|
+
content: `exit ${e.code ?? 1}\n${out}`,
|
|
102
|
+
data: { exitCode: e.code ?? 1, command: input.command },
|
|
103
|
+
isError: false,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
return {
|
|
107
|
+
content: `rtk tool failed: ${e.message}`,
|
|
108
|
+
isError: true,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
},
|
|
112
|
+
};
|
|
113
|
+
//# sourceMappingURL=rtk.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rtk.js","sourceRoot":"","sources":["../../src/tools/rtk.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,6 +88,7 @@ async function nodeScan(input, root, limit) {
|
|
|
88
88
|
const text = await readFile(abs, 'utf8').catch(() => '');
|
|
89
89
|
const lines = text.split('\n');
|
|
90
90
|
for (let i = 0; i < lines.length; i++) {
|
|
91
|
+
regex.lastIndex = 0; // reset state between tests — global-flag RegExp retains lastIndex
|
|
91
92
|
if (regex.test(lines[i])) {
|
|
92
93
|
matches.push(`${abs}:${i + 1}:${lines[i]}`);
|
|
93
94
|
if (matches.length >= limit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-grep.js","sourceRoot":"","sources":["../../src/tools/search-grep.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"search-grep.js","sourceRoot":"","sources":["../../src/tools/search-grep.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/shell.js
CHANGED
|
@@ -63,11 +63,17 @@ export const shellTool = {
|
|
|
63
63
|
},
|
|
64
64
|
required: ["command"],
|
|
65
65
|
},
|
|
66
|
+
timeoutMs: 300_000, // 5 min — generous for multi-step shell commands
|
|
66
67
|
requiresApproval: () => true,
|
|
67
68
|
async execute(rawInput, ctx) {
|
|
68
69
|
const input = rawInput;
|
|
69
70
|
const cwd = input.cwd ?? ctx.cwd;
|
|
70
71
|
const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
72
|
+
// TODO: use context.sandbox when SandboxAdapter.exec() is wired.
|
|
73
|
+
// ctx.sandbox is now populated by createToolExecutor() — replace the
|
|
74
|
+
// spawn() block below with ctx.sandbox.exec({ command, cwd, env, ... })
|
|
75
|
+
// once the mapping from Input → SandboxExecOptions is validated.
|
|
76
|
+
//
|
|
71
77
|
// Platform-aware spawn. On Windows, prefer pwsh > powershell > cmd.
|
|
72
78
|
// PowerShell handles UTF-8, quoting, and multi-line scripts more
|
|
73
79
|
// cleanly than cmd.exe's legacy parser. On POSIX, plain shell:true
|
|
@@ -93,41 +99,44 @@ export const shellTool = {
|
|
|
93
99
|
let stdoutBytes = 0;
|
|
94
100
|
let stderrBytes = 0;
|
|
95
101
|
let truncated = false;
|
|
96
|
-
|
|
97
|
-
|
|
102
|
+
// Shared total so combined stdout+stderr never exceeds MAX_OUTPUT_BYTES.
|
|
103
|
+
let totalBytes = 0;
|
|
104
|
+
const onData = (chunks, trackBytes) => (buf) => {
|
|
105
|
+
const remaining = MAX_OUTPUT_BYTES - totalBytes;
|
|
98
106
|
if (remaining <= 0) {
|
|
99
107
|
truncated = true;
|
|
100
108
|
return;
|
|
101
109
|
}
|
|
102
110
|
const slice = buf.length <= remaining ? buf : buf.subarray(0, remaining);
|
|
103
111
|
chunks.push(slice);
|
|
104
|
-
|
|
112
|
+
totalBytes += slice.length;
|
|
113
|
+
trackBytes(slice.length);
|
|
105
114
|
if (buf.length > remaining)
|
|
106
115
|
truncated = true;
|
|
107
116
|
const text = slice.toString("utf8");
|
|
108
117
|
if (text.trim().length > 0)
|
|
109
118
|
ctx.onProgress?.(text.trimEnd());
|
|
110
119
|
};
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
acc += add;
|
|
118
|
-
stderrBytes = acc;
|
|
119
|
-
return acc;
|
|
120
|
-
})();
|
|
121
|
-
child.stdout.on("data", onData(stdoutChunks, stdoutCount));
|
|
122
|
-
child.stderr.on("data", onData(stderrChunks, stderrCount));
|
|
120
|
+
child.stdout.on("data", onData(stdoutChunks, (n) => {
|
|
121
|
+
stdoutBytes += n;
|
|
122
|
+
}));
|
|
123
|
+
child.stderr.on("data", onData(stderrChunks, (n) => {
|
|
124
|
+
stderrBytes += n;
|
|
125
|
+
}));
|
|
123
126
|
const timer = setTimeout(() => {
|
|
124
127
|
child.kill("SIGKILL");
|
|
125
128
|
}, timeoutMs);
|
|
129
|
+
// Wire abort signal so Esc/cancel kills the child immediately.
|
|
130
|
+
const onAbort = () => {
|
|
131
|
+
child.kill("SIGKILL");
|
|
132
|
+
};
|
|
133
|
+
ctx.signal?.addEventListener("abort", onAbort, { once: true });
|
|
126
134
|
const exitCode = await new Promise((resolveExit) => {
|
|
127
135
|
child.on("error", () => resolveExit(-1));
|
|
128
|
-
child.on("
|
|
136
|
+
child.on("close", (code) => resolveExit(code ?? -1));
|
|
129
137
|
});
|
|
130
138
|
clearTimeout(timer);
|
|
139
|
+
ctx.signal?.removeEventListener("abort", onAbort);
|
|
131
140
|
const stdout = Buffer.concat(stdoutChunks).toString("utf8");
|
|
132
141
|
const stderr = Buffer.concat(stderrChunks).toString("utf8");
|
|
133
142
|
const banner = `exit=${exitCode}${truncated ? " [output truncated]" : ""}`;
|
package/dist/tools/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAUtD,6EAA6E;AAC7E,IAAI,kBAAkB,GAGX,IAAI,CAAC;AAEhB,SAAS,mBAAmB;IAI1B,IAAI,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAClD,wEAAwE;IACxE,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE;YAC9D,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,kBAAkB,GAAG;gBACnB,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC;oBAClC,SAAS;oBACT,YAAY;oBACZ,iBAAiB;oBACjB,eAAe;oBACf,MAAM;oBACN,UAAU;oBACV,MAAM;iBACP;aACF,CAAC;YACF,OAAO,kBAAkB,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,0EAA0E;IAC1E,kBAAkB,GAAG;QACnB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS;QACrC,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;KAC/D,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AASD,MAAM,kBAAkB,GAAG,OAAO,CAAC;AACnC,MAAM,gBAAgB,GAAG,GAAG,GAAG,IAAI,CAAC;AAEpC,MAAM,CAAC,MAAM,SAAS,GAAS;IAC7B,IAAI,EAAE,OAAO;IACb,WAAW,EACT,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC1B,CAAC,CAAC,2UAA2U;QAC7U,CAAC,CAAC,6GAA6G;IACnH,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvB,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;SAC9C;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,KAAK,CAAC,OAAO,CAAC,QAAiB,EAAE,GAAG;QAClC,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC;QACjC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,kBAAkB,CAAC;QACxD,oEAAoE;QACpE,iEAAiE;QACjE,mEAAmE;QACnE,kBAAkB;QAClB,MAAM,KAAK,GACT,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC1B,CAAC,CAAC,CAAC,GAAG,EAAE;gBACJ,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;gBACpC,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;oBACjD,GAAG;oBACH,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;oBACjC,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAC;YACL,CAAC,CAAC,EAAE;YACN,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;gBACnB,GAAG;gBACH,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;QAET,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,MAAM,MAAM,GACV,CAAC,MAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"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"}
|
package/dist/tui/approval.d.ts
CHANGED
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
* stdin; falls back to a line-based prompt when stdin is not a TTY
|
|
4
4
|
* (e.g., piped invocations).
|
|
5
5
|
*/
|
|
6
|
-
import type { ApprovalBus } from
|
|
6
|
+
import type { ApprovalBus } from "../kernel/types.js";
|
|
7
7
|
export declare function createTuiApprovalBus(autoApproveTools?: Set<string>): ApprovalBus;
|
package/dist/tui/approval.js
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* stdin; falls back to a line-based prompt when stdin is not a TTY
|
|
4
4
|
* (e.g., piped invocations).
|
|
5
5
|
*/
|
|
6
|
-
import { style, defaultTheme } from
|
|
7
|
-
import { createInterface } from
|
|
6
|
+
import { style, defaultTheme } from "./theme.js";
|
|
7
|
+
import { createInterface } from "node:readline";
|
|
8
8
|
export function createTuiApprovalBus(autoApproveTools = new Set()) {
|
|
9
9
|
return {
|
|
10
10
|
requiresApproval(toolName) {
|
|
@@ -18,35 +18,59 @@ export function createTuiApprovalBus(autoApproveTools = new Set()) {
|
|
|
18
18
|
const preview = truncate(req.diff, 1200);
|
|
19
19
|
process.stdout.write(`${preview}\n`);
|
|
20
20
|
}
|
|
21
|
-
process.stdout.write(
|
|
21
|
+
process.stdout.write("> ");
|
|
22
22
|
const answer = await readOneChar();
|
|
23
23
|
switch (answer.toLowerCase()) {
|
|
24
|
-
case
|
|
24
|
+
case "a":
|
|
25
25
|
autoApproveTools.add(req.tool);
|
|
26
|
-
return
|
|
27
|
-
case
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
return "approve_once";
|
|
27
|
+
case "d":
|
|
28
|
+
return "deny_always";
|
|
29
|
+
case "n":
|
|
30
|
+
return "deny";
|
|
31
|
+
default:
|
|
32
|
+
return "approve";
|
|
30
33
|
}
|
|
31
34
|
},
|
|
32
35
|
};
|
|
33
36
|
}
|
|
34
37
|
function readOneChar() {
|
|
35
|
-
return new Promise(resolve => {
|
|
38
|
+
return new Promise((resolve, reject) => {
|
|
36
39
|
if (!process.stdin.isTTY) {
|
|
37
|
-
const rl = createInterface({
|
|
38
|
-
|
|
40
|
+
const rl = createInterface({
|
|
41
|
+
input: process.stdin,
|
|
42
|
+
output: process.stdout,
|
|
43
|
+
});
|
|
44
|
+
rl.question("", (ans) => {
|
|
45
|
+
rl.close();
|
|
46
|
+
resolve(ans.trim());
|
|
47
|
+
});
|
|
39
48
|
return;
|
|
40
49
|
}
|
|
50
|
+
let settled = false;
|
|
41
51
|
const onData = (buf) => {
|
|
52
|
+
if (settled)
|
|
53
|
+
return;
|
|
54
|
+
settled = true;
|
|
42
55
|
process.stdin.setRawMode(false);
|
|
43
56
|
process.stdin.pause();
|
|
44
|
-
process.stdin.off(
|
|
45
|
-
|
|
57
|
+
process.stdin.off("data", onData);
|
|
58
|
+
process.stdin.off("error", onError);
|
|
59
|
+
resolve(buf.toString("utf8"));
|
|
60
|
+
};
|
|
61
|
+
const onError = (err) => {
|
|
62
|
+
if (settled)
|
|
63
|
+
return;
|
|
64
|
+
settled = true;
|
|
65
|
+
process.stdin.setRawMode(false);
|
|
66
|
+
process.stdin.off("data", onData);
|
|
67
|
+
process.stdin.off("error", onError);
|
|
68
|
+
reject(err);
|
|
46
69
|
};
|
|
47
70
|
process.stdin.setRawMode(true);
|
|
48
71
|
process.stdin.resume();
|
|
49
|
-
process.stdin.once(
|
|
72
|
+
process.stdin.once("data", onData);
|
|
73
|
+
process.stdin.once("error", onError);
|
|
50
74
|
});
|
|
51
75
|
}
|
|
52
76
|
function truncate(s, max) {
|
package/dist/tui/approval.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval.js","sourceRoot":"","sources":["../../src/tui/approval.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,UAAU,oBAAoB,
|
|
1
|
+
{"version":3,"file":"approval.js","sourceRoot":"","sources":["../../src/tui/approval.ts"],"names":[],"mappings":"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"}
|