@dirgha/code 1.20.39 → 1.22.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 (217) hide show
  1. package/CHANGELOG.md +0 -57
  2. package/README.md +4 -8
  3. package/dist/auth/keypool.js +26 -40
  4. package/dist/auth/keypool.js.map +1 -1
  5. package/dist/auth/keystore.js +11 -16
  6. package/dist/auth/keystore.js.map +1 -1
  7. package/dist/cli/config.d.ts +5 -8
  8. package/dist/cli/config.js +3 -24
  9. package/dist/cli/config.js.map +1 -1
  10. package/dist/cli/first-run.js +24 -40
  11. package/dist/cli/first-run.js.map +1 -1
  12. package/dist/cli/flows/wizard.js +18 -12
  13. package/dist/cli/flows/wizard.js.map +1 -1
  14. package/dist/cli/interactive.d.ts +0 -4
  15. package/dist/cli/interactive.js +1 -29
  16. package/dist/cli/interactive.js.map +1 -1
  17. package/dist/cli/main.js +18 -69
  18. package/dist/cli/main.js.map +1 -1
  19. package/dist/cli/slash/fleet.js +1 -19
  20. package/dist/cli/slash/fleet.js.map +1 -1
  21. package/dist/cli/slash/models.js +2 -4
  22. package/dist/cli/slash/models.js.map +1 -1
  23. package/dist/cli/slash/paste.js +7 -4
  24. package/dist/cli/slash/paste.js.map +1 -1
  25. package/dist/cli/slash.js +10 -26
  26. package/dist/cli/slash.js.map +1 -1
  27. package/dist/cli/subcommands/audit.js +8 -28
  28. package/dist/cli/subcommands/audit.js.map +1 -1
  29. package/dist/cli/subcommands/doctor.d.ts +0 -4
  30. package/dist/cli/subcommands/doctor.js +21 -51
  31. package/dist/cli/subcommands/doctor.js.map +1 -1
  32. package/dist/cli/subcommands/feature-setup.js +6 -6
  33. package/dist/cli/subcommands/feature-setup.js.map +1 -1
  34. package/dist/cli/subcommands/memory.js +0 -23
  35. package/dist/cli/subcommands/memory.js.map +1 -1
  36. package/dist/cli/subcommands/telemetry.d.ts +1 -2
  37. package/dist/cli/subcommands/telemetry.js +34 -47
  38. package/dist/cli/subcommands/telemetry.js.map +1 -1
  39. package/dist/context/branch.d.ts +2 -2
  40. package/dist/context/branch.js +23 -40
  41. package/dist/context/branch.js.map +1 -1
  42. package/dist/context/compaction.js +21 -44
  43. package/dist/context/compaction.js.map +1 -1
  44. package/dist/context/git-state.js +18 -31
  45. package/dist/context/git-state.js.map +1 -1
  46. package/dist/context/knowledge.js +20 -31
  47. package/dist/context/knowledge.js.map +1 -1
  48. package/dist/context/memory.js +1 -8
  49. package/dist/context/memory.js.map +1 -1
  50. package/dist/context/mode-enforcement.js +1 -11
  51. package/dist/context/mode-enforcement.js.map +1 -1
  52. package/dist/context/mode.js +30 -67
  53. package/dist/context/mode.js.map +1 -1
  54. package/dist/context/primer.js +3 -15
  55. package/dist/context/primer.js.map +1 -1
  56. package/dist/fleet/apply-back.js +1 -5
  57. package/dist/fleet/apply-back.js.map +1 -1
  58. package/dist/fleet/cli-command.d.ts +0 -2
  59. package/dist/fleet/cli-command.js +1 -15
  60. package/dist/fleet/cli-command.js.map +1 -1
  61. package/dist/fleet/runner.js +2 -35
  62. package/dist/fleet/runner.js.map +1 -1
  63. package/dist/fleet/scratchpad.js +2 -1
  64. package/dist/fleet/scratchpad.js.map +1 -1
  65. package/dist/fleet/state.d.ts +0 -4
  66. package/dist/fleet/state.js +2 -11
  67. package/dist/fleet/state.js.map +1 -1
  68. package/dist/fleet/templates.d.ts +0 -4
  69. package/dist/fleet/templates.js.map +1 -1
  70. package/dist/fleet/types.d.ts +0 -4
  71. package/dist/fleet/types.js.map +1 -1
  72. package/dist/intelligence/failover-chain.js +1 -10
  73. package/dist/intelligence/failover-chain.js.map +1 -1
  74. package/dist/intelligence/prices.d.ts +4 -6
  75. package/dist/intelligence/prices.js +10 -36
  76. package/dist/intelligence/prices.js.map +1 -1
  77. package/dist/kernel/agent-loop.js +17 -60
  78. package/dist/kernel/agent-loop.js.map +1 -1
  79. package/dist/lsp/client.js +16 -29
  80. package/dist/lsp/client.js.map +1 -1
  81. package/dist/lsp/detector.js +6 -7
  82. package/dist/lsp/detector.js.map +1 -1
  83. package/dist/mcp/client.d.ts +1 -1
  84. package/dist/mcp/client.js +16 -19
  85. package/dist/mcp/client.js.map +1 -1
  86. package/dist/mcp/transport.js +38 -46
  87. package/dist/mcp/transport.js.map +1 -1
  88. package/dist/providers/deepseek.js +1 -1
  89. package/dist/providers/deepseek.js.map +1 -1
  90. package/dist/providers/dispatch.js +1 -15
  91. package/dist/providers/dispatch.js.map +1 -1
  92. package/dist/providers/index.d.ts +0 -11
  93. package/dist/providers/index.js +2 -29
  94. package/dist/providers/index.js.map +1 -1
  95. package/dist/providers/nvidia.js +1 -1
  96. package/dist/providers/nvidia.js.map +1 -1
  97. package/dist/providers/openai-compat.js +2 -4
  98. package/dist/providers/openai-compat.js.map +1 -1
  99. package/dist/providers/openrouter.js +1 -1
  100. package/dist/providers/openrouter.js.map +1 -1
  101. package/dist/safety/audit-log.d.ts +0 -15
  102. package/dist/safety/audit-log.js +0 -21
  103. package/dist/safety/audit-log.js.map +1 -1
  104. package/dist/state/db-telemetry.js +1 -11
  105. package/dist/state/db-telemetry.js.map +1 -1
  106. package/dist/state/db.js +1 -53
  107. package/dist/state/db.js.map +1 -1
  108. package/dist/tools/browser.js +16 -24
  109. package/dist/tools/browser.js.map +1 -1
  110. package/dist/tools/checkpoint.d.ts +1 -6
  111. package/dist/tools/checkpoint.js +62 -79
  112. package/dist/tools/checkpoint.js.map +1 -1
  113. package/dist/tools/cron.js +3 -1
  114. package/dist/tools/cron.js.map +1 -1
  115. package/dist/tools/diff.js +21 -25
  116. package/dist/tools/diff.js.map +1 -1
  117. package/dist/tools/exec.d.ts +0 -2
  118. package/dist/tools/exec.js +0 -13
  119. package/dist/tools/exec.js.map +1 -1
  120. package/dist/tools/fs-edit.d.ts +5 -3
  121. package/dist/tools/fs-edit.js +23 -8
  122. package/dist/tools/fs-edit.js.map +1 -1
  123. package/dist/tools/fs-ls.js +8 -6
  124. package/dist/tools/fs-ls.js.map +1 -1
  125. package/dist/tools/fs-read.d.ts +1 -1
  126. package/dist/tools/fs-read.js +28 -37
  127. package/dist/tools/fs-read.js.map +1 -1
  128. package/dist/tools/fs-write.d.ts +1 -1
  129. package/dist/tools/fs-write.js +33 -33
  130. package/dist/tools/fs-write.js.map +1 -1
  131. package/dist/tools/git.js +6 -12
  132. package/dist/tools/git.js.map +1 -1
  133. package/dist/tools/index.d.ts +2 -5
  134. package/dist/tools/index.js +4 -7
  135. package/dist/tools/index.js.map +1 -1
  136. package/dist/tools/multimodal.js +12 -11
  137. package/dist/tools/multimodal.js.map +1 -1
  138. package/dist/tools/rtk.js +9 -22
  139. package/dist/tools/rtk.js.map +1 -1
  140. package/dist/tools/search-glob.d.ts +1 -1
  141. package/dist/tools/search-glob.js +24 -42
  142. package/dist/tools/search-glob.js.map +1 -1
  143. package/dist/tools/search-grep.d.ts +1 -1
  144. package/dist/tools/search-grep.js +32 -56
  145. package/dist/tools/search-grep.js.map +1 -1
  146. package/dist/tools/shell.d.ts +1 -7
  147. package/dist/tools/shell.js +61 -114
  148. package/dist/tools/shell.js.map +1 -1
  149. package/dist/tui/ink/App.d.ts +1 -2
  150. package/dist/tui/ink/App.js +72 -178
  151. package/dist/tui/ink/App.js.map +1 -1
  152. package/dist/tui/ink/components/DenseToolMessage.js +3 -20
  153. package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
  154. package/dist/tui/ink/components/InputBox.js +15 -16
  155. package/dist/tui/ink/components/InputBox.js.map +1 -1
  156. package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
  157. package/dist/tui/ink/components/KeySetOverlay.js +16 -18
  158. package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
  159. package/dist/tui/ink/components/Logo.d.ts +0 -20
  160. package/dist/tui/ink/components/Logo.js +1 -67
  161. package/dist/tui/ink/components/Logo.js.map +1 -1
  162. package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
  163. package/dist/tui/ink/components/ModelPicker.js +26 -34
  164. package/dist/tui/ink/components/ModelPicker.js.map +1 -1
  165. package/dist/tui/ink/components/PasteCollapse.d.ts +1 -3
  166. package/dist/tui/ink/components/PasteCollapse.js +9 -11
  167. package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
  168. package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
  169. package/dist/tui/ink/components/SpinnerGlyph.js +14 -34
  170. package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
  171. package/dist/tui/ink/components/StatusBar.js +2 -0
  172. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  173. package/dist/tui/ink/components/ThinkingBlock.d.ts +4 -15
  174. package/dist/tui/ink/components/ThinkingBlock.js +17 -34
  175. package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
  176. package/dist/tui/ink/components/ToolBox.js +13 -21
  177. package/dist/tui/ink/components/ToolBox.js.map +1 -1
  178. package/dist/tui/ink/components/VirtualTranscript.d.ts +1 -1
  179. package/dist/tui/ink/components/VirtualTranscript.js +3 -5
  180. package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
  181. package/dist/tui/ink/index.js +1 -17
  182. package/dist/tui/ink/index.js.map +1 -1
  183. package/dist/tui/ink/theme-context.js +3 -6
  184. package/dist/tui/ink/theme-context.js.map +1 -1
  185. package/dist/tui/ink/use-declined-versions.js +2 -6
  186. package/dist/tui/ink/use-declined-versions.js.map +1 -1
  187. package/dist/tui/ink/use-elapsed.d.ts +1 -9
  188. package/dist/tui/ink/use-elapsed.js +2 -17
  189. package/dist/tui/ink/use-elapsed.js.map +1 -1
  190. package/dist/tui/ink/use-event-projection.d.ts +0 -2
  191. package/dist/tui/ink/use-event-projection.js +2 -21
  192. package/dist/tui/ink/use-event-projection.js.map +1 -1
  193. package/dist/tui/ink/use-flicker-detector.js +0 -9
  194. package/dist/tui/ink/use-flicker-detector.js.map +1 -1
  195. package/dist/tui/ink/use-overlays.js +17 -16
  196. package/dist/tui/ink/use-overlays.js.map +1 -1
  197. package/dist/tui/ink/use-render-metrics.js +5 -18
  198. package/dist/tui/ink/use-render-metrics.js.map +1 -1
  199. package/package.json +6 -5
  200. package/dist/telemetry/gateway-push.d.ts +0 -17
  201. package/dist/telemetry/gateway-push.js +0 -48
  202. package/dist/telemetry/gateway-push.js.map +0 -1
  203. package/dist/telemetry/index.d.ts +0 -9
  204. package/dist/telemetry/index.js +0 -9
  205. package/dist/telemetry/index.js.map +0 -1
  206. package/dist/tools/github.d.ts +0 -13
  207. package/dist/tools/github.js +0 -257
  208. package/dist/tools/github.js.map +0 -1
  209. package/dist/tui/ink/markdown/syntax-highlight.d.ts +0 -13
  210. package/dist/tui/ink/markdown/syntax-highlight.js +0 -91
  211. package/dist/tui/ink/markdown/syntax-highlight.js.map +0 -1
  212. package/dist/utils/env.d.ts +0 -1
  213. package/dist/utils/env.js +0 -60
  214. package/dist/utils/env.js.map +0 -1
  215. package/dist/utils/fs.d.ts +0 -10
  216. package/dist/utils/fs.js +0 -37
  217. package/dist/utils/fs.js.map +0 -1
