march-cli 0.1.21 → 0.1.23

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 (244) hide show
  1. package/README.md +88 -0
  2. package/README.zh.md +88 -0
  3. package/bin/march.mjs +13 -13
  4. package/package.json +43 -43
  5. package/src/agent/command-exec-tool.mjs +172 -168
  6. package/src/agent/context-stats-tool.mjs +57 -57
  7. package/src/agent/editing/diff-apply.mjs +28 -28
  8. package/src/agent/editing/diff-format.mjs +57 -57
  9. package/src/agent/editing/lsp-report.mjs +69 -69
  10. package/src/agent/file-edit-tool.mjs +262 -262
  11. package/src/agent/file-tools/read-file-tool.mjs +112 -112
  12. package/src/agent/file-tools/read-image-tool.mjs +76 -76
  13. package/src/agent/model-payload-dumper.mjs +208 -208
  14. package/src/agent/pi-session/pi-session-sidecar-failure.mjs +10 -10
  15. package/src/agent/provider/payload-messages.mjs +138 -138
  16. package/src/agent/runner/codex-large-context-guard.mjs +87 -87
  17. package/src/agent/runner/codex-transport-compression.mjs +180 -180
  18. package/src/agent/runner/codex-transport-debug.mjs +113 -113
  19. package/src/agent/runner/codex-websocket-event-debug.mjs +130 -130
  20. package/src/agent/runner/fast-model.mjs +36 -36
  21. package/src/agent/runner/runner-cleanup.mjs +12 -12
  22. package/src/agent/runner/runner-init.mjs +15 -15
  23. package/src/agent/runner/runner-session-state.mjs +40 -40
  24. package/src/agent/runner/runner-utils.mjs +24 -24
  25. package/src/agent/runner.mjs +299 -299
  26. package/src/agent/runtime/ipc/ipc-peer.mjs +99 -99
  27. package/src/agent/runtime/ipc/process-ipc-transport.mjs +16 -16
  28. package/src/agent/runtime/remote-runner-client.mjs +73 -73
  29. package/src/agent/runtime/remote-ui-client.mjs +20 -20
  30. package/src/agent/runtime/runner-ipc-target.mjs +125 -125
  31. package/src/agent/runtime/runner-process-client.mjs +47 -47
  32. package/src/agent/runtime/runner-process-entry.mjs +11 -11
  33. package/src/agent/runtime/runner-process-factory.mjs +108 -108
  34. package/src/agent/runtime/runner-runtime-host.mjs +79 -79
  35. package/src/agent/runtime/runtime-factory.mjs +42 -42
  36. package/src/agent/runtime/runtime-host.mjs +34 -34
  37. package/src/agent/runtime/ui-event-bridge.mjs +95 -95
  38. package/src/agent/screen-tools/list-windows-tool.mjs +39 -39
  39. package/src/agent/screen-tools/screen-tool.mjs +49 -49
  40. package/src/agent/screen-tools/windows-screen.mjs +133 -133
  41. package/src/agent/session/session-auto-name.mjs +41 -41
  42. package/src/agent/session/session-binding.mjs +12 -12
  43. package/src/agent/session/session-options.mjs +47 -47
  44. package/src/agent/tool-names.mjs +1 -1
  45. package/src/agent/tool-result.mjs +3 -3
  46. package/src/agent/tool-summary.mjs +112 -112
  47. package/src/agent/tools.mjs +58 -58
  48. package/src/agent/turn/turn-events.mjs +111 -111
  49. package/src/agent/turn/turn-logging.mjs +30 -30
  50. package/src/agent/turn/turn-runner.mjs +196 -196
  51. package/src/agent/vision-capability.mjs +14 -14
  52. package/src/auth/login-command.mjs +90 -90
  53. package/src/auth/storage.mjs +34 -34
  54. package/src/cli/args.mjs +79 -79
  55. package/src/cli/commands/copy-command.mjs +87 -87
  56. package/src/cli/commands/export-command.mjs +206 -206
  57. package/src/cli/commands/extensions-command.mjs +53 -53
  58. package/src/cli/commands/help-command.mjs +7 -7
  59. package/src/cli/commands/model-command.mjs +141 -141
  60. package/src/cli/commands/paste-image-command.mjs +43 -43
  61. package/src/cli/commands/provider-command.mjs +59 -59
  62. package/src/cli/commands/status-command.mjs +194 -194
  63. package/src/cli/commands/thinking-command.mjs +87 -87
  64. package/src/cli/fallback-ui.mjs +156 -156
  65. package/src/cli/input/attachment-tokens.mjs +20 -20
  66. package/src/cli/input/autocomplete.mjs +74 -106
  67. package/src/cli/input/external-editor.mjs +39 -39
  68. package/src/cli/input/file-search/index.mjs +160 -0
  69. package/src/cli/input/history-store.mjs +35 -35
  70. package/src/cli/input/image-clipboard.mjs +55 -55
  71. package/src/cli/input/keybinding-dispatch.mjs +76 -76
  72. package/src/cli/input/keybindings.mjs +96 -96
  73. package/src/cli/input/mode-state.mjs +43 -43
  74. package/src/cli/input/prompt-templates.mjs +84 -84
  75. package/src/cli/input/select-with-keyboard.mjs +86 -86
  76. package/src/cli/permissions.mjs +103 -103
  77. package/src/cli/repl-commands.mjs +86 -86
  78. package/src/cli/repl-loop.mjs +183 -183
  79. package/src/cli/selector-list.mjs +21 -21
  80. package/src/cli/session/pi-session-switch-command.mjs +41 -41
  81. package/src/cli/session/session-command.mjs +23 -23
  82. package/src/cli/session/session-list-command.mjs +68 -68
  83. package/src/cli/session/session-name-command.mjs +26 -26
  84. package/src/cli/session/session-source-command.mjs +89 -89
  85. package/src/cli/session/session-switch-command.mjs +1 -1
  86. package/src/cli/shell/shell-command.mjs +55 -55
  87. package/src/cli/shell/shell-drawer-controls.mjs +33 -33
  88. package/src/cli/shell/shell-drawer.mjs +192 -192
  89. package/src/cli/shell/shell-split-layout.mjs +70 -70
  90. package/src/cli/slash-commands.mjs +192 -192
  91. package/src/cli/startup/create-runtime-runner.mjs +61 -61
  92. package/src/cli/startup/runtime-close.mjs +23 -23
  93. package/src/cli/startup/startup-banner.mjs +71 -71
  94. package/src/cli/startup/startup-session.mjs +51 -51
  95. package/src/cli/status-line-updater.mjs +75 -75
  96. package/src/cli/tool-output.mjs +9 -9
  97. package/src/cli/tui/editor/external-editor-runner.mjs +24 -24
  98. package/src/cli/tui/input/mouse-selection-controller.mjs +91 -91
  99. package/src/cli/tui/input/mouse-tracking.mjs +20 -20
  100. package/src/cli/tui/layout/main-pane-layout.mjs +47 -47
  101. package/src/cli/tui/layout/safe-render-boundary.mjs +46 -46
  102. package/src/cli/tui/markdown-renderer.mjs +285 -285
  103. package/src/cli/tui/output/scroll-state.mjs +79 -79
  104. package/src/cli/tui/output/text-line-renderer.mjs +50 -50
  105. package/src/cli/tui/output/tool-card-renderer.mjs +59 -59
  106. package/src/cli/tui/output/visible-lines.mjs +8 -8
  107. package/src/cli/tui/output-buffer.mjs +293 -293
  108. package/src/cli/tui/permission-request-ui.mjs +18 -18
  109. package/src/cli/tui/recall-rendering.mjs +25 -25
  110. package/src/cli/tui/render/render-scheduler.mjs +26 -26
  111. package/src/cli/tui/render/stream-delta-buffer.mjs +46 -46
  112. package/src/cli/tui/select/editor-select-list.mjs +111 -111
  113. package/src/cli/tui/selection-screen.mjs +269 -269
  114. package/src/cli/tui/status/retry-status.mjs +72 -72
  115. package/src/cli/tui/status/spinner-status.mjs +42 -42
  116. package/src/cli/tui/status/status-bar.mjs +225 -225
  117. package/src/cli/tui/syntax/highlighting.mjs +260 -260
  118. package/src/cli/tui/syntax/languages.mjs +91 -91
  119. package/src/cli/tui/syntax/tree-sitter/bash.highlights.scm +261 -261
  120. package/src/cli/tui/syntax/tree-sitter/c.highlights.scm +341 -341
  121. package/src/cli/tui/syntax/tree-sitter/cpp.highlights.scm +268 -268
  122. package/src/cli/tui/syntax/tree-sitter/csharp.highlights.scm +577 -577
  123. package/src/cli/tui/syntax/tree-sitter/css.highlights.scm +109 -109
  124. package/src/cli/tui/syntax/tree-sitter/diff.highlights.scm +49 -49
  125. package/src/cli/tui/syntax/tree-sitter/go.highlights.scm +254 -254
  126. package/src/cli/tui/syntax/tree-sitter/html.highlights.scm +13 -13
  127. package/src/cli/tui/syntax/tree-sitter/java.highlights.scm +330 -330
  128. package/src/cli/tui/syntax/tree-sitter/json.highlights.scm +38 -38
  129. package/src/cli/tui/syntax/tree-sitter/php.highlights.scm +203 -203
  130. package/src/cli/tui/syntax/tree-sitter/python.highlights.scm +137 -137
  131. package/src/cli/tui/syntax/tree-sitter/ruby.highlights.scm +309 -309
  132. package/src/cli/tui/syntax/tree-sitter/rust.highlights.scm +531 -531
  133. package/src/cli/tui/syntax/tree-sitter/toml.highlights.scm +39 -39
  134. package/src/cli/tui/syntax/tree-sitter/tsx.highlights.scm +35 -35
  135. package/src/cli/tui/syntax/tree-sitter/typescript.highlights.scm +35 -35
  136. package/src/cli/tui/syntax/tree-sitter/yaml.highlights.scm +99 -99
  137. package/src/cli/tui/tool-rendering.mjs +87 -87
  138. package/src/cli/tui/tui-diff-rendering.mjs +157 -157
  139. package/src/cli/tui/tui-handlers.mjs +111 -111
  140. package/src/cli/tui/tui-input-controller.mjs +61 -61
  141. package/src/cli/tui/ui-theme.mjs +157 -157
  142. package/src/cli/ui.mjs +297 -297
  143. package/src/config/config-json.mjs +84 -84
  144. package/src/config/dotenv.mjs +20 -20
  145. package/src/config/features.mjs +75 -75
  146. package/src/config/loader.mjs +143 -143
  147. package/src/config/settings-command.mjs +97 -97
  148. package/src/context/engine.mjs +198 -198
  149. package/src/context/injections.mjs +26 -26
  150. package/src/context/profiles.mjs +39 -39
  151. package/src/context/project-context.mjs +20 -20
  152. package/src/context/session-status.mjs +17 -17
  153. package/src/context/shell-layers.mjs +23 -23
  154. package/src/context/system-core/base.md +61 -53
  155. package/src/context/system-core/prompts/deepseek-v4-pro.md +3 -3
  156. package/src/context/system-core/prompts/default.md +3 -3
  157. package/src/context/system-core.mjs +35 -35
  158. package/src/debug/logger.mjs +141 -141
  159. package/src/debug/model-context-dumper.mjs +52 -52
  160. package/src/extensions/discovery.mjs +40 -40
  161. package/src/extensions/lifecycle-adapter.mjs +210 -210
  162. package/src/extensions/lifecycle-manifest.mjs +69 -69
  163. package/src/image-gen/index.mjs +7 -7
  164. package/src/image-gen/provider.mjs +231 -231
  165. package/src/image-gen/tool.mjs +84 -84
  166. package/src/lsp/client.mjs +257 -257
  167. package/src/lsp/diagnostic-store.mjs +42 -42
  168. package/src/lsp/diagnostics-format.mjs +72 -72
  169. package/src/lsp/managed-node-server.mjs +99 -99
  170. package/src/lsp/path-match.mjs +10 -10
  171. package/src/lsp/server-definitions.mjs +188 -188
  172. package/src/lsp/servers.mjs +165 -165
  173. package/src/lsp/service.mjs +110 -110
  174. package/src/lsp/status-message.mjs +9 -9
  175. package/src/lsp/typescript-project-resolver.mjs +186 -186
  176. package/src/main.mjs +299 -299
  177. package/src/mcp/client.mjs +195 -195
  178. package/src/mcp/config.mjs +130 -130
  179. package/src/mcp/index.mjs +48 -48
  180. package/src/mcp/tools.mjs +98 -98
  181. package/src/memory/markdown/markdown-delete.mjs +23 -23
  182. package/src/memory/markdown/markdown-format.mjs +128 -128
  183. package/src/memory/markdown/markdown-recall.mjs +28 -28
  184. package/src/memory/markdown/ripgrep.mjs +16 -16
  185. package/src/memory/markdown/sqlite-index.mjs +87 -87
  186. package/src/memory/markdown-store.mjs +286 -286
  187. package/src/memory/markdown-tools.mjs +103 -103
  188. package/src/network/environment.mjs +131 -131
  189. package/src/notification/desktop-notifier.mjs +262 -262
  190. package/src/platform/open-file.mjs +28 -28
  191. package/src/platform/spawn-command.mjs +27 -27
  192. package/src/provider/accept-command.mjs +89 -89
  193. package/src/provider/command.mjs +21 -21
  194. package/src/provider/config-command.mjs +129 -129
  195. package/src/provider/custom-provider.mjs +113 -113
  196. package/src/provider/hosted-tools.mjs +111 -111
  197. package/src/provider/presets.mjs +72 -72
  198. package/src/provider/share-command.mjs +79 -79
  199. package/src/provider/share-payload.mjs +52 -52
  200. package/src/session/attachment-display.mjs +16 -16
  201. package/src/session/attachment-references.mjs +65 -65
  202. package/src/session/attachments.mjs +140 -140
  203. package/src/session/persist.mjs +1 -1
  204. package/src/session/pi-manager.mjs +34 -34
  205. package/src/session/session-utils.mjs +16 -16
  206. package/src/session/sidecar-sync.mjs +19 -19
  207. package/src/session/sidecar.mjs +69 -69
  208. package/src/session/transcript.mjs +83 -83
  209. package/src/session/tree.mjs +42 -42
  210. package/src/shell/cli-runtime.mjs +11 -11
  211. package/src/shell/hints.mjs +12 -12
  212. package/src/shell/node-pty-adapter.mjs +81 -81
  213. package/src/shell/runtime-state.mjs +126 -126
  214. package/src/shell/runtime.mjs +252 -252
  215. package/src/shell/screen-buffer.mjs +136 -136
  216. package/src/shell/tool-read.mjs +74 -74
  217. package/src/shell/tools.mjs +299 -299
  218. package/src/supergrok/actions/image-generate.mjs +60 -60
  219. package/src/supergrok/actions/search.mjs +78 -78
  220. package/src/supergrok/auth.mjs +36 -36
  221. package/src/supergrok/constants.mjs +18 -18
  222. package/src/supergrok/oauth-provider.mjs +278 -278
  223. package/src/supergrok/provider.mjs +35 -35
  224. package/src/supergrok/response.mjs +76 -76
  225. package/src/supergrok/tool.mjs +61 -61
  226. package/src/text/ansi.mjs +3 -3
  227. package/src/web/config-command.mjs +43 -43
  228. package/src/web/fetch.mjs +78 -78
  229. package/src/web/presets.mjs +16 -16
  230. package/src/web/search.mjs +83 -83
  231. package/src/web/tools.mjs +107 -107
  232. package/src/memory/database.mjs +0 -219
  233. package/src/memory/glossary.mjs +0 -124
  234. package/src/memory/graph/graph-cascades.mjs +0 -109
  235. package/src/memory/graph/graph-diagnostics.mjs +0 -73
  236. package/src/memory/graph/graph-path-removal.mjs +0 -50
  237. package/src/memory/graph/graph-path-utils.mjs +0 -17
  238. package/src/memory/graph/graph-primitives.mjs +0 -103
  239. package/src/memory/graph/graph-read.mjs +0 -159
  240. package/src/memory/graph.mjs +0 -282
  241. package/src/memory/search.mjs +0 -142
  242. package/src/memory/snapshot.mjs +0 -86
  243. package/src/memory/system-views.mjs +0 -120
  244. package/src/memory/tools.mjs +0 -282
