@jahia/jahia-cli 0.5.1 → 0.5.2

package/dist/lib/workflow/resolve-workflows-file-path.d.ts

@@ -8,7 +8,7 @@ export declare const DEFAULT_WORKFLOWS_FILENAME = "jahia-cli.workflows.global.ym
  * Precedence:
  * 1. CLI flag value (resolved relative to CWD)
  * 2. Config key value (resolved relative to config file directory)
- * 3. Default: jahia-cli.workflows.global.yml in CWD
+ * 3. Default: jahia-cli.workflows.global.yml in the config file's directory
  *
  * Returns { path, isExplicit } where isExplicit is true when the user
  * explicitly specified a file (via flag or config key) rather than relying on

package/dist/lib/workflow/resolve-workflows-file-path.js

@@ -9,7 +9,7 @@ export const DEFAULT_WORKFLOWS_FILENAME = 'jahia-cli.workflows.global.yml';
  * Precedence:
  * 1. CLI flag value (resolved relative to CWD)
  * 2. Config key value (resolved relative to config file directory)
- * 3. Default: jahia-cli.workflows.global.yml in CWD
+ * 3. Default: jahia-cli.workflows.global.yml in the config file's directory
  *
  * Returns { path, isExplicit } where isExplicit is true when the user
  * explicitly specified a file (via flag or config key) rather than relying on
@@ -23,6 +23,6 @@ export const resolveWorkflowsFilePath = (configDir, configKey, flagValue) => {
     if (configKey !== undefined) {
         return { path: resolve(configDir, configKey), isExplicit: true };
     }
-    return { path: resolve(DEFAULT_WORKFLOWS_FILENAME), isExplicit: false };
+    return { path: resolve(configDir, DEFAULT_WORKFLOWS_FILENAME), isExplicit: false };
 };
 //# sourceMappingURL=resolve-workflows-file-path.js.map

package/dist/lib/workflow/resolve-workflows-file-path.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-workflows-file-path.js","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAC;AAE3E;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,SAAiB,EACjB,SAA6B,EAC7B,SAA6B,EAC4B,EAAE;IAC3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,0BAA0B,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC1E,CAAC,CAAC"}
+{"version":3,"file":"resolve-workflows-file-path.js","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAC;AAE3E;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,SAAiB,EACjB,SAA6B,EAC7B,SAA6B,EAC4B,EAAE;IAC3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,0BAA0B,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AACrF,CAAC,CAAC"}

package/oclif.manifest.json

@@ -783,32 +783,31 @@
         "provision.js"
       ]
     },
