@jahia/jahia-cli 0.2.0 → 0.3.0

package/dist/commands/tests/artifacts.js

@@ -0,0 +1,112 @@
+import { resolve } from 'node:path';
+import { Command, Flags } from '@oclif/core';
+import { collectAllArtifacts } from '../../lib/artifacts/collect-all.js';
+import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
+import { stateFilePath } from '../../lib/state/state-file-path.js';
+import { stateFlag } from '../../lib/state/state-flag.js';
+const DEFAULT_OUTPUT_DIR = './results/';
+/**
+ * Formats a single component's collection result as human-readable text.
+ */
+export const formatComponentResult = (c) => {
+    const lines = [];
+    const logStatus = c.logFile !== undefined
+        ? `✓ ${c.logFile} (${c.logSource ?? 'unknown'})`
+        : `✗ logs failed${c.logError !== undefined ? `: ${c.logError}` : ''}`;
+    lines.push(`  ${c.componentName}: ${logStatus}`);
+    c.artifacts.forEach((a) => {
+        const status = a.success ? '✓' : '✗';
+        const suffix = a.success ? '' : ` — ${a.error ?? 'unknown error'}`;
+        lines.push(`    ${status} ${a.path}${suffix}`);
+    });
+    return lines.join('\n');
+};
+/**
+ * Formats the full collection result as human-readable output.
+ */
+export const formatCollectionHuman = (result) => {
+    const lines = [
+        `✓ Artifacts collected for environment "${result.envName}"`,
+        `  Output: ${result.outputDir}`,
+        '',
+    ];
+    result.components.forEach((c) => {
+        lines.push(formatComponentResult(c));
+    });
+    return lines.join('\n');
+};
+/**
+ * Builds JSON output for the collection result.
+ */
+export const buildCollectionJson = (result) => JSON.stringify({
+    success: true,
+    envName: result.envName,
+    outputDir: result.outputDir,
+    components: result.components.map((c) => ({
+        name: c.componentName,
+        containerId: c.containerId,
+        logFile: c.logFile ?? null,
+        logSource: c.logSource ?? null,
+        logError: c.logError ?? null,
+        artifacts: c.artifacts.map((a) => ({
+            path: a.path,
+            success: a.success,
+            error: a.error ?? null,
+        })),
+    })),
+}, null, 2);
+export default class TestsArtifacts extends Command {
+    static description = 'Collect test artifacts (container logs and diagnostic files) from the active environment. ' +
+        'Fetches logs from VictoriaLogs (with docker logs fallback) and copies container artifact paths ' +
+        'defined in component definitions or config overrides.';
+    static examples = [
+        '<%= config.bin %> tests artifacts',
+        '<%= config.bin %> tests artifacts --output ./ci-results/',
+        '<%= config.bin %> tests artifacts --state /ci/workspace/state.json --json',
+    ];
+    static flags = {
+        state: stateFlag,
+        output: Flags.string({
+            char: 'o',
+            description: `Output directory for collected artifacts (default: ${DEFAULT_OUTPUT_DIR})`,
+        }),
+        json: Flags.boolean({
+            description: 'Output result as structured JSON (for AI agents and scripting)',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(TestsArtifacts);
+        const statePath = stateFilePath(flags.state);
+        const outputDir = resolve(flags.output ?? DEFAULT_OUTPUT_DIR);
+        try {
+            const env = await getActiveEnvironment(statePath);
+            if (env === undefined) {
+                throw new Error('No active environment found. Create one with "environment create" first.');
+            }
+            const result = await collectAllArtifacts({
+                env,
+                outputDir,
+                onProgress: flags.json ? undefined : (msg) => {
+                    this.log(msg);
+                },
+            });
+            if (flags.json) {
+                this.log(buildCollectionJson(result));
+            }
+            else {
+                this.log(formatCollectionHuman(result));
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (flags.json) {
+                this.log(JSON.stringify({ success: false, error: message }, null, 2));
+            }
+            else {
+                this.error(message);
+            }
+        }
+    }
+}
+//# sourceMappingURL=artifacts.js.map

package/dist/commands/tests/artifacts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../src/commands/tests/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAExC;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAA4B,EAAU,EAAE;IAC5E,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,KAAK,SAAS;QACvC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,SAAS,IAAI,SAAS,GAAG;QAChD,CAAC,CAAC,gBAAgB,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACxE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC,CAAC;IAEjD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACrC,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,eAAe,EAAE,CAAC;QACnE,KAAK,CAAC,IAAI,CAAC,OAAO,MAAM,IAAI,CAAC,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAwB,EAAU,EAAE;IACxE,MAAM,KAAK,GAAa;QACtB,0CAA0C,MAAM,CAAC,OAAO,GAAG;QAC3D,aAAa,MAAM,CAAC,SAAS,EAAE;QAC/B,EAAE;KACH,CAAC;IAEF,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAwB,EAAU,EAAE,CACtE,IAAI,CAAC,SAAS,CACZ;IACE,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,SAAS,EAAE,MAAM,CAAC,SAAS;IAC3B,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxC,IAAI,EAAE,CAAC,CAAC,aAAa;QACrB,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,IAAI;QAC9B,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;QAC5B,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI;SACvB,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ,EACD,IAAI,EACJ,CAAC,CACF,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,OAAO;IACjD,MAAM,CAAU,WAAW,GACzB,4FAA4F;QAC5F,iGAAiG;QACjG,uDAAuD,CAAC;IAE1D,MAAM,CAAU,QAAQ,GAAG;QACzB,mCAAmC;QACnC,0DAA0D;QAC1D,2EAA2E;KAC5E,CAAC;IAEF,MAAM,CAAU,KAAK,GAAG;QACtB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,sDAAsD,kBAAkB,GAAG;SACzF,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EAAE,gEAAgE;YAC7E,OAAO,EAAE,KAAK;SACf,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,kBAAkB,CAAC,CAAC;QAE9D,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;YAC9F,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC;gBACvC,GAAG;gBACH,SAAS;gBACT,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAW,EAAQ,EAAE;oBACzD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAChB,CAAC;aACF,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC"}

package/dist/commands/tests/build.d.ts

@@ -0,0 +1,30 @@
+import { Command } from '@oclif/core';
+import type { TestContainerConfig } from '../../lib/config/types.js';
+/**
+ * Resolves the effective image tag from config.
+ * Priority: tests.container.tag > tests.scaffolding.version > 'latest'
+ */
+export declare const resolveVersion: (containerConfig: TestContainerConfig | undefined, scaffoldingVersion: string | undefined) => string;
+/**
+ * Resolves the effective image name from config.
+ */
+export declare const resolveImageName: (containerConfig: TestContainerConfig | undefined) => string;
+/**
+ * Formats a human-readable build success message.
+ */
+export declare const formatBuildSuccess: (tag: string, dockerfile: string) => string;
+/**
+ * Formats a human-readable build failure message.
+ */
+export declare const formatBuildFailure: (error: string) => string;
+export default class TestsBuild extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'no-cache': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=build.d.ts.map

package/dist/commands/tests/build.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAQrE;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,KACrC,MAAgE,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,mBAAmB,GAAG,SAAS,KAC/C,MAAsD,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,YAAY,MAAM,KAAG,MACG,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,MACV,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAIU;IAErC,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;MAcnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4ClC"}

package/dist/commands/tests/build.js

@@ -0,0 +1,90 @@
+import { resolve } from 'node:path';
+import { Command, Flags } from '@oclif/core';
+import { execa } from 'execa';
+import { loadConfigFile } from '../../lib/config/parser.js';
+import { DEFAULT_DOCKERFILE, DEFAULT_IMAGE_NAME, buildBuildxArgs, resolveImageTag, } from '../../lib/tests/build-image.js';
+/**
+ * Resolves the effective image tag from config.
+ * Priority: tests.container.tag > tests.scaffolding.version > 'latest'
+ */
+export const resolveVersion = (containerConfig, scaffoldingVersion) => containerConfig?.tag ?? scaffoldingVersion ?? 'latest';
+/**
+ * Resolves the effective image name from config.
+ */
+export const resolveImageName = (containerConfig) => containerConfig?.image ?? DEFAULT_IMAGE_NAME;
+/**
+ * Formats a human-readable build success message.
+ */
+export const formatBuildSuccess = (tag, dockerfile) => `✓ Test image built successfully: ${tag}\n  Dockerfile: ${dockerfile}`;
+/**
+ * Formats a human-readable build failure message.
+ */
+export const formatBuildFailure = (error) => `✗ Test image build failed\n  ${error}`;
+export default class TestsBuild extends Command {
+    static description = 'Build the test Docker image using docker buildx. ' +
+        'All build parameters (dockerfile, image, tag, platform, buildArgs) are read from ' +
+        'the config file under tests.container. The image stays local (no push) ' +
+        'and can be run with "tests run".';
+    static examples = [
+        '<%= config.bin %> tests build -c config.yml',
+        '<%= config.bin %> tests build -c config.yml --no-cache',
+        '<%= config.bin %> tests build -c config.yml --json',
+    ];
+    static flags = {
+        config: Flags.string({
+            char: 'c',
+            description: 'Path to jahia-cli config file',
+            required: true,
+        }),
+        'no-cache': Flags.boolean({
+            description: 'Build without using cache',
+            default: false,
+        }),
+        json: Flags.boolean({
+            description: 'Output result as structured JSON',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(TestsBuild);
+        try {
+            const config = await loadConfigFile(resolve(flags.config));
+            const containerConfig = config.tests?.container;
+            const version = resolveVersion(containerConfig, config.tests?.scaffolding?.version);
+            const imageName = resolveImageName(containerConfig);
+            const dockerfile = containerConfig?.dockerfile ?? DEFAULT_DOCKERFILE;
+            const tag = resolveImageTag(imageName, version);
+            const args = buildBuildxArgs({
+                dockerfile,
+                tag,
+                baseVersion: version,
+                platform: containerConfig?.platform,
+                noCache: flags['no-cache'],
+                extraBuildArgs: containerConfig?.buildArgs,
+            });
+            if (!flags.json) {
+                this.log(`Building test image: ${tag}`);
+                this.log(`  Dockerfile: ${dockerfile}`);
+                this.log(`  BASE_VERSION: ${version}`);
+            }
+            await execa('docker', [...args], { stdio: 'inherit' });
+            if (flags.json) {
+                this.log(JSON.stringify({ success: true, tag, dockerfile, version }, null, 2));
+            }
+            else {
+                this.log(formatBuildSuccess(tag, dockerfile));
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (flags.json) {
+                this.log(JSON.stringify({ success: false, error: message }, null, 2));
+            }
+            else {
+                this.log(formatBuildFailure(message));
+            }
+            this.exit(1);
+        }
+    }
+}
+//# sourceMappingURL=build.js.map

package/dist/commands/tests/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/tests/build.ts"],"names":[],"mappings":"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"}

package/dist/commands/tests/run.d.ts

@@ -0,0 +1,28 @@
+import { Command } from '@oclif/core';
+import type { ResolvedComponent } from '../../lib/components/types.js';
+import type { TestContainerConfig } from '../../lib/config/types.js';
+/**
+ * Formats a human-readable test run start message.
+ */
+export declare const formatRunStart: (image: string, network: string, name: string) => string;
+/**
+ * Formats a human-readable test completion message.
+ */
+export declare const formatRunComplete: (name: string, exitCode: number) => string;
+/**
+ * Builds a ResolvedComponent for the cypress test runner using the component registry.
+ * Reads image/tag from tests.container config and applies env injections from sibling components.
+ */
+export declare const buildCypressComponent: (envComponents: readonly string[], containerConfig: TestContainerConfig | undefined, scaffoldingVersion: string | undefined, extraEnv: Readonly<Record<string, string>>) => ResolvedComponent;
+export default class TestsRun extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        state: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        env: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=run.d.ts.map

package/dist/commands/tests/run.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAOrE;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,EAAE,SAAS,MAAM,EAAE,MAAM,MAAM,KAAG,MAOhE,CAAC;AAEf;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,MAIF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,eAAe,SAAS,MAAM,EAAE,EAChC,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,EACtC,UAAU,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KACzC,iBAgCF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,OAAO;IAC3C,OAAgB,WAAW,SAG2E;IAEtG,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;;MAgBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4FlC"}

package/dist/commands/tests/run.js

@@ -0,0 +1,166 @@
+import { resolve } from 'node:path';
+import { Command, Flags } from '@oclif/core';
+import { execa } from 'execa';
+import { applyEnvInjections, getComponent, resolveComponent } from '../../lib/components/index.js';
+import { loadConfigFile } from '../../lib/config/parser.js';
+import { buildRunArgs, containerName, removeContainer } from '../../lib/providers/docker/container.js';
+import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
+import { stateFilePath } from '../../lib/state/state-file-path.js';
+import { stateFlag } from '../../lib/state/state-flag.js';
+import { DEFAULT_IMAGE_NAME, parseKeyValueArgs } from '../../lib/tests/build-image.js';
+/**
+ * Formats a human-readable test run start message.
+ */
+export const formatRunStart = (image, network, name) => [
+    `▶ Running tests`,
+    `  Image:     ${image}`,
+    `  Network:   ${network}`,
+    `  Container: ${name}`,
+    '',
+].join('\n');
+/**
+ * Formats a human-readable test completion message.
+ */
+export const formatRunComplete = (name, exitCode) => {
+    const icon = exitCode === 0 ? '✓' : '✗';
+    const status = exitCode === 0 ? 'passed' : `failed (exit code ${String(exitCode)})`;
+    return `${icon} Tests ${status}\n  Container "${name}" kept for inspection`;
+};
+/**
+ * Builds a ResolvedComponent for the cypress test runner using the component registry.
+ * Reads image/tag from tests.container config and applies env injections from sibling components.
+ */
+export const buildCypressComponent = (envComponents, containerConfig, scaffoldingVersion, extraEnv) => {
+    const definition = getComponent('cypress');
+    if (definition === undefined) {
+        throw new Error('cypress component not found in registry');
+    }
+    const imageOverride = containerConfig?.image ?? DEFAULT_IMAGE_NAME;
+    const tagOverride = containerConfig?.tag ?? scaffoldingVersion ?? 'latest';
+    const resolved = resolveComponent(definition, {
+        image: `${imageOverride}:${tagOverride}`,
+        env: extraEnv,
+    });
+    // Build sibling components (from persisted env) to apply envInjections
+    const siblings = envComponents
+        .map((name) => {
+        const def = getComponent(name);
+        return def !== undefined ? resolveComponent(def) : undefined;
+    })
+        .filter((c) => c !== undefined);
+    const allComponents = [...siblings, resolved];
+    const injected = applyEnvInjections(allComponents);
+    // Return the cypress component with injections applied
+    const cypressResult = injected[injected.length - 1];
+    if (cypressResult === undefined) {
+        throw new Error('Failed to resolve cypress component after env injection');
+    }
+    return cypressResult;
+};
+export default class TestsRun extends Command {
+    static description = 'Run the test Docker image against an active environment. ' +
+        'The container attaches to the environment network, streams output in real-time, ' +
+        'and the CLI exits with the container exit code. Container is kept after completion for debugging.';
+    static examples = [
+        '<%= config.bin %> tests run -c config.yml',
+        '<%= config.bin %> tests run -c config.yml --env CYPRESS_SPEC=cypress/e2e/login.cy.ts',
+        '<%= config.bin %> tests run -c config.yml --state /ci/workspace/state.json --json',
+    ];
+    static flags = {
+        config: Flags.string({
+            char: 'c',
+            description: 'Path to jahia-cli config file',
+            required: true,
+        }),
+        state: stateFlag,
+        env: Flags.string({
+            char: 'e',
+            description: 'Additional env var for test container (KEY=VALUE, repeatable). Supports ${VAR:-default}.',
+            multiple: true,
+        }),
+        json: Flags.boolean({
+            description: 'Output result as structured JSON',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(TestsRun);
+        const statePath = stateFilePath(flags.state);
+        try {
+            const activeEnv = await getActiveEnvironment(statePath);
+            if (activeEnv === undefined) {
+                throw new Error('No active environment found. Create one with "environment create" first.');
+            }
+            if (activeEnv.provider !== 'docker') {
+                throw new Error(`tests run requires a Docker environment. Current provider: ${activeEnv.provider}`);
+            }
+            const config = await loadConfigFile(resolve(flags.config));
+            const containerConfig = config.tests?.container;
+            const userEnv = flags.env !== undefined
+                ? parseKeyValueArgs(flags.env)
+                : {};
+            const component = buildCypressComponent(activeEnv.components.map((c) => c.name), containerConfig, config.tests?.scaffolding?.version, userEnv);
+            const imageRef = `${component.effectiveImage}:${component.effectiveTag}`;
+            const name = containerName(activeEnv.name, 'cypress');
+            const args = buildRunArgs({
+                envName: activeEnv.name,
+                componentName: component.definition.name,
+                image: component.effectiveImage,
+                tag: component.effectiveTag,
+                networkName: activeEnv.network,
+                ports: component.effectivePorts,
+                env: component.effectiveEnv,
+                volumes: component.definition.volumes,
+                networkAliases: component.definition.networkAliases,
+                detached: false,
+            });
+            if (!flags.json) {
+                this.log(formatRunStart(imageRef, activeEnv.network, name));
+            }
+            // Remove any leftover container from a previous run
+            await removeContainer(name);
+            const result = await execa('docker', [...args], {
+                stdio: 'inherit',
+                reject: false,
+            });
+            const exitCode = result.exitCode ?? 1;
+            if (flags.json) {
+                this.log(JSON.stringify({
+                    success: exitCode === 0,
+                    exitCode,
+                    container: name,
+                    image: imageRef,
+                    network: activeEnv.network,
+                }, null, 2));
+            }
+            else {
+                this.log(formatRunComplete(name, exitCode));
+            }
+            if (exitCode !== 0) {
+                this.exit(exitCode);
+            }
+        }
+        catch (error) {
+            if (isExecaError(error)) {
+                const exitCode = error.exitCode ?? 1;
+                if (!flags.json) {
+                    this.log(formatRunComplete('unknown', exitCode));
+                }
+                this.exit(exitCode);
+                return;
+            }
+            const message = error instanceof Error ? error.message : String(error);
+            if (flags.json) {
+                this.log(JSON.stringify({ success: false, error: message }, null, 2));
+            }
+            else {
+                this.error(message);
+            }
+        }
+    }
+}
+/**
+ * Type guard for ExecaError (has exitCode property).
+ */
+const isExecaError = (error) => error instanceof Error && 'exitCode' in error;
+//# sourceMappingURL=run.js.map

package/dist/commands/tests/run.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"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"}

package/dist/commands/workflow/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/init.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAK7C,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,2BAA2B,CAAC;AAM3E;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,cAAc,CAQ5F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,GAAI,YAAY,MAAM,KAAG,MAGlB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC/C,OAAgB,WAAW,SAGiD;IAE5E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;MAenB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAoClC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/init.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAK7C,OAAO,KAAK,EAAE,cAAc,EAAa,MAAM,2BAA2B,CAAC;AAM3E;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,cAAc,CAQ5F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,GAAI,YAAY,MAAM,KAAG,MAGlB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC/C,OAAgB,WAAW,SAI4B;IAEvD,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;MAenB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAoClC"}

package/dist/commands/workflow/init.js

@@ -4,8 +4,8 @@ import { Command, Flags } from '@oclif/core';
 import yaml from 'js-yaml';
 import { configToYaml } from '../../lib/config/config-to-yaml.js';
 import { validateConfig } from '../../lib/config/parser.js';
-import { buildSampleWorkflow } from '../../lib/workflow/build-sample-workflow.js';
-import { mergeWorkflowIntoConfig } from '../../lib/workflow/merge-workflow-into-config.js';
+import { buildSampleWorkflows } from '../../lib/workflow/build-sample-workflow.js';
+import { mergeWorkflowsIntoConfig } from '../../lib/workflow/merge-workflow-into-config.js';
 const DEFAULT_CONFIG_FILE = 'jahia-cli.config.yml';
 /**
  * Loads an existing config file if it exists, returning an empty config if not found.
@@ -23,13 +23,14 @@ export const loadExistingConfigForWorkflow = async (filePath) => {
 /**
  * Builds a human-readable success message for the workflow init command.
  */
-export const buildWorkflowInitSuccessMessage = (outputPath) => `✓ Sample workflow added to ${outputPath}\n\n` +
+export const buildWorkflowInitSuccessMessage = (outputPath) => `✓ Sample workflows added to ${outputPath}\n\n` +
     '  Edit the workflow steps to match your needs, then run:\n' +
     `  jahia-cli workflow run --config ${outputPath}`;
 export default class WorkflowInit extends Command {
-    static description = 'Add a sample workflow section to a configuration file. ' +
-        'Generates ~5 representative steps (init, create, alive, test, cleanup) ' +
-        'to help get started. Preserves existing environment and tests sections.';
+    static description = 'Add sample workflows section to a configuration file. ' +
+        'Generates a named "main" workflow with representative steps ' +
+        '(init, create, alive, test, cleanup) to help get started. ' +
+        'Preserves existing environment and tests sections.';
     static examples = [
         '<%= config.bin %> workflow init',
         '<%= config.bin %> workflow init --config ./my-config.yml',
@@ -44,7 +45,7 @@ export default class WorkflowInit extends Command {
         }),
         force: Flags.boolean({
             char: 'f',
-            description: 'Overwrite existing workflow section if already present',
+            description: 'Overwrite existing workflows section if already present',
             default: false,
         }),
         json: Flags.boolean({
@@ -56,24 +57,24 @@ export default class WorkflowInit extends Command {
         const { flags } = await this.parse(WorkflowInit);
         const configPath = resolve(flags.config);
         const existingConfig = await loadExistingConfigForWorkflow(configPath);
-        if (existingConfig.workflow !== undefined && !flags.force) {
-            const msg = `Configuration file already has a workflow section.\n\n` +
+        if (existingConfig.workflows !== undefined && !flags.force) {
+            const msg = `Configuration file already has a workflows section.\n\n` +
                 `  File: ${configPath}\n\n` +
-                '  Use --force to overwrite the existing workflow.';
+                '  Use --force to overwrite the existing workflows.';
             if (flags.json) {
-                this.log(JSON.stringify({ success: false, error: 'workflow_exists', file: configPath }));
+                this.log(JSON.stringify({ success: false, error: 'workflows_exists', file: configPath }));
             }
             else {
                 this.error(msg);
             }
             return;
         }
-        const sampleWorkflow = buildSampleWorkflow();
-        const merged = mergeWorkflowIntoConfig(existingConfig, sampleWorkflow);
+        const sampleWorkflows = buildSampleWorkflows();
+        const merged = mergeWorkflowsIntoConfig(existingConfig, sampleWorkflows);
         const yamlContent = configToYaml(merged);
         await writeFile(configPath, yamlContent, 'utf-8');
         if (flags.json) {
-            this.log(JSON.stringify({ success: true, file: configPath, workflow: sampleWorkflow }, undefined, 2));
+            this.log(JSON.stringify({ success: true, file: configPath, workflows: sampleWorkflows }, undefined, 2));
         }
         else {
             this.log(buildWorkflowInitSuccessMessage(configPath));

package/dist/commands/workflow/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/workflow/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/workflow/init.ts"],"names":[],"mappings":"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"}

package/dist/commands/workflow/run.d.ts

@@ -7,12 +7,13 @@ export declare const formatDuration: (ms: number) => string;
 /**
  * Builds a formatted summary of workflow execution for human-readable output.
  */
-export declare const buildWorkflowSummary: (steps: readonly StepResult[], success: boolean, totalDurationMs: number) => string;
+export declare const buildWorkflowSummary: (workflowName: string, steps: readonly StepResult[], success: boolean, totalDurationMs: number) => string;
 export default class WorkflowRun extends Command {
     static description: string;
     static examples: string[];
     static flags: {
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         state: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };

package/dist/commands/workflow/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,KAAG,MAa3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,OAAO,SAAS,UAAU,EAAE,EAC5B,SAAS,OAAO,EAChB,iBAAiB,MAAM,KACtB,MAkBF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAGoC;IAE/D,OAAgB,QAAQ,WAGtB;IAEF,OAAgB,KAAK;;;;MAcnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA+ClC"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAK7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,IAAI,MAAM,KAAG,MAa3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAC/B,cAAc,MAAM,EACpB,OAAO,SAAS,UAAU,EAAE,EAC5B,SAAS,OAAO,EAChB,iBAAiB,MAAM,KACtB,MAoBF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;IAC9C,OAAgB,WAAW,SAIsC;IAEjE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;;MAkBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqDlC"}