@dirgha/code 1.17.2 → 1.18.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.
Files changed (239) hide show
  1. package/CHANGELOG.md +130 -45
  2. package/README.md +34 -25
  3. package/dist/cli/config.d.ts +2 -0
  4. package/dist/cli/config.js +16 -1
  5. package/dist/cli/config.js.map +1 -1
  6. package/dist/cli/flows/tarball.js +26 -21
  7. package/dist/cli/flows/tarball.js.map +1 -1
  8. package/dist/cli/flows/wizard.d.ts +1 -1
  9. package/dist/cli/flows/wizard.js +282 -163
  10. package/dist/cli/flows/wizard.js.map +1 -1
  11. package/dist/cli/interactive.js +11 -3
  12. package/dist/cli/interactive.js.map +1 -1
  13. package/dist/cli/main.js +77 -7
  14. package/dist/cli/main.js.map +1 -1
  15. package/dist/cli/models-cmd.js +18 -20
  16. package/dist/cli/models-cmd.js.map +1 -1
  17. package/dist/cli/slash/fleet.d.ts +1 -1
  18. package/dist/cli/slash/fleet.js +25 -16
  19. package/dist/cli/slash/fleet.js.map +1 -1
  20. package/dist/cli/slash/fs.js +1 -3
  21. package/dist/cli/slash/fs.js.map +1 -1
  22. package/dist/cli/slash/models.js +3 -4
  23. package/dist/cli/slash/models.js.map +1 -1
  24. package/dist/cli/slash/paste.d.ts +1 -1
  25. package/dist/cli/slash/paste.js +87 -41
  26. package/dist/cli/slash/paste.js.map +1 -1
  27. package/dist/cli/slash/provider.js +2 -2
  28. package/dist/cli/slash/provider.js.map +1 -1
  29. package/dist/cli/slash/session.js +4 -1
  30. package/dist/cli/slash/session.js.map +1 -1
  31. package/dist/cli/subcommands/doctor.js +48 -0
  32. package/dist/cli/subcommands/doctor.js.map +1 -1
  33. package/dist/cli/subcommands/history.d.ts +8 -0
  34. package/dist/cli/subcommands/history.js +45 -0
  35. package/dist/cli/subcommands/history.js.map +1 -0
  36. package/dist/cli/subcommands/index.js +4 -0
  37. package/dist/cli/subcommands/index.js.map +1 -1
  38. package/dist/cli/subcommands/scaffold.js +6 -2
  39. package/dist/cli/subcommands/scaffold.js.map +1 -1
  40. package/dist/cli/subcommands/state.d.ts +8 -0
  41. package/dist/cli/subcommands/state.js +44 -0
  42. package/dist/cli/subcommands/state.js.map +1 -0
  43. package/dist/cli/subcommands/web.d.ts +1 -1
  44. package/dist/cli/subcommands/web.js +17 -14
  45. package/dist/cli/subcommands/web.js.map +1 -1
  46. package/dist/context/compaction.d.ts +3 -3
  47. package/dist/context/compaction.js +85 -37
  48. package/dist/context/compaction.js.map +1 -1
  49. package/dist/context/default-soul.md +5 -1
  50. package/dist/context/kb-init.d.ts +7 -0
  51. package/dist/context/kb-init.js +51 -0
  52. package/dist/context/kb-init.js.map +1 -0
  53. package/dist/context/ledger.js +3 -3
  54. package/dist/context/ledger.js.map +1 -1
  55. package/dist/context/memory.js +3 -0
  56. package/dist/context/memory.js.map +1 -1
  57. package/dist/context/primer.js +2 -0
  58. package/dist/context/primer.js.map +1 -1
  59. package/dist/context/session.js +5 -0
  60. package/dist/context/session.js.map +1 -1
  61. package/dist/daemon/server.d.ts +4 -0
  62. package/dist/daemon/server.js +81 -29
  63. package/dist/daemon/server.js.map +1 -1
  64. package/dist/fleet/apply-back.d.ts +1 -1
  65. package/dist/fleet/apply-back.js +90 -48
  66. package/dist/fleet/apply-back.js.map +1 -1
  67. package/dist/fleet/cli-command.d.ts +2 -2
  68. package/dist/fleet/cli-command.js +189 -72
  69. package/dist/fleet/cli-command.js.map +1 -1
  70. package/dist/fleet/dag.d.ts +38 -0
  71. package/dist/fleet/dag.js +77 -0
  72. package/dist/fleet/dag.js.map +1 -0
  73. package/dist/fleet/ledger-hook.d.ts +15 -0
  74. package/dist/fleet/ledger-hook.js +67 -0
  75. package/dist/fleet/ledger-hook.js.map +1 -0
  76. package/dist/fleet/runner.js +38 -5
  77. package/dist/fleet/runner.js.map +1 -1
  78. package/dist/fleet/scratchpad-tools.d.ts +13 -0
  79. package/dist/fleet/scratchpad-tools.js +73 -0
  80. package/dist/fleet/scratchpad-tools.js.map +1 -0
  81. package/dist/fleet/scratchpad.d.ts +28 -0
  82. package/dist/fleet/scratchpad.js +93 -0
  83. package/dist/fleet/scratchpad.js.map +1 -0
  84. package/dist/fleet/state.d.ts +37 -0
  85. package/dist/fleet/state.js +82 -0
  86. package/dist/fleet/state.js.map +1 -0
  87. package/dist/fleet/tripleshot.d.ts +2 -2
  88. package/dist/fleet/tripleshot.js +61 -48
  89. package/dist/fleet/tripleshot.js.map +1 -1
  90. package/dist/fleet/types.d.ts +4 -0
  91. package/dist/fleet/types.js.map +1 -1
  92. package/dist/fleet/worktree.d.ts +5 -0
  93. package/dist/fleet/worktree.js +82 -11
  94. package/dist/fleet/worktree.js.map +1 -1
  95. package/dist/hooks/config-bridge.d.ts +2 -2
  96. package/dist/hooks/config-bridge.js +49 -19
  97. package/dist/hooks/config-bridge.js.map +1 -1
  98. package/dist/integrations/arniko-client.d.ts +1 -1
  99. package/dist/integrations/arniko-client.js +32 -26
  100. package/dist/integrations/arniko-client.js.map +1 -1
  101. package/dist/intelligence/cost.js +13 -7
  102. package/dist/intelligence/cost.js.map +1 -1
  103. package/dist/intelligence/failover-chain.d.ts +27 -0
  104. package/dist/intelligence/failover-chain.js +70 -0
  105. package/dist/intelligence/failover-chain.js.map +1 -0
  106. package/dist/intelligence/models-dev-sync.js +10 -3
  107. package/dist/intelligence/models-dev-sync.js.map +1 -1
  108. package/dist/intelligence/prices.js +1 -1
  109. package/dist/intelligence/prices.js.map +1 -1
  110. package/dist/kernel/agent-loop.js +74 -17
  111. package/dist/kernel/agent-loop.js.map +1 -1
  112. package/dist/kernel/event-stream.d.ts +7 -2
  113. package/dist/kernel/event-stream.js +63 -9
  114. package/dist/kernel/event-stream.js.map +1 -1
  115. package/dist/kernel/message.d.ts +2 -2
  116. package/dist/kernel/message.js +45 -30
  117. package/dist/kernel/message.js.map +1 -1
  118. package/dist/kernel/types.d.ts +1 -1
  119. package/dist/lsp/client.js +16 -7
  120. package/dist/lsp/client.js.map +1 -1
  121. package/dist/providers/deepseek.d.ts +2 -2
  122. package/dist/providers/deepseek.js +21 -21
  123. package/dist/providers/deepseek.js.map +1 -1
  124. package/dist/providers/health.d.ts +4 -1
  125. package/dist/providers/health.js +24 -9
  126. package/dist/providers/health.js.map +1 -1
  127. package/dist/providers/http.d.ts +2 -0
  128. package/dist/providers/http.js +42 -22
  129. package/dist/providers/http.js.map +1 -1
  130. package/dist/providers/openai-compat.js +30 -27
  131. package/dist/providers/openai-compat.js.map +1 -1
  132. package/dist/providers/openrouter.d.ts +2 -2
  133. package/dist/providers/openrouter.js +25 -16
  134. package/dist/providers/openrouter.js.map +1 -1
  135. package/dist/safety/approval-bus.js +1 -1
  136. package/dist/safety/approval-bus.js.map +1 -1
  137. package/dist/safety/policy.d.ts +3 -3
  138. package/dist/safety/policy.js +60 -47
  139. package/dist/safety/policy.js.map +1 -1
  140. package/dist/safety/sandbox/noop.d.ts +2 -2
  141. package/dist/safety/sandbox/noop.js +23 -15
  142. package/dist/safety/sandbox/noop.js.map +1 -1
  143. package/dist/safety/sandbox/seatbelt.d.ts +1 -1
  144. package/dist/safety/sandbox/seatbelt.js +16 -9
  145. package/dist/safety/sandbox/seatbelt.js.map +1 -1
  146. package/dist/state/db.d.ts +28 -0
  147. package/dist/state/db.js +129 -0
  148. package/dist/state/db.js.map +1 -0
  149. package/dist/state/index.d.ts +23 -0
  150. package/dist/state/index.js +119 -0
  151. package/dist/state/index.js.map +1 -0
  152. package/dist/subagents/delegator.d.ts +8 -0
  153. package/dist/subagents/delegator.js +22 -5
  154. package/dist/subagents/delegator.js.map +1 -1
  155. package/dist/telemetry/crash-report.js +111 -79
  156. package/dist/telemetry/crash-report.js.map +1 -1
  157. package/dist/tools/browser.d.ts +1 -1
  158. package/dist/tools/browser.js +62 -45
  159. package/dist/tools/browser.js.map +1 -1
  160. package/dist/tools/checkpoint.js +3 -0
  161. package/dist/tools/checkpoint.js.map +1 -1
  162. package/dist/tools/cron.d.ts +1 -1
  163. package/dist/tools/cron.js +61 -41
  164. package/dist/tools/cron.js.map +1 -1
  165. package/dist/tools/exec.js +36 -1
  166. package/dist/tools/exec.js.map +1 -1
  167. package/dist/tools/fs-edit.js +4 -1
  168. package/dist/tools/fs-edit.js.map +1 -1
  169. package/dist/tools/fs-ls.js +4 -1
  170. package/dist/tools/fs-ls.js.map +1 -1
  171. package/dist/tools/fs-read.js +4 -1
  172. package/dist/tools/fs-read.js.map +1 -1
  173. package/dist/tools/fs-write.js +4 -1
  174. package/dist/tools/fs-write.js.map +1 -1
  175. package/dist/tools/git.d.ts +1 -1
  176. package/dist/tools/git.js +45 -25
  177. package/dist/tools/git.js.map +1 -1
  178. package/dist/tools/index.d.ts +3 -1
  179. package/dist/tools/index.js +5 -1
  180. package/dist/tools/index.js.map +1 -1
  181. package/dist/tools/lsp-definition.js +10 -1
  182. package/dist/tools/lsp-definition.js.map +1 -1
  183. package/dist/tools/lsp-hover.js +10 -1
  184. package/dist/tools/lsp-hover.js.map +1 -1
  185. package/dist/tools/lsp-references.js +10 -1
  186. package/dist/tools/lsp-references.js.map +1 -1
  187. package/dist/tools/lsp-symbols.js +10 -1
  188. package/dist/tools/lsp-symbols.js.map +1 -1
  189. package/dist/tools/multimodal.d.ts +2 -2
  190. package/dist/tools/multimodal.js +141 -90
  191. package/dist/tools/multimodal.js.map +1 -1
  192. package/dist/tools/qmd.d.ts +15 -0
  193. package/dist/tools/qmd.js +107 -0
  194. package/dist/tools/qmd.js.map +1 -0
  195. package/dist/tools/registry.d.ts +5 -0
  196. package/dist/tools/registry.js.map +1 -1
  197. package/dist/tools/rtk.d.ts +12 -0
  198. package/dist/tools/rtk.js +113 -0
  199. package/dist/tools/rtk.js.map +1 -0
  200. package/dist/tools/search-grep.js +1 -0
  201. package/dist/tools/search-grep.js.map +1 -1
  202. package/dist/tools/shell.js +25 -16
  203. package/dist/tools/shell.js.map +1 -1
  204. package/dist/tui/approval.d.ts +1 -1
  205. package/dist/tui/approval.js +38 -14
  206. package/dist/tui/approval.js.map +1 -1
  207. package/dist/tui/ink/App.js +88 -69
  208. package/dist/tui/ink/App.js.map +1 -1
  209. package/dist/tui/ink/components/DenseToolMessage.js +2 -8
  210. package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
  211. package/dist/tui/ink/components/InputBox.js +1 -1
  212. package/dist/tui/ink/components/InputBox.js.map +1 -1
  213. package/dist/tui/ink/components/StatusBar.js +2 -21
  214. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  215. package/dist/tui/ink/components/ThinkingBlock.js +3 -3
  216. package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
  217. package/dist/tui/ink/components/ToolBox.js +3 -23
  218. package/dist/tui/ink/components/ToolBox.js.map +1 -1
  219. package/dist/tui/ink/components/ToolGroup.js +2 -8
  220. package/dist/tui/ink/components/ToolGroup.js.map +1 -1
  221. package/dist/tui/ink/ink-approval-bus.js +4 -1
  222. package/dist/tui/ink/ink-approval-bus.js.map +1 -1
  223. package/dist/tui/ink/spinner-context.d.ts +3 -0
  224. package/dist/tui/ink/spinner-context.js +6 -0
  225. package/dist/tui/ink/spinner-context.js.map +1 -0
  226. package/dist/tui/ink/use-event-projection.js +142 -37
  227. package/dist/tui/ink/use-event-projection.js.map +1 -1
  228. package/dist/tui/renderer.js +9 -1
  229. package/dist/tui/renderer.js.map +1 -1
  230. package/dist/web/ledger.d.ts +1 -1
  231. package/dist/web/ledger.js +44 -20
  232. package/dist/web/ledger.js.map +1 -1
  233. package/dist/web/server.js +4 -3
  234. package/dist/web/server.js.map +1 -1
  235. package/package.json +16 -12
  236. package/vendor/qmd/VERSION +3 -0
  237. package/vendor/rtk/CHECKSUMS.txt +6 -0
  238. package/vendor/rtk/VERSION +3 -0
  239. 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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"}
