@dirgha/code 1.20.39 → 1.21.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 (227) 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 -82
  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 +22 -45
  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/health-monitor.d.ts +8 -8
  75. package/dist/intelligence/health-monitor.js +74 -105
  76. package/dist/intelligence/health-monitor.js.map +1 -1
  77. package/dist/intelligence/prices.d.ts +4 -6
  78. package/dist/intelligence/prices.js +10 -36
  79. package/dist/intelligence/prices.js.map +1 -1
  80. package/dist/kernel/agent-loop.js +17 -60
  81. package/dist/kernel/agent-loop.js.map +1 -1
  82. package/dist/lsp/client.js +16 -29
  83. package/dist/lsp/client.js.map +1 -1
  84. package/dist/lsp/detector.js +6 -7
  85. package/dist/lsp/detector.js.map +1 -1
  86. package/dist/mcp/client.d.ts +1 -1
  87. package/dist/mcp/client.js +16 -19
  88. package/dist/mcp/client.js.map +1 -1
  89. package/dist/mcp/transport.js +38 -46
  90. package/dist/mcp/transport.js.map +1 -1
  91. package/dist/providers/deepseek.js +1 -1
  92. package/dist/providers/deepseek.js.map +1 -1
  93. package/dist/providers/dispatch.js +1 -15
  94. package/dist/providers/dispatch.js.map +1 -1
  95. package/dist/providers/index.d.ts +0 -11
  96. package/dist/providers/index.js +2 -29
  97. package/dist/providers/index.js.map +1 -1
  98. package/dist/providers/nvidia.js +1 -1
  99. package/dist/providers/nvidia.js.map +1 -1
  100. package/dist/providers/openai-compat.js +2 -4
  101. package/dist/providers/openai-compat.js.map +1 -1
  102. package/dist/providers/openrouter.js +1 -1
  103. package/dist/providers/openrouter.js.map +1 -1
  104. package/dist/safety/audit-log.d.ts +0 -15
  105. package/dist/safety/audit-log.js +0 -21
  106. package/dist/safety/audit-log.js.map +1 -1
  107. package/dist/state/db.js +5 -60
  108. package/dist/state/db.js.map +1 -1
  109. package/dist/tools/browser.js +16 -24
  110. package/dist/tools/browser.js.map +1 -1
  111. package/dist/tools/checkpoint.d.ts +1 -6
  112. package/dist/tools/checkpoint.js +62 -79
  113. package/dist/tools/checkpoint.js.map +1 -1
  114. package/dist/tools/cron.js +3 -1
  115. package/dist/tools/cron.js.map +1 -1
  116. package/dist/tools/diff.js +21 -25
  117. package/dist/tools/diff.js.map +1 -1
  118. package/dist/tools/exec.d.ts +0 -2
  119. package/dist/tools/exec.js +0 -13
  120. package/dist/tools/exec.js.map +1 -1
  121. package/dist/tools/fs-edit.d.ts +5 -3
  122. package/dist/tools/fs-edit.js +23 -8
  123. package/dist/tools/fs-edit.js.map +1 -1
  124. package/dist/tools/fs-ls.js +8 -6
  125. package/dist/tools/fs-ls.js.map +1 -1
  126. package/dist/tools/fs-read.d.ts +1 -1
  127. package/dist/tools/fs-read.js +28 -37
  128. package/dist/tools/fs-read.js.map +1 -1
  129. package/dist/tools/fs-write.d.ts +1 -1
  130. package/dist/tools/fs-write.js +33 -33
  131. package/dist/tools/fs-write.js.map +1 -1
  132. package/dist/tools/git.js +6 -12
  133. package/dist/tools/git.js.map +1 -1
  134. package/dist/tools/index.d.ts +2 -5
  135. package/dist/tools/index.js +4 -7
  136. package/dist/tools/index.js.map +1 -1
  137. package/dist/tools/multimodal.js +12 -11
  138. package/dist/tools/multimodal.js.map +1 -1
  139. package/dist/tools/rtk.js +9 -22
  140. package/dist/tools/rtk.js.map +1 -1
  141. package/dist/tools/search-glob.d.ts +1 -1
  142. package/dist/tools/search-glob.js +24 -42
  143. package/dist/tools/search-glob.js.map +1 -1
  144. package/dist/tools/search-grep.d.ts +1 -1
  145. package/dist/tools/search-grep.js +32 -56
  146. package/dist/tools/search-grep.js.map +1 -1
  147. package/dist/tools/shell.d.ts +1 -7
  148. package/dist/tools/shell.js +61 -114
  149. package/dist/tools/shell.js.map +1 -1
  150. package/dist/tui/ink/App.d.ts +1 -2
  151. package/dist/tui/ink/App.js +82 -194
  152. package/dist/tui/ink/App.js.map +1 -1
  153. package/dist/tui/ink/components/DenseToolMessage.js +8 -23
  154. package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
  155. package/dist/tui/ink/components/InputBox.js +25 -16
  156. package/dist/tui/ink/components/InputBox.js.map +1 -1
  157. package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
  158. package/dist/tui/ink/components/KeySetOverlay.js +16 -18
  159. package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
  160. package/dist/tui/ink/components/Logo.d.ts +0 -20
  161. package/dist/tui/ink/components/Logo.js +1 -67
  162. package/dist/tui/ink/components/Logo.js.map +1 -1
  163. package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
  164. package/dist/tui/ink/components/ModelPicker.js +26 -34
  165. package/dist/tui/ink/components/ModelPicker.js.map +1 -1
  166. package/dist/tui/ink/components/PasteCollapse.d.ts +1 -3
  167. package/dist/tui/ink/components/PasteCollapse.js +9 -11
  168. package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
  169. package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
  170. package/dist/tui/ink/components/SpinnerGlyph.js +14 -34
  171. package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
  172. package/dist/tui/ink/components/StatusBar.d.ts +0 -7
  173. package/dist/tui/ink/components/StatusBar.js +5 -11
  174. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  175. package/dist/tui/ink/components/ThinkingBlock.d.ts +4 -15
  176. package/dist/tui/ink/components/ThinkingBlock.js +17 -34
  177. package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
  178. package/dist/tui/ink/components/ToolBox.js +13 -23
  179. package/dist/tui/ink/components/ToolBox.js.map +1 -1
  180. package/dist/tui/ink/index.js +1 -17
  181. package/dist/tui/ink/index.js.map +1 -1
  182. package/dist/tui/ink/theme-context.js +3 -6
  183. package/dist/tui/ink/theme-context.js.map +1 -1
  184. package/dist/tui/ink/use-declined-versions.js +2 -6
  185. package/dist/tui/ink/use-declined-versions.js.map +1 -1
  186. package/dist/tui/ink/use-event-projection.d.ts +0 -2
  187. package/dist/tui/ink/use-event-projection.js +2 -21
  188. package/dist/tui/ink/use-event-projection.js.map +1 -1
  189. package/dist/tui/ink/use-overlays.js +17 -16
  190. package/dist/tui/ink/use-overlays.js.map +1 -1
  191. package/package.json +6 -5
  192. package/dist/state/db-telemetry.d.ts +0 -21
  193. package/dist/state/db-telemetry.js +0 -116
  194. package/dist/state/db-telemetry.js.map +0 -1
  195. package/dist/telemetry/gateway-push.d.ts +0 -17
  196. package/dist/telemetry/gateway-push.js +0 -48
  197. package/dist/telemetry/gateway-push.js.map +0 -1
  198. package/dist/telemetry/index.d.ts +0 -9
  199. package/dist/telemetry/index.js +0 -9
  200. package/dist/telemetry/index.js.map +0 -1
  201. package/dist/tools/github.d.ts +0 -13
  202. package/dist/tools/github.js +0 -257
  203. package/dist/tools/github.js.map +0 -1
  204. package/dist/tui/ink/components/VirtualTranscript.d.ts +0 -19
  205. package/dist/tui/ink/components/VirtualTranscript.js +0 -31
  206. package/dist/tui/ink/components/VirtualTranscript.js.map +0 -1
  207. package/dist/tui/ink/markdown/syntax-highlight.d.ts +0 -13
  208. package/dist/tui/ink/markdown/syntax-highlight.js +0 -91
  209. package/dist/tui/ink/markdown/syntax-highlight.js.map +0 -1
  210. package/dist/tui/ink/use-elapsed.d.ts +0 -14
  211. package/dist/tui/ink/use-elapsed.js +0 -61
  212. package/dist/tui/ink/use-elapsed.js.map +0 -1
  213. package/dist/tui/ink/use-flicker-detector.d.ts +0 -12
  214. package/dist/tui/ink/use-flicker-detector.js +0 -37
  215. package/dist/tui/ink/use-flicker-detector.js.map +0 -1
  216. package/dist/tui/ink/use-render-metrics.d.ts +0 -14
  217. package/dist/tui/ink/use-render-metrics.js +0 -106
  218. package/dist/tui/ink/use-render-metrics.js.map +0 -1
  219. package/dist/tui/ink/use-transcript-scroll.d.ts +0 -19
  220. package/dist/tui/ink/use-transcript-scroll.js +0 -83
  221. package/dist/tui/ink/use-transcript-scroll.js.map +0 -1
  222. package/dist/utils/env.d.ts +0 -1
  223. package/dist/utils/env.js +0 -60
  224. package/dist/utils/env.js.map +0 -1
  225. package/dist/utils/fs.d.ts +0 -10
  226. package/dist/utils/fs.js +0 -37
  227. package/dist/utils/fs.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/tools/cron.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/tools/cron.ts"],"names":[],"mappings":"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"}
