@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.
Files changed (294) hide show
  1. package/dist/auth/keypool.js +40 -26
  2. package/dist/auth/keypool.js.map +1 -1
  3. package/dist/auth/keystore.js +16 -11
  4. package/dist/auth/keystore.js.map +1 -1
  5. package/dist/cli/config.js +23 -2
  6. package/dist/cli/config.js.map +1 -1
  7. package/dist/cli/first-run.d.ts +6 -5
  8. package/dist/cli/first-run.js +100 -42
  9. package/dist/cli/first-run.js.map +1 -1
  10. package/dist/cli/flows/wizard.js +13 -19
  11. package/dist/cli/flows/wizard.js.map +1 -1
  12. package/dist/cli/interactive.d.ts +4 -0
  13. package/dist/cli/interactive.js +54 -10
  14. package/dist/cli/interactive.js.map +1 -1
  15. package/dist/cli/main.js +67 -18
  16. package/dist/cli/main.js.map +1 -1
  17. package/dist/cli/setup.js +4 -2
  18. package/dist/cli/setup.js.map +1 -1
  19. package/dist/cli/slash/fleet.js +19 -1
  20. package/dist/cli/slash/fleet.js.map +1 -1
  21. package/dist/cli/slash/keys.js +49 -0
  22. package/dist/cli/slash/keys.js.map +1 -1
  23. package/dist/cli/slash/login.js +7 -3
  24. package/dist/cli/slash/login.js.map +1 -1
  25. package/dist/cli/slash/models.d.ts +1 -1
  26. package/dist/cli/slash/models.js +144 -18
  27. package/dist/cli/slash/models.js.map +1 -1
  28. package/dist/cli/slash/provider.js +1 -1
  29. package/dist/cli/slash/provider.js.map +1 -1
  30. package/dist/cli/slash.js +26 -10
  31. package/dist/cli/slash.js.map +1 -1
  32. package/dist/cli/subcommands/doctor.d.ts +1 -1
  33. package/dist/cli/subcommands/doctor.js +362 -84
  34. package/dist/cli/subcommands/doctor.js.map +1 -1
  35. package/dist/cli/subcommands/keys.js +44 -0
  36. package/dist/cli/subcommands/keys.js.map +1 -1
  37. package/dist/cli/subcommands/login.js +8 -3
  38. package/dist/cli/subcommands/login.js.map +1 -1
  39. package/dist/cli/subcommands/telemetry.d.ts +2 -1
  40. package/dist/cli/subcommands/telemetry.js +47 -34
  41. package/dist/cli/subcommands/telemetry.js.map +1 -1
  42. package/dist/cli/update-check.d.ts +1 -0
  43. package/dist/cli/update-check.js +31 -7
  44. package/dist/cli/update-check.js.map +1 -1
  45. package/dist/context/branch.d.ts +2 -2
  46. package/dist/context/branch.js +40 -23
  47. package/dist/context/branch.js.map +1 -1
  48. package/dist/context/compaction.js +45 -22
  49. package/dist/context/compaction.js.map +1 -1
  50. package/dist/context/git-state.js +31 -18
  51. package/dist/context/git-state.js.map +1 -1
  52. package/dist/context/knowledge.js +31 -20
  53. package/dist/context/knowledge.js.map +1 -1
  54. package/dist/context/memory.js +7 -0
  55. package/dist/context/memory.js.map +1 -1
  56. package/dist/context/mode-enforcement.js +11 -2
  57. package/dist/context/mode-enforcement.js.map +1 -1
  58. package/dist/context/mode.js +67 -30
  59. package/dist/context/mode.js.map +1 -1
  60. package/dist/context/primer.js +15 -3
  61. package/dist/context/primer.js.map +1 -1
  62. package/dist/context/session.d.ts +1 -0
  63. package/dist/context/session.js +4 -1
  64. package/dist/context/session.js.map +1 -1
  65. package/dist/fleet/apply-back.js +5 -1
  66. package/dist/fleet/apply-back.js.map +1 -1
  67. package/dist/fleet/cli-command.d.ts +2 -0
  68. package/dist/fleet/cli-command.js +15 -1
  69. package/dist/fleet/cli-command.js.map +1 -1
  70. package/dist/fleet/runner.js +35 -2
  71. package/dist/fleet/runner.js.map +1 -1
  72. package/dist/fleet/scratchpad.js +1 -2
  73. package/dist/fleet/scratchpad.js.map +1 -1
  74. package/dist/fleet/state.d.ts +4 -0
  75. package/dist/fleet/state.js +11 -2
  76. package/dist/fleet/state.js.map +1 -1
  77. package/dist/fleet/templates.d.ts +4 -0
  78. package/dist/fleet/templates.js.map +1 -1
  79. package/dist/fleet/types.d.ts +4 -0
  80. package/dist/fleet/types.js.map +1 -1
  81. package/dist/intelligence/error-classifier.js +37 -8
  82. package/dist/intelligence/error-classifier.js.map +1 -1
  83. package/dist/intelligence/failover-chain.d.ts +24 -0
  84. package/dist/intelligence/failover-chain.js +79 -6
  85. package/dist/intelligence/failover-chain.js.map +1 -1
  86. package/dist/intelligence/health-monitor.d.ts +27 -0
  87. package/dist/intelligence/health-monitor.js +242 -0
  88. package/dist/intelligence/health-monitor.js.map +1 -0
  89. package/dist/intelligence/index.d.ts +7 -5
  90. package/dist/intelligence/index.js +7 -5
  91. package/dist/intelligence/index.js.map +1 -1
  92. package/dist/intelligence/prices.d.ts +6 -4
  93. package/dist/intelligence/prices.js +169 -40
  94. package/dist/intelligence/prices.js.map +1 -1
  95. package/dist/intelligence/remote-catalogue.d.ts +31 -0
  96. package/dist/intelligence/remote-catalogue.js +174 -0
  97. package/dist/intelligence/remote-catalogue.js.map +1 -0
  98. package/dist/intelligence/remote-config.d.ts +26 -0
  99. package/dist/intelligence/remote-config.js +80 -0
  100. package/dist/intelligence/remote-config.js.map +1 -0
  101. package/dist/kernel/agent-loop.js +73 -16
  102. package/dist/kernel/agent-loop.js.map +1 -1
  103. package/dist/lsp/client.js +29 -16
  104. package/dist/lsp/client.js.map +1 -1
  105. package/dist/lsp/detector.js +7 -6
  106. package/dist/lsp/detector.js.map +1 -1
  107. package/dist/mcp/client.d.ts +1 -1
  108. package/dist/mcp/client.js +19 -16
  109. package/dist/mcp/client.js.map +1 -1
  110. package/dist/mcp/transport.js +46 -38
  111. package/dist/mcp/transport.js.map +1 -1
  112. package/dist/parity/scenarios.d.ts +3 -3
  113. package/dist/parity/scenarios.js +77 -36
  114. package/dist/parity/scenarios.js.map +1 -1
  115. package/dist/providers/anthropic-catalogue.d.ts +9 -0
  116. package/dist/providers/anthropic-catalogue.js +90 -0
  117. package/dist/providers/anthropic-catalogue.js.map +1 -0
  118. package/dist/providers/anthropic.js +3 -1
  119. package/dist/providers/anthropic.js.map +1 -1
  120. package/dist/providers/catalogue.d.ts +34 -0
  121. package/dist/providers/catalogue.js +20 -0
  122. package/dist/providers/catalogue.js.map +1 -0
  123. package/dist/providers/cerebras-catalogue.d.ts +9 -0
  124. package/dist/providers/cerebras-catalogue.js +54 -0
  125. package/dist/providers/cerebras-catalogue.js.map +1 -0
  126. package/dist/providers/cohere-catalogue.d.ts +9 -0
  127. package/dist/providers/cohere-catalogue.js +54 -0
  128. package/dist/providers/cohere-catalogue.js.map +1 -0
  129. package/dist/providers/deepseek-catalogue.d.ts +15 -0
  130. package/dist/providers/deepseek-catalogue.js +81 -0
  131. package/dist/providers/deepseek-catalogue.js.map +1 -0
  132. package/dist/providers/deepseek.d.ts +4 -2
  133. package/dist/providers/deepseek.js +7 -23
  134. package/dist/providers/deepseek.js.map +1 -1
  135. package/dist/providers/dispatch.js +37 -28
  136. package/dist/providers/dispatch.js.map +1 -1
  137. package/dist/providers/extra-providers.js +21 -0
  138. package/dist/providers/extra-providers.js.map +1 -1
  139. package/dist/providers/family-fallback.js +3 -3
  140. package/dist/providers/family-fallback.js.map +1 -1
  141. package/dist/providers/gemini-catalogue.d.ts +9 -0
  142. package/dist/providers/gemini-catalogue.js +73 -0
  143. package/dist/providers/gemini-catalogue.js.map +1 -0
  144. package/dist/providers/gemini.js +12 -3
  145. package/dist/providers/gemini.js.map +1 -1
  146. package/dist/providers/groq-catalogue.d.ts +9 -0
  147. package/dist/providers/groq-catalogue.js +82 -0
  148. package/dist/providers/groq-catalogue.js.map +1 -0
  149. package/dist/providers/index.d.ts +11 -0
  150. package/dist/providers/index.js +29 -2
  151. package/dist/providers/index.js.map +1 -1
  152. package/dist/providers/mistral-catalogue.d.ts +9 -0
  153. package/dist/providers/mistral-catalogue.js +68 -0
  154. package/dist/providers/mistral-catalogue.js.map +1 -0
  155. package/dist/providers/nim-catalogue.d.ts +31 -0
  156. package/dist/providers/nim-catalogue.js +122 -0
  157. package/dist/providers/nim-catalogue.js.map +1 -0
  158. package/dist/providers/nvidia.js +33 -10
  159. package/dist/providers/nvidia.js.map +1 -1
  160. package/dist/providers/openai-catalogue.d.ts +9 -0
  161. package/dist/providers/openai-catalogue.js +82 -0
  162. package/dist/providers/openai-catalogue.js.map +1 -0
  163. package/dist/providers/openai-compat.js +4 -2
  164. package/dist/providers/openai-compat.js.map +1 -1
  165. package/dist/providers/perplexity-catalogue.d.ts +10 -0
  166. package/dist/providers/perplexity-catalogue.js +69 -0
  167. package/dist/providers/perplexity-catalogue.js.map +1 -0
  168. package/dist/providers/together-catalogue.d.ts +9 -0
  169. package/dist/providers/together-catalogue.js +54 -0
  170. package/dist/providers/together-catalogue.js.map +1 -0
  171. package/dist/providers/xai-catalogue.d.ts +9 -0
  172. package/dist/providers/xai-catalogue.js +54 -0
  173. package/dist/providers/xai-catalogue.js.map +1 -0
  174. package/dist/safety/audit-log.d.ts +15 -0
  175. package/dist/safety/audit-log.js +21 -0
  176. package/dist/safety/audit-log.js.map +1 -1
  177. package/dist/state/db-telemetry.d.ts +21 -0
  178. package/dist/state/db-telemetry.js +106 -0
  179. package/dist/state/db-telemetry.js.map +1 -0
  180. package/dist/state/db.js +7 -4
  181. package/dist/state/db.js.map +1 -1
  182. package/dist/telemetry/gateway-push.d.ts +17 -0
  183. package/dist/telemetry/gateway-push.js +48 -0
  184. package/dist/telemetry/gateway-push.js.map +1 -0
  185. package/dist/telemetry/index.d.ts +9 -0
  186. package/dist/telemetry/index.js +9 -0
  187. package/dist/telemetry/index.js.map +1 -0
  188. package/dist/tools/browser.js +24 -16
  189. package/dist/tools/browser.js.map +1 -1
  190. package/dist/tools/checkpoint.d.ts +6 -1
  191. package/dist/tools/checkpoint.js +79 -62
  192. package/dist/tools/checkpoint.js.map +1 -1
  193. package/dist/tools/cron.js +1 -3
  194. package/dist/tools/cron.js.map +1 -1
  195. package/dist/tools/diff.js +25 -21
  196. package/dist/tools/diff.js.map +1 -1
  197. package/dist/tools/exec.d.ts +2 -0
  198. package/dist/tools/exec.js +13 -0
  199. package/dist/tools/exec.js.map +1 -1
  200. package/dist/tools/fs-edit.d.ts +3 -5
  201. package/dist/tools/fs-edit.js +8 -23
  202. package/dist/tools/fs-edit.js.map +1 -1
  203. package/dist/tools/fs-ls.js +6 -8
  204. package/dist/tools/fs-ls.js.map +1 -1
  205. package/dist/tools/fs-read.d.ts +1 -1
  206. package/dist/tools/fs-read.js +37 -28
  207. package/dist/tools/fs-read.js.map +1 -1
  208. package/dist/tools/fs-write.d.ts +1 -1
  209. package/dist/tools/fs-write.js +33 -33
  210. package/dist/tools/fs-write.js.map +1 -1
  211. package/dist/tools/git.js +12 -6
  212. package/dist/tools/git.js.map +1 -1
  213. package/dist/tools/index.d.ts +3 -1
  214. package/dist/tools/index.js +4 -3
  215. package/dist/tools/index.js.map +1 -1
  216. package/dist/tools/multimodal.js +11 -12
  217. package/dist/tools/multimodal.js.map +1 -1
  218. package/dist/tools/rtk.js +22 -9
  219. package/dist/tools/rtk.js.map +1 -1
  220. package/dist/tools/search-glob.d.ts +1 -1
  221. package/dist/tools/search-glob.js +42 -24
  222. package/dist/tools/search-glob.js.map +1 -1
  223. package/dist/tools/search-grep.d.ts +1 -1
  224. package/dist/tools/search-grep.js +56 -32
  225. package/dist/tools/search-grep.js.map +1 -1
  226. package/dist/tools/shell.d.ts +1 -1
  227. package/dist/tools/shell.js +78 -54
  228. package/dist/tools/shell.js.map +1 -1
  229. package/dist/tui/ink/App.d.ts +5 -1
  230. package/dist/tui/ink/App.js +310 -73
  231. package/dist/tui/ink/App.js.map +1 -1
  232. package/dist/tui/ink/components/DenseToolMessage.js +23 -8
  233. package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
  234. package/dist/tui/ink/components/InputBox.d.ts +2 -0
  235. package/dist/tui/ink/components/InputBox.js +22 -25
  236. package/dist/tui/ink/components/InputBox.js.map +1 -1
  237. package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
  238. package/dist/tui/ink/components/KeySetOverlay.js +18 -16
  239. package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
  240. package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
  241. package/dist/tui/ink/components/ModelPicker.js +34 -26
  242. package/dist/tui/ink/components/ModelPicker.js.map +1 -1
  243. package/dist/tui/ink/components/PasteCollapse.d.ts +3 -1
  244. package/dist/tui/ink/components/PasteCollapse.js +11 -9
  245. package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
  246. package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
  247. package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
  248. package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
  249. package/dist/tui/ink/components/StatusBar.d.ts +7 -0
  250. package/dist/tui/ink/components/StatusBar.js +11 -5
  251. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  252. package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
  253. package/dist/tui/ink/components/ThinkingBlock.js +34 -17
  254. package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
  255. package/dist/tui/ink/components/ToolBox.js +23 -13
  256. package/dist/tui/ink/components/ToolBox.js.map +1 -1
  257. package/dist/tui/ink/components/VirtualTranscript.d.ts +19 -0
  258. package/dist/tui/ink/components/VirtualTranscript.js +31 -0
  259. package/dist/tui/ink/components/VirtualTranscript.js.map +1 -0
  260. package/dist/tui/ink/index.d.ts +5 -1
  261. package/dist/tui/ink/index.js +19 -7
  262. package/dist/tui/ink/index.js.map +1 -1
  263. package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
  264. package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
  265. package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
  266. package/dist/tui/ink/use-declined-versions.d.ts +14 -0
  267. package/dist/tui/ink/use-declined-versions.js +61 -0
  268. package/dist/tui/ink/use-declined-versions.js.map +1 -0
  269. package/dist/tui/ink/use-elapsed.d.ts +6 -0
  270. package/dist/tui/ink/use-elapsed.js +46 -0
  271. package/dist/tui/ink/use-elapsed.js.map +1 -0
  272. package/dist/tui/ink/use-event-projection.js +12 -0
  273. package/dist/tui/ink/use-event-projection.js.map +1 -1
  274. package/dist/tui/ink/use-flicker-detector.d.ts +12 -0
  275. package/dist/tui/ink/use-flicker-detector.js +37 -0
  276. package/dist/tui/ink/use-flicker-detector.js.map +1 -0
  277. package/dist/tui/ink/use-overlays.js +16 -17
  278. package/dist/tui/ink/use-overlays.js.map +1 -1
  279. package/dist/tui/ink/use-render-metrics.d.ts +14 -0
  280. package/dist/tui/ink/use-render-metrics.js +97 -0
  281. package/dist/tui/ink/use-render-metrics.js.map +1 -0
  282. package/dist/tui/ink/use-startup-health.d.ts +10 -0
  283. package/dist/tui/ink/use-startup-health.js +125 -0
  284. package/dist/tui/ink/use-startup-health.js.map +1 -0
  285. package/dist/tui/ink/use-transcript-scroll.d.ts +19 -0
  286. package/dist/tui/ink/use-transcript-scroll.js +83 -0
  287. package/dist/tui/ink/use-transcript-scroll.js.map +1 -0
  288. package/dist/utils/env.d.ts +1 -0
  289. package/dist/utils/env.js +60 -0
  290. package/dist/utils/env.js.map +1 -0
  291. package/dist/utils/fs.d.ts +10 -0
  292. package/dist/utils/fs.js +37 -0
  293. package/dist/utils/fs.js.map +1 -0
  294. package/package.json +1 -1
