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
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
2
|
+
import { isAbsolute, relative, resolve } from "node:path";
|
|
3
|
+
import { spawnSync } from "node:child_process";
|
|
4
|
+
import { walkMarkdownFiles } from "./markdown/markdown-format.mjs";
|
|
5
|
+
import { resolveRipgrepCommand } from "./markdown/ripgrep.mjs";
|
|
6
|
+
|
|
7
|
+
const DEFAULT_SEARCH_TIMEOUT_MS = 10000;
|
|
8
|
+
const DEFAULT_CONTEXT_LINES = 2;
|
|
9
|
+
const MAX_CONTEXT_LINES = 20;
|
|
10
|
+
const MAX_OPEN_LINES = 400;
|
|
11
|
+
const MAX_SEARCH_LIMIT = 50;
|
|
12
|
+
|
|
13
|
+
export function searchMarkdownRoot({
|
|
14
|
+
root,
|
|
15
|
+
paths = null,
|
|
16
|
+
query,
|
|
17
|
+
limit = 20,
|
|
18
|
+
context = DEFAULT_CONTEXT_LINES,
|
|
19
|
+
syntax = "regex",
|
|
20
|
+
caseMode = "smart",
|
|
21
|
+
glob = [],
|
|
22
|
+
} = {}) {
|
|
23
|
+
const resolvedRoot = resolve(root);
|
|
24
|
+
const trimmed = String(query ?? "").trim();
|
|
25
|
+
if (!trimmed) return [];
|
|
26
|
+
const max = clampInt(limit, 1, MAX_SEARCH_LIMIT, 20);
|
|
27
|
+
const contextLines = clampInt(context, 0, MAX_CONTEXT_LINES, DEFAULT_CONTEXT_LINES);
|
|
28
|
+
const searchPaths = (paths ?? walkMarkdownFiles(resolvedRoot)).map((path) => resolve(path));
|
|
29
|
+
if (searchPaths.length === 0) return [];
|
|
30
|
+
|
|
31
|
+
const args = ["--json", "--line-number", "--color", "never"];
|
|
32
|
+
if (syntax === "literal") args.push("--fixed-strings");
|
|
33
|
+
if (caseMode === "smart") args.push("--smart-case");
|
|
34
|
+
else if (caseMode === "insensitive") args.push("--ignore-case");
|
|
35
|
+
for (const pattern of normalizeGlob(glob)) args.push("--glob", pattern);
|
|
36
|
+
args.push("--", trimmed, ...searchPaths);
|
|
37
|
+
|
|
38
|
+
const rg = spawnSync(resolveRipgrepCommand(), args, {
|
|
39
|
+
encoding: "utf8",
|
|
40
|
+
timeout: DEFAULT_SEARCH_TIMEOUT_MS,
|
|
41
|
+
windowsHide: true,
|
|
42
|
+
});
|
|
43
|
+
if (rg.error || (rg.status !== 0 && !rg.stdout)) {
|
|
44
|
+
return fallbackSearch({ root: resolvedRoot, paths: searchPaths, query: trimmed, limit: max, context: contextLines });
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
const matches = [];
|
|
48
|
+
for (const raw of rg.stdout.split(/\r?\n/)) {
|
|
49
|
+
if (!raw) continue;
|
|
50
|
+
let event;
|
|
51
|
+
try {
|
|
52
|
+
event = JSON.parse(raw);
|
|
53
|
+
} catch {
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
if (event?.type !== "match") continue;
|
|
57
|
+
const data = event.data ?? {};
|
|
58
|
+
const absolutePath = resolve(data.path?.text ?? "");
|
|
59
|
+
if (!isInsideRoot(resolvedRoot, absolutePath)) continue;
|
|
60
|
+
const line = Number(data.line_number) || 1;
|
|
61
|
+
const matchText = data.submatches?.[0]?.match?.text ?? String(data.lines?.text ?? "").replace(/\r?\n$/, "");
|
|
62
|
+
matches.push({
|
|
63
|
+
path: toMemoryPath(resolvedRoot, absolutePath),
|
|
64
|
+
absolutePath,
|
|
65
|
+
line,
|
|
66
|
+
match: matchText,
|
|
67
|
+
excerpt: buildExcerpt({ path: absolutePath, line, context: contextLines }),
|
|
68
|
+
open: { path: toMemoryPath(resolvedRoot, absolutePath), line, context: 40 },
|
|
69
|
+
});
|
|
70
|
+
if (matches.length >= max) break;
|
|
71
|
+
}
|
|
72
|
+
return matches;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export function openMarkdownRoot({ root, path, line = null, context = 40, offset = null, limit = null } = {}) {
|
|
76
|
+
const resolvedRoot = resolve(root);
|
|
77
|
+
const absolutePath = resolveMemoryPath(resolvedRoot, path);
|
|
78
|
+
if (!existsSync(absolutePath)) throw new Error(`memory not found: ${path}`);
|
|
79
|
+
const content = readFileSync(absolutePath, "utf8");
|
|
80
|
+
const lines = content.split(/\r?\n/);
|
|
81
|
+
const hasLineRange = line != null || offset != null || limit != null;
|
|
82
|
+
if (!hasLineRange) {
|
|
83
|
+
return {
|
|
84
|
+
path: absolutePath,
|
|
85
|
+
relativePath: toMemoryPath(resolvedRoot, absolutePath),
|
|
86
|
+
content,
|
|
87
|
+
startLine: 1,
|
|
88
|
+
endLine: lines.length,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
let startLine;
|
|
93
|
+
let endLine;
|
|
94
|
+
if (line != null) {
|
|
95
|
+
const center = clampInt(line, 1, lines.length || 1, 1);
|
|
96
|
+
const contextLines = clampInt(context, 0, MAX_OPEN_LINES, 40);
|
|
97
|
+
startLine = Math.max(1, center - contextLines);
|
|
98
|
+
endLine = Math.min(lines.length, center + contextLines);
|
|
99
|
+
} else {
|
|
100
|
+
startLine = clampInt(offset ?? 1, 1, lines.length || 1, 1);
|
|
101
|
+
const maxLines = clampInt(limit ?? 120, 1, MAX_OPEN_LINES, 120);
|
|
102
|
+
endLine = Math.min(lines.length, startLine + maxLines - 1);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
return {
|
|
106
|
+
path: absolutePath,
|
|
107
|
+
relativePath: toMemoryPath(resolvedRoot, absolutePath),
|
|
108
|
+
content: lines.slice(startLine - 1, endLine).join("\n"),
|
|
109
|
+
startLine,
|
|
110
|
+
endLine,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
export function toMemoryPath(root, path) {
|
|
115
|
+
return relative(resolve(root), resolve(path)).replace(/\\/g, "/");
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
function fallbackSearch({ root, paths, query, limit, context }) {
|
|
119
|
+
const matches = [];
|
|
120
|
+
for (const absolutePath of paths) {
|
|
121
|
+
if (!existsSync(absolutePath)) continue;
|
|
122
|
+
const lines = readFileSync(absolutePath, "utf8").split(/\r?\n/);
|
|
123
|
+
for (let i = 0; i < lines.length; i++) {
|
|
124
|
+
if (!lines[i].includes(query)) continue;
|
|
125
|
+
const line = i + 1;
|
|
126
|
+
matches.push({
|
|
127
|
+
path: toMemoryPath(root, absolutePath),
|
|
128
|
+
absolutePath,
|
|
129
|
+
line,
|
|
130
|
+
match: query,
|
|
131
|
+
excerpt: buildExcerpt({ path: absolutePath, line, context }),
|
|
132
|
+
open: { path: toMemoryPath(root, absolutePath), line, context: 40 },
|
|
133
|
+
});
|
|
134
|
+
if (matches.length >= limit) return matches;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return matches;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
function buildExcerpt({ path, line, context }) {
|
|
141
|
+
const lines = readFileSync(path, "utf8").split(/\r?\n/);
|
|
142
|
+
const startLine = Math.max(1, line - context);
|
|
143
|
+
const endLine = Math.min(lines.length, line + context);
|
|
144
|
+
const numbered = [];
|
|
145
|
+
for (let n = startLine; n <= endLine; n++) {
|
|
146
|
+
numbered.push({ line: n, text: lines[n - 1] ?? "" });
|
|
147
|
+
}
|
|
148
|
+
return {
|
|
149
|
+
startLine,
|
|
150
|
+
endLine,
|
|
151
|
+
lines: numbered,
|
|
152
|
+
text: numbered.map((item) => `${item.line} | ${truncateLine(item.text)}`).join("\n"),
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
function resolveMemoryPath(root, rawPath) {
|
|
157
|
+
const raw = String(rawPath ?? "").trim();
|
|
158
|
+
if (!raw) throw new Error("memory path is required");
|
|
159
|
+
const path = isAbsolute(raw) ? resolve(raw) : resolve(root, raw);
|
|
160
|
+
if (!isInsideRoot(root, path)) throw new Error(`memory path is outside root: ${raw}`);
|
|
161
|
+
return path;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
function isInsideRoot(root, path) {
|
|
165
|
+
const rel = relative(resolve(root), resolve(path));
|
|
166
|
+
return rel === "" || (!rel.startsWith("..") && !isAbsolute(rel));
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
function normalizeGlob(glob) {
|
|
170
|
+
const items = Array.isArray(glob) ? glob : glob ? [glob] : [];
|
|
171
|
+
return items.map((item) => String(item ?? "").trim()).filter(Boolean).slice(0, 8);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
function clampInt(value, min, max, fallback) {
|
|
175
|
+
const number = Number(value);
|
|
176
|
+
if (!Number.isFinite(number)) return fallback;
|
|
177
|
+
return Math.min(max, Math.max(min, Math.floor(number)));
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
function truncateLine(text, max = 240) {
|
|
181
|
+
const value = String(text ?? "");
|
|
182
|
+
return value.length > max ? `${value.slice(0, max - 1)}…` : value;
|
|
183
|
+
}
|
|
@@ -1,131 +1,131 @@
|
|
|
1
|
-
import { readFileSync } from "node:fs";
|
|
2
|
-
import { execFileSync } from "node:child_process";
|
|
3
|
-
import tls from "node:tls";
|
|
4
|
-
import { EnvHttpProxyAgent, setGlobalDispatcher } from "undici";
|
|
5
|
-
|
|
6
|
-
export function installNetworkEnvironment(network = {}) {
|
|
7
|
-
const proxy = resolveProxySettings(network);
|
|
8
|
-
installProxyDispatcher(proxy);
|
|
9
|
-
const ca = installDefaultCertificates(network.ca ?? "system");
|
|
10
|
-
return { proxy, ca };
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
export function resolveProxySettings(network = {}, { env = process.env, platform = process.platform } = {}) {
|
|
14
|
-
const proxyMode = network.proxy ?? "system";
|
|
15
|
-
const explicitNoProxy = formatNoProxy(network.noProxy);
|
|
16
|
-
|
|
17
|
-
if (proxyMode === false || proxyMode === "none" || proxyMode === "direct") {
|
|
18
|
-
return { mode: "direct", httpProxy: null, httpsProxy: null, noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null };
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
if (typeof proxyMode === "string" && proxyMode.trim() && proxyMode !== "system") {
|
|
22
|
-
const proxy = normalizeProxyUrl(proxyMode.trim());
|
|
23
|
-
return { mode: "config", httpProxy: proxy, httpsProxy: proxy, noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null };
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
const envProxy = proxyFromEnv(env, explicitNoProxy);
|
|
27
|
-
if (envProxy.httpProxy || envProxy.httpsProxy) return { mode: "env", ...envProxy };
|
|
28
|
-
|
|
29
|
-
const systemProxy = platform === "win32" ? detectWindowsProxy() : null;
|
|
30
|
-
if (systemProxy?.httpProxy || systemProxy?.httpsProxy) {
|
|
31
|
-
return {
|
|
32
|
-
mode: "system",
|
|
33
|
-
httpProxy: systemProxy.httpProxy,
|
|
34
|
-
httpsProxy: systemProxy.httpsProxy,
|
|
35
|
-
noProxy: explicitNoProxy ?? systemProxy.noProxy ?? null,
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
return { mode: "direct", httpProxy: null, httpsProxy: null, noProxy: explicitNoProxy ?? null };
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
function installProxyDispatcher(proxy) {
|
|
43
|
-
setGlobalDispatcher(new EnvHttpProxyAgent({
|
|
44
|
-
httpProxy: proxy.httpProxy ?? "",
|
|
45
|
-
httpsProxy: proxy.httpsProxy ?? "",
|
|
46
|
-
noProxy: proxy.noProxy ?? "",
|
|
47
|
-
bodyTimeout: 0,
|
|
48
|
-
headersTimeout: 0,
|
|
49
|
-
}));
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
export function installDefaultCertificates(caConfig = "system") {
|
|
53
|
-
const entries = Array.isArray(caConfig) ? caConfig : [caConfig];
|
|
54
|
-
const wantsSystem = entries.includes("system");
|
|
55
|
-
const pemPaths = entries.filter((entry) => typeof entry === "string" && entry && entry !== "system");
|
|
56
|
-
|
|
57
|
-
if (!wantsSystem && pemPaths.length === 0) return { mode: "default", system: false, extraFiles: [] };
|
|
58
|
-
if (typeof tls.setDefaultCACertificates !== "function" || typeof tls.getCACertificates !== "function") {
|
|
59
|
-
return { mode: "unsupported", system: false, extraFiles: [] };
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
const certificates = [
|
|
63
|
-
...tls.getCACertificates("default"),
|
|
64
|
-
...(wantsSystem ? tls.getCACertificates("system") : []),
|
|
65
|
-
...pemPaths.map((path) => readFileSync(path, "utf8")),
|
|
66
|
-
];
|
|
67
|
-
tls.setDefaultCACertificates([...new Set(certificates)]);
|
|
68
|
-
return { mode: "installed", system: wantsSystem, extraFiles: pemPaths };
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
function proxyFromEnv(env, explicitNoProxy) {
|
|
72
|
-
const httpsProxy = env.HTTPS_PROXY ?? env.https_proxy ?? env.ALL_PROXY ?? env.all_proxy ?? null;
|
|
73
|
-
const httpProxy = env.HTTP_PROXY ?? env.http_proxy ?? env.ALL_PROXY ?? env.all_proxy ?? null;
|
|
74
|
-
const normalizedHttp = httpProxy ? normalizeProxyUrl(httpProxy) : null;
|
|
75
|
-
return {
|
|
76
|
-
httpProxy: normalizedHttp,
|
|
77
|
-
httpsProxy: httpsProxy ? normalizeProxyUrl(httpsProxy) : normalizedHttp,
|
|
78
|
-
noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null,
|
|
79
|
-
};
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
function detectWindowsProxy() {
|
|
83
|
-
try {
|
|
84
|
-
const output = execFileSync("reg", ["query", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"], { encoding: "utf8", windowsHide: true });
|
|
85
|
-
const values = parseRegQuery(output);
|
|
86
|
-
if (values.ProxyEnable !== "0x1") return null;
|
|
87
|
-
return parseWindowsProxyServer(values.ProxyServer, values.ProxyOverride);
|
|
88
|
-
} catch {
|
|
89
|
-
return null;
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
function parseRegQuery(output) {
|
|
94
|
-
const values = {};
|
|
95
|
-
for (const line of output.split(/\r?\n/)) {
|
|
96
|
-
const match = line.trim().match(/^(\S+)\s+REG_\S+\s+(.+)$/);
|
|
97
|
-
if (match) values[match[1]] = match[2].trim();
|
|
98
|
-
}
|
|
99
|
-
return values;
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
function parseWindowsProxyServer(proxyServer, proxyOverride) {
|
|
103
|
-
if (!proxyServer) return null;
|
|
104
|
-
const entries = Object.fromEntries(proxyServer.split(";").map((part) => part.split("=")).filter((part) => part.length === 2));
|
|
105
|
-
const fallback = proxyServer.includes("=") ? null : proxyServer;
|
|
106
|
-
return {
|
|
107
|
-
httpProxy: normalizeProxyUrl(entries.http ?? fallback),
|
|
108
|
-
httpsProxy: normalizeProxyUrl(entries.https ?? entries.http ?? fallback),
|
|
109
|
-
noProxy: formatWindowsProxyOverride(proxyOverride),
|
|
110
|
-
};
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
function normalizeProxyUrl(value) {
|
|
114
|
-
if (!value) return null;
|
|
115
|
-
return /^[a-z][a-z0-9+.-]*:\/\//i.test(value) ? value : `http://${value}`;
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
function formatNoProxy(value) {
|
|
119
|
-
if (Array.isArray(value)) return value.join(",");
|
|
120
|
-
if (typeof value === "string") return value;
|
|
121
|
-
return null;
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
function formatWindowsProxyOverride(value) {
|
|
125
|
-
if (!value) return null;
|
|
126
|
-
return value
|
|
127
|
-
.split(";")
|
|
128
|
-
.map((entry) => entry.trim())
|
|
129
|
-
.filter((entry) => entry && entry !== "<local>")
|
|
130
|
-
.join(",") || null;
|
|
131
|
-
}
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { execFileSync } from "node:child_process";
|
|
3
|
+
import tls from "node:tls";
|
|
4
|
+
import { EnvHttpProxyAgent, setGlobalDispatcher } from "undici";
|
|
5
|
+
|
|
6
|
+
export function installNetworkEnvironment(network = {}) {
|
|
7
|
+
const proxy = resolveProxySettings(network);
|
|
8
|
+
installProxyDispatcher(proxy);
|
|
9
|
+
const ca = installDefaultCertificates(network.ca ?? "system");
|
|
10
|
+
return { proxy, ca };
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function resolveProxySettings(network = {}, { env = process.env, platform = process.platform } = {}) {
|
|
14
|
+
const proxyMode = network.proxy ?? "system";
|
|
15
|
+
const explicitNoProxy = formatNoProxy(network.noProxy);
|
|
16
|
+
|
|
17
|
+
if (proxyMode === false || proxyMode === "none" || proxyMode === "direct") {
|
|
18
|
+
return { mode: "direct", httpProxy: null, httpsProxy: null, noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null };
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (typeof proxyMode === "string" && proxyMode.trim() && proxyMode !== "system") {
|
|
22
|
+
const proxy = normalizeProxyUrl(proxyMode.trim());
|
|
23
|
+
return { mode: "config", httpProxy: proxy, httpsProxy: proxy, noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null };
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const envProxy = proxyFromEnv(env, explicitNoProxy);
|
|
27
|
+
if (envProxy.httpProxy || envProxy.httpsProxy) return { mode: "env", ...envProxy };
|
|
28
|
+
|
|
29
|
+
const systemProxy = platform === "win32" ? detectWindowsProxy() : null;
|
|
30
|
+
if (systemProxy?.httpProxy || systemProxy?.httpsProxy) {
|
|
31
|
+
return {
|
|
32
|
+
mode: "system",
|
|
33
|
+
httpProxy: systemProxy.httpProxy,
|
|
34
|
+
httpsProxy: systemProxy.httpsProxy,
|
|
35
|
+
noProxy: explicitNoProxy ?? systemProxy.noProxy ?? null,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
return { mode: "direct", httpProxy: null, httpsProxy: null, noProxy: explicitNoProxy ?? null };
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function installProxyDispatcher(proxy) {
|
|
43
|
+
setGlobalDispatcher(new EnvHttpProxyAgent({
|
|
44
|
+
httpProxy: proxy.httpProxy ?? "",
|
|
45
|
+
httpsProxy: proxy.httpsProxy ?? "",
|
|
46
|
+
noProxy: proxy.noProxy ?? "",
|
|
47
|
+
bodyTimeout: 0,
|
|
48
|
+
headersTimeout: 0,
|
|
49
|
+
}));
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export function installDefaultCertificates(caConfig = "system") {
|
|
53
|
+
const entries = Array.isArray(caConfig) ? caConfig : [caConfig];
|
|
54
|
+
const wantsSystem = entries.includes("system");
|
|
55
|
+
const pemPaths = entries.filter((entry) => typeof entry === "string" && entry && entry !== "system");
|
|
56
|
+
|
|
57
|
+
if (!wantsSystem && pemPaths.length === 0) return { mode: "default", system: false, extraFiles: [] };
|
|
58
|
+
if (typeof tls.setDefaultCACertificates !== "function" || typeof tls.getCACertificates !== "function") {
|
|
59
|
+
return { mode: "unsupported", system: false, extraFiles: [] };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
const certificates = [
|
|
63
|
+
...tls.getCACertificates("default"),
|
|
64
|
+
...(wantsSystem ? tls.getCACertificates("system") : []),
|
|
65
|
+
...pemPaths.map((path) => readFileSync(path, "utf8")),
|
|
66
|
+
];
|
|
67
|
+
tls.setDefaultCACertificates([...new Set(certificates)]);
|
|
68
|
+
return { mode: "installed", system: wantsSystem, extraFiles: pemPaths };
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function proxyFromEnv(env, explicitNoProxy) {
|
|
72
|
+
const httpsProxy = env.HTTPS_PROXY ?? env.https_proxy ?? env.ALL_PROXY ?? env.all_proxy ?? null;
|
|
73
|
+
const httpProxy = env.HTTP_PROXY ?? env.http_proxy ?? env.ALL_PROXY ?? env.all_proxy ?? null;
|
|
74
|
+
const normalizedHttp = httpProxy ? normalizeProxyUrl(httpProxy) : null;
|
|
75
|
+
return {
|
|
76
|
+
httpProxy: normalizedHttp,
|
|
77
|
+
httpsProxy: httpsProxy ? normalizeProxyUrl(httpsProxy) : normalizedHttp,
|
|
78
|
+
noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
function detectWindowsProxy() {
|
|
83
|
+
try {
|
|
84
|
+
const output = execFileSync("reg", ["query", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"], { encoding: "utf8", windowsHide: true });
|
|
85
|
+
const values = parseRegQuery(output);
|
|
86
|
+
if (values.ProxyEnable !== "0x1") return null;
|
|
87
|
+
return parseWindowsProxyServer(values.ProxyServer, values.ProxyOverride);
|
|
88
|
+
} catch {
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
function parseRegQuery(output) {
|
|
94
|
+
const values = {};
|
|
95
|
+
for (const line of output.split(/\r?\n/)) {
|
|
96
|
+
const match = line.trim().match(/^(\S+)\s+REG_\S+\s+(.+)$/);
|
|
97
|
+
if (match) values[match[1]] = match[2].trim();
|
|
98
|
+
}
|
|
99
|
+
return values;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function parseWindowsProxyServer(proxyServer, proxyOverride) {
|
|
103
|
+
if (!proxyServer) return null;
|
|
104
|
+
const entries = Object.fromEntries(proxyServer.split(";").map((part) => part.split("=")).filter((part) => part.length === 2));
|
|
105
|
+
const fallback = proxyServer.includes("=") ? null : proxyServer;
|
|
106
|
+
return {
|
|
107
|
+
httpProxy: normalizeProxyUrl(entries.http ?? fallback),
|
|
108
|
+
httpsProxy: normalizeProxyUrl(entries.https ?? entries.http ?? fallback),
|
|
109
|
+
noProxy: formatWindowsProxyOverride(proxyOverride),
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
function normalizeProxyUrl(value) {
|
|
114
|
+
if (!value) return null;
|
|
115
|
+
return /^[a-z][a-z0-9+.-]*:\/\//i.test(value) ? value : `http://${value}`;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
function formatNoProxy(value) {
|
|
119
|
+
if (Array.isArray(value)) return value.join(",");
|
|
120
|
+
if (typeof value === "string") return value;
|
|
121
|
+
return null;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
function formatWindowsProxyOverride(value) {
|
|
125
|
+
if (!value) return null;
|
|
126
|
+
return value
|
|
127
|
+
.split(";")
|
|
128
|
+
.map((entry) => entry.trim())
|
|
129
|
+
.filter((entry) => entry && entry !== "<local>")
|
|
130
|
+
.join(",") || null;
|
|
131
|
+
}
|