@dirgha/code 1.20.15 → 1.20.27
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/dist/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.js +23 -2
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.d.ts +6 -5
- package/dist/cli/first-run.js +100 -42
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +13 -19
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +54 -10
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +67 -18
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +4 -2
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/slash/fleet.js +19 -1
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/keys.js +49 -0
- package/dist/cli/slash/keys.js.map +1 -1
- package/dist/cli/slash/login.js +7 -3
- package/dist/cli/slash/login.js.map +1 -1
- package/dist/cli/slash/models.d.ts +1 -1
- package/dist/cli/slash/models.js +144 -18
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/provider.js +1 -1
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +1 -1
- package/dist/cli/subcommands/doctor.js +362 -84
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/keys.js +44 -0
- package/dist/cli/subcommands/keys.js.map +1 -1
- package/dist/cli/subcommands/login.js +8 -3
- package/dist/cli/subcommands/login.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/cli/update-check.d.ts +1 -0
- package/dist/cli/update-check.js +31 -7
- package/dist/cli/update-check.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +45 -22
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +7 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -2
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.js +15 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +1 -0
- package/dist/context/session.js +4 -1
- package/dist/context/session.js.map +1 -1
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/error-classifier.js +37 -8
- package/dist/intelligence/error-classifier.js.map +1 -1
- package/dist/intelligence/failover-chain.d.ts +24 -0
- package/dist/intelligence/failover-chain.js +79 -6
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/health-monitor.d.ts +27 -0
- package/dist/intelligence/health-monitor.js +242 -0
- package/dist/intelligence/health-monitor.js.map +1 -0
- package/dist/intelligence/index.d.ts +7 -5
- package/dist/intelligence/index.js +7 -5
- package/dist/intelligence/index.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +169 -40
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/intelligence/remote-catalogue.d.ts +31 -0
- package/dist/intelligence/remote-catalogue.js +174 -0
- package/dist/intelligence/remote-catalogue.js.map +1 -0
- package/dist/intelligence/remote-config.d.ts +26 -0
- package/dist/intelligence/remote-config.js +80 -0
- package/dist/intelligence/remote-config.js.map +1 -0
- package/dist/kernel/agent-loop.js +73 -16
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/parity/scenarios.d.ts +3 -3
- package/dist/parity/scenarios.js +77 -36
- package/dist/parity/scenarios.js.map +1 -1
- package/dist/providers/anthropic-catalogue.d.ts +9 -0
- package/dist/providers/anthropic-catalogue.js +90 -0
- package/dist/providers/anthropic-catalogue.js.map +1 -0
- package/dist/providers/anthropic.js +3 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/catalogue.d.ts +34 -0
- package/dist/providers/catalogue.js +20 -0
- package/dist/providers/catalogue.js.map +1 -0
- package/dist/providers/cerebras-catalogue.d.ts +9 -0
- package/dist/providers/cerebras-catalogue.js +54 -0
- package/dist/providers/cerebras-catalogue.js.map +1 -0
- package/dist/providers/cohere-catalogue.d.ts +9 -0
- package/dist/providers/cohere-catalogue.js +54 -0
- package/dist/providers/cohere-catalogue.js.map +1 -0
- package/dist/providers/deepseek-catalogue.d.ts +15 -0
- package/dist/providers/deepseek-catalogue.js +81 -0
- package/dist/providers/deepseek-catalogue.js.map +1 -0
- package/dist/providers/deepseek.d.ts +4 -2
- package/dist/providers/deepseek.js +7 -23
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.js +37 -28
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/extra-providers.js +21 -0
- package/dist/providers/extra-providers.js.map +1 -1
- package/dist/providers/family-fallback.js +3 -3
- package/dist/providers/family-fallback.js.map +1 -1
- package/dist/providers/gemini-catalogue.d.ts +9 -0
- package/dist/providers/gemini-catalogue.js +73 -0
- package/dist/providers/gemini-catalogue.js.map +1 -0
- package/dist/providers/gemini.js +12 -3
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/groq-catalogue.d.ts +9 -0
- package/dist/providers/groq-catalogue.js +82 -0
- package/dist/providers/groq-catalogue.js.map +1 -0
- package/dist/providers/index.d.ts +11 -0
- package/dist/providers/index.js +29 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/mistral-catalogue.d.ts +9 -0
- package/dist/providers/mistral-catalogue.js +68 -0
- package/dist/providers/mistral-catalogue.js.map +1 -0
- package/dist/providers/nim-catalogue.d.ts +31 -0
- package/dist/providers/nim-catalogue.js +122 -0
- package/dist/providers/nim-catalogue.js.map +1 -0
- package/dist/providers/nvidia.js +33 -10
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-catalogue.d.ts +9 -0
- package/dist/providers/openai-catalogue.js +82 -0
- package/dist/providers/openai-catalogue.js.map +1 -0
- package/dist/providers/openai-compat.js +4 -2
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/perplexity-catalogue.d.ts +10 -0
- package/dist/providers/perplexity-catalogue.js +69 -0
- package/dist/providers/perplexity-catalogue.js.map +1 -0
- package/dist/providers/together-catalogue.d.ts +9 -0
- package/dist/providers/together-catalogue.js +54 -0
- package/dist/providers/together-catalogue.js.map +1 -0
- package/dist/providers/xai-catalogue.d.ts +9 -0
- package/dist/providers/xai-catalogue.js +54 -0
- package/dist/providers/xai-catalogue.js.map +1 -0
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db-telemetry.d.ts +21 -0
- package/dist/state/db-telemetry.js +106 -0
- package/dist/state/db-telemetry.js.map +1 -0
- package/dist/state/db.js +7 -4
- package/dist/state/db.js.map +1 -1
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +79 -62
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +2 -0
- package/dist/tools/exec.js +13 -0
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +12 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +4 -3
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/multimodal.js +11 -12
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/rtk.js +22 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +42 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -1
- package/dist/tools/shell.js +78 -54
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.d.ts +5 -1
- package/dist/tui/ink/App.js +310 -73
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +23 -8
- 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 +22 -25
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +18 -16
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +3 -1
- package/dist/tui/ink/components/PasteCollapse.js +11 -9
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +7 -0
- package/dist/tui/ink/components/StatusBar.js +11 -5
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
- package/dist/tui/ink/components/ThinkingBlock.js +34 -17
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +23 -13
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +19 -0
- package/dist/tui/ink/components/VirtualTranscript.js +31 -0
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -0
- package/dist/tui/ink/index.d.ts +5 -1
- package/dist/tui/ink/index.js +19 -7
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
- package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
- package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
- package/dist/tui/ink/use-declined-versions.d.ts +14 -0
- package/dist/tui/ink/use-declined-versions.js +61 -0
- package/dist/tui/ink/use-declined-versions.js.map +1 -0
- package/dist/tui/ink/use-elapsed.d.ts +6 -0
- package/dist/tui/ink/use-elapsed.js +46 -0
- package/dist/tui/ink/use-elapsed.js.map +1 -0
- package/dist/tui/ink/use-event-projection.js +12 -0
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.d.ts +12 -0
- package/dist/tui/ink/use-flicker-detector.js +37 -0
- package/dist/tui/ink/use-flicker-detector.js.map +1 -0
- package/dist/tui/ink/use-overlays.js +16 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.d.ts +14 -0
- package/dist/tui/ink/use-render-metrics.js +97 -0
- package/dist/tui/ink/use-render-metrics.js.map +1 -0
- package/dist/tui/ink/use-startup-health.d.ts +10 -0
- package/dist/tui/ink/use-startup-health.js +125 -0
- package/dist/tui/ink/use-startup-health.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.d.ts +19 -0
- package/dist/tui/ink/use-transcript-scroll.js +83 -0
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -0
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +1 -1
package/dist/tools/shell.js
CHANGED
|
@@ -7,45 +7,54 @@
|
|
|
7
7
|
* the model does not misread a capped stream as a complete one.
|
|
8
8
|
*
|
|
9
9
|
* Platform routing (1.13.0):
|
|
10
|
-
* posix → spawn(
|
|
10
|
+
* posix → spawn('/bin/sh', ['-c', command])
|
|
11
11
|
* win32 → prefer pwsh > powershell > cmd.exe via env detection;
|
|
12
12
|
* fall back to cmd if PowerShell isn't on PATH. PowerShell
|
|
13
13
|
* handles quoting + UTF-8 + multi-line scripts more cleanly
|
|
14
14
|
* than cmd.exe's relic Windows-95 parser.
|
|
15
15
|
*/
|
|
16
|
-
import { spawn,
|
|
17
|
-
|
|
16
|
+
import { spawn, execFile } from "node:child_process";
|
|
17
|
+
import { StringDecoder } from "node:string_decoder";
|
|
18
|
+
import { resolve, sep } from "node:path";
|
|
19
|
+
import { promisify } from "node:util";
|
|
20
|
+
const execFileAsync = promisify(execFile);
|
|
21
|
+
/** Cached PowerShell executable detection (probed async at first use). */
|
|
18
22
|
let cachedWindowsShell = null;
|
|
19
|
-
|
|
23
|
+
let windowsShellPromise = null;
|
|
24
|
+
async function resolveWindowsShell() {
|
|
20
25
|
if (cachedWindowsShell)
|
|
21
26
|
return cachedWindowsShell;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
if (!windowsShellPromise) {
|
|
28
|
+
windowsShellPromise = (async () => {
|
|
29
|
+
for (const exe of ["pwsh", "powershell"]) {
|
|
30
|
+
try {
|
|
31
|
+
await execFileAsync(exe, ["-NoLogo", "-Command", "exit 0"], {
|
|
32
|
+
timeout: 3000,
|
|
33
|
+
});
|
|
34
|
+
cachedWindowsShell = {
|
|
35
|
+
cmd: exe,
|
|
36
|
+
args: (script) => [
|
|
37
|
+
"-NoLogo",
|
|
38
|
+
"-NoProfile",
|
|
39
|
+
"-NonInteractive",
|
|
40
|
+
"-OutputFormat",
|
|
41
|
+
"Text",
|
|
42
|
+
"-Command",
|
|
43
|
+
script,
|
|
44
|
+
],
|
|
45
|
+
};
|
|
46
|
+
return cachedWindowsShell;
|
|
47
|
+
}
|
|
48
|
+
catch { }
|
|
49
|
+
}
|
|
28
50
|
cachedWindowsShell = {
|
|
29
|
-
cmd: exe,
|
|
30
|
-
args: (script) => [
|
|
31
|
-
"-NoLogo",
|
|
32
|
-
"-NoProfile",
|
|
33
|
-
"-NonInteractive",
|
|
34
|
-
"-OutputFormat",
|
|
35
|
-
"Text",
|
|
36
|
-
"-Command",
|
|
37
|
-
script,
|
|
38
|
-
],
|
|
51
|
+
cmd: process.env.ComSpec ?? "cmd.exe",
|
|
52
|
+
args: (script) => ["/d", "/s", "/c", script],
|
|
39
53
|
};
|
|
40
54
|
return cachedWindowsShell;
|
|
41
|
-
}
|
|
55
|
+
})();
|
|
42
56
|
}
|
|
43
|
-
|
|
44
|
-
cachedWindowsShell = {
|
|
45
|
-
cmd: process.env.ComSpec ?? "cmd.exe",
|
|
46
|
-
args: (script) => ["/d", "/s", "/c", script],
|
|
47
|
-
};
|
|
48
|
-
return cachedWindowsShell;
|
|
57
|
+
return windowsShellPromise;
|
|
49
58
|
}
|
|
50
59
|
const DEFAULT_TIMEOUT_MS = 120_000;
|
|
51
60
|
const MAX_OUTPUT_BYTES = 256 * 1024;
|
|
@@ -69,39 +78,41 @@ export const shellTool = {
|
|
|
69
78
|
const input = rawInput;
|
|
70
79
|
const cwd = input.cwd ?? ctx.cwd;
|
|
71
80
|
const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
// (= /bin/sh -c).
|
|
81
|
+
if (cwd !== ctx.cwd) {
|
|
82
|
+
const resolved = resolve(cwd);
|
|
83
|
+
const base = resolve(ctx.cwd);
|
|
84
|
+
const baseSep = base.endsWith(sep) ? base : base + sep;
|
|
85
|
+
if (resolved !== base && !resolved.startsWith(baseSep)) {
|
|
86
|
+
return { content: `cwd escapes workspace: ${cwd}`, isError: true };
|
|
87
|
+
}
|
|
88
|
+
}
|
|
81
89
|
const child = process.platform === "win32"
|
|
82
|
-
? (() => {
|
|
83
|
-
const shell = resolveWindowsShell();
|
|
90
|
+
? (async () => {
|
|
91
|
+
const shell = await resolveWindowsShell();
|
|
84
92
|
return spawn(shell.cmd, shell.args(input.command), {
|
|
85
93
|
cwd,
|
|
86
94
|
env: ctx.env,
|
|
87
|
-
stdio: ["
|
|
95
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
88
96
|
windowsHide: true,
|
|
89
97
|
});
|
|
90
98
|
})()
|
|
91
|
-
: spawn(input.command, {
|
|
99
|
+
: spawn("/bin/sh", ["-c", input.command], {
|
|
92
100
|
cwd,
|
|
93
101
|
env: ctx.env,
|
|
94
|
-
stdio: ["
|
|
95
|
-
shell: true,
|
|
102
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
96
103
|
});
|
|
104
|
+
const childProcess = await (child instanceof Promise
|
|
105
|
+
? child
|
|
106
|
+
: Promise.resolve(child));
|
|
97
107
|
const stdoutChunks = [];
|
|
98
108
|
const stderrChunks = [];
|
|
99
109
|
let stdoutBytes = 0;
|
|
100
110
|
let stderrBytes = 0;
|
|
101
111
|
let truncated = false;
|
|
102
|
-
// Shared total so combined stdout+stderr never exceeds MAX_OUTPUT_BYTES.
|
|
103
112
|
let totalBytes = 0;
|
|
104
|
-
const
|
|
113
|
+
const stdoutDecoder = new StringDecoder("utf8");
|
|
114
|
+
const stderrDecoder = new StringDecoder("utf8");
|
|
115
|
+
const onData = (chunks, decoder, trackBytes) => (buf) => {
|
|
105
116
|
const remaining = MAX_OUTPUT_BYTES - totalBytes;
|
|
106
117
|
if (remaining <= 0) {
|
|
107
118
|
truncated = true;
|
|
@@ -113,30 +124,43 @@ export const shellTool = {
|
|
|
113
124
|
trackBytes(slice.length);
|
|
114
125
|
if (buf.length > remaining)
|
|
115
126
|
truncated = true;
|
|
116
|
-
const text =
|
|
127
|
+
const text = decoder.write(slice);
|
|
117
128
|
if (text.trim().length > 0)
|
|
118
129
|
ctx.onProgress?.(text.trimEnd());
|
|
119
130
|
};
|
|
120
|
-
|
|
131
|
+
childProcess.stdout.on("data", onData(stdoutChunks, stdoutDecoder, (n) => {
|
|
121
132
|
stdoutBytes += n;
|
|
122
133
|
}));
|
|
123
|
-
|
|
134
|
+
childProcess.stderr.on("data", onData(stderrChunks, stderrDecoder, (n) => {
|
|
124
135
|
stderrBytes += n;
|
|
125
136
|
}));
|
|
126
137
|
const timer = setTimeout(() => {
|
|
127
|
-
|
|
138
|
+
if (process.platform === "win32") {
|
|
139
|
+
childProcess.kill("SIGTERM");
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
childProcess.kill("SIGKILL");
|
|
143
|
+
}
|
|
128
144
|
}, timeoutMs);
|
|
129
|
-
// Wire abort signal so Esc/cancel kills the child immediately.
|
|
130
145
|
const onAbort = () => {
|
|
131
|
-
|
|
146
|
+
if (process.platform === "win32") {
|
|
147
|
+
childProcess.kill("SIGTERM");
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
childProcess.kill("SIGKILL");
|
|
151
|
+
}
|
|
132
152
|
};
|
|
133
|
-
ctx.signal
|
|
153
|
+
if (ctx.signal) {
|
|
154
|
+
ctx.signal.addEventListener("abort", onAbort, { once: true });
|
|
155
|
+
}
|
|
134
156
|
const exitCode = await new Promise((resolveExit) => {
|
|
135
|
-
|
|
136
|
-
|
|
157
|
+
childProcess.once("error", () => resolveExit(-1));
|
|
158
|
+
childProcess.once("close", (code) => resolveExit(code ?? -1));
|
|
137
159
|
});
|
|
138
160
|
clearTimeout(timer);
|
|
139
|
-
ctx.signal
|
|
161
|
+
if (ctx.signal) {
|
|
162
|
+
ctx.signal.removeEventListener("abort", onAbort);
|
|
163
|
+
}
|
|
140
164
|
const stdout = Buffer.concat(stdoutChunks).toString("utf8");
|
|
141
165
|
const stderr = Buffer.concat(stderrChunks).toString("utf8");
|
|
142
166
|
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,
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAQ1C,0EAA0E;AAC1E,IAAI,kBAAkB,GAGX,IAAI,CAAC;AAChB,IAAI,mBAAmB,GAGX,IAAI,CAAC;AAEjB,KAAK,UAAU,mBAAmB;IAIhC,IAAI,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,mBAAmB,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,aAAa,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE;wBAC1D,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;oBACH,kBAAkB,GAAG;wBACnB,GAAG,EAAE,GAAG;wBACR,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC;4BAClC,SAAS;4BACT,YAAY;4BACZ,iBAAiB;4BACjB,eAAe;4BACf,MAAM;4BACN,UAAU;4BACV,MAAM;yBACP;qBACF,CAAC;oBACF,OAAO,kBAAkB,CAAC;gBAC5B,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACZ,CAAC;YACD,kBAAkB,GAAG;gBACnB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS;gBACrC,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;aAC/D,CAAC;YACF,OAAO,kBAAkB,CAAC;QAC5B,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,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,SAAS,EAAE,OAAO,EAAE,iDAAiD;IACrE,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;QAExD,IAAI,GAAG,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACvD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvD,OAAO,EAAE,OAAO,EAAE,0BAA0B,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACrE,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GACT,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC1B,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;gBACV,MAAM,KAAK,GAAG,MAAM,mBAAmB,EAAE,CAAC;gBAC1C,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,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;oBAC/B,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAC;YACL,CAAC,CAAC,EAAE;YACN,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;gBACtC,GAAG;gBACH,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;aAChC,CAAC,CAAC;QAET,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,YAAY,OAAO;YAClD,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5B,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,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,MAAM,GACV,CACE,MAAgB,EAChB,OAAsB,EACtB,UAA+B,EAC/B,EAAE,CACJ,CAAC,GAAW,EAAE,EAAE;YACd,MAAM,SAAS,GAAG,gBAAgB,GAAG,UAAU,CAAC;YAChD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;gBACnB,SAAS,GAAG,IAAI,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,MAAM,KAAK,GACT,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,UAAU,IAAI,KAAK,CAAC,MAAM,CAAC;YAC3B,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,GAAG,CAAC,MAAM,GAAG,SAAS;gBAAE,SAAS,GAAG,IAAI,CAAC;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;gBAAE,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEJ,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;YACxC,WAAW,IAAI,CAAC,CAAC;QACnB,CAAC,CAAC,CACH,CAAC;QACF,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;YACxC,WAAW,IAAI,CAAC,CAAC;QACnB,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC;QACF,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,QAAQ,GAAW,MAAM,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACzD,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,YAAgD,CACjD,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,YAAgD,CACjD,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,QAAQ,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC3E,MAAM,IAAI,GAAG;YACX,MAAM;YACN,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;YAC7C,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;SAC9C;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;YACxC,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE;YACvD,OAAO,EAAE,QAAQ,KAAK,CAAC;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
|
package/dist/tui/ink/App.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ import type { Message } from "../../kernel/types.js";
|
|
|
18
18
|
import type { EventStream } from "../../kernel/event-stream.js";
|
|
19
19
|
import type { ProviderRegistry } from "../../providers/index.js";
|
|
20
20
|
import type { ToolRegistry } from "../../tools/registry.js";
|
|
21
|
-
import type { SessionStore } from "../../context/session.js";
|
|
21
|
+
import type { SessionStore, Session } from "../../context/session.js";
|
|
22
22
|
import type { DirghaConfig } from "../../cli/config.js";
|
|
23
23
|
import type { SlashRegistry } from "../../cli/slash.js";
|
|
24
24
|
import { type ModelEntry } from "./components/ModelPicker.js";
|
|
@@ -40,5 +40,9 @@ export interface AppProps {
|
|
|
40
40
|
slashRegistry: SlashRegistry;
|
|
41
41
|
/** Cross-session memory/ledger context injected into system prompt. */
|
|
42
42
|
ledgerContext?: string;
|
|
43
|
+
/** Mutable ref — write the active session here so runInkTUI can flush on exit. */
|
|
44
|
+
sessionHandle?: {
|
|
45
|
+
session: Session | null;
|
|
46
|
+
};
|
|
43
47
|
}
|
|
44
48
|
export declare function App(props: AppProps): React.JSX.Element;
|