@@ -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
- const onData = (chunks, counter) => (buf) => {
97
- const remaining = MAX_OUTPUT_BYTES - counter(0);
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
- counter(slice.length);
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
- const stdoutCount = ((acc = 0) => (add) => {
112
- acc += add;
113
- stdoutBytes = acc;
114
- return acc;
115
- })();
116
- const stderrCount = ((acc = 0) => (add) => {
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("exit", (code) => resolveExit(code ?? -1));
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]" : ""}`;
@@ -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,OAA8B,EAAE,EAAE,CAAC,CAAC,GAAW,EAAE,EAAE;YACpE,MAAM,SAAS,GAAG,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,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,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACtB,IAAI,GAAG,CAAC,MAAM,GAAG,SAAS;gBAAE,SAAS,GAAG,IAAI,CAAC;YAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACpC,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,MAAM,WAAW,GAAG,CAClB,CAAC,GAAG,GAAG,CAAC,EAAE,EAAE,CACZ,CAAC,GAAW,EAAE,EAAE;YACd,GAAG,IAAI,GAAG,CAAC;YACX,WAAW,GAAG,GAAG,CAAC;YAClB,OAAO,GAAG,CAAC;QACb,CAAC,CACF,EAAE,CAAC;QACJ,MAAM,WAAW,GAAG,CAClB,CAAC,GAAG,GAAG,CAAC,EAAE,EAAE,CACZ,CAAC,GAAW,EAAE,EAAE;YACd,GAAG,IAAI,GAAG,CAAC;YACX,WAAW,GAAG,GAAG,CAAC;YAClB,OAAO,GAAG,CAAC;QACb,CAAC,CACF,EAAE,CAAC;QAEJ,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;QAE3D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,MAAM,QAAQ,GAAW,MAAM,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACzD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,KAAK,CAAC,CAAC;QAEpB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5D,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"}
1
+ {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"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"}
@@ -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 '../kernel/types.js';
6
+ import type { ApprovalBus } from "../kernel/types.js";
7
7
  export declare function createTuiApprovalBus(autoApproveTools?: Set<string>): ApprovalBus;
@@ -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 './theme.js';
7
- import { createInterface } from 'node:readline';
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 'a':
24
+ case "a":
25
25
  autoApproveTools.add(req.tool);
26
- return 'approve_once';
27
- case 'd': return 'deny_always';
28
- case 'n': return 'deny';
29
- default: return 'approve';
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({ input: process.stdin, output: process.stdout });
38
- rl.question('', ans => { rl.close(); resolve(ans.trim()); });
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('data', onData);
45
- resolve(buf.toString('utf8'));
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('data', onData);
72
+ process.stdin.once("data", onData);
73
+ process.stdin.once("error", onError);
50
74
  });
