@dirgha/code 1.20.25 → 1.20.28

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 (164) 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.js +40 -24
  8. package/dist/cli/first-run.js.map +1 -1
  9. package/dist/cli/flows/wizard.js +12 -18
  10. package/dist/cli/flows/wizard.js.map +1 -1
  11. package/dist/cli/interactive.d.ts +4 -0
  12. package/dist/cli/interactive.js +29 -1
  13. package/dist/cli/interactive.js.map +1 -1
  14. package/dist/cli/main.js +59 -17
  15. package/dist/cli/main.js.map +1 -1
  16. package/dist/cli/slash/fleet.js +19 -1
  17. package/dist/cli/slash/fleet.js.map +1 -1
  18. package/dist/cli/slash/models.js +4 -2
  19. package/dist/cli/slash/models.js.map +1 -1
  20. package/dist/cli/slash.js +26 -10
  21. package/dist/cli/slash.js.map +1 -1
  22. package/dist/cli/subcommands/telemetry.d.ts +2 -1
  23. package/dist/cli/subcommands/telemetry.js +47 -34
  24. package/dist/cli/subcommands/telemetry.js.map +1 -1
  25. package/dist/context/branch.d.ts +2 -2
  26. package/dist/context/branch.js +40 -23
  27. package/dist/context/branch.js.map +1 -1
  28. package/dist/context/compaction.js +38 -18
  29. package/dist/context/compaction.js.map +1 -1
  30. package/dist/context/git-state.js +31 -18
  31. package/dist/context/git-state.js.map +1 -1
  32. package/dist/context/knowledge.js +31 -20
  33. package/dist/context/knowledge.js.map +1 -1
  34. package/dist/context/memory.js +7 -0
  35. package/dist/context/memory.js.map +1 -1
  36. package/dist/context/mode-enforcement.js +11 -1
  37. package/dist/context/mode-enforcement.js.map +1 -1
  38. package/dist/context/mode.js +67 -30
  39. package/dist/context/mode.js.map +1 -1
  40. package/dist/context/primer.js +15 -3
  41. package/dist/context/primer.js.map +1 -1
  42. package/dist/fleet/apply-back.js +5 -1
  43. package/dist/fleet/apply-back.js.map +1 -1
  44. package/dist/fleet/cli-command.d.ts +2 -0
  45. package/dist/fleet/cli-command.js +15 -1
  46. package/dist/fleet/cli-command.js.map +1 -1
  47. package/dist/fleet/runner.js +35 -2
  48. package/dist/fleet/runner.js.map +1 -1
  49. package/dist/fleet/scratchpad.js +1 -2
  50. package/dist/fleet/scratchpad.js.map +1 -1
  51. package/dist/fleet/state.d.ts +4 -0
  52. package/dist/fleet/state.js +11 -2
  53. package/dist/fleet/state.js.map +1 -1
  54. package/dist/fleet/templates.d.ts +4 -0
  55. package/dist/fleet/templates.js.map +1 -1
  56. package/dist/fleet/types.d.ts +4 -0
  57. package/dist/fleet/types.js.map +1 -1
  58. package/dist/intelligence/prices.d.ts +6 -4
  59. package/dist/intelligence/prices.js +36 -10
  60. package/dist/intelligence/prices.js.map +1 -1
  61. package/dist/kernel/agent-loop.js +49 -15
  62. package/dist/kernel/agent-loop.js.map +1 -1
  63. package/dist/lsp/client.js +29 -16
  64. package/dist/lsp/client.js.map +1 -1
  65. package/dist/lsp/detector.js +7 -6
  66. package/dist/lsp/detector.js.map +1 -1
  67. package/dist/mcp/client.d.ts +1 -1
  68. package/dist/mcp/client.js +19 -16
  69. package/dist/mcp/client.js.map +1 -1
  70. package/dist/mcp/transport.js +46 -38
  71. package/dist/mcp/transport.js.map +1 -1
  72. package/dist/providers/dispatch.js +15 -1
  73. package/dist/providers/dispatch.js.map +1 -1
  74. package/dist/providers/index.d.ts +11 -0
  75. package/dist/providers/index.js +29 -2
  76. package/dist/providers/index.js.map +1 -1
  77. package/dist/providers/openai-compat.js +4 -2
  78. package/dist/providers/openai-compat.js.map +1 -1
  79. package/dist/safety/audit-log.d.ts +15 -0
  80. package/dist/safety/audit-log.js +21 -0
  81. package/dist/safety/audit-log.js.map +1 -1
  82. package/dist/telemetry/gateway-push.d.ts +17 -0
  83. package/dist/telemetry/gateway-push.js +48 -0
  84. package/dist/telemetry/gateway-push.js.map +1 -0
  85. package/dist/telemetry/index.d.ts +9 -0
  86. package/dist/telemetry/index.js +9 -0
  87. package/dist/telemetry/index.js.map +1 -0
  88. package/dist/tools/browser.js +24 -16
  89. package/dist/tools/browser.js.map +1 -1
  90. package/dist/tools/checkpoint.d.ts +6 -1
  91. package/dist/tools/checkpoint.js +79 -62
  92. package/dist/tools/checkpoint.js.map +1 -1
  93. package/dist/tools/cron.js +1 -3
  94. package/dist/tools/cron.js.map +1 -1
  95. package/dist/tools/diff.js +25 -21
  96. package/dist/tools/diff.js.map +1 -1
  97. package/dist/tools/exec.d.ts +2 -0
  98. package/dist/tools/exec.js +13 -0
  99. package/dist/tools/exec.js.map +1 -1
  100. package/dist/tools/fs-edit.d.ts +3 -5
  101. package/dist/tools/fs-edit.js +8 -23
  102. package/dist/tools/fs-edit.js.map +1 -1
  103. package/dist/tools/fs-ls.js +6 -8
  104. package/dist/tools/fs-ls.js.map +1 -1
  105. package/dist/tools/fs-read.d.ts +1 -1
  106. package/dist/tools/fs-read.js +37 -28
  107. package/dist/tools/fs-read.js.map +1 -1
  108. package/dist/tools/fs-write.d.ts +1 -1
  109. package/dist/tools/fs-write.js +33 -33
  110. package/dist/tools/fs-write.js.map +1 -1
  111. package/dist/tools/git.js +12 -6
  112. package/dist/tools/git.js.map +1 -1
  113. package/dist/tools/github.d.ts +13 -0
  114. package/dist/tools/github.js +257 -0
  115. package/dist/tools/github.js.map +1 -0
  116. package/dist/tools/index.d.ts +5 -2
  117. package/dist/tools/index.js +7 -4
  118. package/dist/tools/index.js.map +1 -1
  119. package/dist/tools/multimodal.js +11 -12
  120. package/dist/tools/multimodal.js.map +1 -1
  121. package/dist/tools/rtk.js +22 -9
  122. package/dist/tools/rtk.js.map +1 -1
  123. package/dist/tools/search-glob.d.ts +1 -1
  124. package/dist/tools/search-glob.js +42 -24
  125. package/dist/tools/search-glob.js.map +1 -1
  126. package/dist/tools/search-grep.d.ts +1 -1
  127. package/dist/tools/search-grep.js +56 -32
  128. package/dist/tools/search-grep.js.map +1 -1
  129. package/dist/tools/shell.d.ts +7 -1
  130. package/dist/tools/shell.js +114 -61
  131. package/dist/tools/shell.js.map +1 -1
  132. package/dist/tui/ink/App.js +90 -42
  133. package/dist/tui/ink/App.js.map +1 -1
  134. package/dist/tui/ink/components/DenseToolMessage.js +5 -1
  135. package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
  136. package/dist/tui/ink/components/InputBox.js +16 -15
  137. package/dist/tui/ink/components/InputBox.js.map +1 -1
  138. package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
  139. package/dist/tui/ink/components/ModelPicker.js +34 -26
  140. package/dist/tui/ink/components/ModelPicker.js.map +1 -1
  141. package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
  142. package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
  143. package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
  144. package/dist/tui/ink/components/StatusBar.js +0 -2
  145. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  146. package/dist/tui/ink/components/ToolBox.js +1 -3
  147. package/dist/tui/ink/components/ToolBox.js.map +1 -1
  148. package/dist/tui/ink/components/VirtualTranscript.js +3 -1
  149. package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
  150. package/dist/tui/ink/use-declined-versions.js +6 -2
  151. package/dist/tui/ink/use-declined-versions.js.map +1 -1
  152. package/dist/tui/ink/use-event-projection.js +12 -0
  153. package/dist/tui/ink/use-event-projection.js.map +1 -1
  154. package/dist/tui/ink/use-overlays.js +16 -17
  155. package/dist/tui/ink/use-overlays.js.map +1 -1
  156. package/dist/tui/ink/use-render-metrics.js +6 -2
  157. package/dist/tui/ink/use-render-metrics.js.map +1 -1
  158. package/dist/utils/env.d.ts +1 -0
  159. package/dist/utils/env.js +60 -0
  160. package/dist/utils/env.js.map +1 -0
  161. package/dist/utils/fs.d.ts +10 -0
  162. package/dist/utils/fs.js +37 -0
  163. package/dist/utils/fs.js.map +1 -0
  164. package/package.json +1 -1
