linkshell-cli 0.10.42 → 0.10.44
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/dist/cli/src/commands/desktop-update.d.ts +4 -0
- package/dist/cli/src/commands/desktop-update.js +54 -0
- package/dist/cli/src/commands/desktop-update.js.map +1 -0
- package/dist/cli/src/commands/desktop.d.ts +273 -0
- package/dist/cli/src/commands/desktop.js +103 -0
- package/dist/cli/src/commands/desktop.js.map +1 -0
- package/dist/cli/src/commands/login.js +9 -3
- package/dist/cli/src/commands/login.js.map +1 -1
- package/dist/cli/src/commands/upgrade.js +8 -0
- package/dist/cli/src/commands/upgrade.js.map +1 -1
- package/dist/cli/src/index.js +12 -0
- package/dist/cli/src/index.js.map +1 -1
- package/dist/cli/src/utils/daemon.d.ts +2 -0
- package/dist/cli/src/utils/daemon.js +12 -2
- package/dist/cli/src/utils/daemon.js.map +1 -1
- package/dist/cli/src/utils/standalone.d.ts +2 -0
- package/dist/cli/src/utils/standalone.js +19 -0
- package/dist/cli/src/utils/standalone.js.map +1 -0
- package/dist/cli/tsconfig.tsbuildinfo +1 -1
- package/dist/host/src/host.js +2 -0
- package/dist/host/src/host.js.map +1 -1
- package/dist/host/src/index.d.ts +1 -0
- package/dist/host/src/index.js +1 -0
- package/dist/host/src/index.js.map +1 -1
- package/dist/host/src/input.js +3 -0
- package/dist/host/src/input.js.map +1 -1
- package/dist/host/src/rpc/server.d.ts +2 -0
- package/dist/host/src/rpc/server.js +3 -0
- package/dist/host/src/rpc/server.js.map +1 -1
- package/dist/host/src/usage.d.ts +39 -0
- package/dist/host/src/usage.js +217 -0
- package/dist/host/src/usage.js.map +1 -0
- package/dist/wire/src/index.d.ts +1 -0
- package/dist/wire/src/index.js +1 -0
- package/dist/wire/src/index.js.map +1 -1
- package/dist/wire/src/rpc.d.ts +177 -0
- package/dist/wire/src/rpc.js +2 -0
- package/dist/wire/src/rpc.js.map +1 -1
- package/dist/wire/src/usage.d.ts +204 -0
- package/dist/wire/src/usage.js +17 -0
- package/dist/wire/src/usage.js.map +1 -0
- package/dist/wire/src/watch.d.ts +2 -2
- package/package.json +4 -4
- package/src/commands/desktop-update.ts +56 -0
- package/src/commands/desktop.ts +86 -0
- package/src/commands/login.ts +11 -3
- package/src/commands/upgrade.ts +9 -0
- package/src/index.ts +13 -0
- package/src/utils/daemon.ts +10 -2
- package/src/utils/standalone.ts +13 -0
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
/** Called only after the desktop's explicit install confirmation. External hosts are left alone. */
|
|
2
|
+
export declare function prepareDesktopUpdate(): Promise<void>;
|
|
3
|
+
/** New app and canceled update both run this, using their own bundled runtime and preserved settings. */
|
|
4
|
+
export declare function recoverDesktopUpdate(version: string): Promise<void>;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { ensureHostRunning, withRunningHost } from "./host.js";
|
|
4
|
+
import { linkshellDir, readHostLaunch, readHostOwner, readPid, stopDaemonAndWait } from "../utils/daemon.js";
|
|
5
|
+
import { standaloneBundle } from "../utils/standalone.js";
|
|
6
|
+
const markerPath = () => join(linkshellDir(), "desktop-update.json");
|
|
7
|
+
/** Called only after the desktop's explicit install confirmation. External hosts are left alone. */
|
|
8
|
+
export async function prepareDesktopUpdate() {
|
|
9
|
+
const app = standaloneBundle();
|
|
10
|
+
if (!app)
|
|
11
|
+
throw new Error("只有独立 App 可以协调自身更新");
|
|
12
|
+
if (existsSync(markerPath()))
|
|
13
|
+
throw new Error("上次更新尚未恢复,请先重新打开 LinkShell");
|
|
14
|
+
const pid = readPid("host");
|
|
15
|
+
if (!pid || readHostOwner(pid) !== app)
|
|
16
|
+
return;
|
|
17
|
+
const before = await withRunningHost(async (client) => ({
|
|
18
|
+
machine: await client.call("machine.info", {}, 5000),
|
|
19
|
+
gateway: await client.call("gateway.status", {}, 5000),
|
|
20
|
+
}));
|
|
21
|
+
if (!before)
|
|
22
|
+
throw new Error("无法确认正在运行的服务状态,更新已暂停");
|
|
23
|
+
const marker = { schema: 1, app, machineId: before.machine.machineId, gatewayKey: before.gateway.machine?.id, deviceIds: before.gateway.devices.map((d) => d.id), env: readHostLaunch(pid) };
|
|
24
|
+
mkdirSync(linkshellDir(), { recursive: true });
|
|
25
|
+
const temporary = `${markerPath()}.${process.pid}.tmp`;
|
|
26
|
+
writeFileSync(temporary, JSON.stringify(marker), { mode: 0o600, flag: "wx" });
|
|
27
|
+
renameSync(temporary, markerPath());
|
|
28
|
+
// Keep the recovery marker even on a failed stop; never allow bundle replacement after this fails.
|
|
29
|
+
await stopDaemonAndWait("host", 30_000, pid);
|
|
30
|
+
}
|
|
31
|
+
/** New app and canceled update both run this, using their own bundled runtime and preserved settings. */
|
|
32
|
+
export async function recoverDesktopUpdate(version) {
|
|
33
|
+
if (!existsSync(markerPath()))
|
|
34
|
+
return;
|
|
35
|
+
const marker = JSON.parse(readFileSync(markerPath(), "utf8"));
|
|
36
|
+
const app = standaloneBundle();
|
|
37
|
+
if (!app || marker.schema !== 1 || marker.app !== app)
|
|
38
|
+
return;
|
|
39
|
+
const pid = readPid("host");
|
|
40
|
+
if (pid && readHostOwner(pid) !== app)
|
|
41
|
+
throw new Error("另一套安装正在运行,未自动替换该服务。请先停止它,再重试恢复。");
|
|
42
|
+
await ensureHostRunning({ ...process.env, ...marker.env, LINKSHELL_APP_BUNDLE: app });
|
|
43
|
+
const after = await withRunningHost(async (client) => ({
|
|
44
|
+
machine: await client.call("machine.info", {}, 5000),
|
|
45
|
+
gateway: await client.call("gateway.status", {}, 5000),
|
|
46
|
+
}));
|
|
47
|
+
if (!after || after.machine.hostVersion !== version)
|
|
48
|
+
throw new Error("新版 Host 尚未就绪,请查看日志并重试恢复");
|
|
49
|
+
if (after.machine.machineId !== marker.machineId || (marker.gatewayKey && after.gateway.machine?.id !== marker.gatewayKey) || marker.deviceIds.some((id) => !after.gateway.devices.some((device) => device.id === id))) {
|
|
50
|
+
throw new Error("恢复后的身份或配对信息不一致;保留恢复记录,请查看日志");
|
|
51
|
+
}
|
|
52
|
+
unlinkSync(markerPath());
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=desktop-update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"desktop-update.js","sourceRoot":"","sources":["../../../../src/commands/desktop-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
export declare function installationSource(path: string): "homebrew" | "npm";
|
|
2
|
+
/** A versioned, read-only snapshot. Missing sections stay unknown, never healthy. */
|
|
3
|
+
export declare function desktopSnapshot(version: string): Promise<{
|
|
4
|
+
machine: {
|
|
5
|
+
agents: {
|
|
6
|
+
id: string;
|
|
7
|
+
label: string;
|
|
8
|
+
tier: "terminal" | "remote" | "multi_client" | "handoff";
|
|
9
|
+
installed: boolean;
|
|
10
|
+
capabilities: {
|
|
11
|
+
interrupt: boolean;
|
|
12
|
+
steer: boolean;
|
|
13
|
+
permissions: boolean;
|
|
14
|
+
images: boolean;
|
|
15
|
+
fork: boolean;
|
|
16
|
+
models: boolean;
|
|
17
|
+
modes: boolean;
|
|
18
|
+
audio?: boolean | undefined;
|
|
19
|
+
embeddedContext?: boolean | undefined;
|
|
20
|
+
acp?: boolean | undefined;
|
|
21
|
+
};
|
|
22
|
+
version?: string | undefined;
|
|
23
|
+
problem?: string | undefined;
|
|
24
|
+
auth?: {
|
|
25
|
+
state: "unknown" | "ok" | "missing";
|
|
26
|
+
method?: string | undefined;
|
|
27
|
+
hint?: string | undefined;
|
|
28
|
+
} | undefined;
|
|
29
|
+
}[];
|
|
30
|
+
machineId: string;
|
|
31
|
+
hostname: string;
|
|
32
|
+
platform: string;
|
|
33
|
+
hostVersion: string;
|
|
34
|
+
home?: string | undefined;
|
|
35
|
+
direct?: {
|
|
36
|
+
iceServers: string[];
|
|
37
|
+
} | undefined;
|
|
38
|
+
};
|
|
39
|
+
gateway: {
|
|
40
|
+
status: "offline" | "off" | "connecting" | "online";
|
|
41
|
+
devices: {
|
|
42
|
+
name: string;
|
|
43
|
+
id: string;
|
|
44
|
+
online: boolean;
|
|
45
|
+
pairedAt: number;
|
|
46
|
+
}[];
|
|
47
|
+
error?: {
|
|
48
|
+
code: string;
|
|
49
|
+
message: string;
|
|
50
|
+
} | undefined;
|
|
51
|
+
url?: string | undefined;
|
|
52
|
+
machine?: {
|
|
53
|
+
name: string;
|
|
54
|
+
id: string;
|
|
55
|
+
} | undefined;
|
|
56
|
+
account?: {
|
|
57
|
+
userId: string;
|
|
58
|
+
email?: string | undefined;
|
|
59
|
+
} | undefined;
|
|
60
|
+
};
|
|
61
|
+
sessions: {
|
|
62
|
+
agent: string;
|
|
63
|
+
id: string;
|
|
64
|
+
state: "unknown" | "running" | "error" | "idle" | "waiting" | "offline";
|
|
65
|
+
updatedAt: number;
|
|
66
|
+
lastSeq: number;
|
|
67
|
+
nativeId: string;
|
|
68
|
+
cwd: string;
|
|
69
|
+
pendingPermissions: number;
|
|
70
|
+
createdAt: number;
|
|
71
|
+
archived: boolean;
|
|
72
|
+
title?: string | undefined;
|
|
73
|
+
model?: string | undefined;
|
|
74
|
+
driver?: "desktop" | "remote" | "none" | undefined;
|
|
75
|
+
preview?: string | undefined;
|
|
76
|
+
activity?: {
|
|
77
|
+
kind: "tool" | "thinking" | "responding";
|
|
78
|
+
title?: string | undefined;
|
|
79
|
+
toolKind?: "search" | "delete" | "other" | "read" | "edit" | "move" | "execute" | "think" | "fetch" | "switch_mode" | undefined;
|
|
80
|
+
} | undefined;
|
|
81
|
+
permission?: {
|
|
82
|
+
options: {
|
|
83
|
+
name: string;
|
|
84
|
+
kind: "allow_once" | "allow_always" | "reject_once" | "reject_always";
|
|
85
|
+
optionId: string;
|
|
86
|
+
}[];
|
|
87
|
+
title: string;
|
|
88
|
+
requestId: string;
|
|
89
|
+
toolCallId?: string | undefined;
|
|
90
|
+
tool?: {
|
|
91
|
+
title?: string | undefined;
|
|
92
|
+
kind?: "search" | "delete" | "other" | "read" | "edit" | "move" | "execute" | "think" | "fetch" | "switch_mode" | undefined;
|
|
93
|
+
content?: ({
|
|
94
|
+
type: "content";
|
|
95
|
+
content: {
|
|
96
|
+
type: "text";
|
|
97
|
+
text: string;
|
|
98
|
+
annotations?: import("zod").objectOutputType<{
|
|
99
|
+
audience: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodArray<import("zod").ZodEnum<["user", "assistant"]>, "many">>>, ("user" | "assistant")[] | undefined, ("user" | "assistant")[] | null | undefined>;
|
|
100
|
+
priority: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodNumber>>, number | undefined, number | null | undefined>;
|
|
101
|
+
lastModified: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodString>>, string | undefined, string | null | undefined>;
|
|
102
|
+
}, import("zod").ZodTypeAny, "passthrough"> | undefined;
|
|
103
|
+
_meta?: Record<string, unknown> | undefined;
|
|
104
|
+
} | {
|
|
105
|
+
type: "image";
|
|
106
|
+
mimeType: string;
|
|
107
|
+
annotations?: import("zod").objectOutputType<{
|
|
108
|
+
audience: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodArray<import("zod").ZodEnum<["user", "assistant"]>, "many">>>, ("user" | "assistant")[] | undefined, ("user" | "assistant")[] | null | undefined>;
|
|
109
|
+
priority: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodNumber>>, number | undefined, number | null | undefined>;
|
|
110
|
+
lastModified: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodString>>, string | undefined, string | null | undefined>;
|
|
111
|
+
}, import("zod").ZodTypeAny, "passthrough"> | undefined;
|
|
112
|
+
_meta?: Record<string, unknown> | undefined;
|
|
113
|
+
data?: string | undefined;
|
|
114
|
+
uri?: string | undefined;
|
|
115
|
+
} | {
|
|
116
|
+
type: "audio";
|
|
117
|
+
mimeType: string;
|
|
118
|
+
annotations?: import("zod").objectOutputType<{
|
|
119
|
+
audience: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodArray<import("zod").ZodEnum<["user", "assistant"]>, "many">>>, ("user" | "assistant")[] | undefined, ("user" | "assistant")[] | null | undefined>;
|
|
120
|
+
priority: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodNumber>>, number | undefined, number | null | undefined>;
|
|
121
|
+
lastModified: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodString>>, string | undefined, string | null | undefined>;
|
|
122
|
+
}, import("zod").ZodTypeAny, "passthrough"> | undefined;
|
|
123
|
+
_meta?: Record<string, unknown> | undefined;
|
|
124
|
+
data?: string | undefined;
|
|
125
|
+
uri?: string | undefined;
|
|
126
|
+
} | {
|
|
127
|
+
type: "resource";
|
|
128
|
+
resource: {
|
|
129
|
+
uri: string;
|
|
130
|
+
text?: string | undefined;
|
|
131
|
+
_meta?: Record<string, unknown> | undefined;
|
|
132
|
+
mimeType?: string | undefined;
|
|
133
|
+
blob?: string | undefined;
|
|
134
|
+
assetUri?: string | undefined;
|
|
135
|
+
};
|
|
136
|
+
annotations?: import("zod").objectOutputType<{
|
|
137
|
+
audience: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodArray<import("zod").ZodEnum<["user", "assistant"]>, "many">>>, ("user" | "assistant")[] | undefined, ("user" | "assistant")[] | null | undefined>;
|
|
138
|
+
priority: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodNumber>>, number | undefined, number | null | undefined>;
|
|
139
|
+
lastModified: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodString>>, string | undefined, string | null | undefined>;
|
|
140
|
+
}, import("zod").ZodTypeAny, "passthrough"> | undefined;
|
|
141
|
+
_meta?: Record<string, unknown> | undefined;
|
|
142
|
+
} | {
|
|
143
|
+
type: "resource_link";
|
|
144
|
+
uri: string;
|
|
145
|
+
name: string;
|
|
146
|
+
annotations?: import("zod").objectOutputType<{
|
|
147
|
+
audience: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodArray<import("zod").ZodEnum<["user", "assistant"]>, "many">>>, ("user" | "assistant")[] | undefined, ("user" | "assistant")[] | null | undefined>;
|
|
148
|
+
priority: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodNumber>>, number | undefined, number | null | undefined>;
|
|
149
|
+
lastModified: import("zod").ZodEffects<import("zod").ZodOptional<import("zod").ZodNullable<import("zod").ZodString>>, string | undefined, string | null | undefined>;
|
|
150
|
+
}, import("zod").ZodTypeAny, "passthrough"> | undefined;
|
|
151
|
+
_meta?: Record<string, unknown> | undefined;
|
|
152
|
+
mimeType?: string | undefined;
|
|
153
|
+
title?: string | undefined;
|
|
154
|
+
description?: string | undefined;
|
|
155
|
+
size?: number | undefined;
|
|
156
|
+
kind?: "file" | "skill" | "agent" | undefined;
|
|
157
|
+
};
|
|
158
|
+
} | {
|
|
159
|
+
path: string;
|
|
160
|
+
type: "diff";
|
|
161
|
+
newText: string;
|
|
162
|
+
oldText?: string | null | undefined;
|
|
163
|
+
} | {
|
|
164
|
+
path: string;
|
|
165
|
+
type: "patch";
|
|
166
|
+
diff: string;
|
|
167
|
+
change: "add" | "delete" | "update";
|
|
168
|
+
movePath?: string | undefined;
|
|
169
|
+
} | {
|
|
170
|
+
type: "terminal";
|
|
171
|
+
terminalId: string;
|
|
172
|
+
})[] | undefined;
|
|
173
|
+
rawInput?: unknown;
|
|
174
|
+
locations?: {
|
|
175
|
+
path: string;
|
|
176
|
+
line?: number | undefined;
|
|
177
|
+
}[] | undefined;
|
|
178
|
+
} | undefined;
|
|
179
|
+
detail?: string | undefined;
|
|
180
|
+
questions?: {
|
|
181
|
+
text: string;
|
|
182
|
+
kind: "text" | "choice" | "choices";
|
|
183
|
+
id: string;
|
|
184
|
+
options?: {
|
|
185
|
+
value: string;
|
|
186
|
+
label: string;
|
|
187
|
+
description?: string | undefined;
|
|
188
|
+
}[] | undefined;
|
|
189
|
+
other?: boolean | undefined;
|
|
190
|
+
constraints?: {
|
|
191
|
+
type: "string" | "number" | "boolean" | "integer" | "array";
|
|
192
|
+
minimum?: number | undefined;
|
|
193
|
+
maximum?: number | undefined;
|
|
194
|
+
minLength?: number | undefined;
|
|
195
|
+
maxLength?: number | undefined;
|
|
196
|
+
minItems?: number | undefined;
|
|
197
|
+
maxItems?: number | undefined;
|
|
198
|
+
pattern?: string | undefined;
|
|
199
|
+
format?: string | undefined;
|
|
200
|
+
} | undefined;
|
|
201
|
+
defaults?: string[] | undefined;
|
|
202
|
+
header?: string | undefined;
|
|
203
|
+
secret?: boolean | undefined;
|
|
204
|
+
required?: boolean | undefined;
|
|
205
|
+
}[] | undefined;
|
|
206
|
+
childSessionId?: string | undefined;
|
|
207
|
+
url?: {
|
|
208
|
+
url: string;
|
|
209
|
+
elicitationId: string;
|
|
210
|
+
} | undefined;
|
|
211
|
+
} | undefined;
|
|
212
|
+
asyncQuestions?: {
|
|
213
|
+
options: string[];
|
|
214
|
+
title: string;
|
|
215
|
+
id: string;
|
|
216
|
+
}[] | undefined;
|
|
217
|
+
queue?: {
|
|
218
|
+
text: string;
|
|
219
|
+
images: number;
|
|
220
|
+
clientMessageId: string;
|
|
221
|
+
}[] | undefined;
|
|
222
|
+
worktree?: {
|
|
223
|
+
branch: string;
|
|
224
|
+
source: string;
|
|
225
|
+
} | undefined;
|
|
226
|
+
subagents?: {
|
|
227
|
+
running: number;
|
|
228
|
+
total: number;
|
|
229
|
+
} | undefined;
|
|
230
|
+
tasks?: {
|
|
231
|
+
running: number;
|
|
232
|
+
total: number;
|
|
233
|
+
} | undefined;
|
|
234
|
+
}[];
|
|
235
|
+
hasMoreSessions: boolean;
|
|
236
|
+
status: string;
|
|
237
|
+
account: {
|
|
238
|
+
state: string;
|
|
239
|
+
email: string | undefined;
|
|
240
|
+
userId: string;
|
|
241
|
+
} | {
|
|
242
|
+
state: string;
|
|
243
|
+
email?: undefined;
|
|
244
|
+
userId?: undefined;
|
|
245
|
+
};
|
|
246
|
+
schema: number;
|
|
247
|
+
cliVersion: string;
|
|
248
|
+
home: string;
|
|
249
|
+
source: string;
|
|
250
|
+
executable: string;
|
|
251
|
+
hostOwner: string;
|
|
252
|
+
appBundle: string | undefined;
|
|
253
|
+
} | {
|
|
254
|
+
status: string;
|
|
255
|
+
account: {
|
|
256
|
+
state: string;
|
|
257
|
+
email: string | undefined;
|
|
258
|
+
userId: string;
|
|
259
|
+
} | {
|
|
260
|
+
state: string;
|
|
261
|
+
email?: undefined;
|
|
262
|
+
userId?: undefined;
|
|
263
|
+
};
|
|
264
|
+
schema: number;
|
|
265
|
+
cliVersion: string;
|
|
266
|
+
home: string;
|
|
267
|
+
source: string;
|
|
268
|
+
executable: string;
|
|
269
|
+
hostOwner: string;
|
|
270
|
+
appBundle: string | undefined;
|
|
271
|
+
}>;
|
|
272
|
+
export declare function runDesktop(version: string, action: string): Promise<void>;
|
|
273
|
+
export declare function openDesktop(): Promise<void>;
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { loadAuth } from "../auth.js";
|
|
2
|
+
import { runLogin } from "./login.js";
|
|
3
|
+
import { runLogout } from "./logout.js";
|
|
4
|
+
import { joinGatewayAfterLogin, readHostConfig, writeHostConfig, refreshGateway } from "./host.js";
|
|
5
|
+
import { execFile } from "node:child_process";
|
|
6
|
+
import { promisify } from "node:util";
|
|
7
|
+
import { realpathSync } from "node:fs";
|
|
8
|
+
import { standaloneBundle } from "../utils/standalone.js";
|
|
9
|
+
import { prepareDesktopUpdate, recoverDesktopUpdate } from "./desktop-update.js";
|
|
10
|
+
import { sep } from "node:path";
|
|
11
|
+
import { ensureHostRunning, silenceSqliteWarning, withRunningHost } from "./host.js";
|
|
12
|
+
import { linkshellDir, readHostLaunch, readHostOwner, readPid, stopDaemonAndWait } from "../utils/daemon.js";
|
|
13
|
+
export function installationSource(path) {
|
|
14
|
+
return path.includes(`${sep}Cellar${sep}linkshell${sep}`) ? "homebrew" : "npm";
|
|
15
|
+
}
|
|
16
|
+
/** A versioned, read-only snapshot. Missing sections stay unknown, never healthy. */
|
|
17
|
+
export async function desktopSnapshot(version) {
|
|
18
|
+
let executable = process.argv[1];
|
|
19
|
+
try {
|
|
20
|
+
executable = realpathSync(executable);
|
|
21
|
+
}
|
|
22
|
+
catch { /* Retain the launch path for diagnosis. */ }
|
|
23
|
+
const auth = loadAuth();
|
|
24
|
+
const account = auth?.userId ? { state: "signed-in", email: auth.email, userId: auth.userId } : { state: "signed-out" };
|
|
25
|
+
const base = { account, schema: 1, cliVersion: version, home: linkshellDir(), source: standaloneBundle() ? "standalone" : installationSource(executable), executable, hostOwner: readPid("host") ? readHostOwner(readPid("host")) ?? "external" : "none", appBundle: standaloneBundle() };
|
|
26
|
+
const result = await withRunningHost(async (client) => {
|
|
27
|
+
const machine = await client.call("machine.info", {}, 5000);
|
|
28
|
+
const [gateway, sessions] = await Promise.all([
|
|
29
|
+
client.call("gateway.status", {}, 5000),
|
|
30
|
+
client.call("sessions.list", { limit: 200 }, 5000),
|
|
31
|
+
]);
|
|
32
|
+
return { machine, gateway, sessions: sessions.sessions, hasMoreSessions: Boolean(sessions.nextBefore) };
|
|
33
|
+
});
|
|
34
|
+
return result ? { ...base, status: "running", ...result } : { ...base, status: readPid("host") ? "unreachable" : "stopped" };
|
|
35
|
+
}
|
|
36
|
+
export async function runDesktop(version, action) {
|
|
37
|
+
silenceSqliteWarning();
|
|
38
|
+
try {
|
|
39
|
+
if (action.startsWith("usage-")) {
|
|
40
|
+
const match = /^usage-(1|7|30)-(all|codex|claude)$/.exec(action);
|
|
41
|
+
if (!match)
|
|
42
|
+
throw new Error("无效的用量筛选条件");
|
|
43
|
+
const result = await withRunningHost(client => client.call("usage.summary", { days: Number(match[1]), agent: match[2] }, 120_000));
|
|
44
|
+
if (!result)
|
|
45
|
+
throw new Error("请先启动本机服务");
|
|
46
|
+
process.stdout.write(`${JSON.stringify(result)}\n`);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
if (action === "login") {
|
|
50
|
+
const result = await runLogin();
|
|
51
|
+
if (!result)
|
|
52
|
+
throw new Error("登录未完成或已超时,请重试。");
|
|
53
|
+
await joinGatewayAfterLogin(result.plan);
|
|
54
|
+
}
|
|
55
|
+
else if (action === "logout")
|
|
56
|
+
await runLogout();
|
|
57
|
+
else if (action === "connect-gateway") {
|
|
58
|
+
if (!loadAuth()?.userId)
|
|
59
|
+
throw new Error("请先登录账号。");
|
|
60
|
+
if (process.env.LINKSHELL_GATEWAY)
|
|
61
|
+
throw new Error("网关由启动环境指定,请移除 LINKSHELL_GATEWAY 后重新打开 App。");
|
|
62
|
+
const config = readHostConfig(linkshellDir());
|
|
63
|
+
delete config.gateway;
|
|
64
|
+
writeHostConfig(linkshellDir(), config);
|
|
65
|
+
await ensureHostRunning();
|
|
66
|
+
await refreshGateway(15_000);
|
|
67
|
+
}
|
|
68
|
+
else if (action === "prepare-update") {
|
|
69
|
+
await prepareDesktopUpdate();
|
|
70
|
+
}
|
|
71
|
+
else if (action === "recover-update") {
|
|
72
|
+
await recoverDesktopUpdate(version);
|
|
73
|
+
}
|
|
74
|
+
else if (action === "start")
|
|
75
|
+
await ensureHostRunning();
|
|
76
|
+
else if (action === "stop" || action === "restart") {
|
|
77
|
+
const pid = readPid("host");
|
|
78
|
+
const env = { ...process.env, ...(pid ? readHostLaunch(pid) : {}) };
|
|
79
|
+
await stopDaemonAndWait("host", 30_000, pid ?? undefined);
|
|
80
|
+
if (action === "restart")
|
|
81
|
+
await ensureHostRunning(env);
|
|
82
|
+
}
|
|
83
|
+
else if (action !== "snapshot")
|
|
84
|
+
throw new Error("Unknown desktop action");
|
|
85
|
+
process.stdout.write(`${JSON.stringify(await desktopSnapshot(version))}\n`);
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
process.stdout.write(`${JSON.stringify({ schema: 1, status: "unknown", error: error instanceof Error ? error.message : String(error) })}\n`);
|
|
89
|
+
process.exitCode = 1;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
export async function openDesktop() {
|
|
93
|
+
if (process.platform !== "darwin")
|
|
94
|
+
throw new Error("LinkShell.app is available on macOS only");
|
|
95
|
+
silenceSqliteWarning();
|
|
96
|
+
const { shippedApp } = await import("@linkshell/host");
|
|
97
|
+
const app = shippedApp();
|
|
98
|
+
if (!app)
|
|
99
|
+
throw new Error("LinkShell.app is missing; reinstall linkshell-cli with optional dependencies enabled");
|
|
100
|
+
// Pass the exact Node and CLI pair: Finder's PATH need not contain the user's package manager.
|
|
101
|
+
await promisify(execFile)("/usr/bin/open", ["-n", "-a", app, "--args", "--dashboard", "--cli-node", process.execPath, ...process.execArgv.flatMap((arg) => ["--cli-arg", arg]), "--cli-script", realpathSync(process.argv[1]), "--cli-path", process.env.PATH ?? "", "--home", linkshellDir()]);
|
|
102
|
+
}
|
|
103
|
+
//# sourceMappingURL=desktop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"desktop.js","sourceRoot":"","sources":["../../../../src/commands/desktop.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,14 +20,14 @@ export async function runLogin() {
|
|
|
20
20
|
const hash = window.location.hash.substring(1);
|
|
21
21
|
if (hash) {
|
|
22
22
|
fetch('/token?' + hash, { method: 'POST' })
|
|
23
|
-
.then(
|
|
23
|
+
.then(response => { if (!response.ok) throw new Error('Login failed'); document.body.innerHTML = '<h2>Login successful! You can close this tab.</h2>'; })
|
|
24
24
|
.catch(() => { document.body.innerHTML = '<h2>Login failed. Please try again.</h2>'; });
|
|
25
25
|
} else {
|
|
26
26
|
// Try query params (iTool may pass tokens as query params)
|
|
27
27
|
const params = window.location.search.substring(1);
|
|
28
28
|
if (params) {
|
|
29
29
|
fetch('/token?' + params, { method: 'POST' })
|
|
30
|
-
.then(
|
|
30
|
+
.then(response => { if (!response.ok) throw new Error('Login failed'); document.body.innerHTML = '<h2>Login successful! You can close this tab.</h2>'; })
|
|
31
31
|
.catch(() => { document.body.innerHTML = '<h2>Login failed. Please try again.</h2>'; });
|
|
32
32
|
} else {
|
|
33
33
|
document.body.innerHTML = '<h2>No auth data received. Please try again.</h2>';
|
|
@@ -83,10 +83,15 @@ export async function runLogin() {
|
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
catch { }
|
|
86
|
+
if (!userId) {
|
|
87
|
+
res.writeHead(401);
|
|
88
|
+
res.end("无法验证账号,请重新登录。");
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
86
91
|
const tokens = {
|
|
87
92
|
accessToken,
|
|
88
93
|
refreshToken,
|
|
89
|
-
expiresAt: Date.now() + expiresIn * 1000,
|
|
94
|
+
expiresAt: Date.now() + (Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn : 3600) * 1000,
|
|
90
95
|
userId,
|
|
91
96
|
email,
|
|
92
97
|
};
|
|
@@ -112,6 +117,7 @@ export async function runLogin() {
|
|
|
112
117
|
res.writeHead(404);
|
|
113
118
|
res.end("Not found");
|
|
114
119
|
});
|
|
120
|
+
server.on("error", () => { clearTimeout(timeout); resolve(null); });
|
|
115
121
|
server.listen(0, "127.0.0.1", () => {
|
|
116
122
|
const addr = server.address();
|
|
117
123
|
if (!addr || typeof addr === "string") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAGvE,MAAM,cAAc,GAAG,sCAAsC,CAAC;AAmB9D,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAEhD,OAAO,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,EAAE;QACjD,IAAI,OAAkD,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,kBAAkB,CAAC,CAAC;YAExD,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;gBACjC,iEAAiE;gBACjE,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;gBACpD,GAAG,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;QAwBR,CAAC,CAAC;gBACF,OAAO;YACT,CAAC;YAED,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACvD,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBACzD,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,CAAC;gBAEvE,IAAI,CAAC,WAAW,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACnB,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;oBAC1B,OAAO;gBACT,CAAC;gBAED,yBAAyB;gBACzB,IAAI,MAAM,GAAG,EAAE,CAAC;gBAChB,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,IAAI,IAAI,GAAG,MAAM,CAAC;gBAClB,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,YAAY,eAAe,EAAE;wBAC1D,OAAO,EAAE;4BACP,aAAa,EAAE,UAAU,WAAW,EAAE;4BACtC,MAAM,EAAE,iBAAiB;yBAC1B;wBACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;qBACpC,CAAC,CAAC;oBACH,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;wBACf,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAGjC,CAAC;wBACF,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;wBACjB,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;wBAEzB,yCAAyC;wBACzC,MAAM,UAAU,GAAG,MAAM,KAAK,CAC5B,GAAG,YAAY,2BAA2B,MAAM,sCAAsC,EACtF;4BACE,OAAO,EAAE;gCACP,aAAa,EAAE,UAAU,WAAW,EAAE;gCACtC,MAAM,EAAE,iBAAiB;6BAC1B;4BACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;yBACnC,CACF,CAAC;wBACF,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;4BAClB,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAGtC,CAAC;4BACJ,IACE,QAAQ,CAAC,MAAM,GAAG,CAAC;gCACnB,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,KAAK,KAAK;gCAC3B,QAAQ,CAAC,CAAC,CAAE,CAAC,eAAe;gCAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,eAAe,CAAC,GAAG,IAAI,IAAI,EAAE,EACnD,CAAC;gCACD,IAAI,GAAG,KAAK,CAAC;4BACf,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;gBAEV,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACnB,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;oBACzB,OAAO;gBACT,CAAC;gBAED,MAAM,MAAM,GAAe;oBACzB,WAAW;oBACX,YAAY;oBACZ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI;oBAC/F,MAAM;oBACN,KAAK;iBACN,CAAC;gBACF,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAEjB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEd,MAAM,SAAS,GAAG,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC;gBACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,mCAAmC,KAAK,IAAI,MAAM,KAAK,SAAS,OAAO,CACxE,CAAC;gBAEF,yFAAyF;gBACzF,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,UAAU,CAAC,GAAG,EAAE;oBACd,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC;wBACN,OAAO,EAAE,IAAI;wBACb,IAAI,EAAE,IAAsB;wBAC5B,KAAK;wBACL,MAAM;wBACN,WAAW;qBACZ,CAAC,CAAC;gBACL,CAAC,EAAE,GAAG,CAAC,CAAC;gBACR,OAAO;YACT,CAAC;YAED,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qDAAqD,CACtD,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC;gBACd,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,MAAM,WAAW,GAAG,oBAAoB,IAAI,WAAW,CAAC;YACxD,MAAM,OAAO,GAAG,GAAG,cAAc,aAAa,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YAEhF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAChE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,OAAO,MAAM,CAAC,CAAC;YAEzC,IAAI,CAAC;gBACH,MAAM,GAAG,GACP,OAAO,CAAC,QAAQ,KAAK,QAAQ;oBAC3B,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO;wBAC5B,CAAC,CAAC,OAAO;wBACT,CAAC,CAAC,UAAU,CAAC;gBACnB,QAAQ,CAAC,GAAG,GAAG,KAAK,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YAEV,0BAA0B;YAC1B,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC/C,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { execFileSync } from "node:child_process";
|
|
2
2
|
import { realpathSync } from "node:fs";
|
|
3
3
|
import { join, sep } from "node:path";
|
|
4
|
+
import { standaloneBundle } from "../utils/standalone.js";
|
|
5
|
+
import { linkshellDir } from "../utils/daemon.js";
|
|
4
6
|
import { runUpgradeWorker } from "./upgrade-worker.js";
|
|
5
7
|
function isBrewInstall() {
|
|
6
8
|
try {
|
|
@@ -33,6 +35,12 @@ async function fetchLatestVersion() {
|
|
|
33
35
|
}
|
|
34
36
|
}
|
|
35
37
|
export async function runUpgrade(current) {
|
|
38
|
+
const app = standaloneBundle();
|
|
39
|
+
if (app) {
|
|
40
|
+
execFileSync("/usr/bin/open", ["-n", "-a", app, "--args", "--dashboard", "--check-updates", "--home", linkshellDir()]);
|
|
41
|
+
process.stderr.write(" 已打开 LinkShell 软件更新;App、内置 CLI 和 Host 将一起更新。\n");
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
36
44
|
process.stderr.write(`\n Current version: ${current}\n Checking for updates...\n\n`);
|
|
37
45
|
const latest = await fetchLatestVersion();
|
|
38
46
|
if (!latest) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../../src/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/src/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { standaloneBundle } from "./utils/standalone.js";
|
|
2
3
|
import { Command, Option } from "commander";
|
|
3
4
|
import { runDoctor } from "./commands/doctor.js";
|
|
4
5
|
import { runSetup } from "./commands/setup.js";
|
|
@@ -8,11 +9,22 @@ import { runLogout } from "./commands/logout.js";
|
|
|
8
9
|
import { createRequire } from "node:module";
|
|
9
10
|
const require = createRequire(import.meta.url);
|
|
10
11
|
const pkg = require("../../../package.json");
|
|
12
|
+
const bundledApp = standaloneBundle();
|
|
13
|
+
if (bundledApp)
|
|
14
|
+
process.env.LINKSHELL_APP_BUNDLE = bundledApp;
|
|
15
|
+
else
|
|
16
|
+
delete process.env.LINKSHELL_APP_BUNDLE;
|
|
11
17
|
const program = new Command();
|
|
12
18
|
program
|
|
13
19
|
.name("linkshell")
|
|
14
20
|
.description("Your coding agents and terminals, on your phone. Start with `linkshell setup`.")
|
|
15
21
|
.version(pkg.version);
|
|
22
|
+
program.command("app")
|
|
23
|
+
.description("Open the native Mac status app (included with the CLI)")
|
|
24
|
+
.action(async () => { const { openDesktop } = await import("./commands/desktop.js"); await openDesktop(); });
|
|
25
|
+
program.command("desktop", { hidden: true })
|
|
26
|
+
.option("--action <action>", "snapshot, start, stop or restart", "snapshot")
|
|
27
|
+
.action(async (options) => { const { runDesktop } = await import("./commands/desktop.js"); await runDesktop(pkg.version, options.action); });
|
|
16
28
|
// ── host ────────────────────────────────────────────────────────────
|
|
17
29
|
const hostCmd = program
|
|
18
30
|
.command("host")
|