@cydm/happy-elves 0.1.0-beta.20 → 0.1.0-beta.29
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/apps/cli/dist/commands/account.js +1 -0
- package/apps/cli/dist/commands/account.js.map +1 -1
- package/apps/cli/dist/commands/app.js +23 -0
- package/apps/cli/dist/commands/app.js.map +1 -1
- package/apps/cli/dist/commands/lib/args.js +1 -0
- package/apps/cli/dist/commands/lib/args.js.map +1 -1
- package/apps/cli/dist/commands/lib/config.d.ts +2 -1
- package/apps/cli/dist/commands/lib/config.js +20 -2
- package/apps/cli/dist/commands/lib/config.js.map +1 -1
- package/apps/cli/dist/commands/lib/types.d.ts +1 -0
- package/apps/cli/dist/commands/lib/types.js.map +1 -1
- package/apps/cli/dist/commands/lib/usage.js +3 -0
- package/apps/cli/dist/commands/lib/usage.js.map +1 -1
- package/apps/cli/dist/commands/machine.js +33 -0
- package/apps/cli/dist/commands/machine.js.map +1 -1
- package/apps/cli/dist/commands/remote.js +16 -5
- package/apps/cli/dist/commands/remote.js.map +1 -1
- package/apps/daemon/dist/config.d.ts +2 -1
- package/apps/daemon/dist/config.js +26 -2
- package/apps/daemon/dist/config.js.map +1 -1
- package/apps/daemon/dist/relay/devtools.js +9 -2
- package/apps/daemon/dist/relay/devtools.js.map +1 -1
- package/apps/daemon/dist/relay/register.js +1 -0
- package/apps/daemon/dist/relay/register.js.map +1 -1
- package/apps/daemon/dist/relay/send.js +2 -0
- package/apps/daemon/dist/relay/send.js.map +1 -1
- package/apps/daemon/dist/runtime/external-provider.d.ts +1 -0
- package/apps/daemon/dist/runtime/external-provider.js +103 -20
- package/apps/daemon/dist/runtime/external-provider.js.map +1 -1
- package/apps/daemon/dist/runtime.js +1 -1
- package/apps/daemon/dist/runtime.js.map +1 -1
- package/apps/daemon/dist/session/events.d.ts +15 -1
- package/apps/daemon/dist/session/events.js +87 -9
- package/apps/daemon/dist/session/events.js.map +1 -1
- package/apps/daemon/dist/session/file-preview.js +6 -2
- package/apps/daemon/dist/session/file-preview.js.map +1 -1
- package/apps/daemon/dist/session/lifecycle.d.ts +19 -1
- package/apps/daemon/dist/session/lifecycle.js +181 -59
- package/apps/daemon/dist/session/lifecycle.js.map +1 -1
- package/apps/daemon/dist/session/metadata.js +3 -0
- package/apps/daemon/dist/session/metadata.js.map +1 -1
- package/apps/daemon/dist/session/primitives.js +53 -1
- package/apps/daemon/dist/session/primitives.js.map +1 -1
- package/apps/daemon/dist/session/prompt.js +70 -55
- package/apps/daemon/dist/session/prompt.js.map +1 -1
- package/apps/daemon/dist/start.js +9 -0
- package/apps/daemon/dist/start.js.map +1 -1
- package/apps/daemon/dist/types.d.ts +3 -0
- package/apps/daemon/package.json +2 -0
- package/apps/relay/dist/controller-handlers.js +24 -0
- package/apps/relay/dist/controller-handlers.js.map +1 -1
- package/apps/relay/dist/http-routes.js +95 -18
- package/apps/relay/dist/http-routes.js.map +1 -1
- package/apps/relay/dist/http-schemas.d.ts +1 -0
- package/apps/relay/dist/http-schemas.js +5 -0
- package/apps/relay/dist/http-schemas.js.map +1 -1
- package/apps/relay/dist/machine-handlers.js +130 -0
- package/apps/relay/dist/machine-handlers.js.map +1 -1
- package/apps/relay/dist/projections.d.ts +1 -1
- package/apps/relay/dist/projections.js +7 -5
- package/apps/relay/dist/projections.js.map +1 -1
- package/apps/relay/dist/relay-context.js +53 -35
- package/apps/relay/dist/relay-context.js.map +1 -1
- package/apps/relay/dist/repositories.js +9 -2
- package/apps/relay/dist/repositories.js.map +1 -1
- package/apps/relay/dist/scope.js +6 -0
- package/apps/relay/dist/scope.js.map +1 -1
- package/package.json +6 -2
- package/packages/agent-sdk/dist/index.d.ts +341 -0
- package/packages/agent-sdk/dist/index.d.ts.map +1 -0
- package/packages/agent-sdk/dist/index.js +168 -0
- package/packages/agent-sdk/dist/index.js.map +1 -0
- package/packages/agent-sdk/package.json +20 -0
- package/packages/client/dist/client.d.ts +3 -1
- package/packages/client/dist/client.d.ts.map +1 -1
- package/packages/client/dist/client.js +47 -5
- package/packages/client/dist/client.js.map +1 -1
- package/packages/client/dist/index.d.ts +1 -1
- package/packages/client/dist/index.d.ts.map +1 -1
- package/packages/client/dist/parsers.d.ts.map +1 -1
- package/packages/client/dist/parsers.js +4 -0
- package/packages/client/dist/parsers.js.map +1 -1
- package/packages/client/dist/transport.d.ts.map +1 -1
- package/packages/client/dist/transport.js +8 -0
- package/packages/client/dist/transport.js.map +1 -1
- package/packages/client/dist/types.d.ts +18 -0
- package/packages/client/dist/types.d.ts.map +1 -1
- package/packages/client/dist/types.js.map +1 -1
- package/packages/pie-provider/dist/index.d.ts +3 -0
- package/packages/pie-provider/dist/index.d.ts.map +1 -0
- package/packages/pie-provider/dist/index.js +1002 -0
- package/packages/pie-provider/dist/index.js.map +1 -0
- package/packages/pie-provider/package.json +26 -0
- package/packages/runtime/dist/index.d.ts +32 -1
- package/packages/runtime/dist/index.d.ts.map +1 -1
- package/packages/runtime-cli/dist/claude-history.d.ts +2 -1
- package/packages/runtime-cli/dist/claude-history.d.ts.map +1 -1
- package/packages/runtime-cli/dist/claude-history.js +41 -8
- package/packages/runtime-cli/dist/claude-history.js.map +1 -1
- package/packages/runtime-cli/dist/claude-session-store.d.ts +2 -0
- package/packages/runtime-cli/dist/claude-session-store.d.ts.map +1 -1
- package/packages/runtime-cli/dist/claude-session-store.js +22 -2
- package/packages/runtime-cli/dist/claude-session-store.js.map +1 -1
- package/packages/runtime-cli/dist/claude-turn.d.ts +1 -0
- package/packages/runtime-cli/dist/claude-turn.d.ts.map +1 -1
- package/packages/runtime-cli/dist/claude-turn.js +1 -0
- package/packages/runtime-cli/dist/claude-turn.js.map +1 -1
- package/packages/runtime-cli/dist/codex-app-server.d.ts +4 -0
- package/packages/runtime-cli/dist/codex-app-server.d.ts.map +1 -1
- package/packages/runtime-cli/dist/codex-app-server.js +52 -2
- package/packages/runtime-cli/dist/codex-app-server.js.map +1 -1
- package/packages/runtime-cli/dist/codex-history.d.ts +12 -1
- package/packages/runtime-cli/dist/codex-history.d.ts.map +1 -1
- package/packages/runtime-cli/dist/codex-history.js +473 -7
- package/packages/runtime-cli/dist/codex-history.js.map +1 -1
- package/packages/runtime-cli/dist/history-merge.d.ts +18 -0
- package/packages/runtime-cli/dist/history-merge.d.ts.map +1 -0
- package/packages/runtime-cli/dist/history-merge.js +274 -0
- package/packages/runtime-cli/dist/history-merge.js.map +1 -0
- package/packages/runtime-cli/dist/index.d.ts +1 -0
- package/packages/runtime-cli/dist/index.d.ts.map +1 -1
- package/packages/runtime-cli/dist/index.js +92 -35
- package/packages/runtime-cli/dist/index.js.map +1 -1
- package/packages/runtime-cli/dist/session-store.d.ts.map +1 -1
- package/packages/runtime-cli/dist/session-store.js +9 -3
- package/packages/runtime-cli/dist/session-store.js.map +1 -1
- package/packages/shared/dist/args.d.ts.map +1 -1
- package/packages/shared/dist/args.js +4 -0
- package/packages/shared/dist/args.js.map +1 -1
- package/packages/shared/dist/protocol-schemas.d.ts +35 -2
- package/packages/shared/dist/protocol-schemas.d.ts.map +1 -1
- package/packages/shared/dist/protocol-schemas.js +13 -2
- package/packages/shared/dist/protocol-schemas.js.map +1 -1
- package/packages/shared/dist/protocol-types.d.ts +17 -2
- package/packages/shared/dist/protocol-types.d.ts.map +1 -1
- package/packages/shared/dist/protocol.d.ts +41 -2
- package/packages/shared/dist/protocol.d.ts.map +1 -1
- package/packages/shared/dist/protocol.js +44 -1
- package/packages/shared/dist/protocol.js.map +1 -1
- package/apps/cli/dist/args.d.ts +0 -5
- package/apps/cli/dist/args.js +0 -73
- package/apps/cli/dist/args.js.map +0 -1
- package/apps/cli/dist/commands/cancel.d.ts +0 -2
- package/apps/cli/dist/commands/cancel.js +0 -27
- package/apps/cli/dist/commands/cancel.js.map +0 -1
- package/apps/cli/dist/commands/result.d.ts +0 -2
- package/apps/cli/dist/commands/result.js +0 -26
- package/apps/cli/dist/commands/result.js.map +0 -1
- package/apps/cli/dist/commands/run.d.ts +0 -2
- package/apps/cli/dist/commands/run.js +0 -51
- package/apps/cli/dist/commands/run.js.map +0 -1
- package/apps/cli/dist/commands/wait.d.ts +0 -2
- package/apps/cli/dist/commands/wait.js +0 -56
- package/apps/cli/dist/commands/wait.js.map +0 -1
- package/apps/cli/dist/commands/workspace.d.ts +0 -2
- package/apps/cli/dist/commands/workspace.js +0 -69
- package/apps/cli/dist/commands/workspace.js.map +0 -1
- package/apps/daemon/dist/session/permissions.d.ts +0 -2
- package/apps/daemon/dist/session/permissions.js +0 -21
- package/apps/daemon/dist/session/permissions.js.map +0 -1
- package/apps/relay/dist/event-order.d.ts +0 -3
- package/apps/relay/dist/event-order.js +0 -4
- package/apps/relay/dist/event-order.js.map +0 -1
- package/apps/relay/dist/event-ordering.d.ts +0 -13
- package/apps/relay/dist/event-ordering.js +0 -32
- package/apps/relay/dist/event-ordering.js.map +0 -1
- package/packages/client/dist/event-order.d.ts +0 -10
- package/packages/client/dist/event-order.d.ts.map +0 -1
- package/packages/client/dist/event-order.js +0 -19
- package/packages/client/dist/event-order.js.map +0 -1
- package/packages/shared/dist/relay-responses.d.ts +0 -7
- package/packages/shared/dist/relay-responses.d.ts.map +0 -1
- package/packages/shared/dist/relay-responses.js +0 -24
- package/packages/shared/dist/relay-responses.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/commands/account.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/commands/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
1
3
|
import { handleAccount } from "./account.js";
|
|
2
4
|
import { handleCollect } from "./collect.js";
|
|
3
5
|
import { handleConfig } from "./config.js";
|
|
@@ -37,6 +39,10 @@ export async function main() {
|
|
|
37
39
|
console.log(usageText());
|
|
38
40
|
return;
|
|
39
41
|
}
|
|
42
|
+
if (domain === "--version" || domain === "-v" || domain === "version") {
|
|
43
|
+
console.log(cliVersion());
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
40
46
|
const topLevelHelpRequested = argv[1] === "help" || argv.slice(1).some((arg) => arg === "--help" || arg === "-h");
|
|
41
47
|
if (topLevelHelpRequested && commandUsageText(domain)) {
|
|
42
48
|
console.log(commandUsageText(domain));
|
|
@@ -74,4 +80,21 @@ export async function main() {
|
|
|
74
80
|
}
|
|
75
81
|
usage();
|
|
76
82
|
}
|
|
83
|
+
function cliVersion() {
|
|
84
|
+
for (const candidate of [
|
|
85
|
+
path.resolve(import.meta.dirname, "..", "..", "..", "..", "package.json"),
|
|
86
|
+
path.resolve(import.meta.dirname, "..", "..", "..", "package.json"),
|
|
87
|
+
path.resolve(import.meta.dirname, "..", "..", "package.json"),
|
|
88
|
+
]) {
|
|
89
|
+
try {
|
|
90
|
+
const parsed = JSON.parse(fs.readFileSync(candidate, "utf8"));
|
|
91
|
+
if (typeof parsed.version === "string" && parsed.version.trim())
|
|
92
|
+
return parsed.version.trim();
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
// Try the next packaged/source layout.
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return "0.1.0";
|
|
99
|
+
}
|
|
77
100
|
//# sourceMappingURL=app.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/commands/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/commands/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../src/commands/lib/args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,OAAO;IACP,MAAM;IACN,YAAY;IACZ,KAAK;IACL,WAAW;IACX,aAAa;IACb,MAAM;IACN,MAAM;IACN,eAAe;IACf,eAAe;IACf,OAAO;IACP,SAAS;IACT,YAAY;IACZ,MAAM;IACN,MAAM;IACN,QAAQ;IACR,MAAM;IACN,MAAM;IACN,YAAY;IACZ,iBAAiB;IACjB,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,SAAS;IACT,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,UAAU;IACV,UAAU;IACV,QAAQ;IACR,OAAO;IACP,SAAS;IACT,MAAM;IACN,MAAM;IACN,WAAW;IACX,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,iBAAiB;IACjB,IAAI;IACJ,OAAO;IACP,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;CACR,CAAC,CAAC;AACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC;IAC3B,KAAK;IACL,QAAQ;IACR,MAAM;IACN,GAAG;IACH,kBAAkB;IAClB,MAAM;IACN,OAAO;IACP,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,MAAM;CACP,CAAC,CAAC;AACH,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;AAC7D,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEnD,MAAM,UAAU,aAAa,CAAC,IAAc;IAC1C,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,QAAQ,CAAC,mBAAmB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../src/commands/lib/args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,OAAO;IACP,MAAM;IACN,YAAY;IACZ,KAAK;IACL,WAAW;IACX,aAAa;IACb,MAAM;IACN,MAAM;IACN,eAAe;IACf,eAAe;IACf,OAAO;IACP,SAAS;IACT,YAAY;IACZ,MAAM;IACN,MAAM;IACN,QAAQ;IACR,MAAM;IACN,MAAM;IACN,YAAY;IACZ,iBAAiB;IACjB,QAAQ;IACR,aAAa;IACb,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,SAAS;IACT,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,UAAU;IACV,UAAU;IACV,QAAQ;IACR,OAAO;IACP,SAAS;IACT,MAAM;IACN,MAAM;IACN,WAAW;IACX,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,iBAAiB;IACjB,IAAI;IACJ,OAAO;IACP,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;CACR,CAAC,CAAC;AACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC;IAC3B,KAAK;IACL,QAAQ;IACR,MAAM;IACN,GAAG;IACH,kBAAkB;IAClB,MAAM;IACN,OAAO;IACP,SAAS;IACT,SAAS;IACT,SAAS;IACT,SAAS;IACT,MAAM;CACP,CAAC,CAAC;AACH,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;AAC7D,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEnD,MAAM,UAAU,aAAa,CAAC,IAAc;IAC1C,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,QAAQ,CAAC,mBAAmB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -6,9 +6,10 @@ export declare function requireRelayUrl(flags: Record<string, string | boolean>,
|
|
|
6
6
|
export declare function readConfig(flags: Record<string, string | boolean>): Promise<CliConfig>;
|
|
7
7
|
export declare function readDaemonConfig(): Promise<DaemonConfig>;
|
|
8
8
|
export declare function writeDaemonConfig(config: DaemonConfig): Promise<string>;
|
|
9
|
-
export declare function redactedDaemonConfig(config: DaemonConfig): Omit<DaemonConfig, "machineToken" | "accountSecret"> & {
|
|
9
|
+
export declare function redactedDaemonConfig(config: DaemonConfig): Omit<DaemonConfig, "machineToken" | "accountSecret" | "runtimeEnv"> & {
|
|
10
10
|
hasMachineToken: boolean;
|
|
11
11
|
hasAccountSecret: boolean;
|
|
12
|
+
runtimeEnv?: Record<string, boolean>;
|
|
12
13
|
};
|
|
13
14
|
export declare function redactedControllerConfig(config: CliConfig): Omit<CliConfig, "controllerToken" | "accountSecret"> & {
|
|
14
15
|
hasControllerToken: boolean;
|
|
@@ -64,6 +64,14 @@ function assertDaemonConfigShape(value) {
|
|
|
64
64
|
throw new CliError("Daemon config is invalid.", "CONFIG_INVALID");
|
|
65
65
|
}
|
|
66
66
|
const candidate = value;
|
|
67
|
+
const runtimeEnv = {};
|
|
68
|
+
const rawRuntimeEnv = candidate.runtimeEnv;
|
|
69
|
+
if (rawRuntimeEnv && typeof rawRuntimeEnv === "object" && !Array.isArray(rawRuntimeEnv)) {
|
|
70
|
+
for (const [key, runtimeValue] of Object.entries(rawRuntimeEnv)) {
|
|
71
|
+
if (typeof runtimeValue === "string" && runtimeValue.length > 0)
|
|
72
|
+
runtimeEnv[key] = runtimeValue;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
67
75
|
return {
|
|
68
76
|
relayUrl: assertRelayUrl(assertStringField(candidate, "relayUrl", "Daemon"), "Daemon"),
|
|
69
77
|
accountId: assertStringField(candidate, "accountId", "Daemon"),
|
|
@@ -71,11 +79,12 @@ function assertDaemonConfigShape(value) {
|
|
|
71
79
|
machineName: assertStringField(candidate, "machineName", "Daemon"),
|
|
72
80
|
machineToken: assertStringField(candidate, "machineToken", "Daemon"),
|
|
73
81
|
accountSecret: assertStringField(candidate, "accountSecret", "Daemon"),
|
|
82
|
+
...(Object.keys(runtimeEnv).length > 0 ? { runtimeEnv } : {}),
|
|
74
83
|
};
|
|
75
84
|
}
|
|
76
85
|
async function readJsonConfigFile(filePath, label) {
|
|
77
86
|
try {
|
|
78
|
-
return JSON.parse(await fs.readFile(filePath, "utf8"));
|
|
87
|
+
return JSON.parse(stripJsonBom(await fs.readFile(filePath, "utf8")));
|
|
79
88
|
}
|
|
80
89
|
catch (error) {
|
|
81
90
|
if (error.code === "ENOENT") {
|
|
@@ -87,6 +96,9 @@ async function readJsonConfigFile(filePath, label) {
|
|
|
87
96
|
throw error;
|
|
88
97
|
}
|
|
89
98
|
}
|
|
99
|
+
function stripJsonBom(value) {
|
|
100
|
+
return value.charCodeAt(0) === 0xfeff ? value.slice(1) : value;
|
|
101
|
+
}
|
|
90
102
|
export async function readConfig(flags) {
|
|
91
103
|
const relayUrl = typeof flags.relay === "string" ? normalizeRelayUrl(flags.relay) : process.env.HAPPY_ELVES_RELAY_URL;
|
|
92
104
|
const controllerToken = typeof flags.token === "string" ? flags.token : process.env.HAPPY_ELVES_CONTROLLER_TOKEN;
|
|
@@ -94,7 +106,12 @@ export async function readConfig(flags) {
|
|
|
94
106
|
if (relayUrl && controllerToken && accountSecret) {
|
|
95
107
|
return { relayUrl: assertRelayUrl(relayUrl, "Controller"), controllerToken, accountSecret };
|
|
96
108
|
}
|
|
97
|
-
|
|
109
|
+
const stored = assertControllerConfigShape(await readJsonConfigFile(configPath, "Controller"));
|
|
110
|
+
return {
|
|
111
|
+
relayUrl: assertRelayUrl(relayUrl ?? stored.relayUrl, "Controller"),
|
|
112
|
+
controllerToken: controllerToken ?? stored.controllerToken,
|
|
113
|
+
accountSecret: accountSecret ?? stored.accountSecret,
|
|
114
|
+
};
|
|
98
115
|
}
|
|
99
116
|
export async function readDaemonConfig() {
|
|
100
117
|
return assertDaemonConfigShape(await readJsonConfigFile(path.join(configDir, "daemon.json"), "Daemon"));
|
|
@@ -114,6 +131,7 @@ export function redactedDaemonConfig(config) {
|
|
|
114
131
|
machineName: config.machineName,
|
|
115
132
|
hasMachineToken: Boolean(config.machineToken),
|
|
116
133
|
hasAccountSecret: Boolean(config.accountSecret),
|
|
134
|
+
...(config.runtimeEnv ? { runtimeEnv: Object.fromEntries(Object.keys(config.runtimeEnv).map((key) => [key, true])) } : {}),
|
|
117
135
|
};
|
|
118
136
|
}
|
|
119
137
|
export function redactedControllerConfig(config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/lib/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/lib/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/lib/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/lib/types.ts"],"names":[],"mappings":"AAuCA,MAAM,CAAC,MAAM,mBAAmB,GAAgC,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC"}
|
|
@@ -34,7 +34,9 @@ Check local controller config, relay reachability, and daemon state.
|
|
|
34
34
|
happy-elves machine list [--verbose] [--json]
|
|
35
35
|
happy-elves machine status <machineId> [--verbose] [--json]
|
|
36
36
|
happy-elves machine diagnose <machineId> [--json]
|
|
37
|
+
happy-elves machine directory <machineId> [--path <path>] [--json]
|
|
37
38
|
happy-elves machine exec <machineId> --shell <command> [--cwd <path>] [--timeout-ms <ms>] [--wait-timeout-ms <ms>] [--json]
|
|
39
|
+
happy-elves machine exec <machineId> [--json] -- <command> [args...]
|
|
38
40
|
happy-elves machine file info <machineId> --root <cwd> --path <path> [--json]
|
|
39
41
|
happy-elves machine file preview <machineId> --root <cwd> --path <path> [--mode auto|text|image|html-source|html-sandbox] [--output <file>] [--json]
|
|
40
42
|
|
|
@@ -128,6 +130,7 @@ Happy Elves is a remote controller and orchestration layer for coding agents acr
|
|
|
128
130
|
Core commands:
|
|
129
131
|
machine list [--json]
|
|
130
132
|
machine status <machineId> [--verbose] [--json]
|
|
133
|
+
machine directory <machineId> [--path <path>] [--json]
|
|
131
134
|
|
|
132
135
|
session list [--machine <machineId>] [--cwd <path>] [--limit 20] [--json]
|
|
133
136
|
session create --machine <machineId> [--agent codex] [--cwd <path>] [--name <name>] --json
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/commands/lib/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,MAAM,iBAAiB,GAA2B;IAChD,KAAK,EAAE;;;CAGR;IACC,MAAM,EAAE;;;CAGT;IACC,MAAM,EAAE;;;CAGT;IACC,OAAO,EAAE;;;CAGV;IACC,MAAM,EAAE;;;CAGT;IACC,MAAM,EAAE;;;;;;;;;CAST;IACC,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/commands/lib/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,MAAM,iBAAiB,GAA2B;IAChD,KAAK,EAAE;;;CAGR;IACC,MAAM,EAAE;;;CAGT;IACC,MAAM,EAAE;;;CAGT;IACC,OAAO,EAAE;;;CAGV;IACC,MAAM,EAAE;;;CAGT;IACC,MAAM,EAAE;;;;;;;;;CAST;IACC,OAAO,EAAE;;;;;;;;;;;;;CAaV;IACC,OAAO,EAAE;;;;;;;;;;;;;;;;CAgBV;IACC,IAAI,EAAE;;;;;;;;;;;;;;;CAeP;IACC,OAAO,EAAE;;CAEV;IACC,KAAK,EAAE;;;;CAIR;IACC,IAAI,EAAE;;;;;;;;CAQP;IACC,MAAM,EAAE;;;;;;;;;CAST;IACC,KAAK,EAAE;;;;CAIR;CACA,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,OAA2B;IAC1D,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAA2B,EAAE,QAAQ,GAAG,CAAC;IACpE,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,SAAS,EAAE,CAAC;IACtD,IAAI,QAAQ,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,UAAU,CAAC,OAAO,EAAE,sDAAsD,OAAO,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7I,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDR,CAAC;AACF,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDR,CAAC;AACF,CAAC;AAED,MAAM,UAAU,KAAK;IACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,UAAU,CAAC,OAAO,EAAE,sEAAsE,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
|
|
@@ -48,6 +48,12 @@ function printDiagnostics(data) {
|
|
|
48
48
|
console.log(`home: ${data.env.HAPPY_ELVES_HOME}`);
|
|
49
49
|
if (data.env.HAPPY_ELVES_CODEX_COMMAND)
|
|
50
50
|
console.log(`codex env: ${data.env.HAPPY_ELVES_CODEX_COMMAND}`);
|
|
51
|
+
if (data.env.HAPPY_ELVES_ENABLE_PIE_PROVIDER)
|
|
52
|
+
console.log(`pie enabled: ${data.env.HAPPY_ELVES_ENABLE_PIE_PROVIDER}`);
|
|
53
|
+
if (data.env.HAPPY_ELVES_PIE_COMMAND)
|
|
54
|
+
console.log(`pie env: ${data.env.HAPPY_ELVES_PIE_COMMAND}`);
|
|
55
|
+
if (data.env.HAPPY_ELVES_PIE_VERSION)
|
|
56
|
+
console.log(`pie env version: ${data.env.HAPPY_ELVES_PIE_VERSION}`);
|
|
51
57
|
if (data.env.HAPPY_ELVES_DEV_REMOTE_EXEC)
|
|
52
58
|
console.log(`dev exec: ${data.env.HAPPY_ELVES_DEV_REMOTE_EXEC}`);
|
|
53
59
|
for (const command of data.commands) {
|
|
@@ -97,11 +103,38 @@ function printFilePreview(preview, outputPath) {
|
|
|
97
103
|
if (preview.text)
|
|
98
104
|
console.log(preview.text);
|
|
99
105
|
}
|
|
106
|
+
function printDirectoryListing(listing) {
|
|
107
|
+
console.log(`path: ${listing.path}`);
|
|
108
|
+
if (listing.parentPath)
|
|
109
|
+
console.log(`parent: ${listing.parentPath}`);
|
|
110
|
+
if (listing.repoRoot)
|
|
111
|
+
console.log(`repo: ${listing.repoRoot}`);
|
|
112
|
+
if (listing.roots?.length)
|
|
113
|
+
console.log(`roots: ${listing.roots.map((root) => root.path).join(" ")}`);
|
|
114
|
+
for (const entry of listing.entries) {
|
|
115
|
+
const marker = entry.kind === "directory" ? "/" : "";
|
|
116
|
+
const size = entry.kind === "file" && entry.sizeBytes !== undefined ? ` ${entry.sizeBytes} bytes` : "";
|
|
117
|
+
console.log(`${entry.name}${marker}${size}`);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
100
120
|
export async function handleMachine({ domain, action, positional, flags }) {
|
|
101
121
|
if (domain !== "machine")
|
|
102
122
|
return false;
|
|
103
123
|
const config = await readConfig(flags);
|
|
104
124
|
const client = new ControllerClient(config);
|
|
125
|
+
if (action === "directory" || action === "dir" || action === "ls") {
|
|
126
|
+
const machineId = requirePositional(positional[0], "machineId");
|
|
127
|
+
const listing = await client.listDirectory({
|
|
128
|
+
machineId,
|
|
129
|
+
path: typeof flags.path === "string" ? flags.path : positional[1],
|
|
130
|
+
});
|
|
131
|
+
if (!wantsJson(flags)) {
|
|
132
|
+
printDirectoryListing(listing);
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
ok("machine.directory", { machineId, listing }, { machineId });
|
|
136
|
+
return true;
|
|
137
|
+
}
|
|
105
138
|
if (action === "file") {
|
|
106
139
|
const fileAction = positional[0];
|
|
107
140
|
if (fileAction !== "info" && fileAction !== "preview")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/commands/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,WAAW,EAAE,sBAAsB,EAAE,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK1K,SAAS,wBAAwB,CAAC,OAAuB;IACvD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;QAC3C,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,YAAY,EAAE,OAAO,CAAC,mBAAmB;QACzC,YAAY,EAAE,OAAO,CAAC,mBAAmB;KAC1C,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,OAAuB;IACvD,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;QAC3C,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,OAAO,CAAC,GAAG,CACT,GAAG,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,KAAK,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,OAAO,CAAC,YAAY,YAAY,OAAO,CAAC,mBAAmB,YAAY,OAAO,CAAC,mBAAmB,EAAE,CACpM,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAuB;IAClD,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IACnD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;IACtF,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,aAAa,MAAM,EAAE,CAAC,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CACT,eAAe,OAAO,CAAC,YAAY,WAAW,OAAO,CAAC,mBAAmB,aAAa,OAAO,CAAC,iBAAiB,WAAW,OAAO,CAAC,qBAAqB,aAAa,CACrK,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,kDAAkD,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;AACzF,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAiE;IACzF,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,SAAS,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,IAAI,IAAI,CAAC,GAAG,CAAC,gBAAgB;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACjF,IAAI,IAAI,CAAC,GAAG,CAAC,yBAAyB;QAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC,CAAC;IACxG,IAAI,IAAI,CAAC,GAAG,CAAC,2BAA2B;QAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC,CAAC;IAC3G,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QACvF,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,OAAO,CAAC,OAAO;YAAE,OAAO,CAAC,GAAG,CAAC,cAAc,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACpF,IAAI,OAAO,CAAC,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,YAAY,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,MAA+D;IACtF,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,UAAU,KAAK,CAAC,CAAC;IACrI,IAAI,MAAM,CAAC,QAAQ;QAAE,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACzE,OAAO,CAAC,GAAG,CAAC,kBAAkB,MAAM,CAAC,WAAW,IAAI,CAAC,SAAS,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,YAAY,MAAM,CAAC,WAAW,IAAI,CAAC,SAAS,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxM,CAAC;IACD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC1B,IAAI,MAAM,CAAC,cAAc,CAAC,UAAU;YAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1G,IAAI,MAAM,CAAC,cAAc,CAAC,UAAU;YAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1G,IAAI,MAAM,CAAC,cAAc,CAAC,YAAY;YAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,CAAC;IAClH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA6D,EAAE,UAAmB;IAC1G,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,SAAS,SAAS,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACtH,OAAO,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,UAAU,UAAU,EAAE,CAAC,CAAC;QACpC,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;QACvE,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,IAAI;QAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAgB;IACrF,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,SAAS;YAAE,MAAM,IAAI,QAAQ,CAAC,uFAAuF,EAAE,OAAO,CAAC,CAAC;QAC5K,MAAM,SAAS,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,QAAQ,CAAC,uBAAuB,EAAE,kBAAkB,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACrE,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACnG,MAAM,IAAI,QAAQ,CAAC,mBAAmB,IAAI,EAAE,EAAE,kBAAkB,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC;YACvC,SAAS;YACT,QAAQ;YACR,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAA8E;SACrF,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/E,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,aAAa;gBAAE,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;;gBACjG,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,EAAE,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACvJ,OAAO,IAAI,CAAC;IACd,CAAC;IAEH,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;YACxC,GAAG,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvC,GAAG,CAAC,MAAM,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;SACzE,CAAC,CAAC,CACJ,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,EAAE,CAAC,cAAc,EAAE;YACjB,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;YAClI,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE;SACpC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAEH,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,YAAY,CAAC,KAAK,CAAC;gBAAE,mBAAmB,CAAC,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;;gBAC9E,gBAAgB,CAAC,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,EAAE,CACA,gBAAgB,EAChB;YACE,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,EAAE,GAAG,gBAAgB,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBACzF,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;gBACpD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;gBAC/C,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC;SACH,EACD,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAC1B,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAEH,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,EAAE,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAEH,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACxE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAClF,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpG,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC;YAChF,MAAM,IAAI,QAAQ,CAAC,yBAAyB,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;QACzF,CAAC;QACD,MAAM,aAAa,GAAG,OAAO,KAAK,CAAC,iBAAiB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClH,IAAI,aAAa,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,aAAa,IAAI,CAAC,CAAC,EAAE,CAAC;YAC5F,MAAM,IAAI,QAAQ,CAAC,8BAA8B,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC;YACzC,SAAS;YACT,OAAO;YACP,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YACtC,GAAG,EAAE,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YAC1D,KAAK;YACL,SAAS;YACT,aAAa;SACd,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,eAAe,CAAC,MAAM,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,EAAE,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/commands/machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import os from "node:os";
|
|
2
|
-
import { ControllerClient, configPath, ok, parseControllerJoinUrl, parseDurationMs, randomId, readConfig, relayHealth, requirePositional, requireRelayUrl, requireString, wantsJson, wantsVerbose, writeConfig } from "./lib/index.js";
|
|
2
|
+
import { ControllerClient, configPath, ok, parseControllerJoinUrl, parseDurationMs, randomId, readConfig, relayHealth, requirePositional, requireRelayUrl, requireString, showMachine, wantsJson, wantsVerbose, writeConfig } from "./lib/index.js";
|
|
3
3
|
export async function handleRemote({ domain, action, positional, flags }) {
|
|
4
4
|
if (domain === "remote" && action === "devices") {
|
|
5
5
|
const config = await readConfig(flags);
|
|
6
|
-
const
|
|
6
|
+
const client = new ControllerClient(config);
|
|
7
|
+
const [result, snapshot] = await Promise.all([client.listDevices(), client.snapshot().catch(() => undefined)]);
|
|
8
|
+
const machineNames = new Map((await Promise.all((snapshot?.machines ?? []).map(async (machine) => {
|
|
9
|
+
const projected = await showMachine(client, machine).catch(() => ({ ...machine, metadata: { name: undefined, hostname: undefined } }));
|
|
10
|
+
return [machine.id, projected.metadata.name || projected.metadata.hostname || machine.name];
|
|
11
|
+
}))));
|
|
12
|
+
const displayName = (device) => (device.machineId ? machineNames.get(device.machineId) : undefined) || device.name;
|
|
7
13
|
if (!wantsJson(flags)) {
|
|
8
14
|
if (result.devices.length === 0) {
|
|
9
15
|
console.log("No devices.");
|
|
@@ -12,14 +18,19 @@ export async function handleRemote({ domain, action, positional, flags }) {
|
|
|
12
18
|
for (const device of result.devices) {
|
|
13
19
|
const state = device.revoked ? "revoked" : "active";
|
|
14
20
|
const current = device.current ? " current" : "";
|
|
15
|
-
console.log(`${device.deviceId} ${device.kind} ${state}${current} ${device
|
|
21
|
+
console.log(`${device.deviceId} ${device.kind} ${state}${current} ${displayName(device)}`);
|
|
16
22
|
}
|
|
17
23
|
return true;
|
|
18
24
|
}
|
|
19
|
-
|
|
25
|
+
const devices = result.devices.map((device) => ({
|
|
26
|
+
...device,
|
|
27
|
+
name: displayName(device),
|
|
28
|
+
displayName: displayName(device),
|
|
29
|
+
}));
|
|
30
|
+
ok("remote.devices", wantsVerbose(flags) ? { ...result, devices } : {
|
|
20
31
|
devices: result.devices.map((device) => ({
|
|
21
32
|
deviceId: device.deviceId,
|
|
22
|
-
name: device
|
|
33
|
+
name: displayName(device),
|
|
23
34
|
kind: device.kind,
|
|
24
35
|
current: device.current,
|
|
25
36
|
revoked: device.revoked,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/commands/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,EAAE,sBAAsB,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/commands/remote.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { DaemonConfig } from "./types.js";
|
|
2
2
|
export declare function readConfig(): Promise<DaemonConfig>;
|
|
3
|
-
export declare function redactedConfig(config: DaemonConfig): Omit<DaemonConfig, "machineToken" | "accountSecret"> & {
|
|
3
|
+
export declare function redactedConfig(config: DaemonConfig): Omit<DaemonConfig, "machineToken" | "accountSecret" | "runtimeEnv"> & {
|
|
4
4
|
hasMachineToken: boolean;
|
|
5
5
|
hasAccountSecret: boolean;
|
|
6
|
+
runtimeEnv?: Record<string, boolean>;
|
|
6
7
|
};
|
|
7
8
|
export declare function writeConfig(config: DaemonConfig): Promise<void>;
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import { configDir, configPath } from "./paths.js";
|
|
3
3
|
import { DaemonCliError } from "./errors.js";
|
|
4
|
+
const runtimeEnvKeys = new Set([
|
|
5
|
+
"HAPPY_ELVES_CODEX_COMMAND",
|
|
6
|
+
"HAPPY_ELVES_CLAUDE_COMMAND",
|
|
7
|
+
"HAPPY_ELVES_DEV_REMOTE_EXEC",
|
|
8
|
+
"HAPPY_ELVES_ENABLE_PIE_PROVIDER",
|
|
9
|
+
"HAPPY_ELVES_PIE_COMMAND",
|
|
10
|
+
"HAPPY_ELVES_PIE_CONFIG_DIR",
|
|
11
|
+
"HAPPY_ELVES_PIE_VERSION",
|
|
12
|
+
]);
|
|
4
13
|
function assertConfigShape(value) {
|
|
5
14
|
if (!value || typeof value !== "object") {
|
|
6
15
|
throw new DaemonCliError("Daemon config is invalid.", "CONFIG_INVALID");
|
|
@@ -32,11 +41,22 @@ function assertConfigShape(value) {
|
|
|
32
41
|
catch {
|
|
33
42
|
throw new DaemonCliError("Daemon config relayUrl is invalid.", "CONFIG_INVALID");
|
|
34
43
|
}
|
|
35
|
-
|
|
44
|
+
const runtimeEnv = {};
|
|
45
|
+
const rawRuntimeEnv = candidate.runtimeEnv;
|
|
46
|
+
if (rawRuntimeEnv && typeof rawRuntimeEnv === "object" && !Array.isArray(rawRuntimeEnv)) {
|
|
47
|
+
for (const [key, value] of Object.entries(rawRuntimeEnv)) {
|
|
48
|
+
if (runtimeEnvKeys.has(key) && typeof value === "string" && value.length > 0)
|
|
49
|
+
runtimeEnv[key] = value;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
...candidate,
|
|
54
|
+
...(Object.keys(runtimeEnv).length > 0 ? { runtimeEnv } : {}),
|
|
55
|
+
};
|
|
36
56
|
}
|
|
37
57
|
export async function readConfig() {
|
|
38
58
|
try {
|
|
39
|
-
return assertConfigShape(JSON.parse(await fs.readFile(configPath, "utf8")));
|
|
59
|
+
return assertConfigShape(JSON.parse(stripJsonBom(await fs.readFile(configPath, "utf8"))));
|
|
40
60
|
}
|
|
41
61
|
catch (error) {
|
|
42
62
|
if (error.code === "ENOENT") {
|
|
@@ -48,6 +68,9 @@ export async function readConfig() {
|
|
|
48
68
|
throw error;
|
|
49
69
|
}
|
|
50
70
|
}
|
|
71
|
+
function stripJsonBom(value) {
|
|
72
|
+
return value.charCodeAt(0) === 0xfeff ? value.slice(1) : value;
|
|
73
|
+
}
|
|
51
74
|
export function redactedConfig(config) {
|
|
52
75
|
return {
|
|
53
76
|
relayUrl: config.relayUrl,
|
|
@@ -56,6 +79,7 @@ export function redactedConfig(config) {
|
|
|
56
79
|
machineName: config.machineName,
|
|
57
80
|
hasMachineToken: Boolean(config.machineToken),
|
|
58
81
|
hasAccountSecret: Boolean(config.accountSecret),
|
|
82
|
+
...(config.runtimeEnv ? { runtimeEnv: Object.fromEntries(Object.keys(config.runtimeEnv).map((key) => [key, true])) } : {}),
|
|
59
83
|
};
|
|
60
84
|
}
|
|
61
85
|
export async function writeConfig(config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,MAAM,IAAI,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,SAAS,GAAG,KAAqD,CAAC;IACxE,MAAM,cAAc,GAA8B;QAChD,UAAU;QACV,WAAW;QACX,WAAW;QACX,aAAa;QACb,cAAc;QACd,eAAe;KAChB,CAAC;IACF,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,IAAI,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK,QAAQ,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,cAAc,CAAC,4BAA4B,KAAK,GAAG,EAAE,gBAAgB,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IACpC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,cAAc,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,CAAC;IACnF,CAAC;IACD,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,cAAc,CAAC,QAAQ,KAAK,OAAO,IAAI,cAAc,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAChF,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,cAAc,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ export async function handleDevExec(ws, config, command) {
|
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
async function collectDiagnostics() {
|
|
74
|
-
const commandNames = process.platform === "win32" ? ["happy-elves", "codex", "claude", "node", "npm", "pnpm"] : ["happy-elves", "codex", "claude", "node", "npm", "pnpm"];
|
|
74
|
+
const commandNames = process.platform === "win32" ? ["happy-elves", "codex", "claude", "pie", "node", "npm", "pnpm"] : ["happy-elves", "codex", "claude", "pie", "node", "npm", "pnpm"];
|
|
75
75
|
return {
|
|
76
76
|
generatedAt: new Date().toISOString(),
|
|
77
77
|
platform: process.platform,
|
|
@@ -88,6 +88,9 @@ async function collectDiagnostics() {
|
|
|
88
88
|
HAPPY_ELVES_RUNTIME: process.env.HAPPY_ELVES_RUNTIME,
|
|
89
89
|
HAPPY_ELVES_CODEX_COMMAND: trimQuotes(process.env.HAPPY_ELVES_CODEX_COMMAND),
|
|
90
90
|
HAPPY_ELVES_CLAUDE_COMMAND: trimQuotes(process.env.HAPPY_ELVES_CLAUDE_COMMAND),
|
|
91
|
+
HAPPY_ELVES_ENABLE_PIE_PROVIDER: process.env.HAPPY_ELVES_ENABLE_PIE_PROVIDER,
|
|
92
|
+
HAPPY_ELVES_PIE_COMMAND: trimQuotes(process.env.HAPPY_ELVES_PIE_COMMAND),
|
|
93
|
+
HAPPY_ELVES_PIE_VERSION: process.env.HAPPY_ELVES_PIE_VERSION,
|
|
91
94
|
HAPPY_ELVES_DEV_REMOTE_EXEC: process.env.HAPPY_ELVES_DEV_REMOTE_EXEC,
|
|
92
95
|
},
|
|
93
96
|
commands: await Promise.all(commandNames.map(commandDiagnostics)),
|
|
@@ -128,6 +131,8 @@ function diagnosticVersionCommand(name) {
|
|
|
128
131
|
return trimQuotes(process.env.HAPPY_ELVES_CODEX_COMMAND);
|
|
129
132
|
if (name === "claude" && trimQuotes(process.env.HAPPY_ELVES_CLAUDE_COMMAND))
|
|
130
133
|
return trimQuotes(process.env.HAPPY_ELVES_CLAUDE_COMMAND);
|
|
134
|
+
if (name === "pie" && trimQuotes(process.env.HAPPY_ELVES_PIE_COMMAND))
|
|
135
|
+
return trimQuotes(process.env.HAPPY_ELVES_PIE_COMMAND);
|
|
131
136
|
return name;
|
|
132
137
|
}
|
|
133
138
|
async function runDevCommand(command) {
|
|
@@ -136,11 +141,13 @@ async function runDevCommand(command) {
|
|
|
136
141
|
const args = command.args ?? [];
|
|
137
142
|
const spawnInput = command.shell
|
|
138
143
|
? shellCommand(command.shell)
|
|
139
|
-
:
|
|
144
|
+
: resolveCliCommand(trimQuotes(command.command), args, { env: process.env });
|
|
140
145
|
const result = await capture(spawnInput.command, spawnInput.args, {
|
|
141
146
|
cwd: command.cwd,
|
|
147
|
+
env: spawnInput.env,
|
|
142
148
|
requestId: command.requestId,
|
|
143
149
|
timeoutMs,
|
|
150
|
+
windowsVerbatimArguments: spawnInput.windowsVerbatimArguments,
|
|
144
151
|
});
|
|
145
152
|
return {
|
|
146
153
|
command: spawnInput.command,
|