@@ -3,31 +3,49 @@
3
3
  * skips (node_modules, .git, dist by default). Returns matching paths
4
4
  * relative to the search root, sorted for determinism.
5
5
  */
6
- import { readdir, stat } from 'node:fs/promises';
7
- import { join, relative, resolve } from 'node:path';
6
+ import { readdir, stat } from "node:fs/promises";
7
+ import { join, relative } from "node:path";
8
+ import { isValidCwdPath } from "../utils/fs.js";
8
9
  const DEFAULT_LIMIT = 500;
9
- const DEFAULT_SKIP = new Set(['node_modules', '.git', 'dist', 'build', '.next', '.turbo']);
10
+ const DEFAULT_MAX_DEPTH = 64;
11
+ const DEFAULT_SKIP = new Set([
12
+ "node_modules",
13
+ ".git",
14
+ "dist",
15
+ "build",
16
+ ".next",
17
+ ".turbo",
18
+ ]);
10
19
  export const searchGlobTool = {
11
- name: 'search_glob',
20
+ name: "search_glob",
12
21
  description: 'Find files by glob pattern (e.g., "**/*.ts"). Skips node_modules, .git, dist by default.',
13
22
  inputSchema: {
14
- type: 'object',
23
+ type: "object",
15
24
  properties: {
16
- pattern: { type: 'string' },
17
- path: { type: 'string' },
18
- resultLimit: { type: 'integer', minimum: 1 },
25
+ pattern: { type: "string" },
26
+ path: { type: "string" },
27
+ resultLimit: { type: "integer", minimum: 1 },
28
+ maxDepth: {
29
+ type: "integer",
30
+ minimum: 1,
31
+ description: "Maximum recursion depth. Default 64.",
32
+ },
19
33
  },
20
- required: ['pattern'],
34
+ required: ["pattern"],
21
35
  },
22
36
  async execute(rawInput, ctx) {
23
37
  const input = rawInput;
24
- const root = resolve(ctx.cwd, input.path ?? '.');
38
+ const check = isValidCwdPath(ctx.cwd, input.path ?? ".");
39
+ if (!check.valid)
40
+ return { content: check.error, isError: true };
41
+ const root = check.resolved;
25
42
  const limit = input.resultLimit ?? DEFAULT_LIMIT;
43
+ const maxDepth = input.maxDepth ?? DEFAULT_MAX_DEPTH;
26
44
  const matcher = globToRegex(input.pattern);
27
45
  const files = [];
28
46
  let truncated = false;
29
- async function walk(dir) {
30
- if (files.length >= limit) {
47
+ async function walk(dir, depth) {
48
+ if (depth > maxDepth || files.length >= limit) {
31
49
  truncated = true;
32
50
  return;
33
51
  }
@@ -40,7 +58,7 @@ export const searchGlobTool = {
40
58
  if (!info)
41
59
  continue;
42
60
  if (info.isDirectory())
43
- await walk(abs);
61
+ await walk(abs, depth + 1);
44
62
  else if (info.isFile()) {
45
63
  const rel = relative(root, abs);
46
64
  if (matcher.test(rel)) {
@@ -53,34 +71,34 @@ export const searchGlobTool = {
53
71
  }
54
72
  }
55
73
  }
56
- await walk(root);
74
+ await walk(root, 0);
57
75
  files.sort();
58
76
  return {
59
- content: files.length > 0 ? files.join('\n') : '(no matches)',
77
+ content: files.length > 0 ? files.join("\n") : "(no matches)",
60
78
  data: { files: files.length, truncated },
61
79
  isError: false,
62
80
  };
63
81
  },
64
82
  };
65
83
  function globToRegex(pattern) {
66
- let rx = '^';
84
+ let rx = "^";
67
85
  let i = 0;
68
86
  while (i < pattern.length) {
69
87
  const ch = pattern[i];
70
- if (ch === '*') {
71
- if (pattern[i + 1] === '*') {
72
- rx += '.*';
88
+ if (ch === "*") {
89
+ if (pattern[i + 1] === "*") {
90
+ rx += ".*";
73
91
  i += 2;
74
- if (pattern[i] === '/')
92
+ if (pattern[i] === "/")
75
93
  i++;
76
94
  }
77
95
  else {
78
- rx += '[^/]*';
96
+ rx += "[^/]*";
79
97
  i++;
80
98
  }
81
99
  }
82
- else if (ch === '?') {
83
- rx += '[^/]';
100
+ else if (ch === "?") {
101
+ rx += "[^/]";
84
102
  i++;
85
103
  }
86
104
  else if (/[.+^${}()|[\]\\]/.test(ch)) {
@@ -92,7 +110,7 @@ function globToRegex(pattern) {
92
110
  i++;
93
111
  }
94
112
  }
95
- rx += '$';
113
+ rx += "$";
96
114
  return new RegExp(rx);
97
115
  }
98
116
  //# sourceMappingURL=search-glob.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"search-glob.js","sourceRoot":"","sources":["../../src/tools/search-glob.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpD,MAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,cAAc,GAAS;IAClC,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,0FAA0F;IACvG,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;SAC7C;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,CAAC,OAAO,CAAC,QAAiB,EAAE,GAAG;QAClC,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,IAAI,aAAa,CAAC;QACjD,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,KAAK,UAAU,IAAI,CAAC,GAAW;YAC7B,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;gBAAC,SAAS,GAAG,IAAI,CAAC;gBAAC,OAAO;YAAC,CAAC;YACxD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAc,CAAC,CAAC;YAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;oBAAE,SAAS;gBACrC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI;oBAAE,SAAS;gBACpB,IAAI,IAAI,CAAC,WAAW,EAAE;oBAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;qBACnC,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;oBACvB,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBAChC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;wBACtB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBAChB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;4BAAC,SAAS,GAAG,IAAI,CAAC;4BAAC,OAAO;wBAAC,CAAC;oBAC1D,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;YAC7D,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE;YACxC,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,WAAW,CAAC,OAAe;IAClC,IAAI,EAAE,GAAG,GAAG,CAAC;IACb,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC3B,EAAE,IAAI,IAAI,CAAC;gBACX,CAAC,IAAI,CAAC,CAAC;gBACP,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG;oBAAE,CAAC,EAAE,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,EAAE,IAAI,OAAO,CAAC;gBACd,CAAC,EAAE,CAAC;YACN,CAAC;QACH,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACtB,EAAE,IAAI,MAAM,CAAC;YACb,CAAC,EAAE,CAAC;QACN,CAAC;aAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACvC,EAAE,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,CAAC,EAAE,CAAC;QACN,CAAC;aAAM,CAAC;YACN,EAAE,IAAI,EAAE,CAAC;YACT,CAAC,EAAE,CAAC;QACN,CAAC;IACH,CAAC;IACD,EAAE,IAAI,GAAG,CAAC;IACV,OAAO,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"search-glob.js","sourceRoot":"","sources":["../../src/tools/search-glob.ts"],"names":[],"mappings":"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"}
@@ -3,5 +3,5 @@
3
3
  * to a Node-native line scan. Always returns file:line:match triples,
4
4
  * capped by resultLimit to keep the LLM reply compact.
5
5
  */
6
- import type { Tool } from './registry.js';
6
+ import type { Tool } from "./registry.js";
7
7
  export declare const searchGrepTool: Tool;
@@ -3,27 +3,34 @@
3
3
  * to a Node-native line scan. Always returns file:line:match triples,
4
4
  * capped by resultLimit to keep the LLM reply compact.
5
5
  */
6
- import { spawn } from 'node:child_process';
7
- import { readFile, readdir, stat } from 'node:fs/promises';
8
- import { resolve, join } from 'node:path';
6
+ import { spawn } from "node:child_process";
7
+ import { readFile, readdir, stat } from "node:fs/promises";
8
+ import { join } from "node:path";
9
+ import { isValidCwdPath } from "../utils/fs.js";
9
10
  const DEFAULT_LIMIT = 200;
10
11
  export const searchGrepTool = {
11
- name: 'search_grep',
12
- description: 'Search for a regex pattern across files under a directory. Prefers ripgrep when installed.',
12
+ name: "search_grep",
13
+ description: "Search for a regex pattern across files under a directory. Prefers ripgrep when installed.",
13
14
  inputSchema: {
14
- type: 'object',
15
+ type: "object",
15
16
  properties: {
16
- pattern: { type: 'string' },
17
- path: { type: 'string' },
18
- resultLimit: { type: 'integer', minimum: 1 },
19
- ignoreCase: { type: 'boolean' },
20
- filePattern: { type: 'string', description: 'Glob to limit files (ripgrep --glob).' },
17
+ pattern: { type: "string" },
18
+ path: { type: "string" },
19
+ resultLimit: { type: "integer", minimum: 1 },
20
+ ignoreCase: { type: "boolean" },
21
+ filePattern: {
22
+ type: "string",
23
+ description: "Glob to limit files (ripgrep --glob).",
24
+ },
21
25
  },
22
- required: ['pattern'],
26
+ required: ["pattern"],
23
27
  },
24
28
  async execute(rawInput, ctx) {
25
29
  const input = rawInput;
26
- const root = resolve(ctx.cwd, input.path ?? '.');
30
+ const check = isValidCwdPath(ctx.cwd, input.path ?? ".");
31
+ if (!check.valid)
32
+ return { content: check.error, isError: true };
33
+ const root = check.resolved;
27
34
  const limit = input.resultLimit ?? DEFAULT_LIMIT;
28
35
  const rg = await runRipgrep(input, root, limit);
29
36
  if (rg)
@@ -32,34 +39,51 @@ export const searchGrepTool = {
32
39
  },
33
40
  };
34
41
  async function runRipgrep(input, root, limit) {
35
- const args = ['--line-number', '--no-heading', '--color', 'never', `--max-count=${limit}`];
42
+ const args = [
43
+ "--line-number",
44
+ "--no-heading",
45
+ "--color",
46
+ "never",
47
+ `--max-count=${limit}`,
48
+ ];
36
49
  if (input.ignoreCase)
37
- args.push('--ignore-case');
50
+ args.push("--ignore-case");
38
51
  if (input.filePattern)
39
- args.push('--glob', input.filePattern);
40
- args.push('--', input.pattern, root);
41
- const child = spawn('rg', args, { stdio: ['ignore', 'pipe', 'pipe'] });
52
+ args.push("--glob", input.filePattern);
53
+ args.push("--", input.pattern, root);
54
+ const child = spawn("rg", args, {
55
+ cwd: root,
56
+ stdio: ["ignore", "pipe", "pipe"],
57
+ });
42
58
  const out = [];
43
59
  const errChunks = [];
44
- child.stdout.on('data', (buf) => { out.push(buf.toString('utf8')); });
45
- child.stderr.on('data', (buf) => { errChunks.push(buf); });
60
+ child.stdout.on("data", (buf) => {
61
+ out.push(buf.toString("utf8"));
62
+ });
63
+ child.stderr.on("data", (buf) => {
64
+ errChunks.push(buf);
65
+ });
46
66
  const exitCode = await new Promise((resolveExit, rejectExit) => {
47
- child.on('error', err => rejectExit(err));
48
- child.on('exit', code => resolveExit(code ?? -1));
67
+ child.on("error", (err) => rejectExit(err));
68
+ child.on("exit", (code) => resolveExit(code ?? -1));
49
69
  }).catch(() => -1);
70
+ const stderrText = Buffer.concat(errChunks)
71
+ .toString("utf8")
72
+ .trim();
50
73
  if (exitCode === -1 || exitCode === 2)
51
74
  return undefined;
52
- const joined = out.join('');
53
- const lines = joined.length > 0 ? joined.split('\n').filter(l => l.length > 0) : [];
75
+ const joined = out.join("");
76
+ const lines = joined.length > 0 ? joined.split("\n").filter((l) => l.length > 0) : [];
54
77
  const truncated = lines.length >= limit;
78
+ const content = lines.length > 0 ? lines.join("\n") : "(no matches)";
55
79
  return {
56
- content: lines.length > 0 ? lines.join('\n') : '(no matches)',
57
- data: { matches: lines.length, truncated, engine: 'ripgrep' },
80
+ content: stderrText ? `${content}\n\n[stderr]\n${stderrText}` : content,
81
+ data: { matches: lines.length, truncated, engine: "ripgrep" },
58
82
  isError: false,
59
83
  };
60
84
  }
61
85
  async function nodeScan(input, root, limit) {
62
- const flags = input.ignoreCase ? 'gi' : 'g';
86
+ const flags = input.ignoreCase ? "gi" : "g";
63
87
  let regex;
64
88
  try {
65
89
  regex = new RegExp(input.pattern, flags);
@@ -76,7 +100,7 @@ async function nodeScan(input, root, limit) {
76
100
  }
77
101
  const names = await readdir(dir).catch(() => []);
78
102
  for (const name of names) {
79
- if (name === 'node_modules' || name === '.git' || name === 'dist')
103
+ if (name === "node_modules" || name === ".git" || name === "dist")
80
104
  continue;
81
105
  const abs = join(dir, name);
82
106
  const info = await stat(abs).catch(() => undefined);
@@ -85,8 +109,8 @@ async function nodeScan(input, root, limit) {
85
109
  if (info.isDirectory())
86
110
  await walk(abs);
87
111
  else if (info.isFile() && info.size < 512 * 1024) {
88
- const text = await readFile(abs, 'utf8').catch(() => '');
89
- const lines = text.split('\n');
112
+ const text = await readFile(abs, "utf8").catch(() => "");
113
+ const lines = text.split("\n");
90
114
  for (let i = 0; i < lines.length; i++) {
91
115
  regex.lastIndex = 0; // reset state between tests — global-flag RegExp retains lastIndex
92
116
  if (regex.test(lines[i])) {
@@ -102,8 +126,8 @@ async function nodeScan(input, root, limit) {
102
126
  }
103
127
  await walk(root);
104
128
  return {
105
- content: matches.length > 0 ? matches.join('\n') : '(no matches)',
106
- data: { matches: matches.length, truncated, engine: 'node' },
129
+ content: matches.length > 0 ? matches.join("\n") : "(no matches)",
130
+ data: { matches: matches.length, truncated, engine: "node" },
107
131
  isError: false,
108
132
  };
109
133
  }
@@ -1 +1 @@
1
- {"version":3,"file":"search-grep.js","sourceRoot":"","sources":["../../src/tools/search-grep.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAY1C,MAAM,aAAa,GAAG,GAAG,CAAC;AAE1B,MAAM,CAAC,MAAM,cAAc,GAAS;IAClC,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,4FAA4F;IACzG,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;YAC5C,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,uCAAuC,EAAE;SACtF;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,CAAC,OAAO,CAAC,QAAiB,EAAE,GAAG;QAClC,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,IAAI,aAAa,CAAC;QAEjD,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC;QAElB,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,UAAU,CAAC,KAAY,EAAE,IAAY,EAAE,KAAa;IACjE,MAAM,IAAI,GAAG,CAAC,eAAe,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,KAAK,EAAE,CAAC,CAAC;IAC3F,IAAI,KAAK,CAAC,UAAU;QAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAErC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;QACrE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1C,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnB,IAAI,QAAQ,KAAK,CAAC,CAAC,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpF,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC;IACxC,OAAO;QACL,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;QAC7D,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE;QAC7D,OAAO,EAAE,KAAK;KACf,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,KAAY,EAAE,IAAY,EAAE,KAAa;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5C,IAAI,KAAa,CAAC;IAClB,IAAI,CAAC;QAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAAC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QAC7D,OAAO,EAAE,OAAO,EAAE,kBAAkB,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACrE,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,KAAK,UAAU,IAAI,CAAC,GAAW;QAC7B,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;YAAC,SAAS,GAAG,IAAI,CAAC;YAAC,OAAO;QAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAc,CAAC,CAAC;QAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM;gBAAE,SAAS;YAC5E,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,IAAI,CAAC,WAAW,EAAE;gBAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;iBACnC,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;gBACjD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;gBACzD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACtC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,mEAAmE;oBACxF,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACzB,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBAC5C,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;4BAAC,SAAS,GAAG,IAAI,CAAC;4BAAC,OAAO;wBAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;QACjE,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE;QAC5D,OAAO,EAAE,KAAK;KACf,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"search-grep.js","sourceRoot":"","sources":["../../src/tools/search-grep.ts"],"names":[],"mappings":"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"}
@@ -7,11 +7,17 @@
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
+ *
16
+ * Streaming mode (1.14.0):
17
+ * When `streamOutput: true` is passed, each stdout/stderr chunk is
18
+ * forwarded to `ctx.onProgress` as it arrives so the TUI can display
19
+ * live output. Accumulated output is still returned in the final
20
+ * ToolResult for the model. Backwards-compatible: default is false.
15
21
  */
16
22
  import type { Tool } from "./registry.js";
17
23
  export declare const shellTool: Tool;
@@ -7,45 +7,60 @@
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
+ *
16
+ * Streaming mode (1.14.0):
17
+ * When `streamOutput: true` is passed, each stdout/stderr chunk is
18
+ * forwarded to `ctx.onProgress` as it arrives so the TUI can display
19
+ * live output. Accumulated output is still returned in the final
20
+ * ToolResult for the model. Backwards-compatible: default is false.
15
21
  */
16
- import { spawn, spawnSync } from "node:child_process";
17
- /** Cached PowerShell executable detection (per-process, never re-probed). */
22
+ import { spawn, execFile } from "node:child_process";
23
+ import { StringDecoder } from "node:string_decoder";
24
+ import { resolve, sep } from "node:path";
25
+ import { promisify } from "node:util";
26
+ const execFileAsync = promisify(execFile);
27
+ /** Cached PowerShell executable detection (probed async at first use). */
18
28
  let cachedWindowsShell = null;
19
- function resolveWindowsShell() {
29
+ let windowsShellPromise = null;
30
+ async function resolveWindowsShell() {
20
31
  if (cachedWindowsShell)
21
32
  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) {
33
+ if (!windowsShellPromise) {
34
+ windowsShellPromise = (async () => {
35
+ for (const exe of ["pwsh", "powershell"]) {
36
+ try {
37
+ await execFileAsync(exe, ["-NoLogo", "-Command", "exit 0"], {
38
+ timeout: 3000,
39
+ });
40
+ cachedWindowsShell = {
41
+ cmd: exe,
42
+ args: (script) => [
43
+ "-NoLogo",
44
+ "-NoProfile",
45
+ "-NonInteractive",
46
+ "-OutputFormat",
47
+ "Text",
48
+ "-Command",
49
+ script,
50
+ ],
51
+ };
52
+ return cachedWindowsShell;
53
+ }
54
+ catch { }
55
+ }
28
56
  cachedWindowsShell = {
29
- cmd: exe,
30
- args: (script) => [
31
- "-NoLogo",
32
- "-NoProfile",
33
- "-NonInteractive",
34
- "-OutputFormat",
35
- "Text",
36
- "-Command",
37
- script,
38
- ],
57
+ cmd: process.env.ComSpec ?? "cmd.exe",
58
+ args: (script) => ["/d", "/s", "/c", script],
39
59
  };
40
60
  return cachedWindowsShell;
41
- }
61
+ })();
42
62
  }
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;
63
+ return windowsShellPromise;
49
64
  }
50
65
  const DEFAULT_TIMEOUT_MS = 120_000;
51
66
  const MAX_OUTPUT_BYTES = 256 * 1024;
@@ -59,7 +74,19 @@ export const shellTool = {
59
74
  properties: {
60
75
  command: { type: "string" },
61
76
  cwd: { type: "string" },
62
- timeoutMs: { type: "integer", minimum: 1000 },
77
+ timeoutMs: {
78
+ type: "integer",
79
+ minimum: 1000,
80
+ description: "Hard timeout in milliseconds (default 120 000). On expiry the child " +
81
+ "receives SIGTERM then SIGKILL after 2 s.",
82
+ },
83
+ streamOutput: {
84
+ type: "boolean",
85
+ description: "When true, forward each output chunk to the progress bus so the " +
86
+ "TUI can display live output while the command runs. " +
87
+ "Accumulated output is still returned in the final result. " +
88
+ "Default: false.",
89
+ },
63
90
  },
64
91
  required: ["command"],
65
92
  },
@@ -69,39 +96,42 @@ export const shellTool = {
69
96
  const input = rawInput;
70
97
  const cwd = input.cwd ?? ctx.cwd;
71
98
  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).
99
+ const streamOutput = input.streamOutput ?? false;
100
+ if (cwd !== ctx.cwd) {
101
+ const resolved = resolve(cwd);
102
+ const base = resolve(ctx.cwd);
103
+ const baseSep = base.endsWith(sep) ? base : base + sep;
104
+ if (resolved !== base && !resolved.startsWith(baseSep)) {
105
+ return { content: `cwd escapes workspace: ${cwd}`, isError: true };
106
+ }
107
+ }
81
108
  const child = process.platform === "win32"
82
- ? (() => {
83
- const shell = resolveWindowsShell();
109
+ ? (async () => {
110
+ const shell = await resolveWindowsShell();
84
111
  return spawn(shell.cmd, shell.args(input.command), {
85
112
  cwd,
86
113
  env: ctx.env,
87
- stdio: ["ignore", "pipe", "pipe"],
114
+ stdio: ["pipe", "pipe", "pipe"],
88
115
  windowsHide: true,
89
116
  });
90
117
  })()
91
- : spawn(input.command, {
118
+ : spawn("/bin/sh", ["-c", input.command], {
92
119
  cwd,
93
120
  env: ctx.env,
94
- stdio: ["ignore", "pipe", "pipe"],
95
- shell: true,
121
+ stdio: ["pipe", "pipe", "pipe"],
96
122
  });
123
+ const childProcess = await (child instanceof Promise
124
+ ? child
125
+ : Promise.resolve(child));
97
126
  const stdoutChunks = [];
98
127
  const stderrChunks = [];
99
128
  let stdoutBytes = 0;
100
129
  let stderrBytes = 0;
101
130
  let truncated = false;
102
- // Shared total so combined stdout+stderr never exceeds MAX_OUTPUT_BYTES.
103
131
  let totalBytes = 0;
104
- const onData = (chunks, trackBytes) => (buf) => {
132
+ const stdoutDecoder = new StringDecoder("utf8");
133
+ const stderrDecoder = new StringDecoder("utf8");
134
+ const onData = (chunks, decoder, trackBytes, label) => (buf) => {
105
135
  const remaining = MAX_OUTPUT_BYTES - totalBytes;
106
136
  if (remaining <= 0) {
107
137
  truncated = true;
@@ -113,30 +143,53 @@ export const shellTool = {
113
143
  trackBytes(slice.length);
114
144
  if (buf.length > remaining)
115
145
  truncated = true;
116
- const text = slice.toString("utf8");
117
- if (text.trim().length > 0)
118
- ctx.onProgress?.(text.trimEnd());
146
+ const text = decoder.write(slice);
147
+ if (text.trim().length > 0) {
148
+ // In streaming mode forward every non-empty chunk immediately;
149
+ // in non-streaming mode the existing behaviour is preserved
150
+ // (progress is still emitted so the TUI spinner stays alive,
151
+ // but callers that don't pass onProgress see no difference).
152
+ if (streamOutput) {
153
+ ctx.onProgress?.(label === "STDERR" ? `[stderr] ${text.trimEnd()}` : text.trimEnd());
154
+ }
155
+ else {
156
+ ctx.onProgress?.(text.trimEnd());
157
+ }
158
+ }
119
159
  };
120
- child.stdout.on("data", onData(stdoutChunks, (n) => {
160
+ childProcess.stdout.on("data", onData(stdoutChunks, stdoutDecoder, (n) => {
121
161
  stdoutBytes += n;
122
- }));
123
- child.stderr.on("data", onData(stderrChunks, (n) => {
162
+ }, "STDOUT"));
163
+ childProcess.stderr.on("data", onData(stderrChunks, stderrDecoder, (n) => {
124
164
  stderrBytes += n;
125
- }));
126
- const timer = setTimeout(() => {
127
- child.kill("SIGKILL");
128
- }, timeoutMs);
129
- // Wire abort signal so Esc/cancel kills the child immediately.
165
+ }, "STDERR"));
166
+ /** Gracefully terminate: SIGTERM, then SIGKILL after 2 s. */
167
+ const killChild = () => {
168
+ childProcess.kill("SIGTERM");
169
+ setTimeout(() => {
170
+ try {
171
+ childProcess.kill("SIGKILL");
172
+ }
173
+ catch {
174
+ /* already gone */
175
+ }
176
+ }, 2_000);
177
+ };
178
+ const timer = setTimeout(killChild, timeoutMs);
130
179
  const onAbort = () => {
131
- child.kill("SIGKILL");
180
+ killChild();
132
181
  };
133
- ctx.signal?.addEventListener("abort", onAbort, { once: true });
182
+ if (ctx.signal) {
183
+ ctx.signal.addEventListener("abort", onAbort, { once: true });
184
+ }
134
185
  const exitCode = await new Promise((resolveExit) => {
135
- child.on("error", () => resolveExit(-1));
136
- child.on("close", (code) => resolveExit(code ?? -1));
186
+ childProcess.once("error", () => resolveExit(-1));
187
+ childProcess.once("close", (code) => resolveExit(code ?? -1));
137
188
  });
138
189
  clearTimeout(timer);
139
- ctx.signal?.removeEventListener("abort", onAbort);
190
+ if (ctx.signal) {
191
+ ctx.signal.removeEventListener("abort", onAbort);
192
+ }
140
193
  const stdout = Buffer.concat(stdoutChunks).toString("utf8");
141
194
  const stderr = Buffer.concat(stderrChunks).toString("utf8");
142
195
  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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"}