ds-harness-remote 0.4.13 → 0.4.15
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/README.md +2 -2
- package/dist/acp.d.ts +75 -0
- package/dist/acp.d.ts.map +1 -0
- package/dist/acp.js +61 -0
- package/dist/acp.js.map +1 -0
- package/dist/client-runtime.d.ts +11 -0
- package/dist/client-runtime.d.ts.map +1 -1
- package/dist/client-runtime.js +24 -0
- package/dist/client-runtime.js.map +1 -1
- package/dist/client-secure-transport.d.ts +1 -0
- package/dist/client-secure-transport.d.ts.map +1 -1
- package/dist/client-secure-transport.js +12 -5
- package/dist/client-secure-transport.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.github.js +474 -76
- package/dist/client.js +474 -76
- package/dist/client.js.map +1 -1
- package/dist/codex/method-policy.d.ts +10 -10
- package/dist/config.d.ts +36 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +9 -0
- package/dist/config.js.map +1 -1
- package/dist/connection-controller.d.ts +5 -0
- package/dist/connection-controller.d.ts.map +1 -1
- package/dist/connection-controller.js +16 -1
- package/dist/connection-controller.js.map +1 -1
- package/dist/control-route.d.ts +10 -1
- package/dist/control-route.d.ts.map +1 -1
- package/dist/control-route.js +17 -4
- package/dist/control-route.js.map +1 -1
- package/dist/control-runtime.d.ts +12 -1
- package/dist/control-runtime.d.ts.map +1 -1
- package/dist/control-runtime.js +95 -1
- package/dist/control-runtime.js.map +1 -1
- package/dist/control-stream.d.ts +67 -0
- package/dist/control-stream.d.ts.map +1 -0
- package/dist/control-stream.js +179 -0
- package/dist/control-stream.js.map +1 -0
- package/dist/harness-api-bridge.d.ts.map +1 -1
- package/dist/harness-api-bridge.js +32 -8
- package/dist/harness-api-bridge.js.map +1 -1
- package/dist/harness-remote-bridge.d.ts +5 -2
- package/dist/harness-remote-bridge.d.ts.map +1 -1
- package/dist/harness-remote-bridge.js +85 -5
- package/dist/harness-remote-bridge.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1872 -588
- package/dist/index.js.map +4 -4
- package/dist/loopback-host.d.ts +20 -0
- package/dist/loopback-host.d.ts.map +1 -0
- package/dist/loopback-host.js +220 -0
- package/dist/loopback-host.js.map +1 -0
- package/dist/loopback-preview.d.ts +19 -0
- package/dist/loopback-preview.d.ts.map +1 -0
- package/dist/loopback-preview.js +232 -0
- package/dist/loopback-preview.js.map +1 -0
- package/dist/remote-typert-gateway.js +16 -4
- package/dist/remote-typert-gateway.js.map +1 -1
- package/dist/rpc-router.d.ts +7 -2
- package/dist/rpc-router.d.ts.map +1 -1
- package/dist/rpc-router.js +27 -1
- package/dist/rpc-router.js.map +1 -1
- package/dist/server-api.d.ts +6 -3
- package/dist/server-api.d.ts.map +1 -1
- package/dist/server-api.js +50 -26
- package/dist/server-api.js.map +1 -1
- package/dist/server-connection.d.ts +1 -0
- package/dist/server-connection.d.ts.map +1 -1
- package/dist/server-connection.js +54 -7
- package/dist/server-connection.js.map +1 -1
- package/dist/server-credentials.d.ts +9 -0
- package/dist/server-credentials.d.ts.map +1 -1
- package/dist/server-credentials.js +34 -0
- package/dist/server-credentials.js.map +1 -1
- package/dist/service.d.ts +14 -0
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +48 -2
- package/dist/service.js.map +1 -1
- package/dist/status-stream.d.ts +48 -0
- package/dist/status-stream.d.ts.map +1 -0
- package/dist/status-stream.js +133 -0
- package/dist/status-stream.js.map +1 -0
- package/dist/terminal-policy.d.ts +21 -0
- package/dist/terminal-policy.d.ts.map +1 -0
- package/dist/terminal-policy.js +62 -0
- package/dist/terminal-policy.js.map +1 -0
- package/dist/tui-command.js +6 -0
- package/dist/tui-command.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dsh-plugin.json +1 -1
- package/package.json +44 -24
- package/public.d.ts +2 -0
package/dist/config.d.ts
CHANGED
|
@@ -5,6 +5,12 @@ export interface Config {
|
|
|
5
5
|
role?: 'host' | 'client' | 'both';
|
|
6
6
|
serverUrl?: string;
|
|
7
7
|
deviceName?: string;
|
|
8
|
+
terminal?: {
|
|
9
|
+
enabled?: boolean;
|
|
10
|
+
};
|
|
11
|
+
loopback?: {
|
|
12
|
+
ports?: number[];
|
|
13
|
+
};
|
|
8
14
|
forceRelay?: boolean;
|
|
9
15
|
logLevel?: 'debug' | 'info' | 'warn' | 'error';
|
|
10
16
|
reconnect?: boolean | {
|
|
@@ -17,6 +23,20 @@ export interface Config {
|
|
|
17
23
|
enabled?: boolean;
|
|
18
24
|
binary?: string;
|
|
19
25
|
};
|
|
26
|
+
acp?: {
|
|
27
|
+
enabled?: boolean;
|
|
28
|
+
backends?: Array<{
|
|
29
|
+
id: string;
|
|
30
|
+
enabled?: boolean;
|
|
31
|
+
command?: string;
|
|
32
|
+
args?: string[];
|
|
33
|
+
cwd?: string;
|
|
34
|
+
}>;
|
|
35
|
+
backend?: string;
|
|
36
|
+
command?: string;
|
|
37
|
+
args?: string[];
|
|
38
|
+
cwd?: string;
|
|
39
|
+
};
|
|
20
40
|
}
|
|
21
41
|
export interface ResolvedCodexConfig {
|
|
22
42
|
enabled: boolean;
|
|
@@ -35,7 +55,23 @@ export interface ResolvedConfig {
|
|
|
35
55
|
maxDelayMs: number;
|
|
36
56
|
jitter: number;
|
|
37
57
|
};
|
|
58
|
+
terminal: {
|
|
59
|
+
enabled: boolean;
|
|
60
|
+
};
|
|
61
|
+
loopback: {
|
|
62
|
+
ports: number[];
|
|
63
|
+
};
|
|
38
64
|
codex: ResolvedCodexConfig;
|
|
65
|
+
acp?: {
|
|
66
|
+
enabled: boolean;
|
|
67
|
+
backends: Array<{
|
|
68
|
+
id: string;
|
|
69
|
+
enabled: boolean;
|
|
70
|
+
command: string;
|
|
71
|
+
args: string[];
|
|
72
|
+
cwd?: string;
|
|
73
|
+
}>;
|
|
74
|
+
};
|
|
39
75
|
}
|
|
40
76
|
/** Cordis-facing configuration shape; runtime bounds are enforced by resolveConfig. */
|
|
41
77
|
export declare const Config: s<Config>;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAGxC,eAAO,MAAM,yBAAyB,yBAAyB,CAAA;AAE/D,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAA;IACjC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;IAC9C,SAAS,CAAC,EAAE,OAAO,GAAG;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;IACD,iFAAiF;IACjF,KAAK,CAAC,EAAE;QACN,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/config.js
CHANGED
|
@@ -8,6 +8,8 @@ export const Config = s.object({
|
|
|
8
8
|
role: s.union(['host', 'client', 'both']),
|
|
9
9
|
serverUrl: s.string(),
|
|
10
10
|
deviceName: s.string(),
|
|
11
|
+
terminal: s.object({ enabled: s.boolean() }),
|
|
12
|
+
loopback: s.object({ ports: s.array(s.number()) }),
|
|
11
13
|
forceRelay: s.boolean(),
|
|
12
14
|
logLevel: s.union(['debug', 'info', 'warn', 'error']),
|
|
13
15
|
reconnect: s.union([
|
|
@@ -22,6 +24,7 @@ export const Config = s.object({
|
|
|
22
24
|
enabled: s.boolean(),
|
|
23
25
|
binary: s.string(),
|
|
24
26
|
}),
|
|
27
|
+
acp: s.object({ enabled: s.boolean(), backends: s.array(s.object({ id: s.string(), enabled: s.boolean(), command: s.string(), args: s.array(s.string()), cwd: s.string() })) }),
|
|
25
28
|
});
|
|
26
29
|
const reconnectSchema = z.union([
|
|
27
30
|
z.boolean(),
|
|
@@ -36,6 +39,8 @@ const configSchema = z.object({
|
|
|
36
39
|
role: z.enum(['host', 'client', 'both']).optional(),
|
|
37
40
|
serverUrl: z.string().url().optional(),
|
|
38
41
|
deviceName: z.string().trim().min(1).max(80).optional(),
|
|
42
|
+
terminal: z.object({ enabled: z.boolean().optional() }).strict().optional(),
|
|
43
|
+
loopback: z.object({ ports: z.array(z.number().int().min(1024).max(65535)).max(16).optional() }).strict().optional(),
|
|
39
44
|
forceRelay: z.boolean().optional(),
|
|
40
45
|
logLevel: z.enum(['debug', 'info', 'warn', 'error']).optional(),
|
|
41
46
|
reconnect: reconnectSchema.optional(),
|
|
@@ -43,6 +48,7 @@ const configSchema = z.object({
|
|
|
43
48
|
enabled: z.boolean().optional(),
|
|
44
49
|
binary: z.string().trim().min(1).max(4096).optional(),
|
|
45
50
|
}).strict().optional(),
|
|
51
|
+
acp: z.object({ enabled: z.boolean().optional(), backends: z.array(z.object({ id: z.string().trim().regex(/^[a-z0-9][a-z0-9._-]{0,31}$/i), enabled: z.boolean().optional(), command: z.string().trim().min(1).max(4096).optional(), args: z.array(z.string().max(4096)).max(32).optional(), cwd: z.string().max(4096).optional() }).strict()).max(12).optional(), backend: z.string().trim().regex(/^[a-z0-9][a-z0-9._-]{0,31}$/i).optional(), command: z.string().trim().min(1).max(4096).optional(), args: z.array(z.string().max(4096)).max(32).optional(), cwd: z.string().max(4096).optional() }).strict().optional(),
|
|
46
52
|
}).strict();
|
|
47
53
|
export function resolveConfig(input = {}, env = process.env) {
|
|
48
54
|
const parsed = configSchema.parse(input);
|
|
@@ -59,6 +65,8 @@ export function resolveConfig(input = {}, env = process.env) {
|
|
|
59
65
|
role: parsed.role ?? 'host',
|
|
60
66
|
...(serverUrl === undefined ? {} : { serverUrl }),
|
|
61
67
|
deviceName: parsed.deviceName ?? hostname(),
|
|
68
|
+
terminal: { enabled: parsed.terminal?.enabled ?? false },
|
|
69
|
+
loopback: { ports: [...new Set(parsed.loopback?.ports ?? [])] },
|
|
62
70
|
forceRelay: parsed.forceRelay ?? false,
|
|
63
71
|
logLevel: parsed.logLevel ?? 'info',
|
|
64
72
|
reconnect: {
|
|
@@ -71,6 +79,7 @@ export function resolveConfig(input = {}, env = process.env) {
|
|
|
71
79
|
enabled: parsed.codex?.enabled ?? true,
|
|
72
80
|
binary: parsed.codex?.binary ?? 'codex',
|
|
73
81
|
},
|
|
82
|
+
acp: { enabled: parsed.acp?.enabled ?? true, backends: [...new Set(['codex', 'cursor', 'kimi', ...(parsed.acp?.backends?.map(item => item.id) ?? [])])].map(id => { const d = parsed.acp?.backends?.find(x => x.id === id); const legacy = parsed.acp?.backend === id ? parsed.acp : undefined; return { id, enabled: d?.enabled ?? legacy?.enabled ?? true, command: d?.command ?? legacy?.command ?? { codex: 'codex', cursor: 'agent', kimi: 'kimi' }[id] ?? id, args: d?.args ?? legacy?.args ?? ['acp'], ...(d?.cwd ?? legacy?.cwd ? { cwd: d?.cwd ?? legacy?.cwd } : {}) }; }) },
|
|
74
83
|
};
|
|
75
84
|
}
|
|
76
85
|
export function normalizeServerUrl(value) {
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,CAAC,MAAM,0BAA0B,CAAA;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,CAAC,MAAM,yBAAyB,GAAG,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,10 @@ export interface PeerConnectionContext {
|
|
|
7
7
|
connectionId: string;
|
|
8
8
|
peerDeviceId: string;
|
|
9
9
|
}
|
|
10
|
+
export interface ConnectedPeer {
|
|
11
|
+
deviceId: string;
|
|
12
|
+
mode?: 'LAN' | 'P2P' | 'TURN' | 'Relay';
|
|
13
|
+
}
|
|
10
14
|
export type RpcRouterFactory = (context: PeerConnectionContext, send: (message: RemoteMessage) => Promise<void>) => RpcRouter;
|
|
11
15
|
export declare class ConnectionController {
|
|
12
16
|
private readonly identities;
|
|
@@ -20,6 +24,7 @@ export declare class ConnectionController {
|
|
|
20
24
|
isOnline(): boolean;
|
|
21
25
|
connectionCount(): number;
|
|
22
26
|
peerDeviceIds(): string[];
|
|
27
|
+
connectedPeers(): ConnectedPeer[];
|
|
23
28
|
peerDeviceId(): string | undefined;
|
|
24
29
|
connectionMode(): 'LAN' | 'P2P' | 'TURN' | 'Relay' | 'Disconnected';
|
|
25
30
|
send(message: RemoteMessage): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-controller.d.ts","sourceRoot":"","sources":["../src/connection-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAQ1D,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC7B,OAAO,EAAE,qBAAqB,EAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,KAC5C,SAAS,CAAA;AAEd,qBAAa,oBAAoB;IAK7B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAN1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,WAAW,CAAmC;gBAGnC,UAAU,EAAE,aAAa,EACzB,YAAY,EAAE,gBAAgB,EAC9B,MAAM,CAAC,EAAE,UAAU,YAAA;IAGtC,MAAM,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;YAM1C,SAAS;IAsDvB,QAAQ,IAAI,OAAO;IAEnB,eAAe,IAAI,MAAM;IAEzB,aAAa,IAAI,MAAM,EAAE;IAIzB,YAAY,IAAI,MAAM,GAAG,SAAS;IAKlC,cAAc,IAAI,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,cAAc;IAK7D,IAAI,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOtE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAKd,MAAM;YAwBN,MAAM;YAMN,cAAc;YAcd,UAAU;IAgBxB,OAAO,CAAC,QAAQ;CAGjB;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CACnD"}
|
|
1
|
+
{"version":3,"file":"connection-controller.d.ts","sourceRoot":"","sources":["../src/connection-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAQ1D,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,CAAA;CACxC;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC7B,OAAO,EAAE,qBAAqB,EAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,KAC5C,SAAS,CAAA;AAEd,qBAAa,oBAAoB;IAK7B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAN1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,WAAW,CAAmC;gBAGnC,UAAU,EAAE,aAAa,EACzB,YAAY,EAAE,gBAAgB,EAC9B,MAAM,CAAC,EAAE,UAAU,YAAA;IAGtC,MAAM,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;YAM1C,SAAS;IAsDvB,QAAQ,IAAI,OAAO;IAEnB,eAAe,IAAI,MAAM;IAEzB,aAAa,IAAI,MAAM,EAAE;IAIzB,cAAc,IAAI,aAAa,EAAE;IAejC,YAAY,IAAI,MAAM,GAAG,SAAS;IAKlC,cAAc,IAAI,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,cAAc;IAK7D,IAAI,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOtE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAKd,MAAM;YAwBN,MAAM;YAMN,cAAc;YAcd,UAAU;IAgBxB,OAAO,CAAC,QAAQ;CAGjB;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CACnD"}
|
|
@@ -65,7 +65,22 @@ export class ConnectionController {
|
|
|
65
65
|
isOnline() { return this.active.size > 0; }
|
|
66
66
|
connectionCount() { return this.active.size; }
|
|
67
67
|
peerDeviceIds() {
|
|
68
|
-
return
|
|
68
|
+
return this.connectedPeers().map(peer => peer.deviceId);
|
|
69
|
+
}
|
|
70
|
+
connectedPeers() {
|
|
71
|
+
const peers = [];
|
|
72
|
+
const seen = new Set();
|
|
73
|
+
for (const connection of this.active.values()) {
|
|
74
|
+
const deviceId = connection.channel.peerDeviceId;
|
|
75
|
+
if (seen.has(deviceId))
|
|
76
|
+
continue;
|
|
77
|
+
seen.add(deviceId);
|
|
78
|
+
peers.push({
|
|
79
|
+
deviceId,
|
|
80
|
+
...(connection.channel.mode === undefined ? {} : { mode: connection.channel.mode }),
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
return peers;
|
|
69
84
|
}
|
|
70
85
|
peerDeviceId() {
|
|
71
86
|
const peers = this.peerDeviceIds();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-controller.js","sourceRoot":"","sources":["../src/connection-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,aAAa,GAEd,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"connection-controller.js","sourceRoot":"","sources":["../src/connection-controller.ts"],"names":[],"mappings":"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"}
|
package/dist/control-route.d.ts
CHANGED
|
@@ -2,6 +2,10 @@ import type { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'node:
|
|
|
2
2
|
import type { RpcResult } from '@deepseek-ai/dsh-host-apiproxy/api';
|
|
3
3
|
/** Namespaced loopback RPC prefix shared by the Host runtime and browser UI. */
|
|
4
4
|
export declare const CONTROL_RPC_PREFIX = "/ds-harness-remote";
|
|
5
|
+
/** Loopback control endpoint carrying the status event stream. */
|
|
6
|
+
export declare const STATUS_STREAM_ENDPOINT = "status.events";
|
|
7
|
+
/** Full URL path of the loopback status event stream. */
|
|
8
|
+
export declare const STATUS_STREAM_PATH = "/ds-harness-remote/status.events";
|
|
5
9
|
interface HostConnectionHandleLike {
|
|
6
10
|
requestRejection?(request: {
|
|
7
11
|
headers: IncomingHttpHeaders;
|
|
@@ -20,6 +24,11 @@ export interface HostWebServerLike {
|
|
|
20
24
|
}): () => void | Promise<void>;
|
|
21
25
|
}
|
|
22
26
|
export type ControlRouteHandler = (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<RpcResult<unknown>>;
|
|
23
|
-
|
|
27
|
+
/** Long-lived loopback response owner for the status event stream. */
|
|
28
|
+
export interface ControlStatusStreamLike {
|
|
29
|
+
handle(response: ServerResponse): Promise<void>;
|
|
30
|
+
close(): void;
|
|
31
|
+
}
|
|
32
|
+
export declare function registerControlRoute(connection: HostConnectionHandleLike, handler: ControlRouteHandler, webServer?: HostWebServerLike, statusStream?: ControlStatusStreamLike): () => Promise<void>;
|
|
24
33
|
export {};
|
|
25
34
|
//# sourceMappingURL=control-route.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control-route.d.ts","sourceRoot":"","sources":["../src/control-route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AAEnE,gFAAgF;AAChF,eAAO,MAAM,kBAAkB,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"control-route.d.ts","sourceRoot":"","sources":["../src/control-route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AAEnE,gFAAgF;AAChF,eAAO,MAAM,kBAAkB,uBAAuB,CAAA;AAEtD,kEAAkE;AAClE,eAAO,MAAM,sBAAsB,kBAAkB,CAAA;AAErD,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,qCAAoD,CAAA;AAKnF,UAAU,wBAAwB;IAChC,gBAAgB,CAAC,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,mBAAmB,CAAA;KAAE,GAAG,MAAM,GAAG,SAAS,CAAA;IAChF,GAAG,EAAE;QACH,MAAM,CACJ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE;YAAE,SAAS,EAAE,UAAU,GAAG,cAAc,CAAA;SAAE,GAClD,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;KACvB,CAAA;CACF;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE;QACd,IAAI,EAAE,QAAQ,CAAA;QACd,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KACzE,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/B;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,KAChB,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;AAEhC,sEAAsE;AACtE,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,KAAK,IAAI,IAAI,CAAA;CACd;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,wBAAwB,EACpC,OAAO,EAAE,mBAAmB,EAC5B,SAAS,CAAC,EAAE,iBAAiB,EAC7B,YAAY,CAAC,EAAE,uBAAuB,GACrC,MAAM,OAAO,CAAC,IAAI,CAAC,CAkBrB"}
|
package/dist/control-route.js
CHANGED
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
/** Namespaced loopback RPC prefix shared by the Host runtime and browser UI. */
|
|
2
2
|
export const CONTROL_RPC_PREFIX = '/ds-harness-remote';
|
|
3
|
+
/** Loopback control endpoint carrying the status event stream. */
|
|
4
|
+
export const STATUS_STREAM_ENDPOINT = 'status.events';
|
|
5
|
+
/** Full URL path of the loopback status event stream. */
|
|
6
|
+
export const STATUS_STREAM_PATH = `${CONTROL_RPC_PREFIX}/${STATUS_STREAM_ENDPOINT}`;
|
|
3
7
|
const ENDPOINT_SEGMENT_PATTERN = /^[A-Za-z0-9_$.-]+$/;
|
|
4
8
|
const INVALID_REQUEST_RPC_ID = 'invalid-request';
|
|
5
|
-
export function registerControlRoute(connection, handler, webServer) {
|
|
9
|
+
export function registerControlRoute(connection, handler, webServer, statusStream) {
|
|
6
10
|
if (webServer !== undefined && connection.requestRejection !== undefined) {
|
|
7
11
|
const dispose = webServer.register({
|
|
8
12
|
kind: 'prefix',
|
|
9
13
|
path: CONTROL_RPC_PREFIX,
|
|
10
|
-
handler: (req, res) => handleControlRequest(connection, handler, req, res),
|
|
14
|
+
handler: (req, res) => handleControlRequest(connection, handler, req, res, statusStream),
|
|
11
15
|
});
|
|
12
|
-
return async () => {
|
|
16
|
+
return async () => {
|
|
17
|
+
statusStream?.close();
|
|
18
|
+
await dispose();
|
|
19
|
+
};
|
|
13
20
|
}
|
|
21
|
+
// A plain RPC channel owns POST only, so the browser falls back to unary
|
|
22
|
+
// status reads on hosts that do not expose the Web server route.
|
|
14
23
|
return connection.rpc.handle(CONTROL_RPC_PREFIX, handler, {
|
|
15
24
|
authority: 'loopback',
|
|
16
25
|
});
|
|
17
26
|
}
|
|
18
|
-
async function handleControlRequest(connection, handler, req, res) {
|
|
27
|
+
async function handleControlRequest(connection, handler, req, res, statusStream) {
|
|
19
28
|
const rejection = connection.requestRejection?.(req);
|
|
20
29
|
if (rejection !== undefined) {
|
|
21
30
|
res.writeHead(rejection);
|
|
@@ -23,6 +32,10 @@ async function handleControlRequest(connection, handler, req, res) {
|
|
|
23
32
|
return;
|
|
24
33
|
}
|
|
25
34
|
const endpoint = endpointFromPath(CONTROL_RPC_PREFIX, new URL(req.url ?? '/', 'http://dsh.internal').pathname);
|
|
35
|
+
if (req.method === 'GET' && endpoint === STATUS_STREAM_ENDPOINT && statusStream !== undefined) {
|
|
36
|
+
await statusStream.handle(res);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
26
39
|
if (req.method !== 'POST' || endpoint === undefined) {
|
|
27
40
|
writeText(res, 404, 'not found');
|
|
28
41
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control-route.js","sourceRoot":"","sources":["../src/control-route.ts"],"names":[],"mappings":"AAGA,gFAAgF;AAChF,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAA;AAEtD,MAAM,wBAAwB,GAAG,oBAAoB,CAAA;AACrD,MAAM,sBAAsB,GAAG,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"control-route.js","sourceRoot":"","sources":["../src/control-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,10 @@ export interface PluginSettingsView {
|
|
|
6
6
|
config: Config;
|
|
7
7
|
deviceName: string;
|
|
8
8
|
writable: boolean;
|
|
9
|
-
applies: 'restart';
|
|
9
|
+
applies: 'live' | 'restart';
|
|
10
10
|
association?: PluginAssociation;
|
|
11
11
|
associations: Partial<Record<'host' | 'client', PluginAssociation>>;
|
|
12
|
+
acpAvailability?: Record<string, boolean>;
|
|
12
13
|
}
|
|
13
14
|
export interface PluginAssociation {
|
|
14
15
|
method: 'account' | 'host_registration_code' | 'owned_device';
|
|
@@ -23,11 +24,21 @@ export declare class PluginControlRuntime {
|
|
|
23
24
|
private readonly host;
|
|
24
25
|
constructor(config: ResolvedConfig, identityDirectory: string, settings: SettingsScope<Config> | undefined, client: ClientModeRuntime | undefined, host: HostAuthorizationControl | undefined);
|
|
25
26
|
register(connection: HostConnectionHandle, webServer?: HostWebServerLike): () => Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* Read the value the status event stream pushes. It resolves through the same
|
|
29
|
+
* endpoint handler as the unary `status` control call, so a pushed status and
|
|
30
|
+
* a polled one can never diverge.
|
|
31
|
+
*/
|
|
32
|
+
private streamStatus;
|
|
26
33
|
private handle;
|
|
27
34
|
private configure;
|
|
28
35
|
private setServer;
|
|
29
36
|
private setRole;
|
|
37
|
+
private setDevelopment;
|
|
30
38
|
private setCodex;
|
|
39
|
+
private setAcp;
|
|
40
|
+
private addAcp;
|
|
41
|
+
private removeAcp;
|
|
31
42
|
private authorizeOwnedRole;
|
|
32
43
|
private logout;
|
|
33
44
|
private settingsView;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control-runtime.d.ts","sourceRoot":"","sources":["../src/control-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"control-runtime.d.ts","sourceRoot":"","sources":["../src/control-runtime.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAiB,KAAK,MAAM,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAA;AAC7E,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAA;AAI5B,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAGjF,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,WAAW,CAAC,EAAE,iBAAiB,CAAA;IAC/B,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAA;IACnE,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,SAAS,GAAG,wBAAwB,GAAG,cAAc,CAAA;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qFAAqF;AACrF,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAJJ,MAAM,EAAE,cAAc,EACtB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,SAAS,EAC3C,MAAM,EAAE,iBAAiB,GAAG,SAAS,EACrC,IAAI,EAAE,wBAAwB,GAAG,SAAS;IAG7D,QAAQ,CAAC,UAAU,EAAE,oBAAoB,EAAE,SAAS,CAAC,EAAE,iBAAiB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;IAU9F;;;;OAIG;YACW,YAAY;YAMZ,MAAM;YA4CN,SAAS;YAuCT,SAAS;YAcT,OAAO;YAkBP,cAAc;YAiBd,QAAQ;YAiBR,MAAM;YAUN,MAAM;YAcN,SAAS;YAUT,kBAAkB;YAsBlB,MAAM;YAkBN,YAAY;YAgBZ,YAAY;YAYZ,WAAW;IAazB,OAAO,CAAC,cAAc;CASvB"}
|
package/dist/control-runtime.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { hostname } from 'node:os';
|
|
2
|
+
import { execFileSync } from 'node:child_process';
|
|
2
3
|
import { resolveConfig } from './config.js';
|
|
3
4
|
import { ClientModeError, } from './client-runtime.js';
|
|
4
5
|
import { IdentityStore, serverStorageDirectory } from './identity-store.js';
|
|
5
6
|
import { ClientServerApi, HostServerApi } from './server-api.js';
|
|
6
7
|
import { ServerCredentialStore } from './server-credentials.js';
|
|
7
8
|
import { registerControlRoute } from './control-route.js';
|
|
9
|
+
import { ControlStatusStream } from './control-stream.js';
|
|
8
10
|
/** Loopback-only control plane shared by Local/Remote switching and plugin setup. */
|
|
9
11
|
export class PluginControlRuntime {
|
|
10
12
|
config;
|
|
@@ -20,10 +22,24 @@ export class PluginControlRuntime {
|
|
|
20
22
|
this.host = host;
|
|
21
23
|
}
|
|
22
24
|
register(connection, webServer) {
|
|
23
|
-
|
|
25
|
+
const statusStream = new ControlStatusStream(() => this.streamStatus());
|
|
26
|
+
return registerControlRoute(connection, (endpoint, payload, signal) => this.handle(endpoint, payload, signal), webServer, statusStream);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Read the value the status event stream pushes. It resolves through the same
|
|
30
|
+
* endpoint handler as the unary `status` control call, so a pushed status and
|
|
31
|
+
* a polled one can never diverge.
|
|
32
|
+
*/
|
|
33
|
+
async streamStatus() {
|
|
34
|
+
const result = await this.handle('status', {}, new AbortController().signal);
|
|
35
|
+
if (!result.ok)
|
|
36
|
+
throw new ClientModeError('STATUS_UNAVAILABLE', result.error.message);
|
|
37
|
+
return result.value;
|
|
24
38
|
}
|
|
25
39
|
async handle(endpoint, payload, signal) {
|
|
26
40
|
try {
|
|
41
|
+
if (endpoint === 'settings.development.set')
|
|
42
|
+
return ok(await this.setDevelopment(payload));
|
|
27
43
|
if (endpoint === 'settings.get')
|
|
28
44
|
return ok(await this.settingsView());
|
|
29
45
|
if (endpoint === 'settings.configure')
|
|
@@ -34,6 +50,12 @@ export class PluginControlRuntime {
|
|
|
34
50
|
return ok(await this.setRole(payload));
|
|
35
51
|
if (endpoint === 'settings.codex.set')
|
|
36
52
|
return ok(await this.setCodex(payload));
|
|
53
|
+
if (endpoint === 'settings.acp.set')
|
|
54
|
+
return ok(await this.setAcp(payload));
|
|
55
|
+
if (endpoint === 'settings.acp.add')
|
|
56
|
+
return ok(await this.addAcp(payload));
|
|
57
|
+
if (endpoint === 'settings.acp.remove')
|
|
58
|
+
return ok(await this.removeAcp(payload));
|
|
37
59
|
if (endpoint === 'settings.logout')
|
|
38
60
|
return ok(await this.logout());
|
|
39
61
|
if (endpoint === 'host.reconnect') {
|
|
@@ -142,6 +164,28 @@ export class PluginControlRuntime {
|
|
|
142
164
|
await this.settings.replace({ ...current, role });
|
|
143
165
|
return this.settingsView();
|
|
144
166
|
}
|
|
167
|
+
async setDevelopment(payload) {
|
|
168
|
+
if (this.settings === undefined)
|
|
169
|
+
throw new ClientModeError('SETTINGS_UNAVAILABLE', 'DSH user settings are unavailable in this profile.');
|
|
170
|
+
const value = record(payload);
|
|
171
|
+
if (value.terminalEnabled !== undefined && typeof value.terminalEnabled !== 'boolean')
|
|
172
|
+
throw new ClientModeError('INVALID_MESSAGE', 'The terminal switch must be a boolean.');
|
|
173
|
+
if (value.ports !== undefined && (!Array.isArray(value.ports) || value.ports.some((port) => !Number.isInteger(port))))
|
|
174
|
+
throw new ClientModeError('INVALID_MESSAGE', 'Loopback ports must be integers.');
|
|
175
|
+
if (value.terminalEnabled === undefined && value.ports === undefined)
|
|
176
|
+
throw new ClientModeError('INVALID_MESSAGE', 'A terminal switch or loopback ports are required.');
|
|
177
|
+
const current = editableConfig(resolveConfig(this.settings.get()));
|
|
178
|
+
const next = resolveConfig({ ...current,
|
|
179
|
+
terminal: { enabled: value.terminalEnabled === undefined ? (current.terminal?.enabled ?? false) : value.terminalEnabled },
|
|
180
|
+
loopback: { ports: value.ports === undefined ? (current.loopback?.ports ?? []) : value.ports },
|
|
181
|
+
});
|
|
182
|
+
await this.settings.replace(editableConfig(next));
|
|
183
|
+
if (value.terminalEnabled !== undefined)
|
|
184
|
+
this.host?.setTerminalEnabled?.(value.terminalEnabled);
|
|
185
|
+
if (value.ports !== undefined)
|
|
186
|
+
this.host?.setLoopbackPorts?.(value.ports);
|
|
187
|
+
return this.settingsView();
|
|
188
|
+
}
|
|
145
189
|
async setCodex(payload) {
|
|
146
190
|
if (this.settings === undefined) {
|
|
147
191
|
throw new ClientModeError('SETTINGS_UNAVAILABLE', 'DSH user settings are unavailable in this profile.');
|
|
@@ -158,6 +202,43 @@ export class PluginControlRuntime {
|
|
|
158
202
|
await this.settings.replace(editableConfig(next));
|
|
159
203
|
return this.settingsView();
|
|
160
204
|
}
|
|
205
|
+
async setAcp(payload) {
|
|
206
|
+
if (this.settings === undefined)
|
|
207
|
+
throw new ClientModeError('SETTINGS_UNAVAILABLE', 'DSH user settings are unavailable in this profile.');
|
|
208
|
+
const value = record(payload);
|
|
209
|
+
if (typeof value.backend !== 'string' || typeof value.enabled !== 'boolean')
|
|
210
|
+
throw new ClientModeError('INVALID_MESSAGE', 'ACP backend and enabled are required.');
|
|
211
|
+
const current = resolveConfig(this.settings.get());
|
|
212
|
+
const backends = current.acp?.backends.map(item => item.id === value.backend ? { ...item, enabled: value.enabled } : item) ?? [];
|
|
213
|
+
await this.settings.replace({ ...editableConfig(current), acp: { enabled: current.acp?.enabled ?? true, backends } });
|
|
214
|
+
return this.settingsView();
|
|
215
|
+
}
|
|
216
|
+
async addAcp(payload) {
|
|
217
|
+
if (this.settings === undefined)
|
|
218
|
+
throw new ClientModeError('SETTINGS_UNAVAILABLE', 'DSH user settings are unavailable in this profile.');
|
|
219
|
+
const value = record(payload);
|
|
220
|
+
if (typeof value.id !== 'string' || typeof value.command !== 'string' || !Array.isArray(value.args) || !value.args.every(item => typeof item === 'string')) {
|
|
221
|
+
throw new ClientModeError('INVALID_MESSAGE', 'ACP name, command, and arguments are required.');
|
|
222
|
+
}
|
|
223
|
+
const current = resolveConfig(this.settings.get());
|
|
224
|
+
if (current.acp?.backends.some(item => item.id === value.id))
|
|
225
|
+
throw new ClientModeError('INVALID_MESSAGE', 'ACP backend already exists.');
|
|
226
|
+
const backends = [...(current.acp?.backends ?? []), { id: value.id, command: value.command, args: value.args, enabled: false }];
|
|
227
|
+
const next = resolveConfig({ ...editableConfig(current), acp: { enabled: current.acp?.enabled ?? true, backends } });
|
|
228
|
+
await this.settings.replace(editableConfig(next));
|
|
229
|
+
return this.settingsView();
|
|
230
|
+
}
|
|
231
|
+
async removeAcp(payload) {
|
|
232
|
+
if (this.settings === undefined)
|
|
233
|
+
throw new ClientModeError('SETTINGS_UNAVAILABLE', 'DSH user settings are unavailable in this profile.');
|
|
234
|
+
const id = record(payload).id;
|
|
235
|
+
if (typeof id !== 'string' || ['codex', 'cursor', 'kimi'].includes(id))
|
|
236
|
+
throw new ClientModeError('INVALID_MESSAGE', 'Only custom ACP backends can be removed.');
|
|
237
|
+
const current = resolveConfig(this.settings.get());
|
|
238
|
+
const backends = (current.acp?.backends ?? []).filter(item => item.id !== id);
|
|
239
|
+
await this.settings.replace(editableConfig({ ...current, acp: { enabled: current.acp?.enabled ?? true, backends } }));
|
|
240
|
+
return this.settingsView();
|
|
241
|
+
}
|
|
161
242
|
async authorizeOwnedRole(serverUrl, sourceRole, targetRole) {
|
|
162
243
|
const sourceDirectory = serverStorageDirectory(this.identityDirectory, serverUrl, sourceRole);
|
|
163
244
|
const sourceIdentity = await new IdentityStore({ directory: sourceDirectory }).loadOrCreate(hostname());
|
|
@@ -203,6 +284,7 @@ export class PluginControlRuntime {
|
|
|
203
284
|
writable: this.settings !== undefined,
|
|
204
285
|
applies: 'restart',
|
|
205
286
|
associations,
|
|
287
|
+
acpAvailability: Object.fromEntries((config.acp?.backends ?? []).map(item => [item.id, commandAvailable(item.command ?? '')])),
|
|
206
288
|
...(association === undefined ? {} : { association }),
|
|
207
289
|
};
|
|
208
290
|
}
|
|
@@ -241,11 +323,22 @@ export class PluginControlRuntime {
|
|
|
241
323
|
};
|
|
242
324
|
}
|
|
243
325
|
}
|
|
326
|
+
function commandAvailable(command) {
|
|
327
|
+
try {
|
|
328
|
+
execFileSync(process.platform === 'win32' ? 'where' : 'which', [command], { stdio: 'ignore' });
|
|
329
|
+
return true;
|
|
330
|
+
}
|
|
331
|
+
catch {
|
|
332
|
+
return false;
|
|
333
|
+
}
|
|
334
|
+
}
|
|
244
335
|
function editableConfig(config) {
|
|
245
336
|
return {
|
|
246
337
|
enabled: config.enabled,
|
|
247
338
|
role: config.role,
|
|
248
339
|
...(config.serverUrl === undefined ? {} : { serverUrl: config.serverUrl }),
|
|
340
|
+
terminal: config.terminal,
|
|
341
|
+
loopback: config.loopback,
|
|
249
342
|
forceRelay: config.forceRelay,
|
|
250
343
|
logLevel: config.logLevel,
|
|
251
344
|
reconnect: config.reconnect.enabled
|
|
@@ -259,6 +352,7 @@ function editableConfig(config) {
|
|
|
259
352
|
enabled: config.codex.enabled,
|
|
260
353
|
binary: config.codex.binary,
|
|
261
354
|
},
|
|
355
|
+
...(config.acp === undefined ? {} : { acp: { enabled: config.acp.enabled, backends: config.acp.backends } }),
|
|
262
356
|
};
|
|
263
357
|
}
|
|
264
358
|
function isRecord(value) {
|