@ejunz/ea-core 0.1.2-rc.5 → 0.1.3

package/lib/bin.js

@@ -1,10 +1,42 @@
 #!/usr/bin/env node
-import { n as cliManifestPath } from "./cli-paths-Bh47PAKn.js";
-import { t as installHostToolBridge } from "./host-tools-CgS9hPeN.js";
-import { readFileSync } from "node:fs";
-import { loadLayeredEnv } from "@ejunz/app-boot";
+import { n as cliManifestPath } from "./cli-paths-Cpxmk9zd.js";
+import { t as installHostToolBridge } from "./host-tools-BVh5Ga7o.js";
+import { copyFileSync, existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { load } from "js-yaml";
+import { loadLayeredEnv, loadProfile } from "@ejunz/ea-core/app-boot";
 import { Command, CommanderError } from "commander";
-//#region lib/types/commands/args.js
+//#region packages/profile-ejunz/lib/index.js
+/** Standalone Ejunz profile configuration file. */
+const EXAMPLE_PATH = fileURLToPath(new URL("../config.agent.example.yaml", import.meta.url));
+function record(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+/** Create config.agent.yaml from the shipped example, then validate its bridge values. */
+function loadEjunzAgentConfig(cwd = process.cwd()) {
+	const configPath = resolve(cwd, "config.agent.yaml");
+	if (!existsSync(configPath)) {
+		copyFileSync(EXAMPLE_PATH, configPath);
+		console.info(`Created ${configPath} from ${EXAMPLE_PATH}; fill bridge.origin and bridge.token, then retry.`);
+	}
+	let document;
+	try {
+		document = load(readFileSync(configPath, "utf8"));
+	} catch (error) {
+		throw new Error(`profile-ejunz: ${configPath} is not valid YAML: ${String(error)}`);
+	}
+	const bridge = record(record(document)?.bridge);
+	const origin = typeof bridge?.origin === "string" ? bridge.origin.trim() : "";
+	const token = typeof bridge?.token === "string" ? bridge.token.trim() : "";
+	if (origin === "" || token === "") throw new Error(`profile-ejunz: fill bridge.origin and bridge.token in ${configPath}`);
+	return {
+		origin,
+		token
+	};
+}
+//#endregion
+//#region src/commands/args.ts
 /**
 * Commander adapter for the `ea` command line.
 *
@@ -12,10 +44,10 @@ import { Command, CommanderError } from "commander";
 * patch overlays to apply, and the config dumps — and hands **everything after
 * its own flags** to the booted tree verbatim, where injected app plugins parse
 * their own flag families and print their own `--help` (see
-* `@ejunz/cmdline`). Launcher flags therefore come first: the first
+* `@ejunz/ea-core/cmdline`). Launcher flags therefore come first: the first
 * token this parser does not recognize starts the inner arguments, so
-* `ea --profile tui --resume abc` boots the tui profile with `--resume abc`,
-* `plugin` manages a profile's plugin dependencies by forwarding to yarn.
+* `ea --profile web --port 8080` boots the web profile with `--port 8080`,
+* and `plugin` manages a profile's dependencies by forwarding to yarn.
 * @module @ejunz/ea-core/args
 */
 /**
@@ -26,11 +58,11 @@ const collect = (value, previous = []) => [...previous, value];
 /** The launcher's own help text; each app prints its own. */
 const HELP_EXAMPLES = `
 Examples:
-  ea --profile headless "run the tests"     answer one task, print the result, and exit
-  ea --profile tui --patch ./extra.yml      boot a custom profile with one extra overlay
-  ea --profile tui --resume <session>       arguments after the launcher flags reach the app
-  ea node                                   join the server named in $EA_HOME/agent.yaml
-  ea plugin --profile tui add <package>     install a plugin into the tui profile
+  ea --profile web                          boot the generic Web profile
+  ea --profile web --debug                  include Cordis plugin activation logs
+  ea --profile ejunz                        boot with Ejunz-hosted services
+  ea --profile web --port 8080              pass app arguments after launcher flags
+  ea plugin --profile web add <package>     install a plugin into the web profile
 `;
 /**
 * Resolve a boot or dump invocation from the launcher flags and the leftover
@@ -48,7 +80,8 @@ function resolveBoot(program, profile, options, args) {
 		mode: "profile",
 		profile,
 		patches,
-		args
+		args,
+		debug: options.debug === true
 	};
 	if (options.dumpConfig === true && options.dumpDefaultConfig === true) program.error("error: --dump-config and --dump-default-config are mutually exclusive");
 	if (args.length > 0) program.error(`error: config dumps take no app arguments, got ${args.map((argument) => JSON.stringify(argument)).join(" ")}`);
@@ -71,7 +104,7 @@ function resolveBoot(program, profile, options, args) {
 function parseEaArgs(argv, version) {
 	let resolved;
 	const program = new Command();
-	program.name("ea").version(version, "-V, --version", "output the version number").description("ea: boot a EjunzAgent profile — an ordered stack of plugin-bundle patch layers under your own overrides.").addHelpText("after", HELP_EXAMPLES).exitOverride().helpOption(false).allowUnknownOption().passThroughOptions().enablePositionalOptions().argument("[args...]", "arguments for the booted profile's app (see: ea --profile <name> --help)").option("--profile <name>", "the profile under $EA_HOME/profiles to boot").option("--patch <path>", "extra patch-list overlay applied after the profile layer (repeatable)", collect).option("--dump-config", "print the composed profile tree and exit").option("--dump-default-config", "print the profile tree without its user layer or --patch overlays and exit").action((args, options) => {
+	program.name("ea").version(version, "-V, --version", "output the version number").description("ea: boot a EjunzAgent profile — an ordered stack of plugin-bundle patch layers under your own overrides.").addHelpText("after", HELP_EXAMPLES).exitOverride().helpOption(false).allowUnknownOption().passThroughOptions().enablePositionalOptions().argument("[args...]", "arguments for the booted profile's app (see: ea --profile <name> --help)").option("--profile <name>", "the profile under $EA_HOME/profiles to boot").option("--debug", "log profile plugin activation and lifecycle events").option("--patch <path>", "extra patch-list overlay applied after the profile layer (repeatable)", collect).option("--dump-config", "print the composed profile tree and exit").option("--dump-default-config", "print the profile tree without its user layer or --patch overlays and exit").action((args, options) => {
 		if (options.profile === void 0) {
 			if (args.some((argument) => argument === "-h" || argument === "--help")) program.help();
 			program.error("error: --profile <name> is required");
@@ -83,15 +116,8 @@ function parseEaArgs(argv, version) {
 	/** Reject parent options supplied before a subcommand. */
 	const rejectParentOptions = (command) => {
 		const parent = program.opts();
-		if (parent.profile !== void 0 || parent.patch !== void 0 || parent.dumpConfig !== void 0 || parent.dumpDefaultConfig !== void 0) program.error(`error: ${command} takes none of parent --profile, --patch, --dump-config, or --dump-default-config`);
+		if (parent.profile !== void 0 || parent.patch !== void 0 || parent.debug !== void 0 || parent.dumpConfig !== void 0 || parent.dumpDefaultConfig !== void 0) program.error(`error: ${command} takes none of parent --profile, --debug, --patch, --dump-config, or --dump-default-config`);
 	};
-	program.command("node").description("join a server that runs elsewhere, reading $EA_HOME/agent.yaml; the node surface's own flags follow").helpOption(false).allowUnknownOption().passThroughOptions().enablePositionalOptions().argument("[args...]", "arguments for the node surface (e.g. --url <server>, --label <name>)").action((args) => {
-		rejectParentOptions("node");
-		resolved = {
-			mode: "node",
-			args
-		};
-	});
 	program.command("plugin").description("manage a profile's plugins by forwarding the remaining arguments to yarn in the profile directory").requiredOption("--profile <name>", "the profile whose plugins to manage (initialized on first use)").allowUnknownOption().argument("[args...]", "yarn arguments, forwarded verbatim (add <pkg>, remove <pkg>, why <pkg>, ...)").action((args, options) => {
 		rejectParentOptions("plugin");
 		if (options.profile === "") program.error("error: --profile needs a name");
@@ -112,7 +138,7 @@ function parseEaArgs(argv, version) {
 	return resolved;
 }
 //#endregion
-//#region lib/types/entry/bin.js
+//#region src/entry/bin.ts
 /**
 * ea — command-line entry. Dynamic imports per mode keep unrelated modes out
 * of each dispatch path; the adapter prints and exits for
@@ -120,6 +146,11 @@ function parseEaArgs(argv, version) {
 * @module @ejunz/ea-core/bin
 */
 /* v8 ignore file -- built-bin acceptance exercises this self-executing dispatch. */
+function configText(config, key) {
+	if (typeof config !== "object" || config === null) return void 0;
+	const value = config[key];
+	return typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
+}
 /** This app's version, read from its checked-in package.json. */
 function readVersion() {
 	const manifest = JSON.parse(readFileSync(cliManifestPath(), "utf8"));
@@ -128,44 +159,50 @@ function readVersion() {
 const invocation = parseEaArgs(process.argv.slice(2), readVersion());
 switch (invocation.mode) {
 	case "profile": {
-		const { runProfile } = await import("./profile-boot-DB0YtW82.js");
+		const { runProfile } = await import("./profile-boot-CSZwEw6O.js");
+		const ejunzConfig = loadProfile("ea", invocation.profile, cliManifestPath()).layers.some((layer) => layer.packageName === "@ejunz/profile-ejunz") ? loadEjunzAgentConfig() : void 0;
+		const profileConfigPatches = ejunzConfig === void 0 ? [] : [{
+			id: "storage-ejunz",
+			config: ejunzConfig
+		}, {
+			id: "session-persistence-ejunz",
+			config: ejunzConfig
+		}];
 		await runProfile({
 			environment: loadLayeredEnv("ea"),
 			profile: invocation.profile,
 			patchFiles: invocation.patches,
+			profileConfigPatches,
 			args: invocation.args,
-			prepare: async (ctx) => {
-				const origin = process.env.EJUNZ_AGENT_DATA_ORIGIN;
-				const token = process.env.EJUNZ_AGENT_DATA_TOKEN;
-				if (origin && token) await installHostToolBridge(ctx, {
+			debug: invocation.debug,
+			prepare: async (ctx, composed) => {
+				if (!["storage-ejunz", "session-persistence-ejunz"].some((id) => {
+					const row = composed.rows.get(id);
+					return row !== void 0 && row.disabled !== true;
+				})) return;
+				const storageConfig = composed.rows.get("storage-ejunz")?.config;
+				const persistenceConfig = composed.rows.get("session-persistence-ejunz")?.config;
+				const origin = configText(storageConfig, "origin");
+				const token = configText(storageConfig, "token");
+				const persistenceOrigin = configText(persistenceConfig, "origin");
+				const persistenceToken = configText(persistenceConfig, "token");
+				if (!origin || !token || !persistenceOrigin || !persistenceToken) throw new Error("ea: config.agent.yaml must provide the Ejunz bridge for storage-ejunz and session-persistence-ejunz");
+				if (origin !== persistenceOrigin || token !== persistenceToken) throw new Error("ea: storage-ejunz and session-persistence-ejunz must use the same Ejunz bridge origin and token");
+				await installHostToolBridge(ctx, {
 					origin,
 					token
 				});
-				else console.warn(`[host-tools] bridge unavailable origin=${origin ? "set" : "missing"} token=${token ? "set" : "missing"}`);
 			}
 		});
 		break;
 	}
-	case "node": {
-		const { runNode, parseNodeArgs } = await import("./node-DzoSnntW.js");
-		const { surfaceLogger } = await import("./surface-log-fjX8orGn.js");
-		try {
-			await runNode(parseNodeArgs(invocation.args));
-		} catch (error) {
-			const logger = surfaceLogger("ea-node");
-			if (error instanceof Error) logger.error(error.stack ?? error.message);
-			else logger.error(String(error));
-			process.exitCode = 1;
-		}
-		break;
-	}
 	case "plugin": {
-		const { runPlugin } = await import("./plugin-BBl1ViBd.js");
+		const { runPlugin } = await import("./plugin-CUTzbaEG.js");
 		process.exit(runPlugin(invocation.profile, invocation.args));
 		break;
 	}
 	case "dump-config": {
-		const { runDumpConfig } = await import("./dump-config-CD_CP42p.js");
+		const { runDumpConfig } = await import("./dump-config-DxXgKDVl.js");
 		runDumpConfig(invocation.profile, invocation.defaultOnly, invocation.patches);
 		break;
 	}

package/lib/cli-paths-Cpxmk9zd.js

@@ -0,0 +1,21 @@
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+//#region src/lib/cli-paths.ts
+const moduleDirectory = dirname(fileURLToPath(import.meta.url));
+const sourceAppDirectory = join(moduleDirectory, "../..");
+const bundledAppDirectory = join(moduleDirectory, "..");
+/** Resolve an asset owned by the CLI package from source or bundled execution. */
+function cliAssetPath(relativePath) {
+	const sourcePath = join(sourceAppDirectory, relativePath);
+	if (existsSync(sourcePath)) return sourcePath;
+	const bundledPath = join(bundledAppDirectory, relativePath);
+	if (existsSync(bundledPath)) return bundledPath;
+	return sourcePath;
+}
+/** Resolve the CLI package manifest from source or bundled execution. */
+function cliManifestPath() {
+	return cliAssetPath("package.json");
+}
+//#endregion
+export { cliManifestPath as n, cliAssetPath as t };

package/lib/dump-config-DxXgKDVl.js

@@ -0,0 +1,52 @@
+import { a as homePatchPath, n as PROFILE_ROOT_FILENAME, o as prepareProfile } from "./profile-boot-DRHYAiGs.js";
+import { existsSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { loadOptionalPatches, loadOverlayPatches, renderConfigDump } from "@ejunz/ea-core/app-boot";
+//#region src/commands/dump-config.ts
+/**
+* Config-dump entry for `ea --profile <name> --dump-config`: compose the
+* profile's patch layers through the include plugin's patch algorithm without
+* booting or evaluating `!!js`, with one source layer per bundle, the
+* profile's own patch file, and each `--patch` overlay.
+* @module @ejunz/ea-core/dump-config
+*/
+const NAME = "ea";
+/* v8 ignore start -- built-bin acceptance drives this boot-free dispatch */
+/**
+* Print a profile composition with comments naming each source file and patch layer.
+* @param profile - the profile name.
+* @param defaultOnly - omit the profile's user layer and `--patch` overlays
+* (the recovery diagnostic for a broken `cordis.patch.yml`, which is then
+* never parsed).
+* @param patches - `--patch` overlay paths, in argv order.
+*/
+function runDumpConfig(profile, defaultOnly, patches) {
+	const loaded = prepareProfile(profile, !defaultOnly);
+	const layers = loaded.layers.map((layer) => ({
+		label: layer.packageName,
+		patches: layer.patches
+	}));
+	if (!defaultOnly) {
+		if (existsSync(loaded.patchPath)) layers.push({
+			label: loaded.patchPath,
+			patches: loaded.patches
+		});
+		const homePatchFile = homePatchPath();
+		const homePatches = loadOptionalPatches(NAME, homePatchFile);
+		if (homePatches !== void 0) layers.push({
+			label: homePatchFile,
+			patches: homePatches
+		});
+		for (const file of patches) {
+			const absolute = resolve(file);
+			layers.push({
+				label: absolute,
+				patches: loadOverlayPatches(NAME, absolute)
+			});
+		}
+	}
+	process.stdout.write(renderConfigDump(NAME, join(loaded.dir, PROFILE_ROOT_FILENAME), layers));
+}
+/* v8 ignore stop */
+//#endregion
+export { runDumpConfig };

package/lib/dump-config-dI1g8Og5.js

@@ -0,0 +1,52 @@
+import { a as homePatchPath, n as PROFILE_ROOT_FILENAME, o as prepareProfile } from "./profile-boot-BqakeoCE.js";
+import { existsSync } from "node:fs";
+import { loadOptionalPatches, loadOverlayPatches, renderConfigDump } from "@ejunz/ea-core/app-boot";
+import { join, resolve } from "node:path";
+//#region src/commands/dump-config.ts
+/**
+* Config-dump entry for `ea --profile <name> --dump-config`: compose the
+* profile's patch layers through the include plugin's patch algorithm without
+* booting or evaluating `!!js`, with one source layer per bundle, the
+* profile's own patch file, and each `--patch` overlay.
+* @module @ejunz/ea-core/dump-config
+*/
+const NAME = "ea";
+/* v8 ignore start -- built-bin acceptance drives this boot-free dispatch */
+/**
+* Print a profile composition with comments naming each source file and patch layer.
+* @param profile - the profile name.
+* @param defaultOnly - omit the profile's user layer and `--patch` overlays
+* (the recovery diagnostic for a broken `cordis.patch.yml`, which is then
+* never parsed).
+* @param patches - `--patch` overlay paths, in argv order.
+*/
+function runDumpConfig(profile, defaultOnly, patches) {
+	const loaded = prepareProfile(profile, !defaultOnly);
+	const layers = loaded.layers.map((layer) => ({
+		label: layer.packageName,
+		patches: layer.patches
+	}));
+	if (!defaultOnly) {
+		if (existsSync(loaded.patchPath)) layers.push({
+			label: loaded.patchPath,
+			patches: loaded.patches
+		});
+		const homePatchFile = homePatchPath();
+		const homePatches = loadOptionalPatches(NAME, homePatchFile);
+		if (homePatches !== void 0) layers.push({
+			label: homePatchFile,
+			patches: homePatches
+		});
+		for (const file of patches) {
+			const absolute = resolve(file);
+			layers.push({
+				label: absolute,
+				patches: loadOverlayPatches(NAME, absolute)
+			});
+		}
+	}
+	process.stdout.write(renderConfigDump(NAME, join(loaded.dir, PROFILE_ROOT_FILENAME), layers));
+}
+/* v8 ignore stop */
+//#endregion
+export { runDumpConfig };