@@ -6,33 +6,29 @@
6
6
  * subsequence walk; it is not minimised for very large files. Callers
7
7
  * should cap inputs at ~200 KB to keep latency interactive.
8
8
  */
9
- const MAX_DIFF_LINES = 10_000;
10
9
  export function unifiedDiff(before, after, opts = {}) {
11
10
  const ctx = opts.context ?? 3;
12
- const a = before.split("\n");
13
- const b = after.split("\n");
14
- if (a.length > MAX_DIFF_LINES || b.length > MAX_DIFF_LINES) {
15
- return `@@ diff truncated: input too large (${a.length} / ${b.length} lines, max ${MAX_DIFF_LINES}) @@`;
16
- }
11
+ const a = before.split('\n');
12
+ const b = after.split('\n');
17
13
  const ops = lcsOps(a, b);
18
14
  const header = [
19
- `--- ${opts.fromLabel ?? "before"}`,
20
- `+++ ${opts.toLabel ?? "after"}`,
15
+ `--- ${opts.fromLabel ?? 'before'}`,
16
+ `+++ ${opts.toLabel ?? 'after'}`,
21
17
  ];
22
18
  const hunks = [];
23
19
  let i = 0;
24
20
  while (i < ops.length) {
25
- if (ops[i].kind === "eq") {
21
+ if (ops[i].kind === 'eq') {
26
22
  i++;
27
23
  continue;
28
24
  }
29
25
  let start = i;
30
- while (start > 0 && ops[start - 1].kind === "eq" && i - start < ctx)
26
+ while (start > 0 && ops[start - 1].kind === 'eq' && i - start < ctx)
31
27
  start--;
32
28
  let end = i;
33
- while (end < ops.length && (ops[end].kind !== "eq" || end - i < ctx))
29
+ while (end < ops.length && (ops[end].kind !== 'eq' || end - i < ctx))
34
30
  end++;
35
- while (end < ops.length && ops[end].kind === "eq" && end - i < ctx * 2)
31
+ while (end < ops.length && ops[end].kind === 'eq' && end - i < ctx * 2)
36
32
  end++;
37
33
  let aCount = 0;
38
34
  let bCount = 0;
@@ -45,12 +41,12 @@ export function unifiedDiff(before, after, opts = {}) {
45
41
  aStart = op.aLine;
46
42
  if (bStart < 0 && op.bLine !== undefined)
47
43
  bStart = op.bLine;
48
- if (op.kind === "eq") {
44
+ if (op.kind === 'eq') {
49
45
  lines.push(` ${op.text}`);
50
46
  aCount++;
51
47
  bCount++;
52
48
  }
53
- else if (op.kind === "del") {
49
+ else if (op.kind === 'del') {
54
50
  lines.push(`-${op.text}`);
55
51
  aCount++;
56
52
  }
@@ -59,13 +55,13 @@ export function unifiedDiff(before, after, opts = {}) {
59
55
  bCount++;
60
56
  }
61
57
  }
62
- hunks.push(`@@ -${aStart < 0 ? 0 : aStart + 1},${aCount} +${bStart < 0 ? 0 : bStart + 1},${bCount} @@`);
58
+ hunks.push(`@@ -${(aStart < 0 ? 0 : aStart + 1)},${aCount} +${(bStart < 0 ? 0 : bStart + 1)},${bCount} @@`);
63
59
  hunks.push(...lines);
64
60
  i = end;
65
61
  }
66
62
  if (hunks.length === 0)
67
- return "";
68
- return [...header, ...hunks].join("\n");
63
+ return '';
64
+ return [...header, ...hunks].join('\n');
69
65
  }
70
66
  function lcsOps(a, b) {
71
67
  const m = a.length;
@@ -84,25 +80,25 @@ function lcsOps(a, b) {
84
80
  let j = 0;
85
81
  while (i < m && j < n) {
86
82
  if (a[i] === b[j]) {
87
- out.push({ kind: "eq", text: a[i], aLine: i, bLine: j });
83
+ out.push({ kind: 'eq', text: a[i], aLine: i, bLine: j });
88
84
  i++;
89
85
  j++;
90
86
  }
91
87
  else if (dp[i + 1][j] >= dp[i][j + 1]) {
92
- out.push({ kind: "del", text: a[i], aLine: i });
88
+ out.push({ kind: 'del', text: a[i], aLine: i });
93
89
  i++;
94
90
  }
95
91
  else {
96
- out.push({ kind: "add", text: b[j], bLine: j });
92
+ out.push({ kind: 'add', text: b[j], bLine: j });
97
93
  j++;
98
94
  }
99
95
  }
100
96
  while (i < m) {
101
- out.push({ kind: "del", text: a[i], aLine: i });
97
+ out.push({ kind: 'del', text: a[i], aLine: i });
102
98
  i++;
103
99
  }
104
100
  while (j < n) {
105
- out.push({ kind: "add", text: b[j], bLine: j });
101
+ out.push({ kind: 'add', text: b[j], bLine: j });
106
102
  j++;
107
103
  }
108
104
  return out;
@@ -110,10 +106,10 @@ function lcsOps(a, b) {
110
106
  export function summariseDiff(diff) {
111
107
  let added = 0;
112
108
  let removed = 0;
113
- for (const line of diff.split("\n")) {
114
- if (line.startsWith("+") && !line.startsWith("+++"))
109
+ for (const line of diff.split('\n')) {
110
+ if (line.startsWith('+') && !line.startsWith('+++'))
115
111
  added++;
116
- else if (line.startsWith("-") && !line.startsWith("---"))
112
+ else if (line.startsWith('-') && !line.startsWith('---'))
117
113
  removed++;
118
114
  }
119
115
  return { added, removed };
@@ -1 +1 @@
1
- {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,6 @@
11
11
  */
12
12
  import type { ToolExecutor } from "../kernel/types.js";
13
13
  import type { ToolContext, ToolRegistry } from "./registry.js";
14
- import type { PermissionEngine } from "./permission.js";
15
14
  export type { ToolExecutor } from "../kernel/types.js";
16
15
  export interface ToolExecutorOptions {
17
16
  registry: ToolRegistry;
@@ -20,6 +19,5 @@ export interface ToolExecutorOptions {
20
19
  sessionId: string;
21
20
  log?: ToolContext["log"];
22
21
  onProgress?: (toolId: string, message: string) => void;
23
- permission?: PermissionEngine;
24
22
  }
25
23
  export declare function createToolExecutor(opts: ToolExecutorOptions): ToolExecutor;
@@ -32,19 +32,6 @@ export function createToolExecutor(opts) {
32
32
  isError: true,
33
33
  };
34
34
  }
35
- if (opts.permission) {
36
- const decision = opts.permission.check({
37
- tool: call.name,
38
- action: "exec",
39
- target: opts.cwd,
40
- });
41
- if (!decision.allowed) {
42
- return {
43
- content: `Permission denied: ${decision.reason}`,
44
- isError: true,
45
- };
46
- }
47
- }
48
35
  const sandbox = await sandboxPromise;
49
36
  const ctx = {
50
37
  cwd: opts.cwd,
@@ -1 +1 @@
1
- {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  /**
2
- * String-replace edit with exact matching.
2
+ * String-replace edit with exact and fuzzy matching.
3
3
  *
4
- * When the exact string is missing, returns an error so the agent can
5
- * retry with more specific anchors. This is deterministic and
4
+ * Exact match is the fast path. When the exact string is missing, the
5
+ * tool falls back to whitespace-normalised matching and, if still
6
+ * ambiguous, returns an error with the candidate contexts so the agent
7
+ * can retry with more specific anchors. This is deterministic and
6
8
  * auditable — no "nearest fuzzy match" guessing.
7
9
  */
8
10
  import type { Tool } from "./registry.js";
@@ -1,13 +1,28 @@
1
1
  /**
2
- * String-replace edit with exact matching.
2
+ * String-replace edit with exact and fuzzy matching.
3
3
  *
4
- * When the exact string is missing, returns an error so the agent can
5
- * retry with more specific anchors. This is deterministic and
4
+ * Exact match is the fast path. When the exact string is missing, the
5
+ * tool falls back to whitespace-normalised matching and, if still
6
+ * ambiguous, returns an error with the candidate contexts so the agent
7
+ * can retry with more specific anchors. This is deterministic and
6
8
  * auditable — no "nearest fuzzy match" guessing.
7
9
  */
8
10
  import { readFile, stat, writeFile } from "node:fs/promises";
11
+ import { resolve, sep } from "node:path";
9
12
  import { summariseDiff, unifiedDiff } from "./diff.js";
10
- import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
13
+ /** Decode literal \uXXXX escape sequences a model may have emitted as text. */
14
+ function decodeLiteralUnicodeEscapes(s) {
15
+ return s.replace(/\\u([0-9a-fA-F]{4})/g, (_, hex) => {
16
+ const cp = parseInt(hex, 16);
17
+ // Only decode printable ASCII range (0x20–0x7E) plus common whitespace.
18
+ // Leave high-codepoint escapes (e.g. CJK, emoji) as-is to avoid
19
+ // corrupting intentional unicode-escape strings in JS source.
20
+ if ((cp >= 0x20 && cp <= 0x7e) || cp === 0x0a || cp === 0x0d || cp === 0x09) {
21
+ return String.fromCodePoint(cp);
22
+ }
23
+ return _;
24
+ });
25
+ }
11
26
  export const fsEditTool = {
12
27
  name: "fs_edit",
13
28
  description: "Replace an exact substring in a file. Fails on ambiguity (multiple matches) unless replaceAll is set. Use larger context around oldString to disambiguate.",
@@ -24,10 +39,10 @@ export const fsEditTool = {
24
39
  requiresApproval: () => true,
25
40
  async execute(rawInput, ctx) {
26
41
  const input = rawInput;
27
- const check = isValidCwdPath(ctx.cwd, input.path);
28
- if (!check.valid)
29
- return { content: check.error, isError: true };
30
- const abs = check.resolved;
42
+ const abs = resolve(ctx.cwd, input.path);
43
+ if (!abs.startsWith(ctx.cwd + sep) && abs !== ctx.cwd) {
44
+ return { content: `Path escapes working directory: ${input.path}`, isError: true };
45
+ }
31
46
  const info = await stat(abs).catch(() => undefined);
32
47
  if (!info || !info.isFile())
33
48
  return { content: `No such file: ${input.path}`, isError: true };
@@ -1 +1 @@
1
- {"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"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"}
@@ -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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"}