@@ -4,8 +4,7 @@
4
4
  * spending tokens on noisy metadata.
5
5
  */
6
6
  import { readdir, stat } from "node:fs/promises";
7
- import { resolve } from "node:path";
8
- import { isValidCwdPath } from "../utils/fs.js";
7
+ import { resolve, sep } from "node:path";
9
8
  // Paths where a blind fs_ls is almost never what the user actually
10
9
  // wanted. Typing `fs_ls .` at / or /root spills 100+ unrelated entries
11
10
  // into the model's context for no gain. Force a narrower ask.
@@ -35,10 +34,13 @@ export const fsLsTool = {
35
34
  },
36
35
  async execute(rawInput, ctx) {
37
36
  const input = rawInput;
38
- const check = isValidCwdPath(ctx.cwd, input.path ?? ".");
39
- if (!check.valid)
40
- return { content: check.error, isError: true };
41
- const target = check.resolved;
37
+ const target = resolve(ctx.cwd, input.path ?? ".");
38
+ if (!target.startsWith(ctx.cwd + sep) && target !== ctx.cwd) {
39
+ return {
40
+ content: `Path escapes working directory: ${input.path ?? "."}`,
41
+ isError: true,
42
+ };
43
+ }
42
44
  if (HUGE_ROOTS.has(target)) {
43
45
  return {
44
46
  content: `Refusing to list ${target} — too broad. Supply a narrower path, or use search_glob / search_grep with a targeted pattern.`,
@@ -1 +1 @@
1
- {"version":3,"file":"fs-ls.js","sourceRoot":"","sources":["../../src/tools/fs-ls.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs-ls.js","sourceRoot":"","sources":["../../src/tools/fs-ls.ts"],"names":[],"mappings":"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"}
@@ -3,5 +3,5 @@
3
3
  * files are rejected with a clear message; line-based windowing uses
4
4
  * cat -n style numbering so the model can cite line numbers reliably.
5
5
  */
6
- import type { Tool } from "./registry.js";
6
+ import type { Tool } from './registry.js';
7
7
  export declare const fsReadTool: Tool;
@@ -3,70 +3,61 @@
3
3
  * files are rejected with a clear message; line-based windowing uses
4
4
  * cat -n style numbering so the model can cite line numbers reliably.
5
5
  */
6
- import { readFile, stat } from "node:fs/promises";
7
- import { isValidCwdPath, isBinary } from "../utils/fs.js";
6
+ import { readFile, stat } from 'node:fs/promises';
7
+ import { resolve, sep } from 'node:path';
8
8
  const MAX_BYTES = 2 * 1024 * 1024;
9
9
  export const fsReadTool = {
10
- name: "fs_read",
11
- description: "Read a text file from disk. Returns contents with 1-based line numbers. Use offset/limit to page through large files.",
10
+ name: 'fs_read',
11
+ description: 'Read a text file from disk. Returns contents with 1-based line numbers. Use offset/limit to page through large files.',
12
12
  inputSchema: {
13
- type: "object",
13
+ type: 'object',
14
14
  properties: {
15
- path: {
16
- type: "string",
17
- description: "Absolute or cwd-relative path to the file.",
18
- },
19
- offset: {
20
- type: "integer",
21
- minimum: 1,
22
- description: "Line number to start from (1-based).",
23
- },
24
- limit: {
25
- type: "integer",
26
- minimum: 1,
27
- description: "Maximum number of lines to return.",
28
- },
15
+ path: { type: 'string', description: 'Absolute or cwd-relative path to the file.' },
16
+ offset: { type: 'integer', minimum: 0, description: 'Line number to start from (0-based).' },
17
+ limit: { type: 'integer', minimum: 1, description: 'Maximum number of lines to return.' },
29
18
  },
30
- required: ["path"],
19
+ required: ['path'],
31
20
  },
32
21
  async execute(rawInput, ctx) {
33
22
  const input = rawInput;
34
- const check = isValidCwdPath(ctx.cwd, input.path);
35
- if (!check.valid)
36
- return { content: check.error, isError: true };
37
- const abs = check.resolved;
23
+ const abs = resolve(ctx.cwd, input.path);
24
+ if (!abs.startsWith(ctx.cwd + sep) && abs !== ctx.cwd) {
25
+ return { content: `Path escapes working directory: ${input.path}`, isError: true };
26
+ }
38
27
  const info = await stat(abs).catch(() => undefined);
39
28
  if (!info)
40
29
  return { content: `No such file: ${input.path}`, isError: true };
41
30
  if (!info.isFile())
42
31
  return { content: `Not a file: ${input.path}`, isError: true };
43
32
  if (info.size > MAX_BYTES) {
44
- return {
45
- content: `File too large (${info.size} bytes, max ${MAX_BYTES}). Use offset/limit.`,
46
- isError: true,
47
- };
33
+ return { content: `File too large (${info.size} bytes, max ${MAX_BYTES}). Use offset/limit.`, isError: true };
48
34
  }
49
35
  const buffer = await readFile(abs);
50
36
  if (isBinary(buffer))
51
- return {
52
- content: `File appears to be binary: ${input.path}`,
53
- isError: true,
54
- };
55
- const text = buffer.toString("utf8");
56
- const lines = text.split("\n");
57
- const offset = (input.offset ?? 1) - 1;
37
+ return { content: `File appears to be binary: ${input.path}`, isError: true };
38
+ const text = buffer.toString('utf8');
39
+ const lines = text.split('\n');
40
+ const offset = input.offset ?? 0;
58
41
  const limit = input.limit ?? lines.length;
59
42
  const window = lines.slice(offset, offset + limit);
60
43
  const numbered = window
61
44
  .map((line, idx) => `${String(offset + idx + 1).padStart(6)}\t${line}`)
62
- .join("\n");
45
+ .join('\n');
63
46
  const truncated = offset + window.length < lines.length;
64
47
  return {
65
48
  content: numbered,
66
49
  data: { lines: window.length, truncated },
67
50
  isError: false,
68
- metadata: { totalLines: lines.length, offset: offset + 1, limit },
51
+ metadata: { totalLines: lines.length, offset, limit },
69
52
  };
70
53
  },
71
54
  };
55
+ function isBinary(buf) {
56
+ const sample = buf.subarray(0, Math.min(buf.length, 8192));
57
+ for (const byte of sample) {
58
+ if (byte === 0)
59
+ return true;
60
+ }
61
+ return false;
62
+ }
72
63
  //# sourceMappingURL=fs-read.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fs-read.js","sourceRoot":"","sources":["../../src/tools/fs-read.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs-read.js","sourceRoot":"","sources":["../../src/tools/fs-read.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,5 @@
4
4
  * change. Refuses to silently overwrite: the description declares the
5
5
  * overwrite contract.
6
6
  */
7
- import type { Tool } from "./registry.js";
7
+ import type { Tool } from './registry.js';
8
8
  export declare const fsWriteTool: Tool;
@@ -4,57 +4,57 @@
4
4
  * change. Refuses to silently overwrite: the description declares the
5
5
  * overwrite contract.
6
6
  */
7
- import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
8
- import { dirname } from "node:path";
9
- import { summariseDiff, unifiedDiff } from "./diff.js";
10
- import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
7
+ import { mkdir, readFile, stat, writeFile } from 'node:fs/promises';
8
+ import { dirname, resolve, sep } from 'node:path';
9
+ import { summariseDiff, unifiedDiff } from './diff.js';
10
+ /** Decode literal \uXXXX escape sequences a model may have emitted as text. */
11
+ function decodeLiteralUnicodeEscapes(s) {
12
+ return s.replace(/\\u([0-9a-fA-F]{4})/g, (_, hex) => {
13
+ const cp = parseInt(hex, 16);
14
+ // Only decode printable ASCII range (0x20–0x7E) plus common whitespace.
15
+ // Leave high-codepoint escapes (e.g. CJK, emoji) as-is to avoid
16
+ // corrupting intentional unicode-escape strings in JS source.
17
+ if ((cp >= 0x20 && cp <= 0x7e) || cp === 0x0a || cp === 0x0d || cp === 0x09) {
18
+ return String.fromCodePoint(cp);
19
+ }
20
+ return _;
21
+ });
22
+ }
11
23
  export const fsWriteTool = {
12
- name: "fs_write",
13
- description: "Write content to a file. Creates parent directories when createDirs is true. Overwrites existing files.",
24
+ name: 'fs_write',
25
+ description: 'Write content to a file. Creates parent directories when createDirs is true. Overwrites existing files.',
14
26
  inputSchema: {
15
- type: "object",
27
+ type: 'object',
16
28
  properties: {
17
- path: { type: "string" },
18
- content: { type: "string" },
19
- createDirs: {
20
- type: "boolean",
21
- description: "Create parent directories if they do not exist.",
22
- },
29
+ path: { type: 'string' },
30
+ content: { type: 'string' },
31
+ createDirs: { type: 'boolean', description: 'Create parent directories if they do not exist.' },
23
32
  },
24
- required: ["path", "content"],
33
+ required: ['path', 'content'],
25
34
  },
26
35
  requiresApproval: () => true,
27
36
  async execute(rawInput, ctx) {
28
37
  const input = rawInput;
29
- const check = isValidCwdPath(ctx.cwd, input.path);
30
- if (!check.valid)
31
- return { content: check.error, isError: true };
32
- const abs = check.resolved;
33
- let before = "";
34
- const existed = await stat(abs)
35
- .then(() => true)
36
- .catch(() => false);
38
+ const abs = resolve(ctx.cwd, input.path);
39
+ if (!abs.startsWith(ctx.cwd + sep) && abs !== ctx.cwd) {
40
+ return { content: `Path escapes working directory: ${input.path}`, isError: true };
41
+ }
42
+ let before = '';
43
+ const existed = await stat(abs).then(() => true).catch(() => false);
37
44
  if (existed)
38
- before = await readFile(abs, "utf8");
45
+ before = await readFile(abs, 'utf8');
39
46
  else if (input.createDirs)
40
47
  await mkdir(dirname(abs), { recursive: true });
41
48
  const sanitized = decodeLiteralUnicodeEscapes(input.content);
42
- const diff = unifiedDiff(before, sanitized, {
43
- fromLabel: input.path,
44
- toLabel: input.path,
45
- });
49
+ const diff = unifiedDiff(before, sanitized, { fromLabel: input.path, toLabel: input.path });
46
50
  const { added, removed } = summariseDiff(diff);
47
- await writeFile(abs, sanitized, "utf8");
51
+ await writeFile(abs, sanitized, 'utf8');
48
52
  const summary = existed
49
53
  ? `Updated ${input.path} (+${added} / -${removed})`
50
54
  : `Created ${input.path} (${sanitized.length} bytes)`;
51
55
  return {
52
56
  content: summary,
53
- data: {
54
- bytesWritten: Buffer.byteLength(sanitized, "utf8"),
55
- added,
56
- removed,
57
- },
57
+ data: { bytesWritten: Buffer.byteLength(sanitized, 'utf8'), added, removed },
58
58
  isError: false,
59
59
  metadata: { diff },
60
60
  };
@@ -1 +1 @@
1
- {"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQ7E,MAAM,CAAC,MAAM,WAAW,GAAS;IAC/B,IAAI,EAAE,UAAU;IAChB,WAAW,EACT,yGAAyG;IAC3G,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,UAAU,EAAE;gBACV,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,iDAAiD;aAC/D;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC9B;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,KAAK,CAAC,OAAO,CACX,QAAiB,EACjB,GAAG;QAIH,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACjE,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC3B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,OAAO;YAAE,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAC7C,IAAI,KAAK,CAAC,UAAU;YAAE,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE;YAC1C,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,OAAO,EAAE,KAAK,CAAC,IAAI;SACpB,CAAC,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,OAAO;YACrB,CAAC,CAAC,WAAW,KAAK,CAAC,IAAI,MAAM,KAAK,OAAO,OAAO,GAAG;YACnD,CAAC,CAAC,WAAW,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,SAAS,CAAC;QAExD,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC;gBAClD,KAAK;gBACL,OAAO;aACR;YACD,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,EAAE,IAAI,EAAE;SACnB,CAAC;IACJ,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"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"}
package/dist/tools/git.js CHANGED
@@ -5,7 +5,7 @@
5
5
  * a single "exec this command?" prompt per operation.
6
6
  */
7
7
  import { spawn } from "node:child_process";
8
- import { isValidCwdPath } from "../utils/fs.js";
8
+ import { resolve, sep } from "node:path";
9
9
  export const gitTool = {
10
10
  name: "git",
11
11
  description: "Run read-mostly git operations: status, diff, log, branch, show. Destructive git operations should go through the shell tool.",
@@ -18,10 +18,6 @@ export const gitTool = {
18
18
  },
19
19
  required: ["op"],
20
20
  },
21
- requiresApproval: (raw) => {
22
- const input = raw;
23
- return input.op === "diff" || input.op === "show";
24
- },
25
21
  async execute(rawInput, ctx) {
26
22
  const input = rawInput;
27
23
  const base = commandFor(input.op);
@@ -33,12 +29,10 @@ export const gitTool = {
33
29
  };
34
30
  }
35
31
  const full = [...base, ...(input.args ?? [])];
36
- if (input.cwd) {
37
- const check = isValidCwdPath(ctx.cwd, input.cwd);
38
- if (!check.valid)
39
- return { content: check.error, isError: true };
40
- }
41
- const cwd = input.cwd ? ctx.cwd : ctx.cwd;
32
+ const requestedCwd = input.cwd ? resolve(ctx.cwd, input.cwd) : ctx.cwd;
33
+ const cwd = requestedCwd.startsWith(ctx.cwd + sep) || requestedCwd === ctx.cwd
34
+ ? requestedCwd
35
+ : ctx.cwd;
42
36
  const result = await run("git", full, cwd, ctx.env);
43
37
  return {
44
38
  content: [result.stdout, result.stderr]
@@ -70,7 +64,7 @@ async function run(command, args, cwd, env) {
70
64
  const child = spawn(command, args, {
71
65
  cwd,
72
66
  env,
73
- stdio: ["pipe", "pipe", "pipe"],
67
+ stdio: ["ignore", "pipe", "pipe"],
74
68
  });
75
69
  const stdout = [];
76
70
  const stderr = [];
@@ -1 +1 @@
1
- {"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/tools/git.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/tools/git.ts"],"names":[],"mappings":"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"}
@@ -13,19 +13,16 @@ import { searchGrepTool } from "./search-grep.js";
13
13
  import { searchGlobTool } from "./search-glob.js";
14
14
  import { gitTool } from "./git.js";
15
15
  import { browserTool } from "./browser.js";
16
+ import { checkpointTool } from "./checkpoint.js";
16
17
  import { lspGoToDefinitionTool } from "./lsp-definition.js";
17
18
  import { lspFindReferencesTool } from "./lsp-references.js";
18
19
  import { lspHoverTool } from "./lsp-hover.js";
19
20
  import { lspDocumentSymbolsTool } from "./lsp-symbols.js";
20
21
  import { rtkTool } from "./rtk.js";
21
22
  import { qmdTool } from "./qmd.js";
22
- import { githubTool } from "./github.js";
23
- export { createMultimodalTool } from "./multimodal.js";
24
23
  export { createCronTool } from "./cron.js";
25
- export { createCheckpointTool } from "./checkpoint.js";
26
24
  export { createTaskTool } from "./task.js";
27
25
  declare const cronTool: Tool;
28
- declare const checkpointTool: Tool;
29
26
  export * from "./registry.js";
30
27
  export * from "./permission.js";
31
28
  export * from "./exec.js";
@@ -35,4 +32,4 @@ export * from "./lsp-references.js";
35
32
  export * from "./lsp-hover.js";
36
33
  export * from "./lsp-symbols.js";
37
34
  export declare const builtInTools: Tool[];
38
- export { fsReadTool, fsWriteTool, fsEditTool, fsLsTool, shellTool, searchGrepTool, searchGlobTool, gitTool, githubTool, browserTool, checkpointTool, cronTool, lspGoToDefinitionTool, lspFindReferencesTool, lspHoverTool, lspDocumentSymbolsTool, rtkTool, qmdTool, };
35
+ export { fsReadTool, fsWriteTool, fsEditTool, fsLsTool, shellTool, searchGrepTool, searchGlobTool, gitTool, browserTool, checkpointTool, cronTool, lspGoToDefinitionTool, lspFindReferencesTool, lspHoverTool, lspDocumentSymbolsTool, rtkTool, qmdTool, };
@@ -12,7 +12,7 @@ import { searchGrepTool } from "./search-grep.js";
12
12
  import { searchGlobTool } from "./search-glob.js";
13
13
  import { gitTool } from "./git.js";
14
14
  import { browserTool } from "./browser.js";
15
- import { createCheckpointTool } from "./checkpoint.js";
15
+ import { checkpointTool } from "./checkpoint.js";
16
16
  import { createCronTool } from "./cron.js";
17
17
  import { lspGoToDefinitionTool } from "./lsp-definition.js";
18
18
  import { lspFindReferencesTool } from "./lsp-references.js";
@@ -20,13 +20,11 @@ import { lspHoverTool } from "./lsp-hover.js";
20
20
  import { lspDocumentSymbolsTool } from "./lsp-symbols.js";
21
21
  import { rtkTool } from "./rtk.js";
22
22
  import { qmdTool } from "./qmd.js";
23
- import { githubTool } from "./github.js";
24
- export { createMultimodalTool } from "./multimodal.js";
23
+ // multimodal is a factory (needs runtime Provider) — wired in main.ts, not baked into builtInTools
24
+ // export { createMultimodalTool } from "./multimodal.js";
25
25
  export { createCronTool } from "./cron.js";
26
- export { createCheckpointTool } from "./checkpoint.js";
27
26
  export { createTaskTool } from "./task.js";
28
27
  const cronTool = createCronTool();
29
- const checkpointTool = createCheckpointTool();
30
28
  export * from "./registry.js";
31
29
  export * from "./permission.js";
32
30
  export * from "./exec.js";
@@ -44,7 +42,6 @@ export const builtInTools = [
44
42
  searchGrepTool,
45
43
  searchGlobTool,
46
44
  gitTool,
47
- githubTool,
48
45
  browserTool,
49
46
  checkpointTool,
50
47
  cronTool,
@@ -55,5 +52,5 @@ export const builtInTools = [
55
52
  rtkTool,
56
53
  qmdTool,
57
54
  ];
58
- export { fsReadTool, fsWriteTool, fsEditTool, fsLsTool, shellTool, searchGrepTool, searchGlobTool, gitTool, githubTool, browserTool, checkpointTool, cronTool, lspGoToDefinitionTool, lspFindReferencesTool, lspHoverTool, lspDocumentSymbolsTool, rtkTool, qmdTool, };
55
+ export { fsReadTool, fsWriteTool, fsEditTool, fsLsTool, shellTool, searchGrepTool, searchGlobTool, gitTool, browserTool, checkpointTool, cronTool, lspGoToDefinitionTool, lspFindReferencesTool, lspHoverTool, lspDocumentSymbolsTool, rtkTool, qmdTool, };
59
56
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;AAClC,MAAM,cAAc,GAAG,oBAAoB,EAAE,CAAC;AAE9C,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAE1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAW;IAClC,UAAU;IACV,WAAW;IACX,UAAU;IACV,QAAQ;IACR,SAAS;IACT,cAAc;IACd,cAAc;IACd,OAAO;IACP,UAAU;IACV,WAAW;IACX,cAAc;IACd,QAAQ;IACR,qBAAqB;IACrB,qBAAqB;IACrB,YAAY;IACZ,sBAAsB;IACtB,OAAO;IACP,OAAO;CACR,CAAC;AAEF,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAc,EACd,cAAc,EACd,OAAO,EACP,UAAU,EACV,WAAW,EACX,cAAc,EACd,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,sBAAsB,EACtB,OAAO,EACP,OAAO,GACR,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,mGAAmG;AACnG,0DAA0D;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;AAElC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAE1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAW;IAClC,UAAU;IACV,WAAW;IACX,UAAU;IACV,QAAQ;IACR,SAAS;IACT,cAAc;IACd,cAAc;IACd,OAAO;IACP,WAAW;IACX,cAAc;IACd,QAAQ;IACR,qBAAqB;IACrB,qBAAqB;IACrB,YAAY;IACZ,sBAAsB;IACtB,OAAO;IACP,OAAO;CACR,CAAC;AAEF,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAc,EACd,cAAc,EACd,OAAO,EACP,WAAW,EACX,cAAc,EACd,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,sBAAsB,EACtB,OAAO,EACP,OAAO,GACR,CAAC"}
@@ -23,8 +23,7 @@
23
23
  * pull in any streaming/chat-completions internals.
24
24
  */
25
25
  import { readFile, stat, writeFile, mkdir } from "node:fs/promises";
26
- import { resolve, extname, dirname } from "node:path";
27
- import { isValidCwdPath } from "../utils/fs.js";
26
+ import { resolve, extname, dirname, sep } from "node:path";
28
27
  import { OpenAIProvider } from "../providers/openai.js";
29
28
  import { NvidiaProvider } from "../providers/nvidia.js";
30
29
  const MAX_IMAGE_BYTES = 8 * 1024 * 1024;
@@ -199,10 +198,10 @@ async function transcribeAudio(a) {
199
198
  return streamProviderText(a.provider, a.model, messages, "transcribe_audio");
200
199
  }
201
200
  async function loadMedia(path, cwd, allowed, maxBytes, kind) {
202
- const check = isValidCwdPath(cwd, path);
203
- if (!check.valid)
204
- return { error: check.error };
205
- const abs = check.resolved;
201
+ const abs = resolve(cwd, path);
202
+ if (!abs.startsWith(cwd + sep) && abs !== cwd) {
203
+ return { error: `Path escapes working directory: ${path}` };
204
+ }
206
205
  const info = await stat(abs).catch(() => undefined);
207
206
  if (!info || !info.isFile())
208
207
  return { error: `No such ${kind} file: ${path}` };
@@ -232,10 +231,12 @@ function multimodalCapabilityNotice(action, model, mime, bytes) {
232
231
  ].join(" ");
233
232
  }
234
233
  /**
235
- * Build a provider-agnostic multimodal message. For image/audio content,
236
- * uses a structured content blob so provider serialisation layers can
237
- * emit proper `image_url` / `input_audio` blocks. Falls back to a text
238
- * annotation when the content type isn't natively handled.
234
+ * Build a provider-agnostic multimodal message. We stuff the data URL
235
+ * into a tagged text part — providers that natively understand
236
+ * `image_url` style content are expected to adapt via their own
237
+ * serialisation layer; providers that don't will at least see the
238
+ * instruction and a base64 blob and may handle it or return an error
239
+ * the agent loop can surface.
239
240
  */
240
241
  function multimodalMessage(args) {
241
242
  return [
@@ -245,7 +246,7 @@ function multimodalMessage(args) {
245
246
  { type: "text", text: args.instruction },
246
247
  {
247
248
  type: "text",
248
- text: `[${args.mediaKind.toUpperCase()} ATTACHMENT]\n${args.dataUrl}\n[/${args.mediaKind.toUpperCase()} ATTACHMENT]`,
249
+ text: `[${args.mediaKind.toUpperCase()} ATTACHMENT mime=${args.mime}]\n${args.dataUrl}\n[/${args.mediaKind.toUpperCase()} ATTACHMENT]`,
249
250
  },
250
251
  ],
251
252
  },
@@ -1 +1 @@
1
- {"version":3,"file":"multimodal.js","sourceRoot":"","sources":["../../src/tools/multimodal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"multimodal.js","sourceRoot":"","sources":["../../src/tools/multimodal.ts"],"names":[],"mappings":"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"}
package/dist/tools/rtk.js CHANGED
@@ -10,11 +10,12 @@
10
10
  */
11
11
  import { execFile } from "node:child_process";
12
12
  import { promisify } from "node:util";
13
+ import { createRequire } from "node:module";
13
14
  import { join, dirname } from "node:path";
14
15
  import { access, constants } from "node:fs/promises";
15
- import { safeEnvironment } from "../utils/env.js";
16
16
  const execFileAsync = promisify(execFile);
17
- import { createRequire } from "node:module";
17
+ // Resolve the package root: require.resolve returns the absolute path to
18
+ // package.json, so one dirname gives us the package root directory.
18
19
  const _require = createRequire(import.meta.url);
19
20
  const _pkgRoot = dirname(_require.resolve("../../package.json"));
20
21
  // Platform key used to locate the vendored binary.
@@ -71,34 +72,20 @@ export const rtkTool = {
71
72
  const input = raw;
72
73
  const workDir = input.cwd ?? ctx.cwd ?? process.cwd();
73
74
  const timeout = input.timeoutMs ?? 30_000;
74
- const command = input.command.trim();
75
+ const cmdParts = input.command.trim().split(/\s+/);
75
76
  try {
76
77
  const rtkBin = await resolveRtk();
77
- let rtkUsed = false;
78
- let bin;
79
- let args;
80
- if (rtkBin) {
81
- bin = rtkBin;
82
- args = command.split(/\s+/);
83
- rtkUsed = true;
84
- }
85
- else {
86
- bin =
87
- process.platform === "win32"
88
- ? (process.env.ComSpec ?? "cmd.exe")
89
- : "/bin/sh";
90
- args =
91
- process.platform === "win32"
92
- ? ["/d", "/s", "/c", command]
93
- : ["-c", command];
94
- }
78
+ const argv = rtkBin ? [rtkBin, ...cmdParts] : cmdParts;
79
+ const bin = argv[0];
80
+ const args = argv.slice(1);
81
+ const rtkUsed = rtkBin !== null;
95
82
  const { stdout, stderr } = await execFileAsync(bin, args, {
96
83
  cwd: workDir,
97
84
  timeout,
98
85
  maxBuffer: 1024 * 1024 * 4,
99
86
  // Disable rtk's default telemetry. rtk pings telemetry.rtk-ai.app
100
87
  // with aggregate command counts; Dirgha users have not opted in.
101
- env: { ...safeEnvironment(), RTK_TELEMETRY_DISABLED: "1" },
88
+ env: { ...process.env, RTK_TELEMETRY_DISABLED: "1" },
102
89
  });
103
90
  const out = (stdout + (stderr ? `\n[stderr]\n${stderr}` : "")).trim();
104
91
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"rtk.js","sourceRoot":"","sources":["../../src/tools/rtk.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rtk.js","sourceRoot":"","sources":["../../src/tools/rtk.ts"],"names":[],"mappings":"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"}