march-cli 0.1.24 → 0.1.26
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.
- package/bin/march.mjs +13 -13
- package/package.json +49 -49
- package/src/agent/command-exec-tool.mjs +172 -172
- package/src/agent/context-stats-tool.mjs +57 -57
- package/src/agent/editing/diff-apply.mjs +28 -28
- package/src/agent/editing/diff-format.mjs +57 -57
- package/src/agent/editing/lsp-report.mjs +69 -69
- package/src/agent/file-edit-tool.mjs +250 -250
- package/src/agent/file-tools/read-file-tool.mjs +112 -112
- package/src/agent/file-tools/read-image-tool.mjs +76 -76
- package/src/agent/model-payload-dumper.mjs +208 -208
- package/src/agent/pi-session/pi-session-sidecar-failure.mjs +10 -10
- package/src/agent/provider/payload-messages.mjs +138 -138
- package/src/agent/runner/codex-large-context-guard.mjs +87 -87
- package/src/agent/runner/codex-transport-compression.mjs +180 -180
- package/src/agent/runner/codex-transport-debug.mjs +113 -113
- package/src/agent/runner/codex-websocket-event-debug.mjs +130 -130
- package/src/agent/runner/fast-model.mjs +36 -36
- package/src/agent/runner/runner-cleanup.mjs +12 -12
- package/src/agent/runner/runner-init.mjs +15 -15
- package/src/agent/runner/runner-session-state.mjs +40 -40
- package/src/agent/runner/runner-utils.mjs +24 -24
- package/src/agent/runner.mjs +299 -299
- package/src/agent/runtime/ipc/ipc-peer.mjs +99 -99
- package/src/agent/runtime/ipc/process-ipc-transport.mjs +16 -16
- package/src/agent/runtime/remote-runner-client.mjs +73 -73
- package/src/agent/runtime/remote-ui-client.mjs +20 -20
- package/src/agent/runtime/runner-ipc-target.mjs +125 -125
- package/src/agent/runtime/runner-process-client.mjs +47 -47
- package/src/agent/runtime/runner-process-entry.mjs +11 -11
- package/src/agent/runtime/runner-process-factory.mjs +111 -108
- package/src/agent/runtime/runner-runtime-host.mjs +79 -79
- package/src/agent/runtime/runtime-factory.mjs +42 -42
- package/src/agent/runtime/runtime-host.mjs +34 -34
- package/src/agent/runtime/ui-event-bridge.mjs +95 -95
- package/src/agent/screen-tools/list-windows-tool.mjs +39 -39
- package/src/agent/screen-tools/screen-tool.mjs +49 -49
- package/src/agent/screen-tools/windows-screen.mjs +133 -133
- package/src/agent/session/session-auto-name.mjs +41 -41
- package/src/agent/session/session-binding.mjs +12 -12
- package/src/agent/session/session-options.mjs +47 -47
- package/src/agent/tool-names.mjs +1 -1
- package/src/agent/tool-result.mjs +3 -3
- package/src/agent/tool-summary.mjs +112 -112
- package/src/agent/tools.mjs +58 -58
- package/src/agent/turn/turn-events.mjs +111 -111
- package/src/agent/turn/turn-logging.mjs +30 -30
- package/src/agent/turn/turn-runner.mjs +196 -196
- package/src/agent/vision-capability.mjs +14 -14
- package/src/auth/login-command.mjs +90 -90
- package/src/auth/storage.mjs +34 -34
- package/src/cli/args.mjs +96 -79
- package/src/cli/commands/copy-command.mjs +87 -87
- package/src/cli/commands/export-command.mjs +206 -206
- package/src/cli/commands/extensions-command.mjs +53 -53
- package/src/cli/commands/help-command.mjs +7 -7
- package/src/cli/commands/model-command.mjs +141 -141
- package/src/cli/commands/paste-image-command.mjs +43 -43
- package/src/cli/commands/provider-command.mjs +59 -59
- package/src/cli/commands/status-command.mjs +196 -194
- package/src/cli/commands/thinking-command.mjs +87 -87
- package/src/cli/fallback-ui.mjs +156 -156
- package/src/cli/input/attachment-tokens.mjs +20 -20
- package/src/cli/input/autocomplete.mjs +74 -74
- package/src/cli/input/external-editor.mjs +39 -39
- package/src/cli/input/file-search/index.mjs +160 -160
- package/src/cli/input/history-store.mjs +35 -35
- package/src/cli/input/image-clipboard.mjs +55 -55
- package/src/cli/input/keybinding-dispatch.mjs +76 -76
- package/src/cli/input/keybindings.mjs +96 -96
- package/src/cli/input/mode-state.mjs +43 -43
- package/src/cli/input/prompt-templates.mjs +84 -84
- package/src/cli/input/select-with-keyboard.mjs +86 -86
- package/src/cli/permissions.mjs +103 -103
- package/src/cli/repl-commands.mjs +86 -86
- package/src/cli/repl-loop.mjs +183 -183
- package/src/cli/selector-list.mjs +21 -21
- package/src/cli/session/pi-session-switch-command.mjs +41 -41
- package/src/cli/session/session-command.mjs +23 -23
- package/src/cli/session/session-list-command.mjs +68 -68
- package/src/cli/session/session-name-command.mjs +26 -26
- package/src/cli/session/session-source-command.mjs +89 -89
- package/src/cli/session/session-switch-command.mjs +1 -1
- package/src/cli/shell/shell-command.mjs +55 -55
- package/src/cli/shell/shell-drawer-controls.mjs +33 -33
- package/src/cli/shell/shell-drawer.mjs +192 -192
- package/src/cli/shell/shell-split-layout.mjs +70 -70
- package/src/cli/slash-commands.mjs +192 -192
- package/src/cli/startup/create-runtime-runner.mjs +61 -61
- package/src/cli/startup/runtime-close.mjs +23 -23
- package/src/cli/startup/startup-banner.mjs +71 -71
- package/src/cli/startup/startup-session.mjs +51 -51
- package/src/cli/status-line-updater.mjs +75 -75
- package/src/cli/tool-output.mjs +9 -9
- package/src/cli/tui/editor/external-editor-runner.mjs +24 -24
- package/src/cli/tui/input/mouse-selection-controller.mjs +91 -91
- package/src/cli/tui/input/mouse-tracking.mjs +20 -20
- package/src/cli/tui/layout/main-pane-layout.mjs +47 -47
- package/src/cli/tui/layout/safe-render-boundary.mjs +46 -46
- package/src/cli/tui/markdown-renderer.mjs +285 -285
- package/src/cli/tui/output/scroll-state.mjs +79 -79
- package/src/cli/tui/output/text-line-renderer.mjs +50 -50
- package/src/cli/tui/output/tool-card-renderer.mjs +59 -59
- package/src/cli/tui/output/visible-lines.mjs +8 -8
- package/src/cli/tui/output-buffer.mjs +293 -293
- package/src/cli/tui/permission-request-ui.mjs +18 -18
- package/src/cli/tui/recall-rendering.mjs +28 -25
- package/src/cli/tui/render/render-scheduler.mjs +26 -26
- package/src/cli/tui/render/stream-delta-buffer.mjs +46 -46
- package/src/cli/tui/select/editor-select-list.mjs +111 -111
- package/src/cli/tui/selection-screen.mjs +269 -269
- package/src/cli/tui/status/retry-status.mjs +72 -72
- package/src/cli/tui/status/spinner-status.mjs +42 -42
- package/src/cli/tui/status/status-bar.mjs +225 -225
- package/src/cli/tui/syntax/highlighting.mjs +260 -260
- package/src/cli/tui/syntax/languages.mjs +91 -91
- package/src/cli/tui/syntax/tree-sitter/bash.highlights.scm +261 -261
- package/src/cli/tui/syntax/tree-sitter/c.highlights.scm +341 -341
- package/src/cli/tui/syntax/tree-sitter/cpp.highlights.scm +268 -268
- package/src/cli/tui/syntax/tree-sitter/csharp.highlights.scm +577 -577
- package/src/cli/tui/syntax/tree-sitter/css.highlights.scm +109 -109
- package/src/cli/tui/syntax/tree-sitter/diff.highlights.scm +49 -49
- package/src/cli/tui/syntax/tree-sitter/go.highlights.scm +254 -254
- package/src/cli/tui/syntax/tree-sitter/html.highlights.scm +13 -13
- package/src/cli/tui/syntax/tree-sitter/java.highlights.scm +330 -330
- package/src/cli/tui/syntax/tree-sitter/json.highlights.scm +38 -38
- package/src/cli/tui/syntax/tree-sitter/php.highlights.scm +203 -203
- package/src/cli/tui/syntax/tree-sitter/python.highlights.scm +137 -137
- package/src/cli/tui/syntax/tree-sitter/ruby.highlights.scm +309 -309
- package/src/cli/tui/syntax/tree-sitter/rust.highlights.scm +531 -531
- package/src/cli/tui/syntax/tree-sitter/toml.highlights.scm +39 -39
- package/src/cli/tui/syntax/tree-sitter/tsx.highlights.scm +35 -35
- package/src/cli/tui/syntax/tree-sitter/typescript.highlights.scm +35 -35
- package/src/cli/tui/syntax/tree-sitter/yaml.highlights.scm +99 -99
- package/src/cli/tui/tool-rendering.mjs +87 -87
- package/src/cli/tui/tui-diff-rendering.mjs +157 -157
- package/src/cli/tui/tui-handlers.mjs +111 -111
- package/src/cli/tui/tui-input-controller.mjs +61 -61
- package/src/cli/tui/ui-theme.mjs +157 -157
- package/src/cli/ui.mjs +297 -297
- package/src/config/config-json.mjs +108 -84
- package/src/config/dotenv.mjs +20 -20
- package/src/config/features.mjs +75 -75
- package/src/config/loader.mjs +156 -143
- package/src/config/settings-command.mjs +97 -97
- package/src/context/engine.mjs +199 -198
- package/src/context/injections.mjs +26 -26
- package/src/context/profiles.mjs +39 -39
- package/src/context/project-context.mjs +20 -20
- package/src/context/session-status.mjs +25 -17
- package/src/context/shell-layers.mjs +23 -23
- package/src/context/system-core/base.md +51 -50
- package/src/context/system-core/prompts/deepseek-v4-pro.md +3 -3
- package/src/context/system-core/prompts/default.md +3 -3
- package/src/context/system-core.mjs +35 -35
- package/src/debug/logger.mjs +141 -141
- package/src/debug/model-context-dumper.mjs +52 -52
- package/src/extensions/discovery.mjs +40 -40
- package/src/extensions/lifecycle-adapter.mjs +210 -210
- package/src/extensions/lifecycle-manifest.mjs +69 -69
- package/src/image-gen/index.mjs +7 -7
- package/src/image-gen/provider.mjs +231 -231
- package/src/image-gen/tool.mjs +84 -84
- package/src/lsp/client.mjs +257 -257
- package/src/lsp/diagnostic-store.mjs +42 -42
- package/src/lsp/diagnostics-format.mjs +72 -72
- package/src/lsp/managed-node-server.mjs +99 -99
- package/src/lsp/path-match.mjs +10 -10
- package/src/lsp/server-definitions.mjs +188 -188
- package/src/lsp/servers.mjs +165 -165
- package/src/lsp/service.mjs +110 -110
- package/src/lsp/status-message.mjs +9 -9
- package/src/lsp/typescript-project-resolver.mjs +186 -186
- package/src/main.mjs +294 -299
- package/src/mcp/client.mjs +195 -195
- package/src/mcp/config.mjs +130 -130
- package/src/mcp/index.mjs +48 -48
- package/src/mcp/tools.mjs +98 -98
- package/src/memory/command.mjs +120 -0
- package/src/memory/markdown/markdown-delete.mjs +23 -23
- package/src/memory/markdown/markdown-format.mjs +128 -128
- package/src/memory/markdown/markdown-recall.mjs +28 -28
- package/src/memory/markdown/ripgrep.mjs +16 -16
- package/src/memory/markdown/sqlite-index.mjs +87 -87
- package/src/memory/markdown-store.mjs +272 -286
- package/src/memory/markdown-tools.mjs +174 -103
- package/src/memory/remote/client.mjs +68 -0
- package/src/memory/remote/config.mjs +52 -0
- package/src/memory/remote/server.mjs +99 -0
- package/src/memory/search.mjs +183 -0
- package/src/network/environment.mjs +131 -131
- package/src/notification/desktop-notifier.mjs +262 -262
- package/src/platform/open-file.mjs +28 -28
- package/src/platform/spawn-command.mjs +27 -27
- package/src/provider/accept-command.mjs +89 -89
- package/src/provider/command.mjs +21 -21
- package/src/provider/config-command.mjs +129 -129
- package/src/provider/custom-provider.mjs +113 -113
- package/src/provider/hosted-tools.mjs +111 -111
- package/src/provider/presets.mjs +72 -72
- package/src/provider/share-command.mjs +79 -79
- package/src/provider/share-payload.mjs +52 -52
- package/src/session/attachment-display.mjs +16 -16
- package/src/session/attachment-references.mjs +65 -65
- package/src/session/attachments.mjs +140 -140
- package/src/session/persist.mjs +1 -1
- package/src/session/pi-manager.mjs +34 -34
- package/src/session/session-utils.mjs +16 -16
- package/src/session/sidecar-sync.mjs +19 -19
- package/src/session/sidecar.mjs +69 -69
- package/src/session/transcript.mjs +83 -83
- package/src/session/tree.mjs +42 -42
- package/src/shell/cli-runtime.mjs +11 -11
- package/src/shell/hints.mjs +12 -12
- package/src/shell/node-pty-adapter.mjs +81 -81
- package/src/shell/runtime-state.mjs +126 -126
- package/src/shell/runtime.mjs +252 -252
- package/src/shell/screen-buffer.mjs +136 -136
- package/src/shell/tool-read.mjs +74 -74
- package/src/shell/tools.mjs +299 -299
- package/src/supergrok/actions/image-generate.mjs +60 -60
- package/src/supergrok/actions/search.mjs +78 -78
- package/src/supergrok/auth.mjs +36 -36
- package/src/supergrok/constants.mjs +18 -18
- package/src/supergrok/oauth-provider.mjs +278 -278
- package/src/supergrok/provider.mjs +35 -35
- package/src/supergrok/response.mjs +76 -76
- package/src/supergrok/tool.mjs +61 -61
- package/src/text/ansi.mjs +3 -3
- package/src/web/config-command.mjs +43 -43
- package/src/web/fetch.mjs +78 -78
- package/src/web/presets.mjs +16 -16
- package/src/web/search.mjs +83 -83
- package/src/web/tools.mjs +107 -107
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
export function parseMouseEvent(data) {
|
|
2
|
-
const match = data.match(/^\x1b\[<(\d+);(\d+);(\d+)([Mm])$/);
|
|
3
|
-
if (!match) return null;
|
|
4
|
-
const code = parseInt(match[1], 10);
|
|
5
|
-
const col = parseInt(match[2], 10);
|
|
6
|
-
const row = parseInt(match[3], 10);
|
|
7
|
-
const final = match[4];
|
|
8
|
-
|
|
9
|
-
if (code === 64 || code === 65) {
|
|
10
|
-
return { type: "scroll", delta: code === 64 ? -1 : 1, col, row };
|
|
11
|
-
}
|
|
12
|
-
if (final === "m") return { type: "up", button: code & 3, col, row };
|
|
13
|
-
if ((code & 32) === 32) return { type: "drag", button: code & 3, col, row };
|
|
14
|
-
return { type: "down", button: code & 3, col, row };
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export function parseMouseScroll(data) {
|
|
18
|
-
const event = parseMouseEvent(data);
|
|
19
|
-
return event?.type === "scroll" ? event.delta : null;
|
|
20
|
-
}
|
|
1
|
+
export function parseMouseEvent(data) {
|
|
2
|
+
const match = data.match(/^\x1b\[<(\d+);(\d+);(\d+)([Mm])$/);
|
|
3
|
+
if (!match) return null;
|
|
4
|
+
const code = parseInt(match[1], 10);
|
|
5
|
+
const col = parseInt(match[2], 10);
|
|
6
|
+
const row = parseInt(match[3], 10);
|
|
7
|
+
const final = match[4];
|
|
8
|
+
|
|
9
|
+
if (code === 64 || code === 65) {
|
|
10
|
+
return { type: "scroll", delta: code === 64 ? -1 : 1, col, row };
|
|
11
|
+
}
|
|
12
|
+
if (final === "m") return { type: "up", button: code & 3, col, row };
|
|
13
|
+
if ((code & 32) === 32) return { type: "drag", button: code & 3, col, row };
|
|
14
|
+
return { type: "down", button: code & 3, col, row };
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export function parseMouseScroll(data) {
|
|
18
|
+
const event = parseMouseEvent(data);
|
|
19
|
+
return event?.type === "scroll" ? event.delta : null;
|
|
20
|
+
}
|
|
@@ -1,47 +1,47 @@
|
|
|
1
|
-
export class MainPaneLayout {
|
|
2
|
-
constructor({ output, statusBar, editor, terminal, selection = null }) {
|
|
3
|
-
this.output = output;
|
|
4
|
-
this.statusBar = statusBar;
|
|
5
|
-
this.editor = editor;
|
|
6
|
-
this.terminal = terminal;
|
|
7
|
-
this.selection = selection;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
render(width) {
|
|
11
|
-
const safeWidth = Math.max(1, Math.trunc(width));
|
|
12
|
-
const statusTopLines = this.statusBar.renderTop?.(safeWidth) ?? this.statusBar.render(safeWidth);
|
|
13
|
-
const rawEditorLines = this.editor.render(safeWidth);
|
|
14
|
-
const editorLines = this.statusBar.renderInputLines?.(rawEditorLines, safeWidth)
|
|
15
|
-
?? rawEditorLines.map((line) => this.statusBar.renderInputLine?.(line, safeWidth) ?? line);
|
|
16
|
-
const statusBottomLines = this.statusBar.renderBottom?.(safeWidth) ?? [];
|
|
17
|
-
const fixedHeight = statusTopLines.length + editorLines.length + statusBottomLines.length;
|
|
18
|
-
const viewportHeight = Math.max(1, (this.terminal?.rows || 30) - fixedHeight);
|
|
19
|
-
this.output.setViewportHeight(viewportHeight);
|
|
20
|
-
const outputLines = this.output.render(safeWidth);
|
|
21
|
-
const outputTop = Math.max(0, viewportHeight - outputLines.length);
|
|
22
|
-
const editorTop = viewportHeight + statusTopLines.length;
|
|
23
|
-
this.selection?.setRegions?.([
|
|
24
|
-
{ id: "output", topRow: outputTop, leftCol: 0, width: safeWidth, lines: outputLines },
|
|
25
|
-
{ id: "editor", topRow: editorTop, leftCol: 0, width: safeWidth, lines: editorLines },
|
|
26
|
-
]);
|
|
27
|
-
const selectedOutputLines = this.selection?.applyRegion?.("output", outputLines) ?? outputLines;
|
|
28
|
-
const selectedEditorLines = this.selection?.applyRegion?.("editor", editorLines) ?? editorLines;
|
|
29
|
-
return [
|
|
30
|
-
...padToHeight(selectedOutputLines, viewportHeight),
|
|
31
|
-
...statusTopLines,
|
|
32
|
-
...selectedEditorLines,
|
|
33
|
-
...statusBottomLines,
|
|
34
|
-
];
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
invalidate() {
|
|
38
|
-
this.output.invalidate?.();
|
|
39
|
-
this.statusBar.invalidate?.();
|
|
40
|
-
this.editor.invalidate?.();
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
function padToHeight(lines, height) {
|
|
45
|
-
if (lines.length >= height) return lines;
|
|
46
|
-
return [...Array(height - lines.length).fill(""), ...lines];
|
|
47
|
-
}
|
|
1
|
+
export class MainPaneLayout {
|
|
2
|
+
constructor({ output, statusBar, editor, terminal, selection = null }) {
|
|
3
|
+
this.output = output;
|
|
4
|
+
this.statusBar = statusBar;
|
|
5
|
+
this.editor = editor;
|
|
6
|
+
this.terminal = terminal;
|
|
7
|
+
this.selection = selection;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
render(width) {
|
|
11
|
+
const safeWidth = Math.max(1, Math.trunc(width));
|
|
12
|
+
const statusTopLines = this.statusBar.renderTop?.(safeWidth) ?? this.statusBar.render(safeWidth);
|
|
13
|
+
const rawEditorLines = this.editor.render(safeWidth);
|
|
14
|
+
const editorLines = this.statusBar.renderInputLines?.(rawEditorLines, safeWidth)
|
|
15
|
+
?? rawEditorLines.map((line) => this.statusBar.renderInputLine?.(line, safeWidth) ?? line);
|
|
16
|
+
const statusBottomLines = this.statusBar.renderBottom?.(safeWidth) ?? [];
|
|
17
|
+
const fixedHeight = statusTopLines.length + editorLines.length + statusBottomLines.length;
|
|
18
|
+
const viewportHeight = Math.max(1, (this.terminal?.rows || 30) - fixedHeight);
|
|
19
|
+
this.output.setViewportHeight(viewportHeight);
|
|
20
|
+
const outputLines = this.output.render(safeWidth);
|
|
21
|
+
const outputTop = Math.max(0, viewportHeight - outputLines.length);
|
|
22
|
+
const editorTop = viewportHeight + statusTopLines.length;
|
|
23
|
+
this.selection?.setRegions?.([
|
|
24
|
+
{ id: "output", topRow: outputTop, leftCol: 0, width: safeWidth, lines: outputLines },
|
|
25
|
+
{ id: "editor", topRow: editorTop, leftCol: 0, width: safeWidth, lines: editorLines },
|
|
26
|
+
]);
|
|
27
|
+
const selectedOutputLines = this.selection?.applyRegion?.("output", outputLines) ?? outputLines;
|
|
28
|
+
const selectedEditorLines = this.selection?.applyRegion?.("editor", editorLines) ?? editorLines;
|
|
29
|
+
return [
|
|
30
|
+
...padToHeight(selectedOutputLines, viewportHeight),
|
|
31
|
+
...statusTopLines,
|
|
32
|
+
...selectedEditorLines,
|
|
33
|
+
...statusBottomLines,
|
|
34
|
+
];
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
invalidate() {
|
|
38
|
+
this.output.invalidate?.();
|
|
39
|
+
this.statusBar.invalidate?.();
|
|
40
|
+
this.editor.invalidate?.();
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function padToHeight(lines, height) {
|
|
45
|
+
if (lines.length >= height) return lines;
|
|
46
|
+
return [...Array(height - lines.length).fill(""), ...lines];
|
|
47
|
+
}
|
|
@@ -1,46 +1,46 @@
|
|
|
1
|
-
import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
|
|
2
|
-
import { brightBlack } from "../ui-theme.mjs";
|
|
3
|
-
|
|
4
|
-
export class SafeRenderBoundary {
|
|
5
|
-
constructor(child, { onError = null } = {}) {
|
|
6
|
-
this.child = child;
|
|
7
|
-
this.onError = onError;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
render(width) {
|
|
11
|
-
const safeWidth = Math.max(1, Math.trunc(width));
|
|
12
|
-
try {
|
|
13
|
-
return sanitizeRenderedLines(this.child.render(safeWidth), safeWidth);
|
|
14
|
-
} catch (err) {
|
|
15
|
-
this.onError?.(err);
|
|
16
|
-
return sanitizeRenderedLines([brightBlack(`March UI recovered from render error: ${err.message}`)], safeWidth);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
invalidate() {
|
|
21
|
-
this.child.invalidate?.();
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
export function sanitizeRenderedLines(lines, width) {
|
|
26
|
-
const safeWidth = Math.max(1, Math.trunc(width));
|
|
27
|
-
const result = [];
|
|
28
|
-
for (const line of Array.isArray(lines) ? lines : []) {
|
|
29
|
-
for (const part of String(line ?? "").split(/\r?\n/)) {
|
|
30
|
-
result.push(fitRenderedLine(part, safeWidth));
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
return result;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
function fitRenderedLine(line, width) {
|
|
37
|
-
if (visibleWidth(line) <= width) return line;
|
|
38
|
-
const truncated = truncateToWidth(line, width, "…");
|
|
39
|
-
if (visibleWidth(truncated) <= width) return truncated;
|
|
40
|
-
const plain = truncateToWidth(stripAnsi(line), width, "…");
|
|
41
|
-
return visibleWidth(plain) <= width ? plain : "";
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
function stripAnsi(text) {
|
|
45
|
-
return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
|
|
46
|
-
}
|
|
1
|
+
import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
|
|
2
|
+
import { brightBlack } from "../ui-theme.mjs";
|
|
3
|
+
|
|
4
|
+
export class SafeRenderBoundary {
|
|
5
|
+
constructor(child, { onError = null } = {}) {
|
|
6
|
+
this.child = child;
|
|
7
|
+
this.onError = onError;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
render(width) {
|
|
11
|
+
const safeWidth = Math.max(1, Math.trunc(width));
|
|
12
|
+
try {
|
|
13
|
+
return sanitizeRenderedLines(this.child.render(safeWidth), safeWidth);
|
|
14
|
+
} catch (err) {
|
|
15
|
+
this.onError?.(err);
|
|
16
|
+
return sanitizeRenderedLines([brightBlack(`March UI recovered from render error: ${err.message}`)], safeWidth);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
invalidate() {
|
|
21
|
+
this.child.invalidate?.();
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export function sanitizeRenderedLines(lines, width) {
|
|
26
|
+
const safeWidth = Math.max(1, Math.trunc(width));
|
|
27
|
+
const result = [];
|
|
28
|
+
for (const line of Array.isArray(lines) ? lines : []) {
|
|
29
|
+
for (const part of String(line ?? "").split(/\r?\n/)) {
|
|
30
|
+
result.push(fitRenderedLine(part, safeWidth));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return result;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function fitRenderedLine(line, width) {
|
|
37
|
+
if (visibleWidth(line) <= width) return line;
|
|
38
|
+
const truncated = truncateToWidth(line, width, "…");
|
|
39
|
+
if (visibleWidth(truncated) <= width) return truncated;
|
|
40
|
+
const plain = truncateToWidth(stripAnsi(line), width, "…");
|
|
41
|
+
return visibleWidth(plain) <= width ? plain : "";
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function stripAnsi(text) {
|
|
45
|
+
return String(text ?? "").replace(/\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
|
|
46
|
+
}
|