@jahia/jahia-cli 0.2.0 → 0.3.1

package/oclif.manifest.json

@@ -553,6 +553,103 @@
         "stop.js"
       ]
     },
+    "tests:artifacts": {
+      "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.",
+      "examples": [
+        "<%= config.bin %> tests artifacts",
+        "<%= config.bin %> tests artifacts --output ./ci-results/",
+        "<%= config.bin %> tests artifacts --state /ci/workspace/state.json --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",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "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)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "tests:artifacts",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "tests",
+        "artifacts.js"
+      ]
+    },
+    "tests:build": {
+      "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\".",
+      "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"
+      ],
+      "flags": {
+        "config": {
+          "char": "c",
+          "description": "Path to jahia-cli config file",
+          "name": "config",
+          "required": true,
+          "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",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "tests:build",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "tests",
+        "build.js"
+      ]
+    },
     "tests:init": {
       "aliases": [],
       "args": {},
@@ -603,6 +700,181 @@
         "init.js"
       ]
     },
+    "tests: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.",
+      "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"
+      ],
+      "flags": {
+        "config": {
+          "char": "c",
+          "description": "Path to jahia-cli config 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",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "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",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "tests:run",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "tests",
+        "run.js"
+      ]
+    },
+    "workflow:init": {
+      "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.",
+      "examples": [
+        "<%= 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 the YAML configuration file",
+          "name": "config",
+          "default": "jahia-cli.config.yml",
+          "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)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workflow:init",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workflow",
+        "init.js"
+      ]
+    },
+    "workflow:run": {
+      "aliases": [],
+      "args": {},
+      "description": "Execute a named workflow defined in a configuration file. Supports loading shared workflows from a global workflows file (via --workflows-file flag or workflowsFile config key). Local workflows override global 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 %> 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 the YAML configuration 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",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workflows-file": {
+          "char": "w",
+          "description": "Path to a global workflows YAML file. Merged with local config workflows (local takes precedence). Resolved relative to CWD. Overrides the workflowsFile config key.",
+          "name": "workflows-file",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "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": "workflow:run",
+      "pluginAlias": "@jahia/jahia-cli",
+      "pluginName": "@jahia/jahia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workflow",
+        "run.js"
+      ]
+    },
     "jahia:alive": {
       "aliases": [],
       "args": {},
@@ -707,14 +979,15 @@
     "jahia:provision": {
       "aliases": [],
       "args": {},
-      "description": "Execute a provisioning script against a running Jahia instance. The manifest can be a local YAML file or a public URL (auto-detected). Optional file attachments can be included via --file flags or --assets directory.",
+      "description": "Execute provisioning operations against a running Jahia instance. Three modes are available (exactly one per invocation):\n  --manifest: Submit a YAML provisioning manifest with optional file attachments.\n  --modules:  Upload module files (JARs) from a directory, one at a time.\n  --scripts:  Execute provisioning scripts from a directory, one at a time.\nUse --filter to limit which files are processed (glob pattern, matched against filename).",
       "examples": [
         "<%= config.bin %> jahia provision --manifest ./provisioning/setup.yaml",
-        "<%= config.bin %> jahia provision --manifest https://raw.githubusercontent.com/org/repo/main/provisioning.yaml",
-        "<%= config.bin %> jahia provision --manifest ./setup.yaml --file ./modules/mymodule.jar",
         "<%= config.bin %> jahia provision --manifest ./setup.yaml --assets ./artifacts",
-        "<%= config.bin %> jahia provision --manifest ./setup.yaml --file ./mod1.jar --file ./mod2.jar --json",
-        "<%= config.bin %> jahia provision --manifest ./setup.yaml --url http://localhost:8080 --username root --password secret"
+        "<%= config.bin %> jahia provision --manifest ./setup.yaml --assets ./artifacts --filter \"*.jar\"",
+        "<%= config.bin %> jahia provision --modules ./modules/",
+        "<%= config.bin %> jahia provision --modules ./modules/ --filter \"*-SNAPSHOT.jar\"",
+        "<%= config.bin %> jahia provision --scripts ./scripts/",
+        "<%= config.bin %> jahia provision --scripts ./scripts/ --filter \"*.groovy\""
       ],
       "flags": {
         "state": {
@@ -728,8 +1001,44 @@
         "manifest": {
           "char": "m",
           "description": "Path to a local YAML file or a public URL of the provisioning manifest",
+          "exclusive": [
+            "modules",
+            "scripts"
+          ],
           "name": "manifest",
-          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "modules": {
+          "description": "Path to a directory of module files to install (one at a time via installOrUpgradeBundle)",
+          "exclusive": [
+            "manifest",
+            "scripts",
+            "assets",
+            "file"
+          ],
+          "name": "modules",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "scripts": {
+          "description": "Path to a directory of provisioning scripts to execute (one at a time via executeScript)",
+          "exclusive": [
+            "manifest",
+            "modules",
+            "assets",
+            "file"
+          ],
+          "name": "scripts",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "filter": {
+          "description": "Glob pattern to filter files in --assets, --modules, or --scripts directories (default: all files). Example: \"*-SNAPSHOT.jar\"",
+          "name": "filter",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -759,7 +1068,7 @@
         },
         "file": {
           "char": "f",
-          "description": "File attachment to include (can be specified multiple times)",
+          "description": "File attachment to include with --manifest (can be specified multiple times)",
           "name": "file",
           "hasDynamicHelp": false,
           "multiple": true,
@@ -767,7 +1076,7 @@
         },
         "assets": {
           "char": "a",
-          "description": "Directory whose files are attached to the provisioning request (recursive)",
+          "description": "Directory whose files are attached to the --manifest provisioning request",
           "name": "assets",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -795,106 +1104,7 @@
         "jahia",
         "provision.js"
       ]
-    },
-    "workflow:init": {
-      "aliases": [],
-      "args": {},
-      "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.",
-      "examples": [
-        "<%= 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 the YAML configuration file",
-          "name": "config",
-          "default": "jahia-cli.config.yml",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "force": {
-          "char": "f",
-          "description": "Overwrite existing workflow section if already present",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "json": {
-          "description": "Output result as structured JSON (for AI agents and scripting)",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "workflow:init",
-      "pluginAlias": "@jahia/jahia-cli",
-      "pluginName": "@jahia/jahia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "workflow",
-        "init.js"
-      ]
-    },
-    "workflow:run": {
-      "aliases": [],
-      "args": {},
-      "description": "Execute a workflow defined in a configuration file. Runs steps sequentially — shell commands via execa, jahia-cli commands via subprocess. Stops on first failure.",
-      "examples": [
-        "<%= config.bin %> workflow run --config jahia-cli.config.yml",
-        "<%= config.bin %> workflow run --config ./my-config.yml --json"
-      ],
-      "flags": {
-        "config": {
-          "char": "c",
-          "description": "Path to the YAML configuration file",
-          "name": "config",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "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": "workflow:run",
-      "pluginAlias": "@jahia/jahia-cli",
-      "pluginName": "@jahia/jahia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "workflow",
-        "run.js"
-      ]
     }
   },
-  "version": "0.2.0"
+  "version": "0.3.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/jahia-cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "A CLI to accelerate developing and testing Jahia in the Agentic era",
   "author": "Jahia",
   "license": "Apache-2.0",
@@ -40,13 +40,15 @@
     "@inquirer/prompts": "^7.10.1",
     "@oclif/core": "^4",
     "execa": "^9.6.1",
-    "js-yaml": "^4.1.1"
+    "js-yaml": "^4.1.1",
+    "picomatch": "^4.0.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.4",
     "@oclif/test": "^4",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22",
+    "@types/picomatch": "^4.0.3",
     "@typescript-eslint/eslint-plugin": "^8",
     "@typescript-eslint/parser": "^8",
     "@vitest/coverage-v8": "^3.2.4",