@sean.holung/minicode 0.3.11 → 0.4.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 (191) hide show
  1. package/README.md +5 -3
  2. package/dist/scripts/run-benchmarks.js +7 -1
  3. package/dist/src/benchmark/runner.js +66 -3
  4. package/dist/src/cli/benchmark-run.js +1 -1
  5. package/dist/src/index.js +1 -1
  6. package/dist/src/indexer/code-map.js +16 -1
  7. package/dist/src/serve/agent-bridge.js +1 -1
  8. package/dist/src/session/session-store.js +1 -1
  9. package/dist/src/shared/symbol-resolution.js +24 -3
  10. package/dist/src/tools/find-path.js +1 -1
  11. package/dist/src/tools/find-references.js +1 -1
  12. package/dist/src/tools/get-dependencies.js +1 -1
  13. package/dist/src/tools/post-edit-diagnostics.js +185 -0
  14. package/dist/src/tools/read-symbol.js +2 -2
  15. package/dist/src/tools/registry.js +18 -3
  16. package/dist/src/tools/search-code-map.js +101 -9
  17. package/dist/src/ui/cli-ink.js +1 -1
  18. package/dist/tests/agent.test.js +1 -1
  19. package/dist/tests/context-indicator.test.js +1 -1
  20. package/dist/tests/file-tools.test.js +2 -2
  21. package/dist/tests/focus-tracker.test.js +1 -1
  22. package/dist/tests/guardrails.test.js +1 -1
  23. package/dist/tests/indexer.test.js +59 -28
  24. package/dist/tests/model-client-openai.test.js +1 -1
  25. package/dist/tests/model-selection.test.js +1 -1
  26. package/dist/tests/python-plugin.test.js +3 -3
  27. package/dist/tests/read-symbol.test.js +84 -10
  28. package/dist/tests/reasoning-effort.test.js +1 -1
  29. package/dist/tests/search-code-map.test.js +132 -1
  30. package/dist/tests/serve.integration.test.js +1 -1
  31. package/dist/tests/session-store.test.js +1 -1
  32. package/dist/tests/session.test.js +1 -1
  33. package/dist/tests/symbol-resolution.test.js +57 -0
  34. package/dist/tests/system-prompt.test.js +1 -1
  35. package/dist/tests/tool-registry.test.js +1 -1
  36. package/node_modules/@sean.holung/minicode-sdk/LICENSE +201 -0
  37. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/README.md +43 -22
  38. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/agent.d.ts +10 -1
  39. package/node_modules/@sean.holung/minicode-sdk/dist/src/agent/agent.d.ts.map +1 -0
  40. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/agent.js +18 -9
  41. package/node_modules/@sean.holung/minicode-sdk/dist/src/agent/agent.js.map +1 -0
  42. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/index.d.ts +1 -1
  43. package/node_modules/@sean.holung/minicode-sdk/dist/src/index.d.ts.map +1 -0
  44. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/index.js +1 -1
  45. package/node_modules/@sean.holung/minicode-sdk/dist/src/index.js.map +1 -0
  46. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/mcp/client-registry.js +1 -1
  47. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/mcp/client-registry.js.map +1 -1
  48. package/node_modules/@sean.holung/minicode-sdk/dist/src/model/client.d.ts.map +1 -0
  49. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/model/client.js +71 -4
  50. package/node_modules/@sean.holung/minicode-sdk/dist/src/model/client.js.map +1 -0
  51. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/prompt/system-prompt.d.ts.map +1 -1
  52. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/prompt/system-prompt.js +1 -1
  53. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/prompt/system-prompt.js.map +1 -1
  54. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file-replacers.d.ts +59 -0
  55. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file-replacers.d.ts.map +1 -0
  56. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file-replacers.js +392 -0
  57. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file-replacers.js.map +1 -0
  58. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file.d.ts +19 -0
  59. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file.d.ts.map +1 -0
  60. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/edit-file.js +14 -25
  61. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/edit-file.js.map +1 -0
  62. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/read-file.d.ts.map +1 -1
  63. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/read-file.js +11 -5
  64. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/read-file.js.map +1 -1
  65. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/run-command.d.ts.map +1 -1
  66. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/run-command.js +3 -0
  67. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/run-command.js.map +1 -0
  68. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/search.d.ts.map +1 -1
  69. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/search.js +52 -25
  70. package/node_modules/@sean.holung/minicode-sdk/dist/src/tools/search.js.map +1 -0
  71. package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/package.json +6 -2
  72. package/node_modules/minicode-plugin-python/dist/src/index.d.ts +1 -1
  73. package/node_modules/minicode-plugin-python/dist/src/index.d.ts.map +1 -1
  74. package/node_modules/minicode-plugin-python/dist/tsconfig.tsbuildinfo +1 -1
  75. package/node_modules/minicode-plugin-python/package.json +2 -2
  76. package/package.json +3 -3
  77. package/node_modules/@minicode/agent-sdk/dist/src/agent/agent.d.ts.map +0 -1
  78. package/node_modules/@minicode/agent-sdk/dist/src/agent/agent.js.map +0 -1
  79. package/node_modules/@minicode/agent-sdk/dist/src/index.d.ts.map +0 -1
  80. package/node_modules/@minicode/agent-sdk/dist/src/index.js.map +0 -1
  81. package/node_modules/@minicode/agent-sdk/dist/src/model/client.d.ts.map +0 -1
  82. package/node_modules/@minicode/agent-sdk/dist/src/model/client.js.map +0 -1
  83. package/node_modules/@minicode/agent-sdk/dist/src/tools/edit-file.d.ts +0 -13
  84. package/node_modules/@minicode/agent-sdk/dist/src/tools/edit-file.d.ts.map +0 -1
  85. package/node_modules/@minicode/agent-sdk/dist/src/tools/edit-file.js.map +0 -1
  86. package/node_modules/@minicode/agent-sdk/dist/src/tools/run-command.js.map +0 -1
  87. package/node_modules/@minicode/agent-sdk/dist/src/tools/search.js.map +0 -1
  88. package/node_modules/@minicode/agent-sdk/dist/tests/agent.test.d.ts +0 -2
  89. package/node_modules/@minicode/agent-sdk/dist/tests/agent.test.d.ts.map +0 -1
  90. package/node_modules/@minicode/agent-sdk/dist/tests/agent.test.js +0 -569
  91. package/node_modules/@minicode/agent-sdk/dist/tests/agent.test.js.map +0 -1
  92. package/node_modules/@minicode/agent-sdk/dist/tests/file-tools.test.d.ts +0 -2
  93. package/node_modules/@minicode/agent-sdk/dist/tests/file-tools.test.d.ts.map +0 -1
  94. package/node_modules/@minicode/agent-sdk/dist/tests/file-tools.test.js +0 -131
  95. package/node_modules/@minicode/agent-sdk/dist/tests/file-tools.test.js.map +0 -1
  96. package/node_modules/@minicode/agent-sdk/dist/tests/guardrails.test.d.ts +0 -2
  97. package/node_modules/@minicode/agent-sdk/dist/tests/guardrails.test.d.ts.map +0 -1
  98. package/node_modules/@minicode/agent-sdk/dist/tests/guardrails.test.js +0 -54
  99. package/node_modules/@minicode/agent-sdk/dist/tests/guardrails.test.js.map +0 -1
  100. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.integration.test.d.ts +0 -2
  101. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.integration.test.d.ts.map +0 -1
  102. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.integration.test.js +0 -64
  103. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.integration.test.js.map +0 -1
  104. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.test.d.ts +0 -2
  105. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.test.d.ts.map +0 -1
  106. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.test.js +0 -350
  107. package/node_modules/@minicode/agent-sdk/dist/tests/mcp-client.test.js.map +0 -1
  108. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-anthropic-structured-output.test.d.ts +0 -2
  109. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-anthropic-structured-output.test.d.ts.map +0 -1
  110. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-anthropic-structured-output.test.js +0 -211
  111. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-anthropic-structured-output.test.js.map +0 -1
  112. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-openai.test.d.ts +0 -2
  113. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-openai.test.d.ts.map +0 -1
  114. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-openai.test.js +0 -330
  115. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-openai.test.js.map +0 -1
  116. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-structured-output.test.d.ts +0 -2
  117. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-structured-output.test.d.ts.map +0 -1
  118. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-structured-output.test.js +0 -171
  119. package/node_modules/@minicode/agent-sdk/dist/tests/model-client-structured-output.test.js.map +0 -1
  120. package/node_modules/@minicode/agent-sdk/dist/tests/session.test.d.ts +0 -2
  121. package/node_modules/@minicode/agent-sdk/dist/tests/session.test.d.ts.map +0 -1
  122. package/node_modules/@minicode/agent-sdk/dist/tests/session.test.js +0 -226
  123. package/node_modules/@minicode/agent-sdk/dist/tests/session.test.js.map +0 -1
  124. package/node_modules/@minicode/agent-sdk/dist/tests/structured-output.test.d.ts +0 -2
  125. package/node_modules/@minicode/agent-sdk/dist/tests/structured-output.test.d.ts.map +0 -1
  126. package/node_modules/@minicode/agent-sdk/dist/tests/structured-output.test.js +0 -212
  127. package/node_modules/@minicode/agent-sdk/dist/tests/structured-output.test.js.map +0 -1
  128. package/node_modules/@minicode/agent-sdk/dist/tests/system-prompt.test.d.ts +0 -2
  129. package/node_modules/@minicode/agent-sdk/dist/tests/system-prompt.test.d.ts.map +0 -1
  130. package/node_modules/@minicode/agent-sdk/dist/tests/system-prompt.test.js +0 -76
  131. package/node_modules/@minicode/agent-sdk/dist/tests/system-prompt.test.js.map +0 -1
  132. package/node_modules/@minicode/agent-sdk/dist/tests/test-utils.d.ts +0 -3
  133. package/node_modules/@minicode/agent-sdk/dist/tests/test-utils.d.ts.map +0 -1
  134. package/node_modules/@minicode/agent-sdk/dist/tests/test-utils.js +0 -20
  135. package/node_modules/@minicode/agent-sdk/dist/tests/test-utils.js.map +0 -1
  136. package/node_modules/@minicode/agent-sdk/dist/tests/tool-factory-options.test.d.ts +0 -2
  137. package/node_modules/@minicode/agent-sdk/dist/tests/tool-factory-options.test.d.ts.map +0 -1
  138. package/node_modules/@minicode/agent-sdk/dist/tests/tool-factory-options.test.js +0 -72
  139. package/node_modules/@minicode/agent-sdk/dist/tests/tool-factory-options.test.js.map +0 -1
  140. package/node_modules/@minicode/agent-sdk/dist/tests/tool-registry.test.d.ts +0 -2
  141. package/node_modules/@minicode/agent-sdk/dist/tests/tool-registry.test.d.ts.map +0 -1
  142. package/node_modules/@minicode/agent-sdk/dist/tests/tool-registry.test.js +0 -69
  143. package/node_modules/@minicode/agent-sdk/dist/tests/tool-registry.test.js.map +0 -1
  144. package/node_modules/@minicode/agent-sdk/dist/tsconfig.tsbuildinfo +0 -1
  145. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/structured-output.d.ts +0 -0
  146. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/structured-output.d.ts.map +0 -0
  147. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/structured-output.js +0 -0
  148. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/structured-output.js.map +0 -0
  149. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/types.d.ts +0 -0
  150. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/types.d.ts.map +0 -0
  151. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/types.js +0 -0
  152. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/agent/types.js.map +0 -0
  153. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/focus-tracker.d.ts +0 -0
  154. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/focus-tracker.d.ts.map +0 -0
  155. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/focus-tracker.js +0 -0
  156. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/focus-tracker.js.map +0 -0
  157. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/types.d.ts +0 -0
  158. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/types.d.ts.map +0 -0
  159. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/types.js +0 -0
  160. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/indexer/types.js.map +0 -0
  161. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/mcp/client-registry.d.ts +0 -0
  162. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/mcp/client-registry.d.ts.map +0 -0
  163. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/model/client.d.ts +0 -0
  164. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/prompt/system-prompt.d.ts +0 -0
  165. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/safety/guardrails.d.ts +0 -0
  166. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/safety/guardrails.d.ts.map +0 -0
  167. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/safety/guardrails.js +0 -0
  168. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/safety/guardrails.js.map +0 -0
  169. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/session/session.d.ts +0 -0
  170. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/session/session.d.ts.map +0 -0
  171. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/session/session.js +0 -0
  172. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/session/session.js.map +0 -0
  173. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/helpers.d.ts +0 -0
  174. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/helpers.d.ts.map +0 -0
  175. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/helpers.js +0 -0
  176. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/helpers.js.map +0 -0
  177. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/list-files.d.ts +0 -0
  178. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/list-files.d.ts.map +0 -0
  179. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/list-files.js +0 -0
  180. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/list-files.js.map +0 -0
  181. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/read-file.d.ts +0 -0
  182. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/registry.d.ts +0 -0
  183. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/registry.d.ts.map +0 -0
  184. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/registry.js +0 -0
  185. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/registry.js.map +0 -0
  186. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/run-command.d.ts +0 -0
  187. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/search.d.ts +0 -0
  188. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/write-file.d.ts +0 -0
  189. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/write-file.d.ts.map +0 -0
  190. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/write-file.js +0 -0
  191. /package/node_modules/{@minicode/agent-sdk → @sean.holung/minicode-sdk}/dist/src/tools/write-file.js.map +0 -0