-    "workflow:init": {
+    "tests:artifacts": {
       "aliases": [],
       "args": {},
-      "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.",
+      "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.",
       "examples": [
-        "<%= config.bin %> workflow init",
-        "<%= config.bin %> workflow init --config ./my-config.yml",
-        "<%= config.bin %> workflow init --force",
-        "<%= config.bin %> workflow init --json"
+        "<%= config.bin %> tests artifacts",
+        "<%= config.bin %> tests artifacts --output ./ci-results/",
+        "<%= config.bin %> tests artifacts --state /ci/workspace/state.json --json"
       ],
       "flags": {
-        "config": {
-          "char": "c",
-          "description": "Path to the YAML configuration file",
-          "name": "config",
-          "default": "jahia-cli.config.yml",
+        "state": {
+          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
+          "env": "JAHIA_CLI_STATE",
+          "name": "state",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "force": {
-          "char": "f",
-          "description": "Overwrite existing workflows section if already present",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
+        "output": {
+          "char": "o",
+          "description": "Output directory for collected artifacts (default: ./results/)",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
         "json": {
           "description": "Output result as structured JSON (for AI agents and scripting)",
@@ -819,7 +818,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "workflow:init",
+      "id": "tests:artifacts",
       "pluginAlias": "@jahia/jahia-cli",
       "pluginName": "@jahia/jahia-cli",
       "pluginType": "core",
@@ -829,64 +828,54 @@
       "relativePath": [
         "dist",
         "commands",
-        "workflow",
-        "init.js"
+        "tests",
+        "artifacts.js"
       ]
     },
-    "workflow:run": {
+    "tests:build": {
       "aliases": [],
       "args": {},
-      "description": "Execute a named workflow defined in a configuration file. Supports loading shared workflows from a dedicated workflows file (via --workflows-file flag or workflowsFile config key, defaults to jahia-cli.workflows.global.yml in CWD). Config workflows override workflow file ones with the same name. Runs steps sequentially — shell commands via execa, jahia-cli commands via subprocess. Stops on first failure. Use --name to select a workflow, or omit to run the default.",
+      "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\".",
       "examples": [
-        "<%= config.bin %> workflow run --config jahia-cli.config.yml",
-        "<%= config.bin %> workflow run --config jahia-cli.config.yml --name setup",
-        "<%= config.bin %> workflow run --config jahia-cli.config.yml --workflows-file shared.yml",
-        "<%= config.bin %> workflow run --config ./my-config.yml --json"
+        "<%= config.bin %> tests build -c config.yml",
+        "<%= config.bin %> tests build -c config.yml --no-cache",
+        "<%= config.bin %> tests build -c config.yml --context /path/to/test/root",
+        "<%= config.bin %> tests build -c config.yml --json"
       ],
       "flags": {
         "config": {
           "char": "c",
-          "description": "Path to the YAML configuration file",
+          "description": "Path to jahia-cli config file",
           "name": "config",
           "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "name": {
-          "char": "n",
-          "description": "Name of the workflow to run (runs default workflow if omitted)",
-          "name": "name",
+        "context": {
+          "description": "Docker build context directory (default: current working directory)",
+          "name": "context",
+          "default": ".",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "workflows-file": {
-          "char": "w",
-          "description": "Path to a dedicated workflows YAML file. Merged with config workflows (config takes precedence). Resolved relative to CWD. Overrides the workflowsFile config key. Defaults to jahia-cli.workflows.global.yml in CWD.",
-          "name": "workflows-file",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "no-cache": {
+          "description": "Build without using cache",
+          "name": "no-cache",
+          "allowNo": false,
+          "type": "boolean"
         },
         "json": {
-          "description": "Output result as structured JSON (for AI agents and scripting)",
+          "description": "Output result as structured JSON",
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "state": {
-          "char": "s",
-          "description": "Path to the state file (auto-passed to jahia-cli subcommands)",
-          "name": "state",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "workflow:run",
+      "id": "tests:build",
       "pluginAlias": "@jahia/jahia-cli",
       "pluginName": "@jahia/jahia-cli",
       "pluginType": "core",
@@ -896,32 +885,33 @@
       "relativePath": [
         "dist",
         "commands",
-        "workflow",
-        "run.js"
+        "tests",
+        "build.js"
       ]
     },
-    "tests:artifacts": {
+    "tests:init": {
       "aliases": [],
       "args": {},
-      "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.",
+      "description": "Initialize local test scaffolding from a remote repository. Syncs missing files from the configured scaffolding source and manages .gitignore so that remotely-sourced files are not accidentally committed.",
       "examples": [
-        "<%= config.bin %> tests artifacts",
-        "<%= config.bin %> tests artifacts --output ./ci-results/",
-        "<%= config.bin %> tests artifacts --state /ci/workspace/state.json --json"
+        "<%= config.bin %> tests init",
+        "<%= config.bin %> tests init --config ./my-config.yml",
+        "<%= config.bin %> tests init --path ./tests --json"
       ],
       "flags": {
-        "state": {
-          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
-          "env": "JAHIA_CLI_STATE",
-          "name": "state",
+        "config": {
+          "char": "c",
+          "description": "Path to config file (default: jahia-cli.config.yml)",
+          "env": "JAHIA_CLI_CONFIG",
+          "name": "config",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "output": {
-          "char": "o",
-          "description": "Output directory for collected artifacts (default: ./results/)",
-          "name": "output",
+        "path": {
+          "char": "p",
+          "description": "Override destination directory for scaffolding files",
+          "name": "path",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -935,7 +925,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tests:artifacts",
+      "id": "tests:init",
       "pluginAlias": "@jahia/jahia-cli",
       "pluginName": "@jahia/jahia-cli",
       "pluginType": "core",
@@ -946,18 +936,17 @@
         "dist",
         "commands",
         "tests",
-        "artifacts.js"
+        "init.js"
       ]
     },
-    "tests:build": {
+    "tests:run": {
       "aliases": [],
       "args": {},
-      "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\".",
+      "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.",
       "examples": [
-        "<%= config.bin %> tests build -c config.yml",
-        "<%= config.bin %> tests build -c config.yml --no-cache",
-        "<%= config.bin %> tests build -c config.yml --context /path/to/test/root",
-        "<%= config.bin %> tests build -c config.yml --json"
+        "<%= 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"
       ],
       "flags": {
         "config": {
@@ -969,19 +958,21 @@
           "multiple": false,
           "type": "option"
         },
-        "context": {
-          "description": "Docker build context directory (default: current working directory)",
-          "name": "context",
-          "default": ".",
+        "state": {
+          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
+          "env": "JAHIA_CLI_STATE",
+          "name": "state",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Build without using cache",
-          "name": "no-cache",
-          "allowNo": false,
-          "type": "boolean"
+        "env": {
+          "char": "e",
+          "description": "Additional env var for test container (KEY=VALUE, repeatable). Supports ${VAR:-default}.",
+          "name": "env",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
         },
         "json": {
           "description": "Output result as structured JSON",
@@ -992,7 +983,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tests:build",
+      "id": "tests:run",
       "pluginAlias": "@jahia/jahia-cli",
       "pluginName": "@jahia/jahia-cli",
       "pluginType": "core",
@@ -1003,35 +994,35 @@
         "dist",
         "commands",
         "tests",
-        "build.js"
+        "run.js"
       ]
     },
-    "tests:init": {
+    "workflow:init": {
       "aliases": [],
       "args": {},
-      "description": "Initialize local test scaffolding from a remote repository. Syncs missing files from the configured scaffolding source and manages .gitignore so that remotely-sourced files are not accidentally committed.",
+      "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.",
       "examples": [
-        "<%= config.bin %> tests init",
-        "<%= config.bin %> tests init --config ./my-config.yml",
-        "<%= config.bin %> tests init --path ./tests --json"
+        "<%= config.bin %> workflow init",
+        "<%= config.bin %> workflow init --config ./my-config.yml",
+        "<%= config.bin %> workflow init --force",
+        "<%= config.bin %> workflow init --json"
       ],
       "flags": {
         "config": {
           "char": "c",
-          "description": "Path to config file (default: jahia-cli.config.yml)",
-          "env": "JAHIA_CLI_CONFIG",
+          "description": "Path to the YAML configuration file",
           "name": "config",
+          "default": "jahia-cli.config.yml",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "path": {
-          "char": "p",
-          "description": "Override destination directory for scaffolding files",
-          "name": "path",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "force": {
+          "char": "f",
+          "description": "Overwrite existing workflows section if already present",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
         },
         "json": {
           "description": "Output result as structured JSON (for AI agents and scripting)",
@@ -1042,7 +1033,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tests:init",
+      "id": "workflow:init",
       "pluginAlias": "@jahia/jahia-cli",
       "pluginName": "@jahia/jahia-cli",
       "pluginType": "core",
@@ -1052,55 +1043,64 @@
       "relativePath": [
         "dist",
         "commands",
-        "tests",
+        "workflow",
         "init.js"
       ]
     },
-    "tests:run": {
+    "workflow:run": {
       "aliases": [],
       "args": {},
-      "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.",
+      "description": "Execute a named workflow defined in a configuration file. Supports loading shared workflows from a dedicated workflows file (via --workflows-file flag or workflowsFile config key, defaults to jahia-cli.workflows.global.yml in CWD). Config workflows override workflow file ones with the same name. Runs steps sequentially — shell commands via execa, jahia-cli commands via subprocess. Stops on first failure. Use --name to select a workflow, or omit to run the default.",
       "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"
+        "<%= config.bin %> workflow run --config jahia-cli.config.yml",
+        "<%= config.bin %> workflow run --config jahia-cli.config.yml --name setup",
+        "<%= config.bin %> workflow run --config jahia-cli.config.yml --workflows-file shared.yml",
+        "<%= config.bin %> workflow run --config ./my-config.yml --json"
       ],
       "flags": {
         "config": {
           "char": "c",
-          "description": "Path to jahia-cli config file",
+          "description": "Path to the YAML configuration file",
           "name": "config",
           "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "state": {
-          "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
-          "env": "JAHIA_CLI_STATE",
-          "name": "state",
+        "name": {
+          "char": "n",
+          "description": "Name of the workflow to run (runs default workflow if omitted)",
+          "name": "name",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "env": {
-          "char": "e",
-          "description": "Additional env var for test container (KEY=VALUE, repeatable). Supports ${VAR:-default}.",
-          "name": "env",
+        "workflows-file": {
+          "char": "w",
+          "description": "Path to a dedicated workflows YAML file. Merged with config workflows (config takes precedence). Resolved relative to CWD. Overrides the workflowsFile config key. Defaults to jahia-cli.workflows.global.yml in CWD.",
+          "name": "workflows-file",
           "hasDynamicHelp": false,
-          "multiple": true,
+          "multiple": false,
           "type": "option"
         },
         "json": {
-          "description": "Output result as structured JSON",
+          "description": "Output result as structured JSON (for AI agents and scripting)",
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "state": {
+          "char": "s",
+          "description": "Path to the state file (auto-passed to jahia-cli subcommands)",
+          "name": "state",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "tests:run",
+      "id": "workflow:run",
       "pluginAlias": "@jahia/jahia-cli",
       "pluginName": "@jahia/jahia-cli",
       "pluginType": "core",
@@ -1110,10 +1110,10 @@
       "relativePath": [
         "dist",
         "commands",
-        "tests",
+        "workflow",
         "run.js"
       ]
     }
   },
-  "version": "0.5.1"
+  "version": "0.5.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/jahia-cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A CLI to accelerate developing and testing Jahia in the Agentic era",
   "author": "Jahia",
   "license": "Apache-2.0",