@jahia/jahia-cli 0.5.0 → 0.5.1

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.
@@ -1 +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;AAc7C,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,SAOsC;IAEjE,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;MAyBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgGlC"}
1
+ {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,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,SAQsC;IAEjE,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;MA0BnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0GlC"}
@@ -41,9 +41,10 @@ export const buildWorkflowSummary = (workflowName, steps, success, totalDuration
41
41
  };
42
42
  export default class WorkflowRun extends Command {
43
43
  static description = 'Execute a named workflow defined in a configuration file. ' +
44
- 'Supports loading shared workflows from a global workflows file ' +
45
- '(via --workflows-file flag or workflowsFile config key). ' +
46
- 'Local workflows override global ones with the same name. ' +
44
+ 'Supports loading shared workflows from a dedicated workflows file ' +
45
+ '(via --workflows-file flag or workflowsFile config key, ' +
46
+ 'defaults to jahia-cli.workflows.global.yml in CWD). ' +
47
+ 'Config workflows override workflow file ones with the same name. ' +
47
48
  'Runs steps sequentially — shell commands via execa, ' +
48
49
  'jahia-cli commands via subprocess. Stops on first failure. ' +
49
50
  'Use --name to select a workflow, or omit to run the default.';
@@ -65,9 +66,10 @@ export default class WorkflowRun extends Command {
65
66
  }),
66
67
  'workflows-file': Flags.string({
67
68
  char: 'w',
68
- description: 'Path to a global workflows YAML file. ' +
69
- 'Merged with local config workflows (local takes precedence). ' +
70
- 'Resolved relative to CWD. Overrides the workflowsFile config key.',
69
+ description: 'Path to a dedicated workflows YAML file. ' +
70
+ 'Merged with config workflows (config takes precedence). ' +
71
+ 'Resolved relative to CWD. Overrides the workflowsFile config key. ' +
72
+ 'Defaults to jahia-cli.workflows.global.yml in CWD.',
71
73
  }),
72
74
  json: Flags.boolean({
73
75
  description: 'Output result as structured JSON (for AI agents and scripting)',
@@ -83,19 +85,25 @@ export default class WorkflowRun extends Command {
83
85
  const configPath = resolve(flags.config);
84
86
  const configDir = dirname(configPath);
85
87
  const config = await loadConfigFile(configPath);
86
- // Resolve global workflows file path (flag > config key > none)
87
- const globalFilePath = resolveWorkflowsFilePath(configDir, config.workflowsFile, flags['workflows-file']);
88
- // Load global workflows if configured
89
- const globalResult = globalFilePath !== undefined
90
- ? await loadGlobalWorkflows(globalFilePath)
91
- : undefined;
92
- // Merge global + local (local wins)
93
- const mergedResult = mergeWorkflowSources(globalResult?.workflows, config.workflows);
88
+ // Resolve workflows file path (flag > config key > default)
89
+ const { path: workflowsFilePath, isExplicit } = resolveWorkflowsFilePath(configDir, config.workflowsFile, flags['workflows-file']);
90
+ // Load workflows file — always attempt since we now have a default
91
+ const workflowFileResult = await loadGlobalWorkflows(workflowsFilePath);
92
+ // If the user explicitly specified a file that doesn't exist, warn but continue
93
+ if (!workflowFileResult.found && isExplicit) {
94
+ this.warn(`Workflows file not found: ${workflowsFilePath}\n` +
95
+ ` The command will continue using workflows from the config file only.`);
96
+ }
97
+ // Only pass the result downstream when the file was found or explicitly requested
98
+ // (so the UI can show the "not found" warning). Skip silently for missing defaults.
99
+ const effectiveFileResult = workflowFileResult.found || isExplicit ? workflowFileResult : undefined;
100
+ // Merge workflow file + config (config wins)
101
+ const mergedResult = mergeWorkflowSources(workflowFileResult.workflows, config.workflows);
94
102
  const effectiveWorkflows = mergedResult?.workflows;
95
103
  if (effectiveWorkflows === undefined || Object.keys(effectiveWorkflows).length === 0) {
96
- this.error('No workflows found in local config or global workflows file.\n\n' +
104
+ this.error('No workflows found in config or workflows file.\n\n' +
97
105
  ' Run "jahia-cli workflow init" to generate sample workflows,\n' +
98
- ' or specify a global workflows file with --workflows-file.');
106
+ ' or specify a workflows file with --workflows-file.');
99
107
  return;
100
108
  }
101
109
  // mergedResult is guaranteed defined when effectiveWorkflows is defined
@@ -107,7 +115,7 @@ export default class WorkflowRun extends Command {
107
115
  const { steps } = workflow;
108
116
  // Log verbose source/selection info
109
117
  if (!flags.json) {
110
- this.log(formatWorkflowSources(configPath, config.workflows !== undefined ? Object.keys(config.workflows).length : 0, globalResult));
118
+ this.log(formatWorkflowSources(configPath, config.workflows !== undefined ? Object.keys(config.workflows).length : 0, effectiveFileResult));
111
119
  this.log('');
112
120
  this.log(formatAvailableWorkflows(merged, workflowName));
113
121
  this.log('');
@@ -130,7 +138,7 @@ export default class WorkflowRun extends Command {
130
138
  onStepComplete: undefined,
131
139
  });
132
140
  if (flags.json) {
133
- const sourcesJson = buildWorkflowSourcesJson(configPath, config.workflows, globalResult, merged, workflowName);
141
+ const sourcesJson = buildWorkflowSourcesJson(configPath, config.workflows, effectiveFileResult, merged, workflowName);
134
142
  this.log(JSON.stringify({ ...sourcesJson, ...result, workflowName }, undefined, 2));
135
143
  }
136
144
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/workflow/run.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/providers/docker/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAMV,QAAQ,EAGT,MAAM,aAAa,CAAC;AA0PrB;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,QAkP5B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/providers/docker/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAMV,QAAQ,EAGT,MAAM,aAAa,CAAC;AA0PrB;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,QAuP5B,CAAC"}
@@ -223,7 +223,13 @@ export const dockerProvider = {
223
223
  createEnvironment: async (envName, components, onProgress) => {
224
224
  const netName = networkName(envName);
225
225
  try {
226
- await createNetwork(envName);
226
+ const exists = await networkExists(envName);
227
+ if (!exists) {
228
+ await createNetwork(envName);
229
+ }
230
+ else {
231
+ onProgress?.(`Network ${netName} already exists, reusing`);
232
+ }
227
233
  }
228
234
  catch (error) {
229
235
  const msg = error instanceof Error ? error.message : String(error);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/providers/docker/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/providers/docker/index.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import type { MergedWorkflowsResult } from './merge-workflow-sources.js';
4
4
  /**
5
5
  * Builds the human-readable "Workflow sources:" section.
6
6
  */
7
- export declare const formatWorkflowSources: (configPath: string, localWorkflowCount: number, globalResult: GlobalWorkflowsLoadResult | undefined) => string;
7
+ export declare const formatWorkflowSources: (configPath: string, configWorkflowCount: number, workflowFileResult: GlobalWorkflowsLoadResult | undefined) => string;
8
8
  /**
9
9
  * Builds the human-readable "Available workflows:" section.
10
10
  * Marks the selected workflow with → and the default with (default).
@@ -1 +1 @@
1
- {"version":3,"file":"format-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAkB,MAAM,6BAA6B,CAAC;AAEzF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,YAAY,MAAM,EAClB,oBAAoB,MAAM,EAC1B,cAAc,yBAAyB,GAAG,SAAS,KAClD,MAsBF,CAAC;AAcF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,cAAc,qBAAqB,EACnC,cAAc,MAAM,KACnB,MAeF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,YAAY,MAAM,EAClB,gBAAgB,YAAY,GAAG,SAAS,EACxC,cAAc,yBAAyB,GAAG,SAAS,EACnD,cAAc,qBAAqB,EACnC,cAAc,MAAM,KACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CA0BvB,CAAC"}
1
+ {"version":3,"file":"format-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAkB,MAAM,6BAA6B,CAAC;AAEzF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,YAAY,MAAM,EAClB,qBAAqB,MAAM,EAC3B,oBAAoB,yBAAyB,GAAG,SAAS,KACxD,MAsBF,CAAC;AAcF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,cAAc,qBAAqB,EACnC,cAAc,MAAM,KACnB,MAeF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,YAAY,MAAM,EAClB,gBAAgB,YAAY,GAAG,SAAS,EACxC,cAAc,yBAAyB,GAAG,SAAS,EACnD,cAAc,qBAAqB,EACnC,cAAc,MAAM,KACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CA0BvB,CAAC"}
@@ -1,24 +1,24 @@
1
1
  /**
2
2
  * Builds the human-readable "Workflow sources:" section.
3
3
  */
4
- export const formatWorkflowSources = (configPath, localWorkflowCount, globalResult) => {
4
+ export const formatWorkflowSources = (configPath, configWorkflowCount, workflowFileResult) => {
5
5
  const lines = ['▶ Workflow sources:'];
6
- const localLabel = localWorkflowCount > 0
7
- ? `✓ Local config: ${configPath} (${String(localWorkflowCount)} workflows)`
8
- : ` Local config: ${configPath} (no workflows)`;
9
- lines.push(` ${localLabel}`);
10
- if (globalResult !== undefined) {
11
- if (!globalResult.found) {
12
- lines.push(` ⚠ Global file: ${globalResult.path} (file not found, skipping)`);
6
+ const configLabel = configWorkflowCount > 0
7
+ ? `✓ Config: ${configPath} (${String(configWorkflowCount)} workflows)`
8
+ : ` Config: ${configPath} (no workflows)`;
9
+ lines.push(` ${configLabel}`);
10
+ if (workflowFileResult !== undefined) {
11
+ if (!workflowFileResult.found) {
12
+ lines.push(` ⚠ Workflow file: ${workflowFileResult.path} (file not found, skipping)`);
13
13
  }
14
- else if (globalResult.error !== undefined) {
15
- lines.push(` ⚠ Global file: ${globalResult.path} (${globalResult.error})`);
14
+ else if (workflowFileResult.error !== undefined) {
15
+ lines.push(` ⚠ Workflow file: ${workflowFileResult.path} (${workflowFileResult.error})`);
16
16
  }
17
17
  else {
18
- const count = globalResult.workflows !== undefined
19
- ? Object.keys(globalResult.workflows).length
18
+ const count = workflowFileResult.workflows !== undefined
19
+ ? Object.keys(workflowFileResult.workflows).length
20
20
  : 0;
21
- lines.push(` ✓ Global file: ${globalResult.path} (${String(count)} workflows loaded)`);
21
+ lines.push(` ✓ Workflow file: ${workflowFileResult.path} (${String(count)} workflows loaded)`);
22
22
  }
23
23
  }
24
24
  return lines.join('\n');
@@ -28,9 +28,9 @@ export const formatWorkflowSources = (configPath, localWorkflowCount, globalResu
28
28
  */
29
29
  const sourceLabel = (source) => {
30
30
  const labels = {
31
- 'global': 'global',
32
- 'local': 'local',
33
- 'local-override': 'local, overrides global',
31
+ 'workflow-file': 'workflow file',
32
+ 'config': 'config',
33
+ 'config-override': 'config, overrides workflow file',
34
34
  };
35
35
  return labels[source];
36
36
  };
@@ -41,7 +41,7 @@ const sourceLabel = (source) => {
41
41
  export const formatAvailableWorkflows = (mergedResult, selectedName) => {
42
42
  const lines = ['▶ Available workflows:'];
43
43
  Object.entries(mergedResult.workflows).forEach(([name, wf]) => {
44
- const source = mergedResult.sources[name] ?? 'local';
44
+ const source = mergedResult.sources[name] ?? 'config';
45
45
  const isSelected = name === selectedName;
46
46
  const isDefault = wf.default === true;
47
47
  const prefix = isSelected ? '→' : ' ';
@@ -57,13 +57,13 @@ export const formatAvailableWorkflows = (mergedResult, selectedName) => {
57
57
  */
58
58
  export const buildWorkflowSourcesJson = (configPath, localWorkflows, globalResult, mergedResult, selectedName) => ({
59
59
  sources: {
60
- local: {
60
+ config: {
61
61
  path: configPath,
62
62
  workflowCount: localWorkflows !== undefined ? Object.keys(localWorkflows).length : 0,
63
63
  },
64
64
  ...(globalResult !== undefined
65
65
  ? {
66
- global: {
66
+ workflowFile: {
67
67
  path: globalResult.path,
68
68
  found: globalResult.found,
69
69
  ...(globalResult.error !== undefined ? { error: globalResult.error } : {}),
@@ -1 +1 @@
1
- {"version":3,"file":"format-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,UAAkB,EAClB,kBAA0B,EAC1B,YAAmD,EAC3C,EAAE;IACV,MAAM,KAAK,GAAa,CAAC,qBAAqB,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,kBAAkB,GAAG,CAAC;QACvC,CAAC,CAAC,mBAAmB,UAAU,KAAK,MAAM,CAAC,kBAAkB,CAAC,aAAa;QAC3E,CAAC,CAAC,mBAAmB,UAAU,iBAAiB,CAAC;IACnD,KAAK,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;IAE9B,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,qBAAqB,YAAY,CAAC,IAAI,6BAA6B,CAAC,CAAC;QAClF,CAAC;aAAM,IAAI,YAAY,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,qBAAqB,YAAY,CAAC,IAAI,KAAK,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,KAAK,SAAS;gBAChD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM;gBAC5C,CAAC,CAAC,CAAC,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,qBAAqB,YAAY,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,GAAG,CAAC,MAAsB,EAAU,EAAE;IACrD,MAAM,MAAM,GAA6C;QACvD,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,OAAO;QAChB,gBAAgB,EAAE,yBAAyB;KAC5C,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,YAAmC,EACnC,YAAoB,EACZ,EAAE;IACV,MAAM,KAAK,GAAa,CAAC,wBAAwB,CAAC,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QAC5D,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;QACrD,MAAM,UAAU,GAAG,IAAI,KAAK,YAAY,CAAC;QACzC,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;QACtC,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACtC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC,CAAC;IACzF,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,UAAkB,EAClB,cAAwC,EACxC,YAAmD,EACnD,YAAmC,EACnC,YAAoB,EACK,EAAE,CAAC,CAAC;IAC7B,OAAO,EAAE;QACP,KAAK,EAAE;YACL,IAAI,EAAE,UAAU;YAChB,aAAa,EAAE,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACrF;QACD,GAAG,CAAC,YAAY,KAAK,SAAS;YAC5B,CAAC,CAAC;gBACE,MAAM,EAAE;oBACN,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,KAAK,EAAE,YAAY,CAAC,KAAK;oBACzB,GAAG,CAAC,YAAY,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1E,aAAa,EAAE,YAAY,CAAC,SAAS,KAAK,SAAS;wBACjD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM;wBAC5C,CAAC,CAAC,CAAC;iBACN;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR;IACD,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9E,IAAI;QACJ,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;QAClC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI;QAC5B,QAAQ,EAAE,IAAI,KAAK,YAAY;KAChC,CAAC,CAAC;IACH,gBAAgB,EAAE,YAAY;CAC/B,CAAC,CAAC"}
1
+ {"version":3,"file":"format-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/format-workflow-sources.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,11 @@
1
1
  import type { WorkflowsMap } from '../config/types.js';
2
2
  /**
3
3
  * Source attribution for each workflow in the merged map.
4
+ * - 'workflow-file': from the dedicated workflows file
5
+ * - 'config': from the main config file
6
+ * - 'config-override': defined in config, overriding a same-name workflow from the workflow file
4
7
  */
5
- export type WorkflowSource = 'global' | 'local' | 'local-override';
8
+ export type WorkflowSource = 'workflow-file' | 'config' | 'config-override';
6
9
  /**
7
10
  * Result of merging global and local workflow sources.
8
11
  * Includes the merged workflows map and per-name source attribution.
@@ -1 +1 @@
1
- {"version":3,"file":"merge-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,OAAO,GAAG,gBAAgB,CAAC;AAEnE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;CAC5D;AAkBD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,YAAY,GAAG,SAAS,EAChC,OAAO,YAAY,GAAG,SAAS,KAC9B,qBAAqB,GAAG,SAoC1B,CAAC"}
1
+ {"version":3,"file":"merge-workflow-sources.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,QAAQ,GAAG,iBAAiB,CAAC;AAE5E;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;CAC5D;AAkBD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,YAAY,GAAG,SAAS,EAChC,OAAO,YAAY,GAAG,SAAS,KAC9B,qBAAqB,GAAG,SAoC1B,CAAC"}
@@ -27,14 +27,14 @@ export const mergeWorkflowSources = (global, local) => {
27
27
  if (global === undefined) {
28
28
  const sources = {};
29
29
  Object.keys(local ?? {}).forEach((name) => {
30
- sources[name] = 'local';
30
+ sources[name] = 'config';
31
31
  });
32
32
  return { workflows: local ?? {}, sources };
33
33
  }
34
34
  if (local === undefined) {
35
35
  const sources = {};
36
36
  Object.keys(global).forEach((name) => {
37
- sources[name] = 'global';
37
+ sources[name] = 'workflow-file';
38
38
  });
39
39
  return { workflows: global, sources };
40
40
  }
@@ -44,10 +44,10 @@ export const mergeWorkflowSources = (global, local) => {
44
44
  const sources = {};
45
45
  Object.keys(merged).forEach((name) => {
46
46
  if (name in local) {
47
- sources[name] = name in global ? 'local-override' : 'local';
47
+ sources[name] = name in global ? 'config-override' : 'config';
48
48
  }
49
49
  else {
50
- sources[name] = 'global';
50
+ sources[name] = 'workflow-file';
51
51
  }
52
52
  });
53
53
  return { workflows: merged, sources };
@@ -1 +1 @@
1
- {"version":3,"file":"merge-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,MAAM,aAAa,GAAG,CACpB,SAAuB,EACT,EAAE,CAChB,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,IAAI;IACJ,EAAE,CAAC,OAAO,KAAK,IAAI;QACjB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE;QACrB,CAAC,CAAC,EAAE;CACP,CAAC,CACH,CAAC;AAEJ;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAAgC,EAChC,KAA+B,EACI,EAAE;IACrC,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;IAC/E,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAEzE,MAAM,MAAM,GAAmC,EAAE,GAAG,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC;IAChF,MAAM,OAAO,GAAmC,EAAE,CAAC;IAEnD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AACxC,CAAC,CAAC"}
1
+ {"version":3,"file":"merge-workflow-sources.js","sourceRoot":"","sources":["../../../src/lib/workflow/merge-workflow-sources.ts"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,MAAM,aAAa,GAAG,CACpB,SAAuB,EACT,EAAE,CAChB,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;IAC5C,IAAI;IACJ,EAAE,CAAC,OAAO,KAAK,IAAI;QACjB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE;QACrB,CAAC,CAAC,EAAE;CACP,CAAC,CACH,CAAC;AAEJ;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAAgC,EAChC,KAA+B,EACI,EAAE;IACrC,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,OAAO,GAAmC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC;IAC/E,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAEzE,MAAM,MAAM,GAAmC,EAAE,GAAG,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC;IAChF,MAAM,OAAO,GAAmC,EAAE,CAAC;IAEnD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC;QAClC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AACxC,CAAC,CAAC"}
@@ -1,13 +1,22 @@
1
1
  /**
2
- * Resolves the path to the global workflows file.
2
+ * Default filename for the global workflows file, looked up in CWD.
3
+ */
4
+ export declare const DEFAULT_WORKFLOWS_FILENAME = "jahia-cli.workflows.global.yml";
5
+ /**
6
+ * Resolves the path to the workflows file.
3
7
  *
4
8
  * Precedence:
5
9
  * 1. CLI flag value (resolved relative to CWD)
6
10
  * 2. Config key value (resolved relative to config file directory)
7
- * 3. undefined (no global file configured)
11
+ * 3. Default: jahia-cli.workflows.global.yml in CWD
8
12
  *
9
- * Note: No default filename auto-discovery the user must explicitly
10
- * specify a global workflows file via flag or config key.
13
+ * Returns { path, isExplicit } where isExplicit is true when the user
14
+ * explicitly specified a file (via flag or config key) rather than relying on
15
+ * the default. This distinction drives error handling: an explicit file that
16
+ * is missing triggers a warning, while a missing default is silently skipped.
11
17
  */
12
- export declare const resolveWorkflowsFilePath: (configDir: string, configKey: string | undefined, flagValue: string | undefined) => string | undefined;
18
+ export declare const resolveWorkflowsFilePath: (configDir: string, configKey: string | undefined, flagValue: string | undefined) => {
19
+ readonly path: string;
20
+ readonly isExplicit: boolean;
21
+ };
13
22
  //# sourceMappingURL=resolve-workflows-file-path.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-workflows-file-path.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,wBAAwB,GACnC,WAAW,MAAM,EACjB,WAAW,MAAM,GAAG,SAAS,EAC7B,WAAW,MAAM,GAAG,SAAS,KAC5B,MAAM,GAAG,SAUX,CAAC"}
1
+ {"version":3,"file":"resolve-workflows-file-path.d.ts","sourceRoot":"","sources":["../../../src/lib/workflow/resolve-workflows-file-path.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAE3E;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GACnC,WAAW,MAAM,EACjB,WAAW,MAAM,GAAG,SAAS,EAC7B,WAAW,MAAM,GAAG,SAAS,KAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;CAUvD,CAAC"}
@@ -1,22 +1,28 @@
1
1
  import { resolve } from 'node:path';
2
2
  /**
3
- * Resolves the path to the global workflows file.
3
+ * Default filename for the global workflows file, looked up in CWD.
4
+ */
5
+ export const DEFAULT_WORKFLOWS_FILENAME = 'jahia-cli.workflows.global.yml';
6
+ /**
7
+ * Resolves the path to the workflows file.
4
8
  *
5
9
  * Precedence:
6
10
  * 1. CLI flag value (resolved relative to CWD)
7
11
  * 2. Config key value (resolved relative to config file directory)
8
- * 3. undefined (no global file configured)
12
+ * 3. Default: jahia-cli.workflows.global.yml in CWD
9
13
  *
10
- * Note: No default filename auto-discovery the user must explicitly
11
- * specify a global workflows file via flag or config key.
14
+ * Returns { path, isExplicit } where isExplicit is true when the user
15
+ * explicitly specified a file (via flag or config key) rather than relying on
16
+ * the default. This distinction drives error handling: an explicit file that
17
+ * is missing triggers a warning, while a missing default is silently skipped.
12
18
  */
13
19
  export const resolveWorkflowsFilePath = (configDir, configKey, flagValue) => {
14
20
  if (flagValue !== undefined) {
15
- return resolve(flagValue);
21
+ return { path: resolve(flagValue), isExplicit: true };
16
22
  }
17
23
  if (configKey !== undefined) {
18
- return resolve(configDir, configKey);
24
+ return { path: resolve(configDir, configKey), isExplicit: true };
19
25
  }
20
- return undefined;
26
+ return { path: resolve(DEFAULT_WORKFLOWS_FILENAME), isExplicit: false };
21
27
  };
22
28
  //# sourceMappingURL=resolve-workflows-file-path.js.map
@@ -1 +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;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,SAAiB,EACjB,SAA6B,EAC7B,SAA6B,EACT,EAAE;IACtB,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
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"}
@@ -783,31 +783,32 @@
783
783
  "provision.js"
784
784
  ]
785
785
  },
786
- "tests:artifacts": {
786
+ "workflow:init": {
787
787
  "aliases": [],
788
788
  "args": {},
789
- "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.",
789
+ "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.",
790
790
  "examples": [
791
- "<%= config.bin %> tests artifacts",
792
- "<%= config.bin %> tests artifacts --output ./ci-results/",
793
- "<%= config.bin %> tests artifacts --state /ci/workspace/state.json --json"
791
+ "<%= config.bin %> workflow init",
792
+ "<%= config.bin %> workflow init --config ./my-config.yml",
793
+ "<%= config.bin %> workflow init --force",
794
+ "<%= config.bin %> workflow init --json"
794
795
  ],
795
796
  "flags": {
796
- "state": {
797
- "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
798
- "env": "JAHIA_CLI_STATE",
799
- "name": "state",
797
+ "config": {
798
+ "char": "c",
799
+ "description": "Path to the YAML configuration file",
800
+ "name": "config",
801
+ "default": "jahia-cli.config.yml",
800
802
  "hasDynamicHelp": false,
801
803
  "multiple": false,
802
804
  "type": "option"
803
805
  },
804
- "output": {
805
- "char": "o",
806
- "description": "Output directory for collected artifacts (default: ./results/)",
807
- "name": "output",
808
- "hasDynamicHelp": false,
809
- "multiple": false,
810
- "type": "option"
806
+ "force": {
807
+ "char": "f",
808
+ "description": "Overwrite existing workflows section if already present",
809
+ "name": "force",
810
+ "allowNo": false,
811
+ "type": "boolean"
811
812
  },
812
813
  "json": {
813
814
  "description": "Output result as structured JSON (for AI agents and scripting)",
@@ -818,7 +819,7 @@
818
819
  },
819
820
  "hasDynamicHelp": false,
820
821
  "hiddenAliases": [],
821
- "id": "tests:artifacts",
822
+ "id": "workflow:init",
822
823
  "pluginAlias": "@jahia/jahia-cli",
823
824
  "pluginName": "@jahia/jahia-cli",
824
825
  "pluginType": "core",
@@ -828,54 +829,64 @@
828
829
  "relativePath": [
829
830
  "dist",
830
831
  "commands",
831
- "tests",
832
- "artifacts.js"
832
+ "workflow",
833
+ "init.js"
833
834
  ]
834
835
  },
835
- "tests:build": {
836
+ "workflow:run": {
836
837
  "aliases": [],
837
838
  "args": {},
838
- "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\".",
839
+ "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.",
839
840
  "examples": [
840
- "<%= config.bin %> tests build -c config.yml",
841
- "<%= config.bin %> tests build -c config.yml --no-cache",
842
- "<%= config.bin %> tests build -c config.yml --context /path/to/test/root",
843
- "<%= config.bin %> tests build -c config.yml --json"
841
+ "<%= config.bin %> workflow run --config jahia-cli.config.yml",
842
+ "<%= config.bin %> workflow run --config jahia-cli.config.yml --name setup",
843
+ "<%= config.bin %> workflow run --config jahia-cli.config.yml --workflows-file shared.yml",
844
+ "<%= config.bin %> workflow run --config ./my-config.yml --json"
844
845
  ],
845
846
  "flags": {
846
847
  "config": {
847
848
  "char": "c",
848
- "description": "Path to jahia-cli config file",
849
+ "description": "Path to the YAML configuration file",
849
850
  "name": "config",
850
851
  "required": true,
851
852
  "hasDynamicHelp": false,
852
853
  "multiple": false,
853
854
  "type": "option"
854
855
  },
855
- "context": {
856
- "description": "Docker build context directory (default: current working directory)",
857
- "name": "context",
858
- "default": ".",
856
+ "name": {
857
+ "char": "n",
858
+ "description": "Name of the workflow to run (runs default workflow if omitted)",
859
+ "name": "name",
859
860
  "hasDynamicHelp": false,
860
861
  "multiple": false,
861
862
  "type": "option"
862
863
  },
863
- "no-cache": {
864
- "description": "Build without using cache",
865
- "name": "no-cache",
866
- "allowNo": false,
867
- "type": "boolean"
864
+ "workflows-file": {
865
+ "char": "w",
866
+ "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.",
867
+ "name": "workflows-file",
868
+ "hasDynamicHelp": false,
869
+ "multiple": false,
870
+ "type": "option"
868
871
  },
869
872
  "json": {
870
- "description": "Output result as structured JSON",
873
+ "description": "Output result as structured JSON (for AI agents and scripting)",
871
874
  "name": "json",
872
875
  "allowNo": false,
873
876
  "type": "boolean"
877
+ },
878
+ "state": {
879
+ "char": "s",
880
+ "description": "Path to the state file (auto-passed to jahia-cli subcommands)",
881
+ "name": "state",
882
+ "hasDynamicHelp": false,
883
+ "multiple": false,
884
+ "type": "option"
874
885
  }
875
886
  },
876
887
  "hasDynamicHelp": false,
877
888
  "hiddenAliases": [],
878
- "id": "tests:build",
889
+ "id": "workflow:run",
879
890
  "pluginAlias": "@jahia/jahia-cli",
880
891
  "pluginName": "@jahia/jahia-cli",
881
892
  "pluginType": "core",
@@ -885,33 +896,32 @@
885
896
  "relativePath": [
886
897
  "dist",
887
898
  "commands",
888
- "tests",
889
- "build.js"
899
+ "workflow",
900
+ "run.js"
890
901
  ]
891
902
  },
892
- "tests:init": {
903
+ "tests:artifacts": {
893
904
  "aliases": [],
894
905
  "args": {},
895
- "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.",
906
+ "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.",
896
907
  "examples": [
897
- "<%= config.bin %> tests init",
898
- "<%= config.bin %> tests init --config ./my-config.yml",
899
- "<%= config.bin %> tests init --path ./tests --json"
908
+ "<%= config.bin %> tests artifacts",
909
+ "<%= config.bin %> tests artifacts --output ./ci-results/",
910
+ "<%= config.bin %> tests artifacts --state /ci/workspace/state.json --json"
900
911
  ],
901
912
  "flags": {
902
- "config": {
903
- "char": "c",
904
- "description": "Path to config file (default: jahia-cli.config.yml)",
905
- "env": "JAHIA_CLI_CONFIG",
906
- "name": "config",
913
+ "state": {
914
+ "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
915
+ "env": "JAHIA_CLI_STATE",
916
+ "name": "state",
907
917
  "hasDynamicHelp": false,
908
918
  "multiple": false,
909
919
  "type": "option"
910
920
  },
911
- "path": {
912
- "char": "p",
913
- "description": "Override destination directory for scaffolding files",
914
- "name": "path",
921
+ "output": {
922
+ "char": "o",
923
+ "description": "Output directory for collected artifacts (default: ./results/)",
924
+ "name": "output",
915
925
  "hasDynamicHelp": false,
916
926
  "multiple": false,
917
927
  "type": "option"
@@ -925,7 +935,7 @@
925
935
  },
926
936
  "hasDynamicHelp": false,
927
937
  "hiddenAliases": [],
928
- "id": "tests:init",
938
+ "id": "tests:artifacts",
929
939
  "pluginAlias": "@jahia/jahia-cli",
930
940
  "pluginName": "@jahia/jahia-cli",
931
941
  "pluginType": "core",
@@ -936,17 +946,18 @@
936
946
  "dist",
937
947
  "commands",
938
948
  "tests",
939
- "init.js"
949
+ "artifacts.js"
940
950
  ]
941
951
  },
942
- "tests:run": {
952
+ "tests:build": {
943
953
  "aliases": [],
944
954
  "args": {},
945
- "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.",
955
+ "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\".",
946
956
  "examples": [
947
- "<%= config.bin %> tests run -c config.yml",
948
- "<%= config.bin %> tests run -c config.yml --env CYPRESS_SPEC=cypress/e2e/login.cy.ts",
949
- "<%= config.bin %> tests run -c config.yml --state /ci/workspace/state.json --json"
957
+ "<%= config.bin %> tests build -c config.yml",
958
+ "<%= config.bin %> tests build -c config.yml --no-cache",
959
+ "<%= config.bin %> tests build -c config.yml --context /path/to/test/root",
960
+ "<%= config.bin %> tests build -c config.yml --json"
950
961
  ],
951
962
  "flags": {
952
963
  "config": {
@@ -958,21 +969,19 @@
958
969
  "multiple": false,
959
970
  "type": "option"
960
971
  },
961
- "state": {
962
- "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
963
- "env": "JAHIA_CLI_STATE",
964
- "name": "state",
972
+ "context": {
973
+ "description": "Docker build context directory (default: current working directory)",
974
+ "name": "context",
975
+ "default": ".",
965
976
  "hasDynamicHelp": false,
966
977
  "multiple": false,
967
978
  "type": "option"
968
979
  },
969
- "env": {
970
- "char": "e",
971
- "description": "Additional env var for test container (KEY=VALUE, repeatable). Supports ${VAR:-default}.",
972
- "name": "env",
973
- "hasDynamicHelp": false,
974
- "multiple": true,
975
- "type": "option"
980
+ "no-cache": {
981
+ "description": "Build without using cache",
982
+ "name": "no-cache",
983
+ "allowNo": false,
984
+ "type": "boolean"
976
985
  },
977
986
  "json": {
978
987
  "description": "Output result as structured JSON",
@@ -983,7 +992,7 @@
983
992
  },
984
993
  "hasDynamicHelp": false,
985
994
  "hiddenAliases": [],
986
- "id": "tests:run",
995
+ "id": "tests:build",
987
996
  "pluginAlias": "@jahia/jahia-cli",
988
997
  "pluginName": "@jahia/jahia-cli",
989
998
  "pluginType": "core",
@@ -994,35 +1003,35 @@
994
1003
  "dist",
995
1004
  "commands",
996
1005
  "tests",
997
- "run.js"
1006
+ "build.js"
998
1007
  ]
999
1008
  },
1000
- "workflow:init": {
1009
+ "tests:init": {
1001
1010
  "aliases": [],
1002
1011
  "args": {},
1003
- "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.",
1012
+ "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.",
1004
1013
  "examples": [
1005
- "<%= config.bin %> workflow init",
1006
- "<%= config.bin %> workflow init --config ./my-config.yml",
1007
- "<%= config.bin %> workflow init --force",
1008
- "<%= config.bin %> workflow init --json"
1014
+ "<%= config.bin %> tests init",
1015
+ "<%= config.bin %> tests init --config ./my-config.yml",
1016
+ "<%= config.bin %> tests init --path ./tests --json"
1009
1017
  ],
1010
1018
  "flags": {
1011
1019
  "config": {
1012
1020
  "char": "c",
1013
- "description": "Path to the YAML configuration file",
1021
+ "description": "Path to config file (default: jahia-cli.config.yml)",
1022
+ "env": "JAHIA_CLI_CONFIG",
1014
1023
  "name": "config",
1015
- "default": "jahia-cli.config.yml",
1016
1024
  "hasDynamicHelp": false,
1017
1025
  "multiple": false,
1018
1026
  "type": "option"
1019
1027
  },
1020
- "force": {
1021
- "char": "f",
1022
- "description": "Overwrite existing workflows section if already present",
1023
- "name": "force",
1024
- "allowNo": false,
1025
- "type": "boolean"
1028
+ "path": {
1029
+ "char": "p",
1030
+ "description": "Override destination directory for scaffolding files",
1031
+ "name": "path",
1032
+ "hasDynamicHelp": false,
1033
+ "multiple": false,
1034
+ "type": "option"
1026
1035
  },
1027
1036
  "json": {
1028
1037
  "description": "Output result as structured JSON (for AI agents and scripting)",
@@ -1033,7 +1042,7 @@
1033
1042
  },
1034
1043
  "hasDynamicHelp": false,
1035
1044
  "hiddenAliases": [],
1036
- "id": "workflow:init",
1045
+ "id": "tests:init",
1037
1046
  "pluginAlias": "@jahia/jahia-cli",
1038
1047
  "pluginName": "@jahia/jahia-cli",
1039
1048
  "pluginType": "core",
@@ -1043,64 +1052,55 @@
1043
1052
  "relativePath": [
1044
1053
  "dist",
1045
1054
  "commands",
1046
- "workflow",
1055
+ "tests",
1047
1056
  "init.js"
1048
1057
  ]
1049
1058
  },
1050
- "workflow:run": {
1059
+ "tests:run": {
1051
1060
  "aliases": [],
1052
1061
  "args": {},
1053
- "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.",
1062
+ "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.",
1054
1063
  "examples": [
1055
- "<%= config.bin %> workflow run --config jahia-cli.config.yml",
1056
- "<%= config.bin %> workflow run --config jahia-cli.config.yml --name setup",
1057
- "<%= config.bin %> workflow run --config jahia-cli.config.yml --workflows-file shared.yml",
1058
- "<%= config.bin %> workflow run --config ./my-config.yml --json"
1064
+ "<%= config.bin %> tests run -c config.yml",
1065
+ "<%= config.bin %> tests run -c config.yml --env CYPRESS_SPEC=cypress/e2e/login.cy.ts",
1066
+ "<%= config.bin %> tests run -c config.yml --state /ci/workspace/state.json --json"
1059
1067
  ],
1060
1068
  "flags": {
1061
1069
  "config": {
1062
1070
  "char": "c",
1063
- "description": "Path to the YAML configuration file",
1071
+ "description": "Path to jahia-cli config file",
1064
1072
  "name": "config",
1065
1073
  "required": true,
1066
1074
  "hasDynamicHelp": false,
1067
1075
  "multiple": false,
1068
1076
  "type": "option"
1069
1077
  },
1070
- "name": {
1071
- "char": "n",
1072
- "description": "Name of the workflow to run (runs default workflow if omitted)",
1073
- "name": "name",
1078
+ "state": {
1079
+ "description": "Path to the state JSON file. Overrides JAHIA_CLI_STATE env var. Defaults to ~/.jahia-cli/state.json",
1080
+ "env": "JAHIA_CLI_STATE",
1081
+ "name": "state",
1074
1082
  "hasDynamicHelp": false,
1075
1083
  "multiple": false,
1076
1084
  "type": "option"
1077
1085
  },
1078
- "workflows-file": {
1079
- "char": "w",
1080
- "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.",
1081
- "name": "workflows-file",
1086
+ "env": {
1087
+ "char": "e",
1088
+ "description": "Additional env var for test container (KEY=VALUE, repeatable). Supports ${VAR:-default}.",
1089
+ "name": "env",
1082
1090
  "hasDynamicHelp": false,
1083
- "multiple": false,
1091
+ "multiple": true,
1084
1092
  "type": "option"
1085
1093
  },
1086
1094
  "json": {
1087
- "description": "Output result as structured JSON (for AI agents and scripting)",
1095
+ "description": "Output result as structured JSON",
1088
1096
  "name": "json",
1089
1097
  "allowNo": false,
1090
1098
  "type": "boolean"
1091
- },
1092
- "state": {
1093
- "char": "s",
1094
- "description": "Path to the state file (auto-passed to jahia-cli subcommands)",
1095
- "name": "state",
1096
- "hasDynamicHelp": false,
1097
- "multiple": false,
1098
- "type": "option"
1099
1099
  }
1100
1100
  },
1101
1101
  "hasDynamicHelp": false,
1102
1102
  "hiddenAliases": [],
1103
- "id": "workflow:run",
1103
+ "id": "tests:run",
1104
1104
  "pluginAlias": "@jahia/jahia-cli",
1105
1105
  "pluginName": "@jahia/jahia-cli",
1106
1106
  "pluginType": "core",
@@ -1110,10 +1110,10 @@
1110
1110
  "relativePath": [
1111
1111
  "dist",
1112
1112
  "commands",
1113
- "workflow",
1113
+ "tests",
1114
1114
  "run.js"
1115
1115
  ]
1116
1116
  }
1117
1117
  },
1118
- "version": "0.5.0"
1118
+ "version": "0.5.1"
1119
1119
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jahia/jahia-cli",
3
- "version": "0.5.0",
3
+ "version": "0.5.1",
4
4
  "description": "A CLI to accelerate developing and testing Jahia in the Agentic era",
5
5
  "author": "Jahia",
6
6
  "license": "Apache-2.0",