@@ -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(cmd, { shell: true }) // /bin/sh -c <cmd>
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, spawnSync } from "node:child_process";
17
- /** Cached PowerShell executable detection (per-process, never re-probed). */
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
- function resolveWindowsShell() {
23
+ let windowsShellPromise = null;
24
+ async function resolveWindowsShell() {
20
25
  if (cachedWindowsShell)
21
26
  return cachedWindowsShell;
22
- // Prefer PowerShell 7+ (`pwsh`), then Windows PowerShell 5.1, then cmd.
23
- for (const exe of ["pwsh", "powershell"]) {
24
- const probe = spawnSync(exe, ["-NoLogo", "-Command", "exit 0"], {
25
- timeout: 3000,
26
- });
27
- if (probe.status === 0) {
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
- // Fallback: cmd.exe via shell:true (no /c needed since spawn handles it).
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
- // 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
- //
77
- // Platform-aware spawn. On Windows, prefer pwsh > powershell > cmd.
78
- // PowerShell handles UTF-8, quoting, and multi-line scripts more
79
- // cleanly than cmd.exe's legacy parser. On POSIX, plain shell:true
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: ["ignore", "pipe", "pipe"],
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: ["ignore", "pipe", "pipe"],
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 onData = (chunks, trackBytes) => (buf) => {
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 = slice.toString("utf8");
127
+ const text = decoder.write(slice);
117
128
  if (text.trim().length > 0)
118
129
  ctx.onProgress?.(text.trimEnd());
119
130
  };
120
- child.stdout.on("data", onData(stdoutChunks, (n) => {
131
+ childProcess.stdout.on("data", onData(stdoutChunks, stdoutDecoder, (n) => {
121
132
  stdoutBytes += n;
122
133
  }));
123
- child.stderr.on("data", onData(stderrChunks, (n) => {
134
+ childProcess.stderr.on("data", onData(stderrChunks, stderrDecoder, (n) => {
124
135
  stderrBytes += n;
125
136
  }));
126
137
  const timer = setTimeout(() => {
127
- child.kill("SIGKILL");
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
- child.kill("SIGKILL");
146
+ if (process.platform === "win32") {
147
+ childProcess.kill("SIGTERM");
148
+ }
149
+ else {
150
+ childProcess.kill("SIGKILL");
151
+ }
132
152
  };
133
- ctx.signal?.addEventListener("abort", onAbort, { once: true });
153
+ if (ctx.signal) {
154
+ ctx.signal.addEventListener("abort", onAbort, { once: true });
155
+ }
134
156
  const exitCode = await new Promise((resolveExit) => {
135
- child.on("error", () => resolveExit(-1));
136
- child.on("close", (code) => resolveExit(code ?? -1));
157
+ childProcess.once("error", () => resolveExit(-1));
158
+ childProcess.once("close", (code) => resolveExit(code ?? -1));
137
159
  });
138
160
  clearTimeout(timer);
139
- ctx.signal?.removeEventListener("abort", onAbort);
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]" : ""}`;
@@ -1 +1 @@
1
- {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"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"}
@@ -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;