51
75
  }
52
76
  function truncate(s, max) {
@@ -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,CAAC,mBAAgC,IAAI,GAAG,EAAE;IAC5E,OAAO;QACL,gBAAgB,CAAC,QAAgB;YAC/B,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,GAAG;YACf,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,CAAC,IAAI,iCAAiC,CAAC,CAAC;YACrG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC;YACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACtE,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACb,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;YACvC,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;YACnC,QAAQ,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC7B,KAAK,GAAG;oBAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAAC,OAAO,cAAc,CAAC;gBAChE,KAAK,GAAG,CAAC,CAAC,OAAO,aAAa,CAAC;gBAC/B,KAAK,GAAG,CAAC,CAAC,OAAO,MAAM,CAAC;gBACxB,OAAO,CAAC,CAAC,OAAO,SAAS,CAAC;YAC5B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7E,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,GAAW,EAAQ,EAAE;YACnC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS,EAAE,GAAW;IACtC,OAAO,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;AACzD,CAAC"}
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,CAClC,mBAAgC,IAAI,GAAG,EAAE;IAEzC,OAAO;QACL,gBAAgB,CAAC,QAAgB;YAC/B,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,GAAG;YACf,MAAM,MAAM,GAAG,KAAK,CAClB,YAAY,CAAC,OAAO,EACpB,eAAe,GAAG,CAAC,IAAI,iCAAiC,CACzD,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC;YACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACtE,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACb,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;YACvC,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;YACnC,QAAQ,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC7B,KAAK,GAAG;oBACN,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC/B,OAAO,cAAc,CAAC;gBACxB,KAAK,GAAG;oBACN,OAAO,aAAa,CAAC;gBACvB,KAAK,GAAG;oBACN,OAAO,MAAM,CAAC;gBAChB;oBACE,OAAO,SAAS,CAAC;YACrB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,eAAe,CAAC;gBACzB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;YACH,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE;gBACtB,EAAE,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,MAAM,GAAG,CAAC,GAAW,EAAQ,EAAE;YACnC,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,GAAU,EAAQ,EAAE;YACnC,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS,EAAE,GAAW;IACtC,OAAO,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;AACzD,CAAC"}
@@ -49,6 +49,7 @@ import { AtFileComplete } from "./components/AtFileComplete.js";
49
49
  import { SlashComplete } from "./components/SlashComplete.js";
50
50
  import { ThemePicker } from "./components/ThemePicker.js";
51
51
  import { ThemeProvider } from "./theme-context.js";
52
+ import { SpinnerContext, SPINNER_FRAMES as GLOBAL_SPINNER_FRAMES } from "./spinner-context.js";
52
53
  import { writeFile, mkdir, readFile } from "node:fs/promises";
53
54
  import { homedir } from "node:os";
54
55
  import { join as pathJoin } from "node:path";
@@ -122,29 +123,40 @@ export function App(props) {
122
123
  const [liveOutputTokens, setLiveOutputTokens] = React.useState(0);
123
124
  const [liveDurationMs, setLiveDurationMs] = React.useState(0);
124
125
  const turnStartRef = React.useRef(0);
126
+ const liveOutputTokensAccRef = React.useRef(0);
125
127
  React.useEffect(() => {
126
128
  const unsub = props.events.subscribe((ev) => {
127
129
  if (ev.type === "agent_start") {
128
130
  turnStartRef.current = Date.now();
131
+ liveOutputTokensAccRef.current = 0;
129
132
  setLiveOutputTokens(0);
130
133
  setLiveDurationMs(0);
131
134
  }
132
135
  else if (ev.type === "text_delta" || ev.type === "thinking_delta") {
133
- // Approximate output-token count by char/4 — same heuristic
134
- // the rest of the codebase uses for streaming-side estimates.
135
- const delta = (ev.delta?.length ?? 0) / 4;
136
- setLiveOutputTokens((prev) => prev + delta);
136
+ liveOutputTokensAccRef.current += (ev.delta?.length ?? 0) / 4;
137
137
  }
138
138
  else if (ev.type === "usage") {
139
- setLiveOutputTokens(ev.outputTokens ?? 0);
139
+ // Only update the accumulator ref — the 1s tick interval reads it.
140
+ // Calling setLiveOutputTokens here would double-render on usage events.
141
+ liveOutputTokensAccRef.current = ev.outputTokens ?? 0;
140
142
  }
141
143
  else if (ev.type === "agent_end") {
142
144
  setLiveDurationMs(0);
143
145
  setLiveOutputTokens(0);
146
+ liveOutputTokensAccRef.current = 0;
144
147
  }
145
148
  });
146
149
  return unsub;
147
150
  }, [props.events]);
151
+ const [globalSpinnerFrame, setGlobalSpinnerFrame] = React.useState(0);
152
+ React.useEffect(() => {
153
+ if (!busy) {
154
+ setGlobalSpinnerFrame(0);
155
+ return;
156
+ }
157
+ const t = setInterval(() => setGlobalSpinnerFrame((f) => (f + 1) % GLOBAL_SPINNER_FRAMES.length), 80);
158
+ return () => clearInterval(t);
159
+ }, [busy]);
148
160
  // Tick the duration so the tok/s number updates while streaming.
149
161
  React.useEffect(() => {
150
162
  if (!busy)
@@ -152,6 +164,7 @@ export function App(props) {
152
164
  const t = setInterval(() => {
153
165
  if (turnStartRef.current > 0)
154
166
  setLiveDurationMs(Date.now() - turnStartRef.current);
167
+ setLiveOutputTokens(liveOutputTokensAccRef.current);
155
168
  }, 1000);
156
169
  return () => clearInterval(t);
157
170
  }, [busy]);
@@ -200,6 +213,10 @@ export function App(props) {
200
213
  }, [props.events, currentModel]);
201
214
  const models = React.useMemo(() => props.models ?? defaultModelCatalogue(), [props.models]);
202
215
  const slashCommands = props.slashCommands ?? [];
216
+ // runTurnRef ensures handleSubmit always calls the latest runTurn closure
217
+ // (which captures current currentModel, mode, etc.) without adding those
218
+ // values to handleSubmit's deps and causing it to recreate on every change.
219
+ const runTurnRef = React.useRef(() => Promise.resolve());
203
220
  const handleSubmit = React.useCallback((raw) => {
204
221
  const value = raw.trim();
205
222
  if (value.length === 0)
@@ -370,7 +387,7 @@ export function App(props) {
370
387
  };
371
388
  setTranscript((prev) => [...prev, userItem]);
372
389
  historyRef.current.push({ role: "user", content: value });
373
- void runTurn();
390
+ void runTurnRef.current();
374
391
  }, [busy, exit, props, projection, overlays]);
375
392
  const runTurn = async () => {
376
393
  setBusy(true);
@@ -446,6 +463,7 @@ export function App(props) {
446
463
  abortRef.current = null;
447
464
  }
448
465
  };
466
+ runTurnRef.current = runTurn;
449
467
  // Drain the prompt queue when a turn finishes. Pops the oldest queued
450
468
  // prompt and re-submits it through handleSubmit (which transitions
451
469
  // back into busy=true via runTurn). Guarded on `!busy` so we never
@@ -617,9 +635,11 @@ export function App(props) {
617
635
  setTimeout(() => handleSubmit(spliced || `/${name}`), 0);
618
636
  }
619
637
  }, [overlays, ARGLESS_SLASH, handleSubmit]);
