@galaxy-stack/blackhole-cli 3.0.13 → 3.0.14
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/CHANGELOG.md +971 -0
- package/README.md +12 -11
- package/dist/harness/install-command.js +2 -2
- package/dist/harness/install-command.js.map +1 -1
- package/dist/harness/install.d.ts +1 -1
- package/dist/harness/install.js +1 -1
- package/dist/harness/locate.d.ts +9 -3
- package/dist/harness/locate.d.ts.map +1 -1
- package/dist/harness/locate.js +39 -7
- package/dist/harness/locate.js.map +1 -1
- package/dist/harness/node-runtime.d.ts +37 -3
- package/dist/harness/node-runtime.d.ts.map +1 -1
- package/dist/harness/node-runtime.js +60 -14
- package/dist/harness/node-runtime.js.map +1 -1
- package/dist/harness/process.d.ts +1 -1
- package/dist/harness/process.d.ts.map +1 -1
- package/dist/harness/process.js +14 -5
- package/dist/harness/process.js.map +1 -1
- package/dist/migrate.d.ts +20 -12
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +39 -67
- package/dist/migrate.js.map +1 -1
- package/dist/options.d.ts +1 -1
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +1 -1
- package/dist/web/command.d.ts +1 -1
- package/dist/web/command.js +3 -3
- package/dist/web/command.js.map +1 -1
- package/dist/web/doctor.js +5 -5
- package/dist/web/doctor.js.map +1 -1
- package/dist/web/options.js +2 -2
- package/dist/web/options.js.map +1 -1
- package/dist/web/web.d.ts +6 -4
- package/dist/web/web.d.ts.map +1 -1
- package/dist/web/web.js +10 -8
- package/dist/web/web.js.map +1 -1
- package/package.json +4 -6
- package/dist/web/dsh.d.ts +0 -51
- package/dist/web/dsh.d.ts.map +0 -1
- package/dist/web/dsh.js +0 -149
- package/dist/web/dsh.js.map +0 -1
- package/web/brand/app-icon-192.png +0 -0
- package/web/brand/app-icon-512.png +0 -0
- package/web/brand/client.template.js +0 -1259
- package/web/brand/dsh-locale-keys.json +0 -8659
- package/web/brand/favicon.png +0 -0
- package/web/brand/favicon.svg +0 -12
- package/web/brand/lib/app-icons.js +0 -3
- package/web/brand/lib/client.js +0 -5161
- package/web/brand/lib/favicon.js +0 -1
- package/web/brand/lib/index.d.ts +0 -3
- package/web/brand/lib/index.js +0 -1068
- package/web/brand/lib/journey-host.js +0 -288
- package/web/brand/lib/journey-run.d.ts +0 -70
- package/web/brand/lib/journey-run.js +0 -344
- package/web/brand/lib/journey-store.d.ts +0 -61
- package/web/brand/lib/journey-store.js +0 -183
- package/web/brand/lib/session-store.d.ts +0 -54
- package/web/brand/lib/session-store.js +0 -288
- package/web/brand/logo.png +0 -0
- package/web/brand/logo.svg +0 -20
- package/web/brand/package.json +0 -35
- package/web/brand/panel/journey-panel.js +0 -1037
- package/web/brand/vi-same-by-design.json +0 -112
- package/web/brand/vi.locales.json +0 -2867
- package/web/brand/zalo.jpg +0 -0
- package/web/patches/gbh-brand.patch.yml +0 -13
- package/web/patches/gbh-ui.patch.yml +0 -7
- package/web/patches/gbh-web.patch.yml +0 -124
package/README.md
CHANGED
|
@@ -9,10 +9,12 @@ repository, plus the launcher for the Galaxy Blackhole web GUI. Published identi
|
|
|
9
9
|
desktop shell loads. The one-shot `run`, `flow`, `skills` and `memory` commands still use
|
|
10
10
|
`@galaxy-stack/ai-coder-core`; the terminal surface itself is React 19 + Ink 7.
|
|
11
11
|
|
|
12
|
-
The harness
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
The harness is an **npm dependency of this package** (the same model as `@deepseek-ai/dsh`):
|
|
13
|
+
`npm i -g @galaxy-stack/blackhole-cli` installs the CLI and the harness together, so there is no
|
|
14
|
+
separate install step. The resolver reads, in order, `GBH_TAURI_ROOT`, the npm dependency
|
|
15
|
+
`@galaxy-blackhole/blackhole-harness` shipped with this CLI, `$GBH_HOME/harness/blackhole-harness`,
|
|
16
|
+
`~/.galaxy/harness/blackhole-harness` (and any `--dir` the repair installer recorded), a sibling
|
|
17
|
+
`blackhole-harness` checkout, and finally the developer path
|
|
16
18
|
`~/Desktop/Project/galaxy/galaxy-blackhole/blackhole-harness`. Booting needs **Node 22.6+** — the
|
|
17
19
|
floor for stripping TypeScript types — and nothing else: the launcher is a Node program, so
|
|
18
20
|
`blackhole web` runs it with Node instead of asking for Bun. The ladder is `GBH_NODE` → newest
|
|
@@ -24,7 +26,6 @@ build tool of the desktop checkout (it bundles the client plugins), never a boot
|
|
|
24
26
|
|
|
25
27
|
```sh
|
|
26
28
|
npm i -g @galaxy-stack/blackhole-cli@latest
|
|
27
|
-
blackhole harness install # install the harness from npm into ~/.galaxy/harness
|
|
28
29
|
blackhole doctor # check the API key and the connection
|
|
29
30
|
blackhole web # open the Galaxy Blackhole web GUI
|
|
30
31
|
blackhole chat # start working
|
|
@@ -32,15 +33,15 @@ blackhole chat # start working
|
|
|
32
33
|
|
|
33
34
|
Node.js >= 22.13 is required.
|
|
34
35
|
|
|
35
|
-
A global install carries the
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
A global install now carries the harness via `dependencies`, so `blackhole harness install` is only
|
|
37
|
+
needed to repair a broken/custom checkout, to pin `--dir`, or to work offline from a local archive.
|
|
38
|
+
If the dependency is missing (for example an old global install), `chat` and `web` print the repair
|
|
39
|
+
command and, in a terminal, offer `Cài harness ngay? [Y/n]`.
|
|
39
40
|
|
|
40
41
|
## The harness
|
|
41
42
|
|
|
42
|
-
The harness (`blackhole-harness`) is the app `chat` and `web` boot. It
|
|
43
|
-
this package
|
|
43
|
+
The harness (`blackhole-harness`) is the app `chat` and `web` boot. It arrives as an npm dependency
|
|
44
|
+
of this package; `harness install` remains the repair/offline path:
|
|
44
45
|
|
|
45
46
|
| command | what it does |
|
|
46
47
|
|---|---|
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* desc harness status in dòng "nguồn: npm <gói>@<version>" khi cây cài là gói npm; help nói rõ bậc npm và --from npm
|
|
7
7
|
*/
|
|
8
8
|
/**
|
|
9
|
-
* `blackhole harness` — install, inspect and remove the blackhole-
|
|
9
|
+
* `blackhole harness` — install, inspect and remove the blackhole-harness checkout that
|
|
10
10
|
* `blackhole chat` and `blackhole web` boot.
|
|
11
11
|
*
|
|
12
12
|
* The CLI ships without the harness, so a fresh global install has nothing to launch. This command
|
|
@@ -20,7 +20,7 @@ import { DSH_RUNTIME_ENTRY, HARNESS_REPO, dshRuntimeEntry, harnessStatusFacts, i
|
|
|
20
20
|
import { askConfirm } from "./ensure.js";
|
|
21
21
|
/** The help `blackhole harness --help` prints. */
|
|
22
22
|
export const HARNESS_HELP = [
|
|
23
|
-
"blackhole harness — bản harness blackhole-
|
|
23
|
+
"blackhole harness — bản harness blackhole-harness mà chat/web cần",
|
|
24
24
|
"",
|
|
25
25
|
"Usage:",
|
|
26
26
|
" blackhole harness install [--force] [--dir <thư mục>] [--from <url|npm>] [--no-deps]",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-command.js","sourceRoot":"","sources":["../../src/harness/install-command.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,uBAAuB,EAA0B,MAAM,aAAa,CAAC;AAC/I,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAsE,MAAM,cAAc,CAAC;AACxL,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,kDAAkD;AAClD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,
|
|
1
|
+
{"version":3,"file":"install-command.js","sourceRoot":"","sources":["../../src/harness/install-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare const HARNESS_DIR_NAME = "blackhole-harness";
|
|
|
16
16
|
/** The npm package that carries the harness (rename with `GBH_HARNESS_PACKAGE`). */
|
|
17
17
|
export declare const HARNESS_PACKAGE = "@galaxy-blackhole/blackhole-harness";
|
|
18
18
|
/** The dist-tag the npm rung asks for (pin a version with `GBH_HARNESS_SPEC`). */
|
|
19
|
-
export declare const HARNESS_PACKAGE_SPEC = "^0.1.
|
|
19
|
+
export declare const HARNESS_PACKAGE_SPEC = "^0.1.4";
|
|
20
20
|
/**
|
|
21
21
|
* Every place the host runtime can be, relative to the harness root, in preference order.
|
|
22
22
|
*
|
package/dist/harness/install.js
CHANGED
|
@@ -40,7 +40,7 @@ export const HARNESS_DIR_NAME = "blackhole-harness";
|
|
|
40
40
|
/** The npm package that carries the harness (rename with `GBH_HARNESS_PACKAGE`). */
|
|
41
41
|
export const HARNESS_PACKAGE = "@galaxy-blackhole/blackhole-harness";
|
|
42
42
|
/** The dist-tag the npm rung asks for (pin a version with `GBH_HARNESS_SPEC`). */
|
|
43
|
-
export const HARNESS_PACKAGE_SPEC = "^0.1.
|
|
43
|
+
export const HARNESS_PACKAGE_SPEC = "^0.1.4";
|
|
44
44
|
/**
|
|
45
45
|
* Every place the host runtime can be, relative to the harness root, in preference order.
|
|
46
46
|
*
|
package/dist/harness/locate.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** The ladder step that produced a checkout. */
|
|
2
|
-
export type HarnessSource = "env" | "home" | "installed" | "sibling" | "dev";
|
|
2
|
+
export type HarnessSource = "env" | "dependency" | "home" | "installed" | "sibling" | "dev";
|
|
3
3
|
/** A found checkout and the step that found it. */
|
|
4
4
|
export interface HarnessLocation {
|
|
5
5
|
/** Absolute root of the checkout that owns `apps/cli/src/main.ts`. */
|
|
@@ -30,6 +30,11 @@ export interface LocateEnvironment {
|
|
|
30
30
|
readonly home?: string;
|
|
31
31
|
/** Reads an install record, or undefined when the file is missing or unreadable. */
|
|
32
32
|
readonly readRecord?: (path: string) => HarnessRecord | undefined;
|
|
33
|
+
/**
|
|
34
|
+
* Resolves a Node package specifier to a file, when this CLI was installed with the harness as
|
|
35
|
+
* its npm dependency (the DSH model: `npm i -g` carries the harness too).
|
|
36
|
+
*/
|
|
37
|
+
readonly resolveDependency?: (specifier: string) => string | undefined;
|
|
33
38
|
}
|
|
34
39
|
/** The real filesystem, PATH and environment. */
|
|
35
40
|
export declare function systemLocateEnvironment(): LocateEnvironment;
|
|
@@ -66,8 +71,9 @@ export declare function readHarnessRecord(path: string): HarnessRecord | undefin
|
|
|
66
71
|
export declare function isHarnessCheckout(environment: LocateEnvironment, root: string): boolean;
|
|
67
72
|
/**
|
|
68
73
|
* Find the harness checkout and say which rung answered:
|
|
69
|
-
* `GBH_TAURI_ROOT` → `$GBH_HOME/harness/blackhole-harness` →
|
|
70
|
-
* (each slot also honours the record `install --dir` leaves)
|
|
74
|
+
* `GBH_TAURI_ROOT` → npm dependency of this CLI → `$GBH_HOME/harness/blackhole-harness` →
|
|
75
|
+
* `~/.galaxy/harness/blackhole-harness` (each slot also honours the record `install --dir` leaves)
|
|
76
|
+
* → sibling of this package → dev path.
|
|
71
77
|
* @param environment - filesystem, PATH and environment facts.
|
|
72
78
|
* @returns the checkout and its provenance, or undefined when this machine has none.
|
|
73
79
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locate.d.ts","sourceRoot":"","sources":["../../src/harness/locate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"locate.d.ts","sourceRoot":"","sources":["../../src/harness/locate.ts"],"names":[],"mappings":"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"}
|
package/dist/harness/locate.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Where the Galaxy Blackhole harness lives on this machine.
|
|
3
3
|
*
|
|
4
|
-
* The CLI is published
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* The CLI is published with the harness as an npm dependency (the same model as `@deepseek-ai/dsh`:
|
|
5
|
+
* one `npm i -g` installs the CLI and its harness). A harness checkout can still be placed under
|
|
6
|
+
* `~/.galaxy/harness/blackhole-harness` by `blackhole harness install` as a repair/offline path, a
|
|
7
|
+
* harness home can pin its own copy at `$GBH_HOME/harness/blackhole-harness`, the installer records
|
|
8
|
+
* any `--dir` it was given, and a developer still has a sibling checkout. `GBH_TAURI_ROOT`
|
|
8
9
|
* overrides all of it.
|
|
9
10
|
*
|
|
10
11
|
* Every step reports *where* it found the harness as well as the path, so `blackhole doctor`,
|
|
@@ -13,8 +14,9 @@
|
|
|
13
14
|
*/
|
|
14
15
|
import { execFileSync } from "node:child_process";
|
|
15
16
|
import { existsSync, readFileSync } from "node:fs";
|
|
17
|
+
import { createRequire } from "node:module";
|
|
16
18
|
import { homedir } from "node:os";
|
|
17
|
-
import { join, resolve } from "node:path";
|
|
19
|
+
import { dirname, join, resolve } from "node:path";
|
|
18
20
|
import { fileURLToPath } from "node:url";
|
|
19
21
|
/** The real filesystem, PATH and environment. */
|
|
20
22
|
export function systemLocateEnvironment() {
|
|
@@ -35,6 +37,16 @@ export function systemLocateEnvironment() {
|
|
|
35
37
|
},
|
|
36
38
|
home: homedir(),
|
|
37
39
|
readRecord: readHarnessRecord,
|
|
40
|
+
resolveDependency: specifier => {
|
|
41
|
+
// The CLI is compiled to dist/cli.js; `import.meta.url` stays inside the installed package,
|
|
42
|
+
// so Node resolves the harness from the same npm install that carried this CLI.
|
|
43
|
+
try {
|
|
44
|
+
return createRequire(import.meta.url).resolve(specifier);
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
},
|
|
38
50
|
};
|
|
39
51
|
}
|
|
40
52
|
/** The home directory every `~` path is built from. */
|
|
@@ -110,10 +122,26 @@ export function readHarnessRecord(path) {
|
|
|
110
122
|
export function isHarnessCheckout(environment, root) {
|
|
111
123
|
return environment.exists(join(root, "apps", "cli", "src", "main.ts"));
|
|
112
124
|
}
|
|
125
|
+
/**
|
|
126
|
+
* The harness that arrived as this CLI's npm dependency (`@galaxy-blackhole/blackhole-harness`).
|
|
127
|
+
*
|
|
128
|
+
* The package has no `exports` map, so resolving its `package.json` gives the installed root; the
|
|
129
|
+
* root must still own `apps/cli/src/main.ts` — a bare package without the launcher is not usable.
|
|
130
|
+
* @param environment - dependency resolver and filesystem facts.
|
|
131
|
+
* @returns the checkout root, or undefined when the dependency is absent or has no launcher.
|
|
132
|
+
*/
|
|
133
|
+
function dependencyHarnessRoot(environment) {
|
|
134
|
+
const manifest = environment.resolveDependency?.("@galaxy-blackhole/blackhole-harness/package.json");
|
|
135
|
+
if (manifest === undefined)
|
|
136
|
+
return undefined;
|
|
137
|
+
const root = dirname(manifest);
|
|
138
|
+
return isHarnessCheckout(environment, root) ? root : undefined;
|
|
139
|
+
}
|
|
113
140
|
/**
|
|
114
141
|
* Find the harness checkout and say which rung answered:
|
|
115
|
-
* `GBH_TAURI_ROOT` → `$GBH_HOME/harness/blackhole-harness` →
|
|
116
|
-
* (each slot also honours the record `install --dir` leaves)
|
|
142
|
+
* `GBH_TAURI_ROOT` → npm dependency of this CLI → `$GBH_HOME/harness/blackhole-harness` →
|
|
143
|
+
* `~/.galaxy/harness/blackhole-harness` (each slot also honours the record `install --dir` leaves)
|
|
144
|
+
* → sibling of this package → dev path.
|
|
117
145
|
* @param environment - filesystem, PATH and environment facts.
|
|
118
146
|
* @returns the checkout and its provenance, or undefined when this machine has none.
|
|
119
147
|
*/
|
|
@@ -124,6 +152,10 @@ export function findTauriLocation(environment = systemLocateEnvironment()) {
|
|
|
124
152
|
if (isHarnessCheckout(environment, root))
|
|
125
153
|
return Object.freeze({ root, source: "env", label: "GBH_TAURI_ROOT" });
|
|
126
154
|
}
|
|
155
|
+
const dependency = dependencyHarnessRoot(environment);
|
|
156
|
+
if (dependency !== undefined) {
|
|
157
|
+
return Object.freeze({ root: dependency, source: "dependency", label: "npm dependency @galaxy-blackhole/blackhole-harness" });
|
|
158
|
+
}
|
|
127
159
|
const home = locateHome(environment);
|
|
128
160
|
const slots = [
|
|
129
161
|
{ dir: join(harnessHome(environment), "harness"), label: "$GBH_HOME/harness/blackhole-harness" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locate.js","sourceRoot":"","sources":["../../src/harness/locate.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"locate.js","sourceRoot":"","sources":["../../src/harness/locate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,23 @@
|
|
|
1
1
|
/** Lowest Node major the harness launcher and its kernel accept. */
|
|
2
2
|
export declare const MIN_NODE_MAJOR = 22;
|
|
3
|
+
/** Lowest minor of Node 22 — `--experimental-strip-types` exists from 22.6 on. */
|
|
4
|
+
export declare const MIN_NODE_MINOR = 6;
|
|
5
|
+
/** The flag that lets Node run a `.ts` entry point; a no-op from 22.18 / 23.6 on. */
|
|
6
|
+
export declare const TYPE_STRIP_FLAG = "--experimental-strip-types";
|
|
7
|
+
/** First Node 22 minor that strips types by default, so the flag stops being needed. */
|
|
8
|
+
export declare const TYPE_STRIP_DEFAULT_MINOR = 18;
|
|
3
9
|
/** The one sentence every failure shares: what to install and how to point at it. */
|
|
4
10
|
export declare const NODE_INSTALL_HINT: string;
|
|
5
11
|
/** A Node binary this CLI is willing to boot the harness with. */
|
|
6
12
|
export interface NodeRuntime {
|
|
7
13
|
/** Absolute path, or the PATH name that resolved. */
|
|
8
14
|
readonly bin: string;
|
|
9
|
-
/** Version as printed by `node --version`, e.g. `
|
|
15
|
+
/** Version as printed by `node --version`, e.g. `v22.13.0`. */
|
|
10
16
|
readonly version: string;
|
|
11
17
|
/** Major version, already checked against {@link MIN_NODE_MAJOR}. */
|
|
12
18
|
readonly major: number;
|
|
19
|
+
/** Minor version, because 22.6 (floor) and 22.18 (type stripping by default) are the two that matter. */
|
|
20
|
+
readonly minor: number;
|
|
13
21
|
/** Where the candidate came from: `GBH_NODE`, `nvm vX`, `PATH` or a system path. */
|
|
14
22
|
readonly source: string;
|
|
15
23
|
}
|
|
@@ -35,12 +43,38 @@ export interface NodeLookup {
|
|
|
35
43
|
/** `node --version` for one binary, or undefined when it is missing or stays silent. */
|
|
36
44
|
readonly probe: (bin: string) => string | undefined;
|
|
37
45
|
}
|
|
38
|
-
/** Parses `
|
|
46
|
+
/** Parses `v22.13.0` / `22.13.0` into major and minor. */
|
|
39
47
|
export declare function parseNodeVersion(text: string): {
|
|
40
48
|
major: number;
|
|
41
49
|
minor: number;
|
|
42
50
|
version: string;
|
|
43
51
|
} | undefined;
|
|
52
|
+
/**
|
|
53
|
+
* Whether a version is below what the harness needs.
|
|
54
|
+
* @param major - Node major version.
|
|
55
|
+
* @param minor - Node minor version.
|
|
56
|
+
* @returns true below Node 22.6, the release that added `--experimental-strip-types`.
|
|
57
|
+
*/
|
|
58
|
+
export declare function belowNodeFloor(major: number, minor: number): boolean;
|
|
59
|
+
/**
|
|
60
|
+
* Whether a runtime needs {@link TYPE_STRIP_FLAG} to run a `.ts` entry point.
|
|
61
|
+
*
|
|
62
|
+
* Node 22.6–22.17 and Node 23.0–23.5 need the flag; 22.18+ and 23.6+ strip types by default.
|
|
63
|
+
* @param major - Node major version.
|
|
64
|
+
* @param minor - Node minor version.
|
|
65
|
+
* @returns true for the two windows that predate the default.
|
|
66
|
+
*/
|
|
67
|
+
export declare function needsTypeStripFlag(major: number, minor: number): boolean;
|
|
68
|
+
/**
|
|
69
|
+
* The flags that must precede a `.ts` entry point for one runtime.
|
|
70
|
+
*
|
|
71
|
+
* Without this, a machine inside the `engines` window (`>=22.13` but `<22.18`) refuses the `.ts`
|
|
72
|
+
* launcher with `bad option: --experimental-strip-types` — or, worse, dies on the first type
|
|
73
|
+
* annotation. Passing it only where needed keeps newer runtimes free of experimental warnings.
|
|
74
|
+
* @param runtime - a resolved runtime, or any `{major, minor}` pair.
|
|
75
|
+
* @returns `["--experimental-strip-types"]` when needed, otherwise empty.
|
|
76
|
+
*/
|
|
77
|
+
export declare function nodeEntryArgs(runtime: Pick<NodeRuntime, "major" | "minor">): readonly string[];
|
|
44
78
|
/** The real filesystem, PATH probe and environment. */
|
|
45
79
|
export declare function systemNodeLookup(): NodeLookup;
|
|
46
80
|
/**
|
|
@@ -55,7 +89,7 @@ export declare function nodeCandidates(lookup: NodeLookup): {
|
|
|
55
89
|
}[];
|
|
56
90
|
/**
|
|
57
91
|
* Resolves the Node runtime that boots the harness: explicit pin, newest nvm install, PATH, then
|
|
58
|
-
* the system paths, refusing anything below
|
|
92
|
+
* the system paths, refusing anything below Node 22.6.
|
|
59
93
|
* @param lookup - filesystem, environment and version-probe facts.
|
|
60
94
|
* @returns the first acceptable runtime.
|
|
61
95
|
* @throws with a Vietnamese message naming the requirement, the fix and every binary it tried.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-runtime.d.ts","sourceRoot":"","sources":["../../src/harness/node-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"node-runtime.d.ts","sourceRoot":"","sources":["../../src/harness/node-runtime.ts"],"names":[],"mappings":"AAgBA,oEAAoE;AACpE,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,kFAAkF;AAClF,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC,qFAAqF;AACrF,eAAO,MAAM,eAAe,+BAA+B,CAAC;AAE5D,wFAAwF;AACxF,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAK3C,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,QAE+E,CAAC;AAE9G,kEAAkE;AAClE,MAAM,WAAW,WAAW;IAC1B,qDAAqD;IACrD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,qEAAqE;IACrE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,yGAAyG;IACzG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,oFAAoF;IACpF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,qFAAqF;AACrF,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,kFAAkF;AAClF,MAAM,WAAW,UAAU;IACzB,2DAA2D;IAC3D,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAChC,2DAA2D;IAC3D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAC3C,yDAAyD;IACzD,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAC5C,wFAAwF;IACxF,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CACrD;AAED,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI5G;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAIxE;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,SAAS,MAAM,EAAE,CAE9F;AAED,uDAAuD;AACvD,wBAAgB,gBAAgB,IAAI,UAAU,CAa7C;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,CAsBpF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,UAA+B,GAAG,WAAW,CA6BvF"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Which Node binary runs the blackhole-
|
|
2
|
+
* Which Node binary runs the blackhole-harness launcher (`bh host`).
|
|
3
3
|
*
|
|
4
|
-
* The launcher and the kernel it boots are Node programs
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
4
|
+
* The launcher and the kernel it boots are Node programs, and the harness supports **Node >= 22.6**
|
|
5
|
+
* — the release that ships `--experimental-strip-types` — so `blackhole web` looks for that runtime
|
|
6
|
+
* instead of asking for Bun. Type stripping only becomes the default in Node 22.18/23.6, so
|
|
7
|
+
* {@link nodeEntryArgs} passes the flag on the releases in between. The ladder is the desktop's own
|
|
8
|
+
* (blackhole-harness `apps/cli/src/runtime.ts`): an explicit pin, the newest nvm install, PATH, then
|
|
9
|
+
* the usual system locations. Every fact is injectable, so the ladder is testable without a real
|
|
10
|
+
* install.
|
|
9
11
|
*/
|
|
10
12
|
import { spawnSync } from "node:child_process";
|
|
11
13
|
import { existsSync, readdirSync } from "node:fs";
|
|
@@ -13,16 +15,60 @@ import { homedir } from "node:os";
|
|
|
13
15
|
import { join } from "node:path";
|
|
14
16
|
/** Lowest Node major the harness launcher and its kernel accept. */
|
|
15
17
|
export const MIN_NODE_MAJOR = 22;
|
|
18
|
+
/** Lowest minor of Node 22 — `--experimental-strip-types` exists from 22.6 on. */
|
|
19
|
+
export const MIN_NODE_MINOR = 6;
|
|
20
|
+
/** The flag that lets Node run a `.ts` entry point; a no-op from 22.18 / 23.6 on. */
|
|
21
|
+
export const TYPE_STRIP_FLAG = "--experimental-strip-types";
|
|
22
|
+
/** First Node 22 minor that strips types by default, so the flag stops being needed. */
|
|
23
|
+
export const TYPE_STRIP_DEFAULT_MINOR = 18;
|
|
24
|
+
/** Node 23.6 turned type stripping on by default, four minors before Node 24 did. */
|
|
25
|
+
const TYPE_STRIP_DEFAULT_MINOR_23 = 6;
|
|
16
26
|
/** The one sentence every failure shares: what to install and how to point at it. */
|
|
17
|
-
export const NODE_INSTALL_HINT = "Cài Node " + String(MIN_NODE_MAJOR) + " (nvm install " + String(MIN_NODE_MAJOR) + " · brew install node@" + String(MIN_NODE_MAJOR) +
|
|
18
|
-
") hoặc đặt GBH_NODE tới một binary node >= " + String(MIN_NODE_MAJOR) + ".";
|
|
19
|
-
/** Parses `
|
|
27
|
+
export const NODE_INSTALL_HINT = "Cài Node " + String(MIN_NODE_MAJOR) + "." + String(MIN_NODE_MINOR) + "+ (nvm install " + String(MIN_NODE_MAJOR) + " · brew install node@" + String(MIN_NODE_MAJOR) +
|
|
28
|
+
") hoặc đặt GBH_NODE tới một binary node >= " + String(MIN_NODE_MAJOR) + "." + String(MIN_NODE_MINOR) + ".";
|
|
29
|
+
/** Parses `v22.13.0` / `22.13.0` into major and minor. */
|
|
20
30
|
export function parseNodeVersion(text) {
|
|
21
31
|
const match = /v?(\d+)\.(\d+)\.(\d+)/u.exec(text);
|
|
22
32
|
if (match === null)
|
|
23
33
|
return undefined;
|
|
24
34
|
return { major: Number(match[1]), minor: Number(match[2]), version: "v" + String(match[1]) + "." + String(match[2]) + "." + String(match[3]) };
|
|
25
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Whether a version is below what the harness needs.
|
|
38
|
+
* @param major - Node major version.
|
|
39
|
+
* @param minor - Node minor version.
|
|
40
|
+
* @returns true below Node 22.6, the release that added `--experimental-strip-types`.
|
|
41
|
+
*/
|
|
42
|
+
export function belowNodeFloor(major, minor) {
|
|
43
|
+
return major < MIN_NODE_MAJOR || (major === MIN_NODE_MAJOR && minor < MIN_NODE_MINOR);
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Whether a runtime needs {@link TYPE_STRIP_FLAG} to run a `.ts` entry point.
|
|
47
|
+
*
|
|
48
|
+
* Node 22.6–22.17 and Node 23.0–23.5 need the flag; 22.18+ and 23.6+ strip types by default.
|
|
49
|
+
* @param major - Node major version.
|
|
50
|
+
* @param minor - Node minor version.
|
|
51
|
+
* @returns true for the two windows that predate the default.
|
|
52
|
+
*/
|
|
53
|
+
export function needsTypeStripFlag(major, minor) {
|
|
54
|
+
if (major === 22)
|
|
55
|
+
return minor < TYPE_STRIP_DEFAULT_MINOR;
|
|
56
|
+
if (major === 23)
|
|
57
|
+
return minor < TYPE_STRIP_DEFAULT_MINOR_23;
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* The flags that must precede a `.ts` entry point for one runtime.
|
|
62
|
+
*
|
|
63
|
+
* Without this, a machine inside the `engines` window (`>=22.13` but `<22.18`) refuses the `.ts`
|
|
64
|
+
* launcher with `bad option: --experimental-strip-types` — or, worse, dies on the first type
|
|
65
|
+
* annotation. Passing it only where needed keeps newer runtimes free of experimental warnings.
|
|
66
|
+
* @param runtime - a resolved runtime, or any `{major, minor}` pair.
|
|
67
|
+
* @returns `["--experimental-strip-types"]` when needed, otherwise empty.
|
|
68
|
+
*/
|
|
69
|
+
export function nodeEntryArgs(runtime) {
|
|
70
|
+
return needsTypeStripFlag(runtime.major, runtime.minor) ? [TYPE_STRIP_FLAG] : [];
|
|
71
|
+
}
|
|
26
72
|
/** The real filesystem, PATH probe and environment. */
|
|
27
73
|
export function systemNodeLookup() {
|
|
28
74
|
return {
|
|
@@ -73,7 +119,7 @@ export function nodeCandidates(lookup) {
|
|
|
73
119
|
}
|
|
74
120
|
/**
|
|
75
121
|
* Resolves the Node runtime that boots the harness: explicit pin, newest nvm install, PATH, then
|
|
76
|
-
* the system paths, refusing anything below
|
|
122
|
+
* the system paths, refusing anything below Node 22.6.
|
|
77
123
|
* @param lookup - filesystem, environment and version-probe facts.
|
|
78
124
|
* @returns the first acceptable runtime.
|
|
79
125
|
* @throws with a Vietnamese message naming the requirement, the fix and every binary it tried.
|
|
@@ -96,14 +142,14 @@ export function resolveNodeRuntime(lookup = systemNodeLookup()) {
|
|
|
96
142
|
rejected.push({ bin: candidate.bin, version: printed, reason: "không đọc được phiên bản" });
|
|
97
143
|
continue;
|
|
98
144
|
}
|
|
99
|
-
if (parsed.major
|
|
100
|
-
rejected.push({ bin: candidate.bin, version: parsed.version, reason: "dưới mức v" + String(MIN_NODE_MAJOR) });
|
|
145
|
+
if (belowNodeFloor(parsed.major, parsed.minor)) {
|
|
146
|
+
rejected.push({ bin: candidate.bin, version: parsed.version, reason: "dưới mức v" + String(MIN_NODE_MAJOR) + "." + String(MIN_NODE_MINOR) });
|
|
101
147
|
continue;
|
|
102
148
|
}
|
|
103
|
-
return { bin: candidate.bin, version: parsed.version, major: parsed.major, source: candidate.source };
|
|
149
|
+
return { bin: candidate.bin, version: parsed.version, major: parsed.major, minor: parsed.minor, source: candidate.source };
|
|
104
150
|
}
|
|
105
151
|
const tried = rejected.map(entry => entry.bin + " (" + (entry.version ?? "?") + ": " + entry.reason + ")").join(" · ");
|
|
106
|
-
throw new Error("Không tìm thấy Node >= " + String(MIN_NODE_MAJOR) + " để chạy harness blackhole-
|
|
152
|
+
throw new Error("Không tìm thấy Node >= " + String(MIN_NODE_MAJOR) + "." + String(MIN_NODE_MINOR) + " để chạy harness blackhole-harness. " + NODE_INSTALL_HINT +
|
|
107
153
|
(tried.length === 0 ? "" : " Đã thử: " + tried + "."));
|
|
108
154
|
}
|
|
109
155
|
//# sourceMappingURL=node-runtime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-runtime.js","sourceRoot":"","sources":["../../src/harness/node-runtime.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"node-runtime.js","sourceRoot":"","sources":["../../src/harness/node-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ export declare class HarnessBootError extends Error {
|
|
|
49
49
|
* Spawn `bh host` and wait for its authenticated URL.
|
|
50
50
|
* @param options - port, profile, home, log directory and timeout.
|
|
51
51
|
* @returns the running host, already serving.
|
|
52
|
-
* @throws HarnessBootError when Node
|
|
52
|
+
* @throws HarnessBootError when no usable Node runtime, the checkout, or the ready line is missing.
|
|
53
53
|
*/
|
|
54
54
|
export declare function spawnHarnessHost(options?: HarnessHostOptions): Promise<HarnessHost>;
|
|
55
55
|
//# sourceMappingURL=process.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../src/harness/process.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAiE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOpH,wBAAwB;AACxB,MAAM,WAAW,WAAW;IAC1B,kFAAkF;IAClF,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,+BAA+B;AAC/B,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,sEAAsE;IACtE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,mCAAmC;IACnC,QAAQ,CAAC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IACzC,6DAA6D;IAC7D,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;AAED,iEAAiE;AACjE,qBAAa,gBAAiB,SAAQ,KAAK;IACZ,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM;gBAA5E,OAAO,EAAE,MAAM,EAAW,OAAO,EAAE,MAAM,GAAG,SAAS,EAAW,IAAI,EAAE,MAAM;CAIzF;AAMD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../src/harness/process.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAiE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOpH,wBAAwB;AACxB,MAAM,WAAW,WAAW;IAC1B,kFAAkF;IAClF,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,+BAA+B;AAC/B,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,sEAAsE;IACtE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,mCAAmC;IACnC,QAAQ,CAAC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IACzC,6DAA6D;IAC7D,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;AAED,iEAAiE;AACjE,qBAAa,gBAAiB,SAAQ,KAAK;IACZ,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM;gBAA5E,OAAO,EAAE,MAAM,EAAW,OAAO,EAAE,MAAM,GAAG,SAAS,EAAW,IAAI,EAAE,MAAM;CAIzF;AAMD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC,CAgG7F"}
|
package/dist/harness/process.js
CHANGED
|
@@ -11,7 +11,7 @@ import { createWriteStream, mkdirSync } from "node:fs";
|
|
|
11
11
|
import { join } from "node:path";
|
|
12
12
|
import { findTauriRoot, harnessMissingMessage, systemLocateEnvironment } from "./locate.js";
|
|
13
13
|
import { harnessRuntimeMissingMessage, hasDshRuntime } from "./install.js";
|
|
14
|
-
import { resolveNodeRuntime } from "./node-runtime.js";
|
|
14
|
+
import { nodeEntryArgs, resolveNodeRuntime } from "./node-runtime.js";
|
|
15
15
|
/** The authenticated URL the harness prints when the web surface is serving. */
|
|
16
16
|
const READY_URL = /https?:\/\/127\.0\.0\.1:\d+\/\?token=[A-Za-z0-9._~+/=-]+/u;
|
|
17
17
|
/** A boot failure that carries the launcher's own last words. */
|
|
@@ -32,7 +32,7 @@ function stamp() {
|
|
|
32
32
|
* Spawn `bh host` and wait for its authenticated URL.
|
|
33
33
|
* @param options - port, profile, home, log directory and timeout.
|
|
34
34
|
* @returns the running host, already serving.
|
|
35
|
-
* @throws HarnessBootError when Node
|
|
35
|
+
* @throws HarnessBootError when no usable Node runtime, the checkout, or the ready line is missing.
|
|
36
36
|
*/
|
|
37
37
|
export async function spawnHarnessHost(options = {}) {
|
|
38
38
|
const environment = options.environment ?? systemLocateEnvironment();
|
|
@@ -45,16 +45,25 @@ export async function spawnHarnessHost(options = {}) {
|
|
|
45
45
|
if (!hasDshRuntime(root, environment.exists)) {
|
|
46
46
|
throw new HarnessBootError(harnessRuntimeMissingMessage(root), undefined, "");
|
|
47
47
|
}
|
|
48
|
-
// The launcher is a Node program
|
|
48
|
+
// The launcher is a Node program whose entry point is TypeScript: the ladder refuses anything
|
|
49
|
+
// below Node 22.6 and nodeEntryArgs adds --experimental-strip-types where Node needs it (<22.18).
|
|
49
50
|
let node;
|
|
51
|
+
let entryArgs = [];
|
|
50
52
|
try {
|
|
51
|
-
|
|
53
|
+
if (options.node === undefined) {
|
|
54
|
+
const runtime = resolveNodeRuntime();
|
|
55
|
+
node = runtime.bin;
|
|
56
|
+
entryArgs = nodeEntryArgs(runtime);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
node = options.node;
|
|
60
|
+
}
|
|
52
61
|
}
|
|
53
62
|
catch (error) {
|
|
54
63
|
throw new HarnessBootError(error instanceof Error ? error.message : String(error), undefined, "");
|
|
55
64
|
}
|
|
56
65
|
const port = options.port ?? 0;
|
|
57
|
-
const args = [join(root, "apps", "cli", "src", "main.ts"), "host", "--port", String(port)];
|
|
66
|
+
const args = [...entryArgs, join(root, "apps", "cli", "src", "main.ts"), "host", "--port", String(port)];
|
|
58
67
|
if (options.profile !== undefined)
|
|
59
68
|
args.push("--profile", options.profile);
|
|
60
69
|
const logDir = options.logDir ?? process.cwd();
|