@@ -0,0 +1,392 @@
1
+ /**
2
+ * Fuzzy edit-replacer cascade.
3
+ *
4
+ * Adapted from sst/opencode (`packages/opencode/src/tool/edit.ts`), which
5
+ * in turn credits cline and gemini-cli as upstream:
6
+ * - https://github.com/cline/cline/blob/main/evals/diff-edits/diff-apply/diff-06-23-25.ts
7
+ * - https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/utils/editCorrector.ts
8
+ *
9
+ * Why this exists: small models routinely emit `old_string` with subtly
10
+ * wrong indentation, whitespace, or `\n`-vs-`\\n` escaping. A strict
11
+ * exact-match `indexOf` rejects these and the model retries with marginally
12
+ * different whitespace, looping until the agent's duplicate-tool-call guard
13
+ * trips. The cascade gives each candidate a series of progressively-fuzzier
14
+ * passes; the first one that yields a uniquely-matchable substring in the
15
+ * actual file content wins. This converts a class of edit-loop failures
16
+ * into successful edits without changing the agent's prompt.
17
+ *
18
+ * Each replacer is a generator that yields candidate substrings present in
19
+ * `content`. The orchestrator (`replaceWithCascade`) picks the first
20
+ * candidate that occurs exactly once.
21
+ */
22
+ const SINGLE_CANDIDATE_SIMILARITY_THRESHOLD = 0.0;
23
+ const MULTIPLE_CANDIDATES_SIMILARITY_THRESHOLD = 0.3;
24
+ function levenshtein(a, b) {
25
+ if (a === "" || b === "") {
26
+ return Math.max(a.length, b.length);
27
+ }
28
+ const matrix = Array.from({ length: a.length + 1 }, (_, i) => Array.from({ length: b.length + 1 }, (_, j) => i === 0 ? j : j === 0 ? i : 0));
29
+ for (let i = 1; i <= a.length; i++) {
30
+ for (let j = 1; j <= b.length; j++) {
31
+ const cost = a[i - 1] === b[j - 1] ? 0 : 1;
32
+ matrix[i][j] = Math.min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost);
33
+ }
34
+ }
35
+ return matrix[a.length][b.length];
36
+ }
37
+ /** Exact-match. The original `indexOf` behaviour. */
38
+ export const SimpleReplacer = function* (_content, find) {
39
+ yield find;
40
+ };
41
+ /** Match line-by-line ignoring per-line leading/trailing whitespace. */
42
+ export const LineTrimmedReplacer = function* (content, find) {
43
+ const originalLines = content.split("\n");
44
+ const searchLines = find.split("\n");
45
+ if (searchLines[searchLines.length - 1] === "") {
46
+ searchLines.pop();
47
+ }
48
+ for (let i = 0; i <= originalLines.length - searchLines.length; i++) {
49
+ let matches = true;
50
+ for (let j = 0; j < searchLines.length; j++) {
51
+ if (originalLines[i + j].trim() !== searchLines[j].trim()) {
52
+ matches = false;
53
+ break;
54
+ }
55
+ }
56
+ if (matches) {
57
+ let matchStartIndex = 0;
58
+ for (let k = 0; k < i; k++) {
59
+ matchStartIndex += originalLines[k].length + 1;
60
+ }
61
+ let matchEndIndex = matchStartIndex;
62
+ for (let k = 0; k < searchLines.length; k++) {
63
+ matchEndIndex += originalLines[i + k].length;
64
+ if (k < searchLines.length - 1) {
65
+ matchEndIndex += 1;
66
+ }
67
+ }
68
+ yield content.substring(matchStartIndex, matchEndIndex);
69
+ }
70
+ }
71
+ };
72
+ /**
73
+ * Anchor on the first and last lines of a multi-line block, fuzzy-match the
74
+ * middle. Useful when the model gets the structural anchors right but
75
+ * miscopies an intermediate line.
76
+ */
77
+ export const BlockAnchorReplacer = function* (content, find) {
78
+ const originalLines = content.split("\n");
79
+ const searchLines = find.split("\n");
80
+ if (searchLines.length < 3) {
81
+ return;
82
+ }
83
+ if (searchLines[searchLines.length - 1] === "") {
84
+ searchLines.pop();
85
+ }
86
+ const firstLineSearch = searchLines[0].trim();
87
+ const lastLineSearch = searchLines[searchLines.length - 1].trim();
88
+ const searchBlockSize = searchLines.length;
89
+ const candidates = [];
90
+ for (let i = 0; i < originalLines.length; i++) {
91
+ if (originalLines[i].trim() !== firstLineSearch) {
92
+ continue;
93
+ }
94
+ for (let j = i + 2; j < originalLines.length; j++) {
95
+ if (originalLines[j].trim() === lastLineSearch) {
96
+ candidates.push({ startLine: i, endLine: j });
97
+ break;
98
+ }
99
+ }
100
+ }
101
+ if (candidates.length === 0) {
102
+ return;
103
+ }
104
+ const yieldBlock = (startLine, endLine) => {
105
+ let matchStartIndex = 0;
106
+ for (let k = 0; k < startLine; k++) {
107
+ matchStartIndex += originalLines[k].length + 1;
108
+ }
109
+ let matchEndIndex = matchStartIndex;
110
+ for (let k = startLine; k <= endLine; k++) {
111
+ matchEndIndex += originalLines[k].length;
112
+ if (k < endLine) {
113
+ matchEndIndex += 1;
114
+ }
115
+ }
116
+ return content.substring(matchStartIndex, matchEndIndex);
117
+ };
118
+ if (candidates.length === 1) {
119
+ const { startLine, endLine } = candidates[0];
120
+ const actualBlockSize = endLine - startLine + 1;
121
+ let similarity = 0;
122
+ const linesToCheck = Math.min(searchBlockSize - 2, actualBlockSize - 2);
123
+ if (linesToCheck > 0) {
124
+ for (let j = 1; j < searchBlockSize - 1 && j < actualBlockSize - 1; j++) {
125
+ const originalLine = originalLines[startLine + j].trim();
126
+ const searchLine = searchLines[j].trim();
127
+ const maxLen = Math.max(originalLine.length, searchLine.length);
128
+ if (maxLen === 0)
129
+ continue;
130
+ const distance = levenshtein(originalLine, searchLine);
131
+ similarity += (1 - distance / maxLen) / linesToCheck;
132
+ if (similarity >= SINGLE_CANDIDATE_SIMILARITY_THRESHOLD)
133
+ break;
134
+ }
135
+ }
136
+ else {
137
+ similarity = 1.0;
138
+ }
139
+ if (similarity >= SINGLE_CANDIDATE_SIMILARITY_THRESHOLD) {
140
+ yield yieldBlock(startLine, endLine);
141
+ }
142
+ return;
143
+ }
144
+ let bestMatch = null;
145
+ let maxSimilarity = -1;
146
+ for (const candidate of candidates) {
147
+ const { startLine, endLine } = candidate;
148
+ const actualBlockSize = endLine - startLine + 1;
149
+ let similarity = 0;
150
+ const linesToCheck = Math.min(searchBlockSize - 2, actualBlockSize - 2);
151
+ if (linesToCheck > 0) {
152
+ for (let j = 1; j < searchBlockSize - 1 && j < actualBlockSize - 1; j++) {
153
+ const originalLine = originalLines[startLine + j].trim();
154
+ const searchLine = searchLines[j].trim();
155
+ const maxLen = Math.max(originalLine.length, searchLine.length);
156
+ if (maxLen === 0)
157
+ continue;
158
+ similarity += 1 - levenshtein(originalLine, searchLine) / maxLen;
159
+ }
160
+ similarity /= linesToCheck;
161
+ }
162
+ else {
163
+ similarity = 1.0;
164
+ }
165
+ if (similarity > maxSimilarity) {
166
+ maxSimilarity = similarity;
167
+ bestMatch = candidate;
168
+ }
169
+ }
170
+ if (maxSimilarity >= MULTIPLE_CANDIDATES_SIMILARITY_THRESHOLD && bestMatch) {
171
+ yield yieldBlock(bestMatch.startLine, bestMatch.endLine);
172
+ }
173
+ };
174
+ /** Collapse all whitespace runs to single spaces and compare. */
175
+ export const WhitespaceNormalizedReplacer = function* (content, find) {
176
+ const normalize = (text) => text.replace(/\s+/g, " ").trim();
177
+ const normalizedFind = normalize(find);
178
+ const lines = content.split("\n");
179
+ for (let i = 0; i < lines.length; i++) {
180
+ const line = lines[i];
181
+ if (normalize(line) === normalizedFind) {
182
+ yield line;
183
+ }
184
+ else if (normalize(line).includes(normalizedFind)) {
185
+ const words = find.trim().split(/\s+/);
186
+ if (words.length > 0) {
187
+ const pattern = words
188
+ .map((w) => w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
189
+ .join("\\s+");
190
+ try {
191
+ const regex = new RegExp(pattern);
192
+ const match = line.match(regex);
193
+ if (match)
194
+ yield match[0];
195
+ }
196
+ catch {
197
+ // Invalid regex pattern — skip.
198
+ }
199
+ }
200
+ }
201
+ }
202
+ const findLines = find.split("\n");
203
+ if (findLines.length > 1) {
204
+ for (let i = 0; i <= lines.length - findLines.length; i++) {
205
+ const block = lines.slice(i, i + findLines.length);
206
+ if (normalize(block.join("\n")) === normalizedFind) {
207
+ yield block.join("\n");
208
+ }
209
+ }
210
+ }
211
+ };
212
+ /**
213
+ * Strip the common leading indentation across both `find` and content blocks
214
+ * before comparing. Useful when the model emits a snippet without the
215
+ * surrounding indentation that the file actually has.
216
+ */
217
+ export const IndentationFlexibleReplacer = function* (content, find) {
218
+ const removeIndent = (text) => {
219
+ const lines = text.split("\n");
220
+ const nonEmpty = lines.filter((l) => l.trim().length > 0);
221
+ if (nonEmpty.length === 0)
222
+ return text;
223
+ const minIndent = Math.min(...nonEmpty.map((l) => l.match(/^(\s*)/)?.[1]?.length ?? 0));
224
+ return lines
225
+ .map((l) => (l.trim().length === 0 ? l : l.slice(minIndent)))
226
+ .join("\n");
227
+ };
228
+ const normalizedFind = removeIndent(find);
229
+ const contentLines = content.split("\n");
230
+ const findLines = find.split("\n");
231
+ for (let i = 0; i <= contentLines.length - findLines.length; i++) {
232
+ const block = contentLines.slice(i, i + findLines.length).join("\n");
233
+ if (removeIndent(block) === normalizedFind) {
234
+ yield block;
235
+ }
236
+ }
237
+ };
238
+ /** Handle backslash-escapes in the model's `find` string (\\n, \\t, etc.). */
239
+ export const EscapeNormalizedReplacer = function* (content, find) {
240
+ const unescape = (str) => str.replace(/\\(n|t|r|'|"|`|\\|\n|\$)/g, (match, ch) => {
241
+ switch (ch) {
242
+ case "n":
243
+ return "\n";
244
+ case "t":
245
+ return "\t";
246
+ case "r":
247
+ return "\r";
248
+ case "'":
249
+ return "'";
250
+ case '"':
251
+ return '"';
252
+ case "`":
253
+ return "`";
254
+ case "\\":
255
+ return "\\";
256
+ case "\n":
257
+ return "\n";
258
+ case "$":
259
+ return "$";
260
+ default:
261
+ return match;
262
+ }
263
+ });
264
+ const unescapedFind = unescape(find);
265
+ if (content.includes(unescapedFind)) {
266
+ yield unescapedFind;
267
+ }
268
+ const lines = content.split("\n");
269
+ const findLines = unescapedFind.split("\n");
270
+ for (let i = 0; i <= lines.length - findLines.length; i++) {
271
+ const block = lines.slice(i, i + findLines.length).join("\n");
272
+ if (unescape(block) === unescapedFind) {
273
+ yield block;
274
+ }
275
+ }
276
+ };
277
+ /** Trim leading/trailing whitespace from `find` before searching. */
278
+ export const TrimmedBoundaryReplacer = function* (content, find) {
279
+ const trimmed = find.trim();
280
+ if (trimmed === find)
281
+ return;
282
+ if (content.includes(trimmed)) {
283
+ yield trimmed;
284
+ }
285
+ const lines = content.split("\n");
286
+ const findLines = find.split("\n");
287
+ for (let i = 0; i <= lines.length - findLines.length; i++) {
288
+ const block = lines.slice(i, i + findLines.length).join("\n");
289
+ if (block.trim() === trimmed) {
290
+ yield block;
291
+ }
292
+ }
293
+ };
294
+ /**
295
+ * Same anchor strategy as BlockAnchorReplacer but with a relaxed similarity
296
+ * threshold (50% line overlap instead of Levenshtein-weighted). Catches
297
+ * cases the anchor replacer misses on heavily-modified middles.
298
+ */
299
+ export const ContextAwareReplacer = function* (content, find) {
300
+ const findLines = find.split("\n");
301
+ if (findLines.length < 3)
302
+ return;
303
+ if (findLines[findLines.length - 1] === "")
304
+ findLines.pop();
305
+ const contentLines = content.split("\n");
306
+ const firstLine = findLines[0].trim();
307
+ const lastLine = findLines[findLines.length - 1].trim();
308
+ for (let i = 0; i < contentLines.length; i++) {
309
+ if (contentLines[i].trim() !== firstLine)
310
+ continue;
311
+ for (let j = i + 2; j < contentLines.length; j++) {
312
+ if (contentLines[j].trim() === lastLine) {
313
+ const blockLines = contentLines.slice(i, j + 1);
314
+ const block = blockLines.join("\n");
315
+ if (blockLines.length === findLines.length) {
316
+ let matching = 0;
317
+ let totalNonEmpty = 0;
318
+ for (let k = 1; k < blockLines.length - 1; k++) {
319
+ const bLine = blockLines[k].trim();
320
+ const fLine = findLines[k].trim();
321
+ if (bLine.length > 0 || fLine.length > 0) {
322
+ totalNonEmpty++;
323
+ if (bLine === fLine)
324
+ matching++;
325
+ }
326
+ }
327
+ if (totalNonEmpty === 0 || matching / totalNonEmpty >= 0.5) {
328
+ yield block;
329
+ break;
330
+ }
331
+ }
332
+ break;
333
+ }
334
+ }
335
+ }
336
+ };
337
+ /** Yield each occurrence of an exact-match `find` (used for replaceAll). */
338
+ export const MultiOccurrenceReplacer = function* (content, find) {
339
+ let startIndex = 0;
340
+ while (true) {
341
+ const index = content.indexOf(find, startIndex);
342
+ if (index === -1)
343
+ break;
344
+ yield find;
345
+ startIndex = index + find.length;
346
+ }
347
+ };
348
+ const REPLACERS = [
349
+ SimpleReplacer,
350
+ LineTrimmedReplacer,
351
+ BlockAnchorReplacer,
352
+ WhitespaceNormalizedReplacer,
353
+ IndentationFlexibleReplacer,
354
+ EscapeNormalizedReplacer,
355
+ TrimmedBoundaryReplacer,
356
+ ContextAwareReplacer,
357
+ MultiOccurrenceReplacer,
358
+ ];
359
+ /**
360
+ * Apply the cascade. Returns the post-replacement content if a unique
361
+ * candidate is found at any tier; throws with a descriptive error
362
+ * otherwise. Mirrors opencode's `replace` orchestrator.
363
+ */
364
+ export function replaceWithCascade(content, oldString, newString, replaceAll = false) {
365
+ if (oldString === newString) {
366
+ throw new Error("No changes to apply: old_string and new_string are identical.");
367
+ }
368
+ let foundButAmbiguous = false;
369
+ for (const replacer of REPLACERS) {
370
+ for (const search of replacer(content, oldString)) {
371
+ const index = content.indexOf(search);
372
+ if (index === -1)
373
+ continue;
374
+ if (replaceAll) {
375
+ return content.replaceAll(search, newString);
376
+ }
377
+ const lastIndex = content.lastIndexOf(search);
378
+ if (index !== lastIndex) {
379
+ foundButAmbiguous = true;
380
+ continue;
381
+ }
382
+ return (content.substring(0, index) +
383
+ newString +
384
+ content.substring(index + search.length));
385
+ }
386
+ }
387
+ if (foundButAmbiguous) {
388
+ throw new Error("Found multiple matches for old_string. Provide more surrounding context to make the match unique.");
389
+ }
390
+ throw new Error("Could not find old_string in the file. It must match the file content (whitespace and indentation are matched flexibly across multiple strategies, but the structural content must be present).");
391
+ }
392
+ //# sourceMappingURL=edit-file-replacers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"edit-file-replacers.js","sourceRoot":"","sources":["../../../src/tools/edit-file-replacers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAOH,MAAM,qCAAqC,GAAG,GAAG,CAAC;AAClD,MAAM,wCAAwC,GAAG,GAAG,CAAC;AAErD,SAAS,WAAW,CAAC,CAAS,EAAE,CAAS;IACvC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,MAAM,GAAe,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACvE,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9B,CACF,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CACtB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,CAAE,GAAG,CAAC,EACtB,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAE,GAAG,CAAC,EACtB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAE,GAAG,IAAI,CAC9B,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,MAAM,CAAE,CAAC;AACtC,CAAC;AAED,qDAAqD;AACrD,MAAM,CAAC,MAAM,cAAc,GAAa,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI;IAC/D,MAAM,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,wEAAwE;AACxE,MAAM,CAAC,MAAM,mBAAmB,GAAa,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI;IACnE,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAErC,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC/C,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpE,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,IAAI,aAAa,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5D,OAAO,GAAG,KAAK,CAAC;gBAChB,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,eAAe,GAAG,CAAC,CAAC;YACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3B,eAAe,IAAI,aAAa,CAAC,CAAC,CAAE,CAAC,MAAM,GAAG,CAAC,CAAC;YAClD,CAAC;YACD,IAAI,aAAa,GAAG,eAAe,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,aAAa,IAAI,aAAa,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,MAAM,CAAC;gBAC9C,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/B,aAAa,IAAI,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAa,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI;IACnE,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAErC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC/C,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;IAC/C,MAAM,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;IACnE,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC;IAE3C,MAAM,UAAU,GAAkD,EAAE,CAAC;IACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,IAAI,aAAa,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;YACjD,SAAS;QACX,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,IAAI,aAAa,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,KAAK,cAAc,EAAE,CAAC;gBAChD,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAE,OAAe,EAAU,EAAE;QAChE,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,eAAe,IAAI,aAAa,CAAC,CAAC,CAAE,CAAC,MAAM,GAAG,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,aAAa,GAAG,eAAe,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,aAAa,IAAI,aAAa,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;YAC1C,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC;gBAChB,aAAa,IAAI,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC;QAC9C,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,CAAC,CAAC;QAEhD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,GAAG,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC,CAAC;QACxE,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,GAAG,CAAC,IAAI,CAAC,GAAG,eAAe,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxE,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,GAAG,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;gBAC1D,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;gBAChE,IAAI,MAAM,KAAK,CAAC;oBAAE,SAAS;gBAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBACvD,UAAU,IAAI,CAAC,CAAC,GAAG,QAAQ,GAAG,MAAM,CAAC,GAAG,YAAY,CAAC;gBACrD,IAAI,UAAU,IAAI,qCAAqC;oBAAE,MAAM;YACjE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,GAAG,CAAC;QACnB,CAAC;QAED,IAAI,UAAU,IAAI,qCAAqC,EAAE,CAAC;YACxD,MAAM,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,SAAS,GAAkD,IAAI,CAAC;IACpE,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;IAEvB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;QACzC,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,GAAG,CAAC,CAAC;QAChD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,GAAG,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC,CAAC;QACxE,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,GAAG,CAAC,IAAI,CAAC,GAAG,eAAe,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxE,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,GAAG,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;gBAC1D,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;gBAChE,IAAI,MAAM,KAAK,CAAC;oBAAE,SAAS;gBAC3B,UAAU,IAAI,CAAC,GAAG,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC;YACnE,CAAC;YACD,UAAU,IAAI,YAAY,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,GAAG,CAAC;QACnB,CAAC;QACD,IAAI,UAAU,GAAG,aAAa,EAAE,CAAC;YAC/B,aAAa,GAAG,UAAU,CAAC;YAC3B,SAAS,GAAG,SAAS,CAAC;QACxB,CAAC;IACH,CAAC;IAED,IAAI,aAAa,IAAI,wCAAwC,IAAI,SAAS,EAAE,CAAC;QAC3E,MAAM,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC;AAEF,iEAAiE;AACjE,MAAM,CAAC,MAAM,4BAA4B,GAAa,QAAQ,CAAC,EAC7D,OAAO,EACP,IAAI;IAEJ,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACrE,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACvB,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,cAAc,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC;QACb,CAAC;aAAM,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YACpD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,KAAK;qBAClB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;qBACpD,IAAI,CAAC,MAAM,CAAC,CAAC;gBAChB,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;oBAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAChC,IAAI,KAAK;wBAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBAAC,MAAM,CAAC;oBACP,gCAAgC;gBAClC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YACnD,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,cAAc,EAAE,CAAC;gBACnD,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAa,QAAQ,CAAC,EAC5D,OAAO,EACP,IAAI;IAEJ,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC1D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACxB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAC5D,CAAC;QACF,OAAO,KAAK;aACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;aAC5D,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjE,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,cAAc,EAAE,CAAC;YAC3C,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,wBAAwB,GAAa,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI;IACxE,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAU,EAAE,CACvC,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACrD,QAAQ,EAAE,EAAE,CAAC;YACX,KAAK,GAAG;gBACN,OAAO,IAAI,CAAC;YACd,KAAK,GAAG;gBACN,OAAO,IAAI,CAAC;YACd,KAAK,GAAG;gBACN,OAAO,IAAI,CAAC;YACd,KAAK,GAAG;gBACN,OAAO,GAAG,CAAC;YACb,KAAK,GAAG;gBACN,OAAO,GAAG,CAAC;YACb,KAAK,GAAG;gBACN,OAAO,GAAG,CAAC;YACb,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC;YACd,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC;YACd,KAAK,GAAG;gBACN,OAAO,GAAG,CAAC;YACb;gBACE,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACpC,MAAM,aAAa,CAAC;IACtB,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,aAAa,EAAE,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,qEAAqE;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAa,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI;IACvE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO;IAE7B,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,MAAM,OAAO,CAAC;IAChB,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE,CAAC;YAC7B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAa,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI;IACpE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO;IACjC,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,SAAS,CAAC,GAAG,EAAE,CAAC;IAE5D,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI,YAAY,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,KAAK,SAAS;YAAE,SAAS;QACpD,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,IAAI,YAAY,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,KAAK,QAAQ,EAAE,CAAC;gBACzC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;gBAChD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEpC,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;oBAC3C,IAAI,QAAQ,GAAG,CAAC,CAAC;oBACjB,IAAI,aAAa,GAAG,CAAC,CAAC;oBACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;wBACpC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC;wBACnC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACzC,aAAa,EAAE,CAAC;4BAChB,IAAI,KAAK,KAAK,KAAK;gCAAE,QAAQ,EAAE,CAAC;wBAClC,CAAC;oBACH,CAAC;oBACD,IAAI,aAAa,KAAK,CAAC,IAAI,QAAQ,GAAG,aAAa,IAAI,GAAG,EAAE,CAAC;wBAC3D,MAAM,KAAK,CAAC;wBACZ,MAAM;oBACR,CAAC;gBACH,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,4EAA4E;AAC5E,MAAM,CAAC,MAAM,uBAAuB,GAAa,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI;IACvE,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM;QACxB,MAAM,IAAI,CAAC;QACX,UAAU,GAAG,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;IACnC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAe;IAC5B,cAAc;IACd,mBAAmB;IACnB,mBAAmB;IACnB,4BAA4B;IAC5B,2BAA2B;IAC3B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,uBAAuB;CACxB,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,SAAiB,EACjB,SAAiB,EACjB,UAAU,GAAG,KAAK;IAElB,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;IACJ,CAAC;IAED,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,KAAK,KAAK,CAAC,CAAC;gBAAE,SAAS;YAE3B,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC9C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,iBAAiB,GAAG,IAAI,CAAC;gBACzB,SAAS;YACX,CAAC;YACD,OAAO,CACL,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC;gBAC3B,SAAS;gBACT,OAAO,CAAC,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CACzC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CACb,iMAAiM,CAClM,CAAC;AACJ,CAAC"}
@@ -0,0 +1,19 @@
1
+ import type { ToolDefinition } from "../agent/types.js";
2
+ /**
3
+ * Minimal options needed by the edit_file tool. `AgentConfig` satisfies
4
+ * this structurally, so passing the full config keeps working.
5
+ */
6
+ export interface EditFileToolOptions {
7
+ workspaceRoot: string;
8
+ }
9
+ export interface EditFileHooks {
10
+ /**
11
+ * Called after a successful edit. If the hook returns a non-empty string,
12
+ * it is appended to the tool's success message — used to surface post-edit
13
+ * diagnostics (e.g. type-check errors) so the model can fix bad edits on
14
+ * the next turn.
15
+ */
16
+ afterEdit?: ((filePath: string, content: string) => void | string | Promise<void | string>) | undefined;
17
+ }
18
+ export declare function createEditFileTool(options: EditFileToolOptions, hooks?: EditFileHooks): ToolDefinition;
19
+ //# sourceMappingURL=edit-file.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"edit-file.d.ts","sourceRoot":"","sources":["../../../src/tools/edit-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKxD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;CACvB;AAUD,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,SAAS,CAAC,EACN,CAAC,CACC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,KACZ,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,GAC5C,SAAS,CAAC;CACf;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,mBAAmB,EAC5B,KAAK,CAAC,EAAE,aAAa,GACpB,cAAc,CAqDhB"}
@@ -1,5 +1,6 @@
1
1
  import { readFile, writeFile } from "node:fs/promises";
2
2
  import { resolveWorkspacePath } from "../safety/guardrails.js";
3
+ import { replaceWithCascade } from "./edit-file-replacers.js";
3
4
  import { expectNonEmptyString } from "./helpers.js";
4
5
  function expectString(input, key) {
5
6
  const value = input[key];
@@ -8,22 +9,6 @@ function expectString(input, key) {
8
9
  }
9
10
  return value;
10
11
  }
11
- function countOccurrences(haystack, needle) {
12
- if (needle.length === 0) {
13
- return 0;
14
- }
15
- let count = 0;
16
- let index = 0;
17
- while (true) {
18
- const found = haystack.indexOf(needle, index);
19
- if (found === -1) {
20
- break;
21
- }
22
- count += 1;
23
- index = found + needle.length;
24
- }
25
- return count;
26
- }
27
12
  export function createEditFileTool(options, hooks) {
28
13
  return {
29
14
  name: "edit_file",
@@ -37,7 +22,7 @@ export function createEditFileTool(options, hooks) {
37
22
  },
38
23
  old_string: {
39
24
  type: "string",
40
- description: "Exact text to replace (must match once).",
25
+ description: "Text to replace (must match the file uniquely).",
41
26
  },
42
27
  new_string: {
43
28
  type: "string",
@@ -53,19 +38,23 @@ export function createEditFileTool(options, hooks) {
53
38
  const newString = expectString(input, "new_string");
54
39
  const filePath = resolveWorkspacePath(requestedPath, options.workspaceRoot);
55
40
  const current = await readFile(filePath, "utf8");
56
- const occurrences = countOccurrences(current, oldString);
57
- if (occurrences === 0) {
58
- throw new Error(`old_string was not found in "${requestedPath}".`);
41
+ let updated;
42
+ try {
43
+ updated = replaceWithCascade(current, oldString, newString);
59
44
  }
60
- if (occurrences > 1) {
61
- throw new Error(`old_string matched ${occurrences} times in "${requestedPath}". It must be unique.`);
45
+ catch (error) {
46
+ const detail = error.message;
47
+ throw new Error(`${detail} (file: "${requestedPath}")`);
62
48
  }
63
- const updated = current.replace(oldString, newString);
64
49
  await writeFile(filePath, updated, "utf8");
50
+ let suffix = "";
65
51
  if (hooks?.afterEdit) {
66
- await hooks.afterEdit(filePath, updated);
52
+ const result = await hooks.afterEdit(filePath, updated);
53
+ if (typeof result === "string" && result.length > 0) {
54
+ suffix = `\n\n${result}`;
55
+ }
67
56
  }
68
- return `Updated "${requestedPath}" successfully.`;
57
+ return `Updated "${requestedPath}" successfully.${suffix}`;
69
58
  },
70
59
  };
71
60
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"edit-file.js","sourceRoot":"","sources":["../../../src/tools/edit-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAUpD,SAAS,YAAY,CAAC,KAA8B,EAAE,GAAW;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,qBAAqB,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAiBD,MAAM,UAAU,kBAAkB,CAChC,OAA4B,EAC5B,KAAqB;IAErB,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,WAAW,EACT,uEAAuE;QACzE,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,0CAA0C;iBACxD;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,iDAAiD;iBAC/D;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,mBAAmB;iBACjC;aACF;YACD,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC;YAC9C,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,KAAK,EAAE,KAA8B,EAAmB,EAAE;YACjE,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YAEpD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,OAAe,CAAC;YACpB,IAAI,CAAC;gBACH,OAAO,GAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC9D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,MAAM,GAAI,KAAe,CAAC,OAAO,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,YAAY,aAAa,IAAI,CAAC,CAAC;YAC1D,CAAC;YAED,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAE3C,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,KAAK,EAAE,SAAS,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBACxD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpD,MAAM,GAAG,OAAO,MAAM,EAAE,CAAC;gBAC3B,CAAC;YACH,CAAC;YAED,OAAO,YAAY,aAAa,kBAAkB,MAAM,EAAE,CAAC;QAC7D,CAAC;KACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMxD;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAwCD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,cAAc,CA6D/E"}
1
+ {"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMxD;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAwCD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,cAAc,CAiE/E"}
@@ -67,11 +67,17 @@ export function createReadFileTool(options) {
67
67
  const startLine = parseLineOffset(lines.length, offset);
68
68
  const effectiveLimit = parseLimit(limit, lines.length);
69
69
  const output = formatWithLineNumbers(content, startLine, effectiveLimit);
70
- if (limit === undefined &&
71
- lines.length > DEFAULT_LINE_LIMIT &&
72
- effectiveLimit < lines.length) {
73
- const remaining = Math.max(0, lines.length - (startLine - 1) - effectiveLimit);
74
- return `${output}\n\n[... truncated, ${remaining} more lines. Use offset and limit to read specific sections.]`;
70
+ // Always tell the agent how much of the file it actually saw.
71
+ // The previous gate only fired when `limit` was undefined and the
72
+ // default kicked in — so an explicit `limit: 260` on a 462-line
73
+ // file silently returned the first 260 lines with no signal that
74
+ // anything was missing. The model would then assert the missing
75
+ // content didn't exist. Footer now fires on content-clipped, not
76
+ // on parameter-implicit.
77
+ const lastShownLine = Math.min(lines.length, startLine - 1 + effectiveLimit);
78
+ if (lastShownLine < lines.length) {
79
+ const remaining = lines.length - lastShownLine;
80
+ return `${output}\n\n[... showed lines ${startLine}-${lastShownLine} of ${lines.length}; ${remaining} more line(s). Use offset/limit to read further.]`;
75
81
  }
76
82
  return output;
77
83
  },
@@ -1 +1 @@
1
- {"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAYjC,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAEtB,SAAS,eAAe,CAAC,UAAkB,EAAE,SAA6B;IACxE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,SAAS,UAAU,CACjB,QAA4B,EAC5B,UAAkB;IAElB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,UAAU,GAAG,kBAAkB,EAAE,CAAC;QACpC,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAA4B;IAC7D,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,WAAW,EACT,oJAAoJ;QACtJ,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,kDAAkD;iBAChE;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,mFAAmF;iBACtF;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,6CAA6C;iBAC3D;aACF;YACD,QAAQ,EAAE,CAAC,MAAM,CAAC;YAClB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,KAAK,EAAE,KAA8B,EAAmB,EAAE;YACjE,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrD,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAEnD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,IAAI,aAAa,kBAAkB,CAAC,CAAC;YACvD,CAAC;YAED,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC9D,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACjD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;YAEzE,IACE,KAAK,KAAK,SAAS;gBACnB,KAAK,CAAC,MAAM,GAAG,kBAAkB;gBACjC,cAAc,GAAG,KAAK,CAAC,MAAM,EAC7B,CAAC;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACxB,CAAC,EACD,KAAK,CAAC,MAAM,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,cAAc,CAChD,CAAC;gBACF,OAAO,GAAG,MAAM,uBAAuB,SAAS,+DAA+D,CAAC;YAClH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAYjC,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAEtB,SAAS,eAAe,CAAC,UAAkB,EAAE,SAA6B;IACxE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,SAAS,UAAU,CACjB,QAA4B,EAC5B,UAAkB;IAElB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,UAAU,GAAG,kBAAkB,EAAE,CAAC;QACpC,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAA4B;IAC7D,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,WAAW,EACT,oJAAoJ;QACtJ,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,kDAAkD;iBAChE;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,mFAAmF;iBACtF;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,6CAA6C;iBAC3D;aACF;YACD,QAAQ,EAAE,CAAC,MAAM,CAAC;YAClB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,KAAK,EAAE,KAA8B,EAAmB,EAAE;YACjE,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrD,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAEnD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,IAAI,aAAa,kBAAkB,CAAC,CAAC;YACvD,CAAC;YAED,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC9D,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACjD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;YAEzE,8DAA8D;YAC9D,kEAAkE;YAClE,gEAAgE;YAChE,iEAAiE;YACjE,gEAAgE;YAChE,iEAAiE;YACjE,yBAAyB;YACzB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAC5B,KAAK,CAAC,MAAM,EACZ,SAAS,GAAG,CAAC,GAAG,cAAc,CAC/B,CAAC;YACF,IAAI,aAAa,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC;gBAC/C,OAAO,GAAG,MAAM,yBAAyB,SAAS,IAAI,aAAa,OAAO,KAAK,CAAC,MAAM,KAAK,SAAS,mDAAmD,CAAC;YAC1J,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../../src/tools/run-command.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOxD;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,sBAAsB;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAID,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;CACxG;AAyGD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,qBAAqB,EAC9B,KAAK,CAAC,EAAE,eAAe,GACtB,cAAc,CAkEhB"}
1
+ {"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../../src/tools/run-command.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOxD;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,sBAAsB;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAID,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;CACxG;AA4GD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,qBAAqB,EAC9B,KAAK,CAAC,EAAE,eAAe,GACtB,cAAc,CAkEhB"}
@@ -14,6 +14,9 @@ function executeBashCommand(command, cwd, timeoutMs) {
14
14
  let stderr = "";
15
15
  let timedOut = false;
16
16
  let settled = false;
17
+ // Forward-declared because the `cleanup` closure below reads it
18
+ // before the setTimeout call lower in the function assigns it.
19
+ // eslint-disable-next-line prefer-const -- reassigned in setTimeout call below; declared early so cleanup() closure can reference it
17
20
  let timeout;
18
21
  let forceKillTimeout;
19
22
  let forceResolveTimeout;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../src/tools/run-command.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/tools/search.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAsED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAkI3E"}
1
+ {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/tools/search.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AA2GD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAkI3E"}