march-cli 0.1.24 → 0.1.25
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 +50 -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,269 +1,269 @@
|
|
|
1
|
-
import { visibleWidth } from "@earendil-works/pi-tui";
|
|
2
|
-
|
|
3
|
-
const CONTROL_RE = /\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|\[[0-?]*[ -/]*[@-~]|[@-Z\\-_])/g;
|
|
4
|
-
const INVERSE = "\x1b[7m";
|
|
5
|
-
const RESET = "\x1b[0m";
|
|
6
|
-
|
|
7
|
-
export class ScreenSelection {
|
|
8
|
-
constructor() {
|
|
9
|
-
this.active = false;
|
|
10
|
-
this.anchor = null;
|
|
11
|
-
this.focus = null;
|
|
12
|
-
this.regions = [];
|
|
13
|
-
this._plainLines = new Map();
|
|
14
|
-
this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: 0 };
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
setLines(lines) {
|
|
18
|
-
this.setViewport({ topRow: 0, leftCol: 0, width: Infinity, lines });
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
setViewport({ topRow = 0, leftCol = 0, width = Infinity, lines = [] } = {}) {
|
|
22
|
-
this.setRegions([{ id: "default", topRow, leftCol, width, lines }]);
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
setRegions(regions = []) {
|
|
26
|
-
let docRow = 0;
|
|
27
|
-
this.regions = regions
|
|
28
|
-
.map((region, index) => normalizeRegion(region, index))
|
|
29
|
-
.filter((region) => region.lines.length > 0)
|
|
30
|
-
.sort((a, b) => a.topRow - b.topRow || a.leftCol - b.leftCol)
|
|
31
|
-
.map((region) => {
|
|
32
|
-
const normalized = { ...region, docStart: docRow };
|
|
33
|
-
docRow += region.lines.length;
|
|
34
|
-
return normalized;
|
|
35
|
-
});
|
|
36
|
-
this.lines = this.regions.flatMap((region) => region.lines);
|
|
37
|
-
this._plainLines = new Map();
|
|
38
|
-
this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: this.lines.length };
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
start(point) {
|
|
42
|
-
const normalized = normalizePoint(point, this.regions, true);
|
|
43
|
-
if (!normalized) {
|
|
44
|
-
this.clear();
|
|
45
|
-
return false;
|
|
46
|
-
}
|
|
47
|
-
this.active = true;
|
|
48
|
-
this.anchor = normalized;
|
|
49
|
-
this.focus = this.anchor;
|
|
50
|
-
return true;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
update(point) {
|
|
54
|
-
if (!this.active || !this.anchor) return false;
|
|
55
|
-
this.focus = normalizePoint(point, this.regions, true) ?? this.focus;
|
|
56
|
-
return true;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
finish(point, { clear = true } = {}) {
|
|
60
|
-
if (!this.active || !this.anchor) return "";
|
|
61
|
-
this.focus = normalizePoint(point, this.regions, true) ?? this.focus;
|
|
62
|
-
const text = this.text();
|
|
63
|
-
if (clear) this.clear();
|
|
64
|
-
else this.active = false;
|
|
65
|
-
return text;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
clear() {
|
|
69
|
-
const hadSelection = this.active || Boolean(this.anchor || this.focus);
|
|
70
|
-
this.active = false;
|
|
71
|
-
this.anchor = null;
|
|
72
|
-
this.focus = null;
|
|
73
|
-
return hadSelection;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
text() {
|
|
77
|
-
const range = this.range();
|
|
78
|
-
if (!range) return "";
|
|
79
|
-
const selected = [];
|
|
80
|
-
for (let row = range.start.row; row <= range.end.row; row += 1) {
|
|
81
|
-
const line = this._plainLine(row);
|
|
82
|
-
const startCol = row === range.start.row ? range.start.col : 0;
|
|
83
|
-
const endCol = row === range.end.row ? range.end.col : visibleWidth(line);
|
|
84
|
-
selected.push(sliceColumns(line, startCol, endCol));
|
|
85
|
-
}
|
|
86
|
-
return selected.join("\n").replace(/[ \t]+$/gm, "").trimEnd();
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
apply(lines) {
|
|
90
|
-
return this.applyRegion("default", lines);
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
applyRegion(id, lines) {
|
|
94
|
-
const range = this.range();
|
|
95
|
-
const region = this.regions.find((candidate) => candidate.id === id);
|
|
96
|
-
if (!range || !region) return lines;
|
|
97
|
-
return lines.map((line, row) => {
|
|
98
|
-
const docRow = region.docStart + row;
|
|
99
|
-
if (docRow < range.start.row || docRow > range.end.row) return line;
|
|
100
|
-
const plain = this._plainLine(docRow);
|
|
101
|
-
const startCol = docRow === range.start.row ? range.start.col : 0;
|
|
102
|
-
const endCol = docRow === range.end.row ? range.end.col : visibleWidth(plain);
|
|
103
|
-
if (endCol <= startCol) return line;
|
|
104
|
-
return highlightAnsiLine(line, startCol, endCol);
|
|
105
|
-
});
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
_plainLine(row) {
|
|
109
|
-
if (!this._plainLines.has(row)) this._plainLines.set(row, stripAnsi(this.lines[row] ?? ""));
|
|
110
|
-
return this._plainLines.get(row);
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
range() {
|
|
114
|
-
if (!this.anchor || !this.focus) return null;
|
|
115
|
-
const [start, end] = comparePoints(this.anchor, this.focus) <= 0
|
|
116
|
-
? [this.anchor, this.focus]
|
|
117
|
-
: [this.focus, this.anchor];
|
|
118
|
-
if (start.row === end.row && start.col === end.col) return null;
|
|
119
|
-
return { start, end };
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
export function stripAnsi(text) {
|
|
124
|
-
return String(text ?? "").replace(CONTROL_RE, "");
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
function normalizeRegion(region, index) {
|
|
128
|
-
const lines = [...(region.lines ?? [])];
|
|
129
|
-
const width = Number.isFinite(region.width) ? Math.max(1, Math.trunc(region.width)) : Infinity;
|
|
130
|
-
return {
|
|
131
|
-
id: region.id ?? `region-${index}`,
|
|
132
|
-
lines,
|
|
133
|
-
topRow: Math.max(0, Math.trunc(region.topRow ?? 0)),
|
|
134
|
-
leftCol: Math.max(0, Math.trunc(region.leftCol ?? 0)),
|
|
135
|
-
width,
|
|
136
|
-
};
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
function normalizePoint({ row, col }, regions, clamp) {
|
|
140
|
-
const screenRow = Math.trunc(row) - 1;
|
|
141
|
-
const screenCol = Math.trunc(col) - 1;
|
|
142
|
-
if (regions.length === 0) return null;
|
|
143
|
-
|
|
144
|
-
for (const region of regions) {
|
|
145
|
-
const localRow = screenRow - region.topRow;
|
|
146
|
-
const localCol = screenCol - region.leftCol;
|
|
147
|
-
const maxCol = Number.isFinite(region.width) ? region.width : Infinity;
|
|
148
|
-
if (localRow >= 0 && localRow < region.lines.length) {
|
|
149
|
-
if (!clamp && (localCol < 0 || localCol > maxCol)) return null;
|
|
150
|
-
return {
|
|
151
|
-
row: region.docStart + localRow,
|
|
152
|
-
col: clampNumber(localCol, 0, maxCol),
|
|
153
|
-
};
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
if (!clamp) return null;
|
|
158
|
-
const first = regions[0];
|
|
159
|
-
const last = regions.at(-1);
|
|
160
|
-
if (screenRow < first.topRow) return { row: first.docStart, col: 0 };
|
|
161
|
-
if (screenRow > last.topRow + last.lines.length - 1) {
|
|
162
|
-
return { row: last.docStart + last.lines.length - 1, col: last.width };
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
let nearest = null;
|
|
166
|
-
for (const region of regions) {
|
|
167
|
-
const beforeDistance = Math.abs(screenRow - region.topRow);
|
|
168
|
-
const afterDistance = Math.abs(screenRow - (region.topRow + region.lines.length - 1));
|
|
169
|
-
const before = { row: region.docStart, col: 0, distance: beforeDistance };
|
|
170
|
-
const after = { row: region.docStart + region.lines.length - 1, col: region.width, distance: afterDistance };
|
|
171
|
-
for (const candidate of [before, after]) {
|
|
172
|
-
if (!nearest || candidate.distance < nearest.distance) nearest = candidate;
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
return nearest ? { row: nearest.row, col: nearest.col } : null;
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
function comparePoints(a, b) {
|
|
179
|
-
if (a.row !== b.row) return a.row - b.row;
|
|
180
|
-
return a.col - b.col;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
function highlightAnsiLine(line, startCol, endCol) {
|
|
184
|
-
const { before, selected, after, activeAtStart, activeAtEnd } = splitAnsiColumns(line, startCol, endCol);
|
|
185
|
-
return `${before}${INVERSE}${activeAtStart}${keepInverseAfterReset(selected)}${RESET}${activeAtEnd}${after}`;
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
function keepInverseAfterReset(text) {
|
|
189
|
-
return String(text ?? "").replace(/\x1b\[([0-9;]*)m/g, (seq, body) => {
|
|
190
|
-
const params = body === "" ? ["0"] : body.split(";");
|
|
191
|
-
return params.includes("0") ? `${seq}${INVERSE}` : seq;
|
|
192
|
-
});
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
function sliceColumns(text, startCol, endCol) {
|
|
196
|
-
let col = 0;
|
|
197
|
-
let result = "";
|
|
198
|
-
for (const ch of String(text ?? "")) {
|
|
199
|
-
const next = col + visibleWidth(ch);
|
|
200
|
-
if (next > startCol && col < endCol) result += ch;
|
|
201
|
-
col = next;
|
|
202
|
-
if (col >= endCol) break;
|
|
203
|
-
}
|
|
204
|
-
return result;
|
|
205
|
-
}
|
|
206
|
-
|
|
207
|
-
function splitAnsiColumns(text, startCol, endCol) {
|
|
208
|
-
let col = 0;
|
|
209
|
-
let i = 0;
|
|
210
|
-
let before = "";
|
|
211
|
-
let selected = "";
|
|
212
|
-
let after = "";
|
|
213
|
-
let active = "";
|
|
214
|
-
let activeAtStart = "";
|
|
215
|
-
let activeAtEnd = "";
|
|
216
|
-
let capturedStart = false;
|
|
217
|
-
let capturedEnd = false;
|
|
218
|
-
const source = String(text ?? "");
|
|
219
|
-
|
|
220
|
-
while (i < source.length) {
|
|
221
|
-
const ansi = readAnsi(source, i);
|
|
222
|
-
if (ansi) {
|
|
223
|
-
active = updateActiveSgr(active, ansi);
|
|
224
|
-
if (col < startCol) before += ansi;
|
|
225
|
-
else if (col < endCol) selected += ansi;
|
|
226
|
-
else after += ansi;
|
|
227
|
-
i += ansi.length;
|
|
228
|
-
continue;
|
|
229
|
-
}
|
|
230
|
-
|
|
231
|
-
const ch = source[i];
|
|
232
|
-
if (!capturedStart && col >= startCol) {
|
|
233
|
-
activeAtStart = active;
|
|
234
|
-
capturedStart = true;
|
|
235
|
-
}
|
|
236
|
-
if (!capturedEnd && col >= endCol) {
|
|
237
|
-
activeAtEnd = active;
|
|
238
|
-
capturedEnd = true;
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
const next = col + visibleWidth(ch);
|
|
242
|
-
if (next <= startCol) before += ch;
|
|
243
|
-
else if (col >= endCol) after += ch;
|
|
244
|
-
else selected += ch;
|
|
245
|
-
col = next;
|
|
246
|
-
i += 1;
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
if (!capturedStart) activeAtStart = active;
|
|
250
|
-
if (!capturedEnd) activeAtEnd = active;
|
|
251
|
-
return { before, selected, after, activeAtStart, activeAtEnd };
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
function readAnsi(text, offset) {
|
|
255
|
-
if (text[offset] !== "\x1b") return null;
|
|
256
|
-
const match = text.slice(offset).match(/^\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|\[[0-?]*[ -/]*[@-~]|[@-Z\\-_])/);
|
|
257
|
-
return match?.[0] ?? null;
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
function updateActiveSgr(active, seq) {
|
|
261
|
-
if (!seq.startsWith("\x1b[") || !seq.endsWith("m")) return active;
|
|
262
|
-
const body = seq.slice(2, -1);
|
|
263
|
-
if (body === "" || body.split(";").includes("0")) return "";
|
|
264
|
-
return seq;
|
|
265
|
-
}
|
|
266
|
-
|
|
267
|
-
function clampNumber(value, min, max) {
|
|
268
|
-
return Math.min(max, Math.max(min, value));
|
|
269
|
-
}
|
|
1
|
+
import { visibleWidth } from "@earendil-works/pi-tui";
|
|
2
|
+
|
|
3
|
+
const CONTROL_RE = /\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|\[[0-?]*[ -/]*[@-~]|[@-Z\\-_])/g;
|
|
4
|
+
const INVERSE = "\x1b[7m";
|
|
5
|
+
const RESET = "\x1b[0m";
|
|
6
|
+
|
|
7
|
+
export class ScreenSelection {
|
|
8
|
+
constructor() {
|
|
9
|
+
this.active = false;
|
|
10
|
+
this.anchor = null;
|
|
11
|
+
this.focus = null;
|
|
12
|
+
this.regions = [];
|
|
13
|
+
this._plainLines = new Map();
|
|
14
|
+
this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: 0 };
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
setLines(lines) {
|
|
18
|
+
this.setViewport({ topRow: 0, leftCol: 0, width: Infinity, lines });
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
setViewport({ topRow = 0, leftCol = 0, width = Infinity, lines = [] } = {}) {
|
|
22
|
+
this.setRegions([{ id: "default", topRow, leftCol, width, lines }]);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
setRegions(regions = []) {
|
|
26
|
+
let docRow = 0;
|
|
27
|
+
this.regions = regions
|
|
28
|
+
.map((region, index) => normalizeRegion(region, index))
|
|
29
|
+
.filter((region) => region.lines.length > 0)
|
|
30
|
+
.sort((a, b) => a.topRow - b.topRow || a.leftCol - b.leftCol)
|
|
31
|
+
.map((region) => {
|
|
32
|
+
const normalized = { ...region, docStart: docRow };
|
|
33
|
+
docRow += region.lines.length;
|
|
34
|
+
return normalized;
|
|
35
|
+
});
|
|
36
|
+
this.lines = this.regions.flatMap((region) => region.lines);
|
|
37
|
+
this._plainLines = new Map();
|
|
38
|
+
this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: this.lines.length };
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
start(point) {
|
|
42
|
+
const normalized = normalizePoint(point, this.regions, true);
|
|
43
|
+
if (!normalized) {
|
|
44
|
+
this.clear();
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
this.active = true;
|
|
48
|
+
this.anchor = normalized;
|
|
49
|
+
this.focus = this.anchor;
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
update(point) {
|
|
54
|
+
if (!this.active || !this.anchor) return false;
|
|
55
|
+
this.focus = normalizePoint(point, this.regions, true) ?? this.focus;
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
finish(point, { clear = true } = {}) {
|
|
60
|
+
if (!this.active || !this.anchor) return "";
|
|
61
|
+
this.focus = normalizePoint(point, this.regions, true) ?? this.focus;
|
|
62
|
+
const text = this.text();
|
|
63
|
+
if (clear) this.clear();
|
|
64
|
+
else this.active = false;
|
|
65
|
+
return text;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
clear() {
|
|
69
|
+
const hadSelection = this.active || Boolean(this.anchor || this.focus);
|
|
70
|
+
this.active = false;
|
|
71
|
+
this.anchor = null;
|
|
72
|
+
this.focus = null;
|
|
73
|
+
return hadSelection;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
text() {
|
|
77
|
+
const range = this.range();
|
|
78
|
+
if (!range) return "";
|
|
79
|
+
const selected = [];
|
|
80
|
+
for (let row = range.start.row; row <= range.end.row; row += 1) {
|
|
81
|
+
const line = this._plainLine(row);
|
|
82
|
+
const startCol = row === range.start.row ? range.start.col : 0;
|
|
83
|
+
const endCol = row === range.end.row ? range.end.col : visibleWidth(line);
|
|
84
|
+
selected.push(sliceColumns(line, startCol, endCol));
|
|
85
|
+
}
|
|
86
|
+
return selected.join("\n").replace(/[ \t]+$/gm, "").trimEnd();
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
apply(lines) {
|
|
90
|
+
return this.applyRegion("default", lines);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
applyRegion(id, lines) {
|
|
94
|
+
const range = this.range();
|
|
95
|
+
const region = this.regions.find((candidate) => candidate.id === id);
|
|
96
|
+
if (!range || !region) return lines;
|
|
97
|
+
return lines.map((line, row) => {
|
|
98
|
+
const docRow = region.docStart + row;
|
|
99
|
+
if (docRow < range.start.row || docRow > range.end.row) return line;
|
|
100
|
+
const plain = this._plainLine(docRow);
|
|
101
|
+
const startCol = docRow === range.start.row ? range.start.col : 0;
|
|
102
|
+
const endCol = docRow === range.end.row ? range.end.col : visibleWidth(plain);
|
|
103
|
+
if (endCol <= startCol) return line;
|
|
104
|
+
return highlightAnsiLine(line, startCol, endCol);
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
_plainLine(row) {
|
|
109
|
+
if (!this._plainLines.has(row)) this._plainLines.set(row, stripAnsi(this.lines[row] ?? ""));
|
|
110
|
+
return this._plainLines.get(row);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
range() {
|
|
114
|
+
if (!this.anchor || !this.focus) return null;
|
|
115
|
+
const [start, end] = comparePoints(this.anchor, this.focus) <= 0
|
|
116
|
+
? [this.anchor, this.focus]
|
|
117
|
+
: [this.focus, this.anchor];
|
|
118
|
+
if (start.row === end.row && start.col === end.col) return null;
|
|
119
|
+
return { start, end };
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
export function stripAnsi(text) {
|
|
124
|
+
return String(text ?? "").replace(CONTROL_RE, "");
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
function normalizeRegion(region, index) {
|
|
128
|
+
const lines = [...(region.lines ?? [])];
|
|
129
|
+
const width = Number.isFinite(region.width) ? Math.max(1, Math.trunc(region.width)) : Infinity;
|
|
130
|
+
return {
|
|
131
|
+
id: region.id ?? `region-${index}`,
|
|
132
|
+
lines,
|
|
133
|
+
topRow: Math.max(0, Math.trunc(region.topRow ?? 0)),
|
|
134
|
+
leftCol: Math.max(0, Math.trunc(region.leftCol ?? 0)),
|
|
135
|
+
width,
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
function normalizePoint({ row, col }, regions, clamp) {
|
|
140
|
+
const screenRow = Math.trunc(row) - 1;
|
|
141
|
+
const screenCol = Math.trunc(col) - 1;
|
|
142
|
+
if (regions.length === 0) return null;
|
|
143
|
+
|
|
144
|
+
for (const region of regions) {
|
|
145
|
+
const localRow = screenRow - region.topRow;
|
|
146
|
+
const localCol = screenCol - region.leftCol;
|
|
147
|
+
const maxCol = Number.isFinite(region.width) ? region.width : Infinity;
|
|
148
|
+
if (localRow >= 0 && localRow < region.lines.length) {
|
|
149
|
+
if (!clamp && (localCol < 0 || localCol > maxCol)) return null;
|
|
150
|
+
return {
|
|
151
|
+
row: region.docStart + localRow,
|
|
152
|
+
col: clampNumber(localCol, 0, maxCol),
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
if (!clamp) return null;
|
|
158
|
+
const first = regions[0];
|
|
159
|
+
const last = regions.at(-1);
|
|
160
|
+
if (screenRow < first.topRow) return { row: first.docStart, col: 0 };
|
|
161
|
+
if (screenRow > last.topRow + last.lines.length - 1) {
|
|
162
|
+
return { row: last.docStart + last.lines.length - 1, col: last.width };
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
let nearest = null;
|
|
166
|
+
for (const region of regions) {
|
|
167
|
+
const beforeDistance = Math.abs(screenRow - region.topRow);
|
|
168
|
+
const afterDistance = Math.abs(screenRow - (region.topRow + region.lines.length - 1));
|
|
169
|
+
const before = { row: region.docStart, col: 0, distance: beforeDistance };
|
|
170
|
+
const after = { row: region.docStart + region.lines.length - 1, col: region.width, distance: afterDistance };
|
|
171
|
+
for (const candidate of [before, after]) {
|
|
172
|
+
if (!nearest || candidate.distance < nearest.distance) nearest = candidate;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
return nearest ? { row: nearest.row, col: nearest.col } : null;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
function comparePoints(a, b) {
|
|
179
|
+
if (a.row !== b.row) return a.row - b.row;
|
|
180
|
+
return a.col - b.col;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
function highlightAnsiLine(line, startCol, endCol) {
|
|
184
|
+
const { before, selected, after, activeAtStart, activeAtEnd } = splitAnsiColumns(line, startCol, endCol);
|
|
185
|
+
return `${before}${INVERSE}${activeAtStart}${keepInverseAfterReset(selected)}${RESET}${activeAtEnd}${after}`;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
function keepInverseAfterReset(text) {
|
|
189
|
+
return String(text ?? "").replace(/\x1b\[([0-9;]*)m/g, (seq, body) => {
|
|
190
|
+
const params = body === "" ? ["0"] : body.split(";");
|
|
191
|
+
return params.includes("0") ? `${seq}${INVERSE}` : seq;
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
function sliceColumns(text, startCol, endCol) {
|
|
196
|
+
let col = 0;
|
|
197
|
+
let result = "";
|
|
198
|
+
for (const ch of String(text ?? "")) {
|
|
199
|
+
const next = col + visibleWidth(ch);
|
|
200
|
+
if (next > startCol && col < endCol) result += ch;
|
|
201
|
+
col = next;
|
|
202
|
+
if (col >= endCol) break;
|
|
203
|
+
}
|
|
204
|
+
return result;
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
function splitAnsiColumns(text, startCol, endCol) {
|
|
208
|
+
let col = 0;
|
|
209
|
+
let i = 0;
|
|
210
|
+
let before = "";
|
|
211
|
+
let selected = "";
|
|
212
|
+
let after = "";
|
|
213
|
+
let active = "";
|
|
214
|
+
let activeAtStart = "";
|
|
215
|
+
let activeAtEnd = "";
|
|
216
|
+
let capturedStart = false;
|
|
217
|
+
let capturedEnd = false;
|
|
218
|
+
const source = String(text ?? "");
|
|
219
|
+
|
|
220
|
+
while (i < source.length) {
|
|
221
|
+
const ansi = readAnsi(source, i);
|
|
222
|
+
if (ansi) {
|
|
223
|
+
active = updateActiveSgr(active, ansi);
|
|
224
|
+
if (col < startCol) before += ansi;
|
|
225
|
+
else if (col < endCol) selected += ansi;
|
|
226
|
+
else after += ansi;
|
|
227
|
+
i += ansi.length;
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
const ch = source[i];
|
|
232
|
+
if (!capturedStart && col >= startCol) {
|
|
233
|
+
activeAtStart = active;
|
|
234
|
+
capturedStart = true;
|
|
235
|
+
}
|
|
236
|
+
if (!capturedEnd && col >= endCol) {
|
|
237
|
+
activeAtEnd = active;
|
|
238
|
+
capturedEnd = true;
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
const next = col + visibleWidth(ch);
|
|
242
|
+
if (next <= startCol) before += ch;
|
|
243
|
+
else if (col >= endCol) after += ch;
|
|
244
|
+
else selected += ch;
|
|
245
|
+
col = next;
|
|
246
|
+
i += 1;
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
if (!capturedStart) activeAtStart = active;
|
|
250
|
+
if (!capturedEnd) activeAtEnd = active;
|
|
251
|
+
return { before, selected, after, activeAtStart, activeAtEnd };
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
function readAnsi(text, offset) {
|
|
255
|
+
if (text[offset] !== "\x1b") return null;
|
|
256
|
+
const match = text.slice(offset).match(/^\x1b(?:\][^\x07]*(?:\x07|\x1b\\)|\[[0-?]*[ -/]*[@-~]|[@-Z\\-_])/);
|
|
257
|
+
return match?.[0] ?? null;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
function updateActiveSgr(active, seq) {
|
|
261
|
+
if (!seq.startsWith("\x1b[") || !seq.endsWith("m")) return active;
|
|
262
|
+
const body = seq.slice(2, -1);
|
|
263
|
+
if (body === "" || body.split(";").includes("0")) return "";
|
|
264
|
+
return seq;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
function clampNumber(value, min, max) {
|
|
268
|
+
return Math.min(max, Math.max(min, value));
|
|
269
|
+
}
|