620
- const inputFocus = overlays.active === null ||
621
- overlays.active === "atfile" ||
622
- overlays.active === "slash";
638
+ const inputFocus = pendingKey === null &&
639
+ pendingApproval === null &&
640
+ (overlays.active === null ||
641
+ overlays.active === "atfile" ||
642
+ overlays.active === "slash");
623
643
  // Active theme name — driven by local state so the picker can flip it
624
644
  // live. Initial value comes from config; subsequent changes are
625
645
  // persisted to ~/.dirgha/config.json so future sessions pick it up.
@@ -648,72 +668,71 @@ export function App(props) {
648
668
  }
649
669
  })();
650
670
  }, [overlays]);
671
+ const allTranscriptItems = React.useMemo(() => [...transcript, ...projection.liveItems], [transcript, projection.liveItems]);
672
+ const renderedTranscript = React.useMemo(() => renderTranscript(allTranscriptItems), [allTranscriptItems]);
673
+ const providerEntries = React.useMemo(() => buildProviderEntries(models, currentModel), [models, currentModel]);
651
674
  // BISECT: Static moved out of the transcript render. Logo stays
652
675
  // in a one-item Static (its original placement). Both committed
653
676
  // transcript and live items render in the regular dynamic Box. If
654
677
  // streaming text appears now, the Static-around-transcript pattern