@@ -1,157 +1,157 @@
1
- import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
2
- import { bold, dim, red, green, brightBlack } from "./ui-theme.mjs";
3
- import { highlightCodeLine, styleSyntax } from "./syntax/highlighting.mjs";
4
-
5
- const SPLIT_DIFF_MIN_WIDTH = 121;
6
- const BG_DEL = "48;2;55;34;44";
7
- const BG_ADD = "48;2;32;48;59";
8
- const BG_CTX = "";
9
-
10
- export function writeEditDiff({ output, path, diffLines }) {
11
- const lines = formatEditDiffLines({ path, diffLines });
12
- if (typeof output.addBlock === "function") output.addBlock({ type: "diff", path, diffLines, lines });
13
- else for (const line of lines) output.writeln(line);
14
- }
15
-
16
- export function renderEditDiffBlock(block, width) {
17
- return formatEditDiffLines({ path: block.path, diffLines: block.diffLines ?? [], width });
18
- }
19
-
20
- export function formatEditDiffLines({ path, diffLines, width = 0 }) {
21
- if (width >= SPLIT_DIFF_MIN_WIDTH) return formatSplitDiffLines({ path, diffLines, width });
22
- return formatUnifiedDiffLines({ path, diffLines });
23
- }
24
-
25
- function formatUnifiedDiffLines({ path, diffLines }) {
26
- const counts = countChanges(diffLines);
27
- const summary = [`± ${path}`];
28
- if (counts.del > 0) summary.push(red(`${counts.del}-`));
29
- if (counts.add > 0) summary.push(green(`${counts.add}+`));
30
-
31
- const lines = [bold(summary.join(" "))];
32
- const gutterWidth = maxLineNumber(diffLines);
33
- for (const line of diffLines) {
34
- const num = line.lineNum != null ? String(line.lineNum).padStart(gutterWidth) : " ".repeat(gutterWidth);
35
- if (line.type === "del") lines.push(formatUnifiedSide({ num, sign: "-", text: line.text, type: "del", path }));
36
- else if (line.type === "add") lines.push(formatUnifiedSide({ num, sign: "+", text: line.text, type: "add", path }));
37
- else lines.push(`${brightBlack(`${num} │`)} ${dim(` ${line.text}`)}`);
38
- }
39
- return lines;
40
- }
41
-
42
- function formatSplitDiffLines({ path, diffLines, width }) {
43
- const rows = pairDiffRows(diffLines);
44
- const counts = countChanges(diffLines);
45
- const summary = [`± ${path}`];
46
- if (counts.del > 0) summary.push(red(`${counts.del}-`));
47
- if (counts.add > 0) summary.push(green(`${counts.add}+`));
48
-
49
- const gutterWidth = maxLineNumber(diffLines);
50
- const sep = brightBlack(" │ ");
51
- const sepWidth = 3;
52
- const sideWidth = Math.floor((width - sepWidth) / 2);
53
- if (sideWidth < gutterWidth + 12) return formatUnifiedDiffLines({ path, diffLines });
54
-
55
- const lines = [bold(summary.join(" "))];
56
- for (const row of rows) {
57
- const left = formatSplitSide({ side: row.left, sideWidth, gutterWidth, path, fallbackType: row.type });
58
- const right = formatSplitSide({ side: row.right, sideWidth: width - sepWidth - sideWidth, gutterWidth, path, fallbackType: row.type });
59
- lines.push(`${left}${sep}${right}`);
60
- }
61
- return lines;
62
- }
63
-
64
- function formatUnifiedSide({ num, sign, text, type, path }) {
65
- const bg = type === "del" ? BG_DEL : BG_ADD;
66
- const signScope = type === "del" ? "comment" : "string";
67
- return `${stylePlain(`${num} │ `, "90", bg)}${styleSyntax(`${sign} `, signScope, bg)}${highlightCodeLine(text, path, { bg })}`;
68
- }
69
-
70
- function formatSplitSide({ side, sideWidth, gutterWidth, path, fallbackType }) {
71
- if (!side) return formatEmptySplitSide({ sideWidth, gutterWidth });
72
- const type = side.type ?? fallbackType;
73
- const bg = type === "del" ? BG_DEL : type === "add" ? BG_ADD : BG_CTX;
74
- const sign = type === "del" ? "-" : type === "add" ? "+" : " ";
75
- const signScope = type === "del" ? "comment" : type === "add" ? "string" : "default";
76
- const num = side.lineNum != null ? String(side.lineNum).padStart(gutterWidth) : " ".repeat(gutterWidth);
77
- const line = [
78
- stylePlain(`${num} │ `, "90", bg),
79
- styleSyntax(`${sign} `, signScope, bg),
80
- highlightCodeLine(side.text ?? "", path, { bg }),
81
- ].join("");
82
- return fitAnsiToWidth(line, sideWidth, bg);
83
- }
84
-
85
- function formatEmptySplitSide({ sideWidth, gutterWidth }) {
86
- const line = [
87
- stylePlain(`${" ".repeat(gutterWidth)} │ `, "90", ""),
88
- styleSyntax(" ", "default", ""),
89
- ].join("");
90
- return fitAnsiToWidth(line, sideWidth, "");
91
- }
92
-
93
- function fitAnsiToWidth(text, width, bg = "") {
94
- const fitted = truncateToWidth(String(text ?? ""), width, "…", false);
95
- const padding = Math.max(0, width - visibleWidth(fitted));
96
- return `${fitted}${stylePlain(" ".repeat(padding), "", bg)}`;
97
- }
98
-
99
- function pairDiffRows(lines) {
100
- const rows = [];
101
- for (let i = 0; i < lines.length;) {
102
- const line = lines[i];
103
- if (line.type === "ctx") {
104
- rows.push({ type: "ctx", left: line, right: line });
105
- i++;
106
- continue;
107
- }
108
-
109
- if (line.type === "del") {
110
- const del = [];
111
- while (i < lines.length && lines[i].type === "del") del.push(lines[i++]);
112
- const add = [];
113
- while (i < lines.length && lines[i].type === "add") add.push(lines[i++]);
114
- const max = Math.max(del.length, add.length);
115
- for (let n = 0; n < max; n++) rows.push({ type: del[n] && add[n] ? "mod" : del[n] ? "del" : "add", left: del[n], right: add[n] });
116
- continue;
117
- }
118
-
119
- if (line.type === "add") {
120
- rows.push({ type: "add", left: null, right: line });
121
- i++;
122
- continue;
123
- }
124
-
125
- i++;
126
- }
127
- return rows;
128
- }
129
-
130
- function countChanges(lines) {
131
- let del = 0; let add = 0;
132
- for (const line of lines) {
133
- if (line.type === "del") del += 1;
134
- if (line.type === "add") add += 1;
135
- }
136
- return { del, add };
137
- }
138
-
139
- function maxLineNumber(lines) {
140
- let max = 0;
141
- for (const line of lines) {
142
- if (line.lineNum != null && line.lineNum > max) max = line.lineNum;
143
- }
144
- return max > 0 ? String(max).length : 1;
145
- }
146
-
147
- function stylePlain(text, fg = "", bg = "") {
148
- const plain = stripAnsi(String(text ?? ""));
149
- const codes = [];
150
- if (fg) codes.push(fg);
151
- if (bg) codes.push(bg);
152
- return codes.length ? `\x1b[${codes.join(";")}m${plain}\x1b[0m` : plain;
153
- }
154
-
155
- function stripAnsi(text) {
156
- return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
157
- }
1
+ import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
2
+ import { bold, dim, red, green, brightBlack } from "./ui-theme.mjs";
3
+ import { highlightCodeLine, styleSyntax } from "./syntax/highlighting.mjs";
4
+
5
+ const SPLIT_DIFF_MIN_WIDTH = 121;
6
+ const BG_DEL = "48;2;55;34;44";
7
+ const BG_ADD = "48;2;32;48;59";
8
+ const BG_CTX = "";
9
+
10
+ export function writeEditDiff({ output, path, diffLines }) {
11
+ const lines = formatEditDiffLines({ path, diffLines });
12
+ if (typeof output.addBlock === "function") output.addBlock({ type: "diff", path, diffLines, lines });
13
+ else for (const line of lines) output.writeln(line);
14
+ }
15
+
16
+ export function renderEditDiffBlock(block, width) {
17
+ return formatEditDiffLines({ path: block.path, diffLines: block.diffLines ?? [], width });
18
+ }
19
+
20
+ export function formatEditDiffLines({ path, diffLines, width = 0 }) {
21
+ if (width >= SPLIT_DIFF_MIN_WIDTH) return formatSplitDiffLines({ path, diffLines, width });
22
+ return formatUnifiedDiffLines({ path, diffLines });
23
+ }
24
+
25
+ function formatUnifiedDiffLines({ path, diffLines }) {
26
+ const counts = countChanges(diffLines);
27
+ const summary = [`± ${path}`];
28
+ if (counts.del > 0) summary.push(red(`${counts.del}-`));
29
+ if (counts.add > 0) summary.push(green(`${counts.add}+`));
30
+
31
+ const lines = [bold(summary.join(" "))];
32
+ const gutterWidth = maxLineNumber(diffLines);
33
+ for (const line of diffLines) {
34
+ const num = line.lineNum != null ? String(line.lineNum).padStart(gutterWidth) : " ".repeat(gutterWidth);
35
+ if (line.type === "del") lines.push(formatUnifiedSide({ num, sign: "-", text: line.text, type: "del", path }));
36
+ else if (line.type === "add") lines.push(formatUnifiedSide({ num, sign: "+", text: line.text, type: "add", path }));
37
+ else lines.push(`${brightBlack(`${num} │`)} ${dim(` ${line.text}`)}`);
38
+ }
39
+ return lines;
40
+ }
41
+
42
+ function formatSplitDiffLines({ path, diffLines, width }) {
43
+ const rows = pairDiffRows(diffLines);
44
+ const counts = countChanges(diffLines);
45
+ const summary = [`± ${path}`];
46
+ if (counts.del > 0) summary.push(red(`${counts.del}-`));
47
+ if (counts.add > 0) summary.push(green(`${counts.add}+`));
48
+
49
+ const gutterWidth = maxLineNumber(diffLines);
50
+ const sep = brightBlack(" │ ");
51
+ const sepWidth = 3;
52
+ const sideWidth = Math.floor((width - sepWidth) / 2);
53
+ if (sideWidth < gutterWidth + 12) return formatUnifiedDiffLines({ path, diffLines });
54
+
55
+ const lines = [bold(summary.join(" "))];
56
+ for (const row of rows) {
57
+ const left = formatSplitSide({ side: row.left, sideWidth, gutterWidth, path, fallbackType: row.type });
58
+ const right = formatSplitSide({ side: row.right, sideWidth: width - sepWidth - sideWidth, gutterWidth, path, fallbackType: row.type });
59
+ lines.push(`${left}${sep}${right}`);
60
+ }
61
+ return lines;
62
+ }
63
+
64
+ function formatUnifiedSide({ num, sign, text, type, path }) {
65
+ const bg = type === "del" ? BG_DEL : BG_ADD;
66
+ const signScope = type === "del" ? "comment" : "string";
67
+ return `${stylePlain(`${num} │ `, "90", bg)}${styleSyntax(`${sign} `, signScope, bg)}${highlightCodeLine(text, path, { bg })}`;
68
+ }
69
+
70
+ function formatSplitSide({ side, sideWidth, gutterWidth, path, fallbackType }) {
71
+ if (!side) return formatEmptySplitSide({ sideWidth, gutterWidth });
72
+ const type = side.type ?? fallbackType;
73
+ const bg = type === "del" ? BG_DEL : type === "add" ? BG_ADD : BG_CTX;
74
+ const sign = type === "del" ? "-" : type === "add" ? "+" : " ";
75
+ const signScope = type === "del" ? "comment" : type === "add" ? "string" : "default";
76
+ const num = side.lineNum != null ? String(side.lineNum).padStart(gutterWidth) : " ".repeat(gutterWidth);
77
+ const line = [
78
+ stylePlain(`${num} │ `, "90", bg),
79
+ styleSyntax(`${sign} `, signScope, bg),
80
+ highlightCodeLine(side.text ?? "", path, { bg }),
81
+ ].join("");
82
+ return fitAnsiToWidth(line, sideWidth, bg);
83
+ }
84
+
85
+ function formatEmptySplitSide({ sideWidth, gutterWidth }) {
86
+ const line = [
87
+ stylePlain(`${" ".repeat(gutterWidth)} │ `, "90", ""),
88
+ styleSyntax(" ", "default", ""),
89
+ ].join("");
90
+ return fitAnsiToWidth(line, sideWidth, "");
91
+ }
92
+
93
+ function fitAnsiToWidth(text, width, bg = "") {
94
+ const fitted = truncateToWidth(String(text ?? ""), width, "…", false);
95
+ const padding = Math.max(0, width - visibleWidth(fitted));
96
+ return `${fitted}${stylePlain(" ".repeat(padding), "", bg)}`;
97
+ }
98
+
99
+ function pairDiffRows(lines) {
100
+ const rows = [];
101
+ for (let i = 0; i < lines.length;) {
102
+ const line = lines[i];
103
+ if (line.type === "ctx") {
104
+ rows.push({ type: "ctx", left: line, right: line });
105
+ i++;
106
+ continue;
107
+ }
108
+
109
+ if (line.type === "del") {
110
+ const del = [];
111
+ while (i < lines.length && lines[i].type === "del") del.push(lines[i++]);
112
+ const add = [];
113
+ while (i < lines.length && lines[i].type === "add") add.push(lines[i++]);
114
+ const max = Math.max(del.length, add.length);
115
+ for (let n = 0; n < max; n++) rows.push({ type: del[n] && add[n] ? "mod" : del[n] ? "del" : "add", left: del[n], right: add[n] });
116
+ continue;
117
+ }
118
+
119
+ if (line.type === "add") {
120
+ rows.push({ type: "add", left: null, right: line });
121
+ i++;
122
+ continue;
123
+ }
124
+
125
+ i++;
126
+ }
127
+ return rows;
128
+ }
129
+
130
+ function countChanges(lines) {
131
+ let del = 0; let add = 0;
132
+ for (const line of lines) {
133
+ if (line.type === "del") del += 1;
134
+ if (line.type === "add") add += 1;
135
+ }
136
+ return { del, add };
137
+ }
138
+
139
+ function maxLineNumber(lines) {
140
+ let max = 0;
141
+ for (const line of lines) {
142
+ if (line.lineNum != null && line.lineNum > max) max = line.lineNum;
143
+ }
144
+ return max > 0 ? String(max).length : 1;
145
+ }
146
+
147
+ function stylePlain(text, fg = "", bg = "") {
148
+ const plain = stripAnsi(String(text ?? ""));
149
+ const codes = [];
150
+ if (fg) codes.push(fg);
151
+ if (bg) codes.push(bg);
152
+ return codes.length ? `\x1b[${codes.join(";")}m${plain}\x1b[0m` : plain;
153
+ }
154
+
155
+ function stripAnsi(text) {
156
+ return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
157
+ }
@@ -1,111 +1,111 @@
1
- import { buildModelSelectItems, persistModelSelection } from "../commands/model-command.mjs";
2
- import { pasteClipboardImage } from "../commands/paste-image-command.mjs";
3
- import { buildThinkingSelectItems } from "../commands/thinking-command.mjs";
4
- import { brightBlack } from "./ui-theme.mjs";
5
-
6
- export function wireTuiHandlers({
7
- ui,
8
- runner,
9
- sessionState,
10
- projectMarchDir,
11
- refreshStatusBar = () => {},
12
- isTurnRunning = () => false,
13
- modeState = null,
14
- pasteClipboardImageImpl = pasteClipboardImage,
15
- configHomeDir,
16
- } = {}) {
17
- let lastIdleCtrlCAt = 0;
18
- ui.setEscapeHandler(() => {
19
- lastIdleCtrlCAt = 0;
20
- if (isTurnRunning()) {
21
- runner.abort();
22
- refreshStatusBar.markAborted?.();
23
- }
24
- });
25
- ui.setCtrlCHandler?.(() => {
26
- if (isTurnRunning()) {
27
- lastIdleCtrlCAt = 0;
28
- runner.abort();
29
- refreshStatusBar.markAborted?.();
30
- return;
31
- }
32
- const now = Date.now();
33
- if (now - lastIdleCtrlCAt > 2000) {
34
- lastIdleCtrlCAt = now;
35
- ui.status?.("press Ctrl+C again to exit");
36
- return;
37
- }
38
- ui.requestExit?.();
39
- });
40
-
41
- const selectThinkingLevel = async () => {
42
- try {
43
- const levels = runner.getAvailableThinkingLevels?.() || [];
44
- if (!ui.selectList || levels.length === 0) {
45
- ui.writeln(brightBlack(`● thinking: no selector available`));
46
- return;
47
- }
48
- const current = runner.getThinkingLevel?.();
49
- const selectedIndex = Math.max(0, levels.indexOf(current));
50
- const item = await ui.selectList({
51
- items: buildThinkingSelectItems(levels, current),
52
- selectedIndex,
53
- width: 48,
54
- });
55
- if (!item) {
56
- ui.writeln(brightBlack(`● thinking: unchanged`));
57
- return;
58
- }
59
- ui.writeln(brightBlack(`● thinking: ${await runner.setThinkingLevel(item.level)}`));
60
- refreshStatusBar();
61
- } catch (err) {
62
- ui.writeln(`Error: ${err.message}`);
63
- }
64
- };
65
-
66
- ui.setShiftTabHandler(selectThinkingLevel);
67
- ui.setToggleModeHandler?.(() => {
68
- const mode = modeState?.toggle?.();
69
- if (!mode) return;
70
- refreshStatusBar();
71
- });
72
- ui.setCtrlTHandler(selectThinkingLevel);
73
-
74
- ui.setCtrlLHandler(async () => {
75
- try {
76
- const scopedModels = runner.getScopedModels?.() || [];
77
- if (ui.selectList && scopedModels.length > 0) {
78
- const current = runner.getCurrentModel?.();
79
- const items = buildModelSelectItems({ current, scopedModels });
80
- const selectedIndex = Math.max(0, items.findIndex((item) =>
81
- current && item.model.id === current.id && item.model.provider === current.provider
82
- ));
83
- const selectedItem = await ui.selectList({
84
- items,
85
- selectedIndex,
86
- width: 72,
87
- });
88
- if (!selectedItem) {
89
- ui.writeln(brightBlack(`● model: unchanged`));
90
- return;
91
- }
92
- const model = await runner.setModel(selectedItem.model);
93
- persistModelSelection(model, { configHomeDir });
94
- const name = model.name || model.id;
95
- ui.writeln(brightBlack(`● model: ${name} (${model.provider})`));
96
- refreshStatusBar();
97
- return;
98
- }
99
- ui.writeln(brightBlack(`● model: no selector available`));
100
- } catch (err) {
101
- ui.writeln(`Error: ${err.message}`);
102
- }
103
- });
104
-
105
- ui.setPasteImageHandler(() => {
106
- const sessionId = runner.getSessionStats?.().sessionId ?? sessionState.sessionId;
107
- for (const line of pasteClipboardImageImpl({ ui, projectMarchDir, sessionId })) {
108
- ui.status(line);
109
- }
110
- });
111
- }
1
+ import { buildModelSelectItems, persistModelSelection } from "../commands/model-command.mjs";
2
+ import { pasteClipboardImage } from "../commands/paste-image-command.mjs";
3
+ import { buildThinkingSelectItems } from "../commands/thinking-command.mjs";
4
+ import { brightBlack } from "./ui-theme.mjs";
5
+
6
+ export function wireTuiHandlers({
7
+ ui,
8
+ runner,
9
+ sessionState,
10
+ projectMarchDir,
11
+ refreshStatusBar = () => {},
12
+ isTurnRunning = () => false,
13
+ modeState = null,
14
+ pasteClipboardImageImpl = pasteClipboardImage,
15
+ configHomeDir,
16
+ } = {}) {
17
+ let lastIdleCtrlCAt = 0;
18
+ ui.setEscapeHandler(() => {
19
+ lastIdleCtrlCAt = 0;
20
+ if (isTurnRunning()) {
21
+ runner.abort();
22
+ refreshStatusBar.markAborted?.();
23
+ }
24
+ });
25
+ ui.setCtrlCHandler?.(() => {
26
+ if (isTurnRunning()) {
27
+ lastIdleCtrlCAt = 0;
28
+ runner.abort();
29
+ refreshStatusBar.markAborted?.();
30
+ return;
31
+ }
32
+ const now = Date.now();
33
+ if (now - lastIdleCtrlCAt > 2000) {
34
+ lastIdleCtrlCAt = now;
35
+ ui.status?.("press Ctrl+C again to exit");
36
+ return;
37
+ }
38
+ ui.requestExit?.();
39
+ });
40
+
41
+ const selectThinkingLevel = async () => {
42
+ try {
43
+ const levels = runner.getAvailableThinkingLevels?.() || [];
44
+ if (!ui.selectList || levels.length === 0) {
45
+ ui.writeln(brightBlack(`● thinking: no selector available`));
46
+ return;
47
+ }
48
+ const current = runner.getThinkingLevel?.();
49
+ const selectedIndex = Math.max(0, levels.indexOf(current));
50
+ const item = await ui.selectList({
51
+ items: buildThinkingSelectItems(levels, current),
52
+ selectedIndex,
53
+ width: 48,
54
+ });
55
+ if (!item) {
56
+ ui.writeln(brightBlack(`● thinking: unchanged`));
57
+ return;
58
+ }
59
+ ui.writeln(brightBlack(`● thinking: ${await runner.setThinkingLevel(item.level)}`));
60
+ refreshStatusBar();
61
+ } catch (err) {
62
+ ui.writeln(`Error: ${err.message}`);
63
+ }
64
+ };
65
+
66
+ ui.setShiftTabHandler(selectThinkingLevel);
67
+ ui.setToggleModeHandler?.(() => {
68
+ const mode = modeState?.toggle?.();
69
+ if (!mode) return;
70
+ refreshStatusBar();
71
+ });
72
+ ui.setCtrlTHandler(selectThinkingLevel);
73
+
74
+ ui.setCtrlLHandler(async () => {
75
+ try {
76
+ const scopedModels = runner.getScopedModels?.() || [];
77
+ if (ui.selectList && scopedModels.length > 0) {
78
+ const current = runner.getCurrentModel?.();
79
+ const items = buildModelSelectItems({ current, scopedModels });
80
+ const selectedIndex = Math.max(0, items.findIndex((item) =>
81
+ current && item.model.id === current.id && item.model.provider === current.provider
82
+ ));
83
+ const selectedItem = await ui.selectList({
84
+ items,
85
+ selectedIndex,
86
+ width: 72,
87
+ });
88
+ if (!selectedItem) {
89
+ ui.writeln(brightBlack(`● model: unchanged`));
90
+ return;
91
+ }
92
+ const model = await runner.setModel(selectedItem.model);
93
+ persistModelSelection(model, { configHomeDir });
94
+ const name = model.name || model.id;
95
+ ui.writeln(brightBlack(`● model: ${name} (${model.provider})`));
96
+ refreshStatusBar();
97
+ return;
98
+ }
99
+ ui.writeln(brightBlack(`● model: no selector available`));
100
+ } catch (err) {
101
+ ui.writeln(`Error: ${err.message}`);
102
+ }
103
+ });
104
+
105
+ ui.setPasteImageHandler(() => {
106
+ const sessionId = runner.getSessionStats?.().sessionId ?? sessionState.sessionId;
107
+ for (const line of pasteClipboardImageImpl({ ui, projectMarchDir, sessionId })) {
108
+ ui.status(line);
109
+ }
110
+ });
111
+ }
@@ -1,61 +1,61 @@
1
- import { resolveAttachmentTokens, uniqueAttachmentToken, withLeadingSpace } from "../input/attachment-tokens.mjs";
2
-
3
- export function createTuiInputController({ editor, requestRender, historyStore = null }) {
4
- let onSubmitResolve = null;
5
- const attachmentTokens = new Map();
6
-
7
- return {
8
- readline() {
9
- return new Promise((resolve) => {
10
- onSubmitResolve = resolve;
11
- editor.disableSubmit = false;
12
- editor.onSubmit = (text) => {
13
- const resolvedText = resolveAttachmentTokens(text, attachmentTokens);
14
- if (attachmentTokens.size === 0) {
15
- editor.addToHistory(text);
16
- saveHistory();
17
- }
18
- clearSubmitState();
19
- attachmentTokens.clear();
20
- resolve(resolvedText);
21
- };
22
- });
23
- },
24
-
25
- requestExit() {
26
- if (!onSubmitResolve) return;
27
- const resolve = onSubmitResolve;
28
- clearSubmitState();
29
- attachmentTokens.clear();
30
- resolve(null);
31
- },
32
-
33
- getInputText() {
34
- return editor.getText();
35
- },
36
-
37
- insertTextAtCursor(text) {
38
- editor.insertTextAtCursor(text);
39
- requestRender();
40
- },
41
-
42
- insertAttachmentAtCursor({ marker, label }) {
43
- const token = uniqueAttachmentToken(label || "[image]", attachmentTokens);
44
- attachmentTokens.set(token, marker);
45
- editor.insertTextAtCursor(withLeadingSpace(editor.getText(), token));
46
- requestRender();
47
- },
48
- };
49
-
50
- function clearSubmitState() {
51
- editor.disableSubmit = true;
52
- editor.onSubmit = undefined;
53
- onSubmitResolve = null;
54
- }
55
-
56
- function saveHistory() {
57
- try {
58
- historyStore?.save?.(editor.history);
59
- } catch {}
60
- }
61
- }
1
+ import { resolveAttachmentTokens, uniqueAttachmentToken, withLeadingSpace } from "../input/attachment-tokens.mjs";
2
+
3
+ export function createTuiInputController({ editor, requestRender, historyStore = null }) {
4
+ let onSubmitResolve = null;
5
+ const attachmentTokens = new Map();
6
+
7
+ return {
8
+ readline() {
9
+ return new Promise((resolve) => {
10
+ onSubmitResolve = resolve;
11
+ editor.disableSubmit = false;
12
+ editor.onSubmit = (text) => {
13
+ const resolvedText = resolveAttachmentTokens(text, attachmentTokens);
14
+ if (attachmentTokens.size === 0) {
15
+ editor.addToHistory(text);
16
+ saveHistory();
17
+ }
18
+ clearSubmitState();
19
+ attachmentTokens.clear();
20
+ resolve(resolvedText);
21
+ };
22
+ });
23
+ },
24
+
25
+ requestExit() {
26
+ if (!onSubmitResolve) return;
27
+ const resolve = onSubmitResolve;
28
+ clearSubmitState();
29
+ attachmentTokens.clear();
30
+ resolve(null);
31
+ },
32
+
33
+ getInputText() {
34
+ return editor.getText();
35
+ },
36
+
37
+ insertTextAtCursor(text) {
38
+ editor.insertTextAtCursor(text);
39
+ requestRender();
40
+ },
41
+
42
+ insertAttachmentAtCursor({ marker, label }) {
43
+ const token = uniqueAttachmentToken(label || "[image]", attachmentTokens);
44
+ attachmentTokens.set(token, marker);
45
+ editor.insertTextAtCursor(withLeadingSpace(editor.getText(), token));
46
+ requestRender();
47
+ },
48
+ };
49
+
50
+ function clearSubmitState() {
51
+ editor.disableSubmit = true;
52
+ editor.onSubmit = undefined;
53
+ onSubmitResolve = null;
54
+ }
55
+
56
+ function saveHistory() {
57
+ try {
58
+ historyStore?.save?.(editor.history);
59
+ } catch {}
60
+ }
61
+ }