655
678
  // was suppressing the live region updates. If still not, the bug
656
679
  // is upstream in useEventProjection.
657
- return (_jsx(ThemeProvider, { activeTheme: themeName, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: [{ key: "logo" }], children: (_item) => _jsx(Logo, { version: VERSION }, "logo") }), _jsx(Box, { flexDirection: "column", children: renderTranscript([...transcript, ...projection.liveItems]) }), pendingApproval !== null && approvalBusRef.current && (_jsx(ApprovalPrompt, { request: pendingApproval, onResolve: (decision) => {
658
- approvalBusRef.current?.resolve(pendingApproval.id, decision);
659
- } })), pendingFailover !== null && (_jsx(ModelSwitchPrompt, { failedModel: pendingFailover.failedModel, failoverModel: pendingFailover.failoverModel, onAccept: (failover) => {
660
- const lastPrompt = pendingFailover.lastPrompt;
661
- setCurrentModel(failover);
662
- setPendingFailover(null);
663
- // Re-submit the failed prompt against the new model.
664
- if (lastPrompt) {
665
- setTimeout(() => handleSubmit(lastPrompt), 0);
666
- }
667
- }, onReject: () => setPendingFailover(null), onPicker: () => {
668
- setPendingFailover(null);
669
- overlays.openOverlay("models");
670
- } })), _jsx(PromptQueueIndicator, { queued: promptQueue }), _jsx(InputBox, { value: input, onChange: setInput, onSubmit: handleSubmit, busy: busy, vimMode: props.config.vimMode === true, onAtQueryChange: overlays.setAtQuery, onSlashQueryChange: overlays.setSlashQuery, onRequestOverlay: overlays.openOverlay, onRequestYoloToggle: () => {
671
- const next = mode === "yolo" ? "act" : "yolo";
672
- setMode(next);
673
- setTranscript((prev) => [
674
- ...prev,
675
- {
676
- kind: "notice",
677
- id: randomUUID(),
678
- text: next === "yolo"
679
- ? "YOLO mode ON — every tool call is auto-approved. Ctrl+Y to exit."
680
- : "YOLO mode OFF — back to standard confirmation.",
681
- },
682
- ]);
683
- }, inputFocus: inputFocus }), overlays.active === "atfile" && overlays.atQuery !== null && (_jsx(AtFileComplete, { cwd: props.cwd, query: overlays.atQuery, onPick: handleAtPick, onCancel: () => {
684
- overlays.setAtQuery(null);
685
- overlays.setActive(null);
686
- } })), overlays.active === "slash" && overlays.slashQuery !== null && (_jsx(SlashComplete, { commands: slashCommands, query: overlays.slashQuery, onPick: handleSlashPick, onCancel: () => {
687
- overlays.setSlashQuery(null);
688
- overlays.setActive(null);
689
- } })), overlays.active === "models" &&
690
- pickerStage === "provider" &&
691
- (() => {
692
- // Build provider entries — only include providers that actually have
693
- // models in our catalogue. Without this, the picker shows providers
694
- // with 0 models and the user lands on an empty model list.
695
- const providers = buildProviderEntries(models, currentModel);
696
- if (providers.length === 0) {
697
- // Fall through to flat ModelPicker if no providers (catalogue empty).
698
- return null;
699
- }
700
- return (_jsx(ProviderPicker, { providers: providers, onPick: (providerId) => {
701
- setPickerProvider(providerId);
702
- setPickerStage("model");
703
- }, onCancel: () => {
704
- setPickerStage("provider");
705
- setPickerProvider(null);
706
- overlays.closeOverlay();
707
- } }));
708
- })(), overlays.active === "models" && pickerStage === "model" && (_jsx(ModelPicker, { models: models.filter((m) => m.provider === pickerProvider), current: currentModel, onPick: (id) => {
709
- handleModelPick(id);
710
- setPickerStage("provider");
711
- setPickerProvider(null);
712
- }, onCancel: () => {
713
- // Esc inside ModelPicker → back to ProviderPicker (NOT close).
714
- setPickerStage("provider");
715
- setPickerProvider(null);
716
- } })), overlays.active === "help" && (_jsx(HelpOverlay, { slashCommands: slashCommands, onClose: overlays.closeOverlay })), overlays.active === "theme" && (_jsx(ThemePicker, { current: themeName, onPick: handleThemePick, onCancel: overlays.closeOverlay })), pendingKey && (_jsx(KeySetOverlay, { keyName: pendingKey.keyName, onSave: handleKeySetSave, onCancel: () => setPendingKey(null) })), _jsx(StatusBar, { model: currentModel, provider: providerIdForModel(currentModel), inputTokens: projection.totals.inputTokens, outputTokens: projection.totals.outputTokens, costUsd: projection.totals.costUsd, cwd: props.cwd, busy: busy, mode: mode, contextWindow: contextWindowFor(currentModel), liveOutputTokens: liveOutputTokens, liveDurationMs: liveDurationMs })] }) }));
680
+ return (_jsx(ThemeProvider, { activeTheme: themeName, children: _jsx(SpinnerContext.Provider, { value: globalSpinnerFrame, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: [{ key: "logo" }], children: (_item) => _jsx(Logo, { version: VERSION }, "logo") }), _jsx(Box, { flexDirection: "column", children: renderedTranscript }), pendingApproval !== null && approvalBusRef.current && (_jsx(ApprovalPrompt, { request: pendingApproval, onResolve: (decision) => {
681
+ approvalBusRef.current?.resolve(pendingApproval.id, decision);
682
+ } })), pendingFailover !== null && (_jsx(ModelSwitchPrompt, { failedModel: pendingFailover.failedModel, failoverModel: pendingFailover.failoverModel, onAccept: (failover) => {
683
+ const lastPrompt = pendingFailover.lastPrompt;
684
+ setCurrentModel(failover);
685
+ setPendingFailover(null);
686
+ // Re-submit the failed prompt against the new model.
687
+ if (lastPrompt) {
688
+ setTimeout(() => handleSubmit(lastPrompt), 0);
689
+ }
690
+ }, onReject: () => setPendingFailover(null), onPicker: () => {
691
+ setPendingFailover(null);
692
+ overlays.openOverlay("models");
693
+ } })), _jsx(PromptQueueIndicator, { queued: promptQueue }), _jsx(InputBox, { value: input, onChange: setInput, onSubmit: handleSubmit, busy: busy, vimMode: props.config.vimMode === true, onAtQueryChange: overlays.setAtQuery, onSlashQueryChange: overlays.setSlashQuery, onRequestOverlay: overlays.openOverlay, onRequestYoloToggle: () => {
694
+ const next = mode === "yolo" ? "act" : "yolo";
695
+ setMode(next);
696
+ setTranscript((prev) => [
697
+ ...prev,
698
+ {
699
+ kind: "notice",
700
+ id: randomUUID(),
701
+ text: next === "yolo"
702
+ ? "YOLO mode ON — every tool call is auto-approved. Ctrl+Y to exit."
703
+ : "YOLO mode OFF — back to standard confirmation.",
704
+ },
705
+ ]);
706
+ }, inputFocus: inputFocus }), overlays.active === "atfile" && overlays.atQuery !== null && (_jsx(AtFileComplete, { cwd: props.cwd, query: overlays.atQuery, onPick: handleAtPick, onCancel: () => {
707
+ overlays.setAtQuery(null);
708
+ overlays.setActive(null);
709
+ } })), overlays.active === "slash" && overlays.slashQuery !== null && (_jsx(SlashComplete, { commands: slashCommands, query: overlays.slashQuery, onPick: handleSlashPick, onCancel: () => {
710
+ overlays.setSlashQuery(null);
711
+ overlays.setActive(null);
712
+ } })), overlays.active === "models" &&
713
+ pickerStage === "provider" &&
714
+ (() => {
715
+ if (providerEntries.length === 0) {
716
+ // Fall through to flat ModelPicker if no providers (catalogue empty).
717
+ return null;
718
+ }
719
+ return (_jsx(ProviderPicker, { providers: providerEntries, onPick: (providerId) => {
720
+ setPickerProvider(providerId);
721
+ setPickerStage("model");
722
+ }, onCancel: () => {
723
+ setPickerStage("provider");
724
+ setPickerProvider(null);
725
+ overlays.closeOverlay();
726
+ } }));
727
+ })(), overlays.active === "models" && pickerStage === "model" && (_jsx(ModelPicker, { models: models.filter((m) => m.provider === pickerProvider), current: currentModel, onPick: (id) => {
728
+ handleModelPick(id);
729
+ setPickerStage("provider");
730
+ setPickerProvider(null);
731
+ }, onCancel: () => {
732
+ // Esc inside ModelPicker → back to ProviderPicker (NOT close).
733
+ setPickerStage("provider");
734
+ setPickerProvider(null);
735
+ } })), overlays.active === "help" && (_jsx(HelpOverlay, { slashCommands: slashCommands, onClose: overlays.closeOverlay })), overlays.active === "theme" && (_jsx(ThemePicker, { current: themeName, onPick: handleThemePick, onCancel: overlays.closeOverlay })), pendingKey && (_jsx(KeySetOverlay, { keyName: pendingKey.keyName, onSave: handleKeySetSave, onCancel: () => setPendingKey(null) })), _jsx(StatusBar, { model: currentModel, provider: providerIdForModel(currentModel), inputTokens: projection.totals.inputTokens, outputTokens: projection.totals.outputTokens, costUsd: projection.totals.costUsd, cwd: props.cwd, busy: busy, mode: mode, contextWindow: contextWindowFor(currentModel), liveOutputTokens: liveOutputTokens, liveDurationMs: liveDurationMs })] }) }) }));
717
736
  }
718
737
  /**
719
738
  * Walk the transcript and fold consecutive `tool` items into a single