@jahia/jahia-cli 0.5.5 → 0.5.6

package/dist/commands/jahia/alive.d.ts

@@ -1,4 +1,8 @@
 import { Command } from '@oclif/core';
+/**
+ * Formats a human-readable label describing where the URL came from.
+ */
+export declare const formatUrlSourceLabel: (source: string, networkMode: string) => string;
 export default class JahiaAlive extends Command {
     static description: string;
     static examples: string[];

package/dist/commands/jahia/alive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alive.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAG+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;;;;;MAqCnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkFlC"}
+{"version":3,"file":"alive.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,EAAE,aAAa,MAAM,KAAG,MAK5B,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAG+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;;;;;MAqCnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6ElC"}

package/dist/commands/jahia/alive.js

@@ -1,6 +1,6 @@
 import { Command, Flags } from '@oclif/core';
 import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
-import { getJahiaConnectionDefaults } from '../../lib/state/get-jahia-connection-defaults.js';
+import { resolveJahiaConnection } from '../../lib/state/get-jahia-connection-defaults.js';
 import { stateFilePath } from '../../lib/state/state-file-path.js';
 import { stateFlag } from '../../lib/state/state-flag.js';
 import { waitForSam } from '../../lib/sam/wait-for-sam.js';
@@ -8,6 +8,14 @@ const DEFAULT_INTERVAL = 2;
 const DEFAULT_TIMEOUT = 300;
 const DEFAULT_COUNT = 5;
 const DEFAULT_SEVERITY = 'MEDIUM';
+/**
+ * Formats a human-readable label describing where the URL came from.
+ */
+export const formatUrlSourceLabel = (source, networkMode) => source === 'flag'
+    ? 'source: --url flag'
+    : source === 'state'
+        ? `source: state file, mode: ${networkMode}`
+        : `source: default, mode: ${networkMode}`;
 export default class JahiaAlive extends Command {
     static description = 'Wait until the Jahia environment is fully alive and responding GREEN. ' +
         'Polls the Server Availability Manager (SAM) healthcheck endpoint and requires ' +
@@ -59,20 +67,16 @@ export default class JahiaAlive extends Command {
     async run() {
         const { flags } = await this.parse(JahiaAlive);
         const stateOverride = flags.state;
-        // When --url is explicitly provided, the state file is not used at all.
-        // The command operates in "direct URL" mode without environment context.
-        const directUrl = flags.url;
-        const useDirectUrl = directUrl !== undefined;
-        const env = useDirectUrl ? undefined : await getActiveEnvironment(stateOverride);
-        const defaults = useDirectUrl
-            ? { url: directUrl, username: 'root', password: 'root1234' }
-            : getJahiaConnectionDefaults(env);
-        const url = directUrl ?? defaults.url;
-        const username = flags.username ?? defaults.username;
-        const password = flags.password ?? defaults.password;
-        const envName = env?.name ?? (useDirectUrl ? 'direct' : 'unknown');
+        // Always load state for credential resolution — even with --url, password may come from config
+        const env = await getActiveEnvironment(stateOverride);
+        const connection = await resolveJahiaConnection(env, flags.url);
+        const url = connection.url;
+        const username = flags.username ?? connection.username;
+        const password = flags.password ?? connection.password;
+        const envName = flags.url !== undefined ? (env?.name ?? 'direct') : (env?.name ?? 'unknown');
+        const urlSourceLabel = formatUrlSourceLabel(connection.resolvedUrl.source, connection.resolvedUrl.networkMode);
         if (!flags.json) {
-            if (useDirectUrl) {
+            if (flags.url !== undefined) {
                 this.log(`Waiting for Jahia at "${url}" to become alive (direct URL mode — state file not used)...`);
             }
             else {
@@ -80,7 +84,7 @@ export default class JahiaAlive extends Command {
                 this.log(`Waiting for Jahia environment "${envName}" to become alive...`);
                 this.log(`  State:    ${statePath}`);
             }
-            this.log(`  URL:      ${url}`);
+            this.log(`  URL:      ${url} (${urlSourceLabel})`);
             this.log(`  Requires: ${String(flags.count)} consecutive GREEN at ${String(flags.interval)}s interval`);
             this.log(`  Timeout:  ${String(flags.timeout)}s`);
             this.log('');
@@ -105,14 +109,14 @@ export default class JahiaAlive extends Command {
                 onPoll,
             });
             if (flags.json) {
-                const jsonBase = useDirectUrl
-                    ? { ...result, url, mode: 'direct' }
-                    : { ...result, environment: envName, stateFile: stateFilePath(stateOverride) };
+                const jsonBase = flags.url !== undefined
+                    ? { ...result, url, mode: 'direct', urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode }
+                    : { ...result, environment: envName, stateFile: stateFilePath(stateOverride), urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode };
                 this.log(JSON.stringify(jsonBase, null, 2));
             }
             else {
                 this.log('');
-                const label = useDirectUrl ? `Jahia at "${url}"` : `Environment "${envName}"`;
+                const label = flags.url !== undefined ? `Jahia at "${url}"` : `Environment "${envName}"`;
                 this.log(`✓ ${label} is alive and responding GREEN`);
                 this.log(`  Confirmed in ${String(result.elapsedSeconds)}s with ${String(result.consecutiveGreen)} consecutive checks`);
             }
@@ -120,9 +124,9 @@ export default class JahiaAlive extends Command {
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             if (flags.json) {
-                const jsonBase = useDirectUrl
-                    ? { success: false, url, mode: 'direct', error: 'timeout', message }
-                    : { success: false, environment: envName, stateFile: stateFilePath(stateOverride), error: 'timeout', message };
+                const jsonBase = flags.url !== undefined
+                    ? { success: false, url, mode: 'direct', error: 'timeout', message, urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode }
+                    : { success: false, environment: envName, stateFile: stateFilePath(stateOverride), error: 'timeout', message, urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode };
                 this.log(JSON.stringify(jsonBase, null, 2));
             }
             else {

package/dist/commands/jahia/alive.js.map

@@ -1 +1 @@
-{"version":3,"file":"alive.js","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"alive.js","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AAElC;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,WAAmB,EAAU,EAAE,CAClF,MAAM,KAAK,MAAM;IACf,CAAC,CAAC,oBAAoB;IACtB,CAAC,CAAC,MAAM,KAAK,OAAO;QAClB,CAAC,CAAC,6BAA6B,WAAW,EAAE;QAC5C,CAAC,CAAC,0BAA0B,WAAW,EAAE,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,MAAM,CAAU,WAAW,GACzB,wEAAwE;QACxE,gFAAgF;QAChF,uEAAuE,CAAC;IAE1E,MAAM,CAAU,QAAQ,GAAG;QACzB,+BAA+B;QAC/B,wDAAwD;QACxD,kEAAkE;QAClE,gEAAgE;KACjE,CAAC;IAEF,MAAM,CAAU,KAAK,GAAG;QACtB,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;YAChB,WAAW,EAAE,gEAAgE;SAC9E,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,sEAAsE;SACpF,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0EAA0E;SACxF,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,8DAA8D;YAC3E,OAAO,EAAE,gBAAgB;SAC1B,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,+BAA+B;YAC5C,OAAO,EAAE,gBAAgB;SAC1B,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,eAAe;SACzB,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,gDAAgD;YAC7D,OAAO,EAAE,aAAa;SACvB,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,UAAU,CAAC,CAAC;QAC/C,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC;QAElC,+FAA+F;QAC/F,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhE,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;QAC3B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,SAAS,CAAC,CAAC;QAC7F,MAAM,cAAc,GAAG,oBAAoB,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE/G,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,yBAAyB,GAAG,8DAA8D,CAAC,CAAC;YACvG,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;gBAC/C,IAAI,CAAC,GAAG,CAAC,kCAAkC,OAAO,sBAAsB,CAAC,CAAC;gBAC1E,IAAI,CAAC,GAAG,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,eAAe,GAAG,KAAK,cAAc,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,yBAAyB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACxG,IAAI,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACf,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,KAAmB,EAAQ,EAAE;YAC3C,IAAI,KAAK,CAAC,IAAI;gBAAE,OAAO;YACvB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAClD,MAAM,QAAQ,GACZ,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAChG,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC,CAAC;QAC3G,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,GAAG;gBACH,QAAQ;gBACR,QAAQ;gBACR,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,eAAe,EAAE,KAAK,CAAC,QAAQ;gBAC/B,cAAc,EAAE,KAAK,CAAC,OAAO;gBAC7B,gBAAgB,EAAE,KAAK,CAAC,KAAK;gBAC7B,MAAM;aACP,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,KAAK,SAAS;oBACtC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAiB,EAAE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE;oBACxI,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC5K,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACb,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,OAAO,GAAG,CAAC;gBACzF,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,gCAAgC,CAAC,CAAC;gBACrD,IAAI,CAAC,GAAG,CACN,kBAAkB,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAC9G,CAAC;YACJ,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,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,KAAK,SAAS;oBACtC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,QAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE;oBACxK,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC5M,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;IACH,CAAC"}

package/dist/commands/jahia/provision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAU7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAMhG;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,SAAS,MAAM,EAAE,KAC3B,OAAO,CAAC,SAAS,sBAAsB,EAAE,CAQ3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAI,QAAQ;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,KAAG,MAkBH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ,gBAAgB,KAAG,MAIjE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,OAAO;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,KAAG,aAqBH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,aAAa,EACnB,OAAO;IACL,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,KACA,IAYF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,OAAO;IACjD,OAAgB,WAAW,SAMmE;IAE9F,OAAgB,QAAQ,WAQtB;IAEF,OAAgB,KAAK;;;;;;;;;;;;MA0CnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA+CnB,eAAe;YAmHf,iBAAiB;IA+H/B;;;OAGG;YACW,wBAAwB;CAyCvC"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAU7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAOhG;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,SAAS,MAAM,EAAE,KAC3B,OAAO,CAAC,SAAS,sBAAsB,EAAE,CAQ3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAI,QAAQ;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,KAAG,MAkBH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ,gBAAgB,KAAG,MAIjE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,OAAO;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,KAAG,aAqBH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,aAAa,EACnB,OAAO;IACL,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,KACA,IAYF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,OAAO;IACjD,OAAgB,WAAW,SAMmE;IAE9F,OAAgB,QAAQ,WAQtB;IAEF,OAAgB,KAAK;;;;;;;;;;;;MA0CnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAgDnB,eAAe;YAoHf,iBAAiB;IAgI/B;;;OAGG;YACW,wBAAwB;CAyCvC"}

package/dist/commands/jahia/provision.js

@@ -9,9 +9,10 @@ import { resolveAssetPaths } from '../../lib/provisioning/resolve-asset-paths.js
 import { submitFileAction } from '../../lib/provisioning/submit-file-action.js';
 import { submitProvisioning } from '../../lib/provisioning/submit-provisioning.js';
 import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
-import { getJahiaConnectionDefaults } from '../../lib/state/get-jahia-connection-defaults.js';
+import { resolveJahiaConnection } from '../../lib/state/get-jahia-connection-defaults.js';
 import { stateFilePath } from '../../lib/state/state-file-path.js';
 import { stateFlag } from '../../lib/state/state-flag.js';
+import { formatUrlSourceLabel } from './alive.js';
 /**
  * Reads file attachments from disk and returns them as ProvisioningAttachment objects.
  */
@@ -151,10 +152,11 @@ export default class JahiaProvision extends Command {
         const statePath = stateFilePath(flags.state);
         const env = await getActiveEnvironment(flags.state);
         const envName = env?.name ?? 'unknown';
-        const defaults = getJahiaConnectionDefaults(env);
-        const url = flags.url ?? defaults.url;
-        const username = flags.username ?? defaults.username;
-        const password = flags.password ?? defaults.password;
+        const connection = await resolveJahiaConnection(env, flags.url);
+        const url = connection.url;
+        const username = flags.username ?? connection.username;
+        const password = flags.password ?? connection.password;
+        const urlSourceLabel = formatUrlSourceLabel(connection.resolvedUrl.source, connection.resolvedUrl.networkMode);
         try {
             const mode = detectProvisionMode({
                 manifest: flags.manifest,
@@ -167,7 +169,7 @@ export default class JahiaProvision extends Command {
                 filter: flags.filter,
             });
             if (mode === 'manifest') {
-                await this.runManifestMode(flags, { url, username, password, envName, statePath });
+                await this.runManifestMode(flags, { url, username, password, envName, statePath, urlSourceLabel });
             }
             else {
                 const dirPath = mode === 'modules' ? flags.modules : flags.scripts;
@@ -175,7 +177,7 @@ export default class JahiaProvision extends Command {
                     throw new Error(`Missing directory path for --${mode} mode.`);
                 }
                 const actionType = mode === 'modules' ? 'module' : 'script';
-                await this.runFileActionMode(dirPath, actionType, mode, flags, { url, username, password, envName });
+                await this.runFileActionMode(dirPath, actionType, mode, flags, { url, username, password, envName, urlSourceLabel });
             }
         }
         catch (error) {
@@ -198,7 +200,7 @@ export default class JahiaProvision extends Command {
         if (!flags.json) {
             this.log(`Provisioning Jahia environment "${connection.envName}"...`);
             this.log(`  Manifest: ${manifest} (${source})`);
-            this.log(`  URL:      ${connection.url}`);
+            this.log(`  URL:      ${connection.url} (${connection.urlSourceLabel})`);
             this.log(`  State:    ${connection.statePath}`);
             if (flags.file && flags.file.length > 0) {
                 this.log(`  Files:    ${flags.file.join(', ')}`);
@@ -319,7 +321,7 @@ export default class JahiaProvision extends Command {
         const modeLabel = mode === 'modules' ? 'module' : 'script';
         if (!flags.json) {
             this.log(`▶ Uploading ${String(filePaths.length)} ${modeLabel}(s) from "${dirPath}"...`);
-            this.log(`  URL: ${connection.url}`);
+            this.log(`  URL: ${connection.url} (${connection.urlSourceLabel})`);
             if (flags.filter !== undefined) {
                 this.log(`  Filter: ${flags.filter}`);
             }

package/dist/commands/jahia/provision.js.map

@@ -1 +1 @@
-{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AAEnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,SAA4B,EACgB,EAAE;IAC9C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACnD,CAAC,CAAC,CACH,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAO7C,EAAU,EAAE;IACX,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACjF,MAAM,KAAK,GAAG;QACZ,GAAG,IAAI,IAAI,MAAM,EAAE;QACnB,gBAAgB,MAAM,CAAC,QAAQ,EAAE;QACjC,qBAAqB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAChD,gBAAgB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI;KAC9C,CAAC;IAEF,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;SAAM,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAwB,EAAU,EAAE;IACzE,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvD,OAAO,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,MAAM,MAAM,UAAU,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;AACxH,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAInC,EAAiB,EAAE;IAClB,MAAM,KAAK,GAA6B;QACtC,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAE,CAAC,UAAU,CAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAE,CAAC,SAAS,CAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAE,CAAC,SAAS,CAAW,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC;IAEF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,IAAmB,EACnB,KAIC,EACK,EAAE;IACR,IAAI,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7E,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACpF,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAChF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,OAAO;IACjD,MAAM,CAAU,WAAW,GACzB,oEAAoE;QACpE,2DAA2D;QAC3D,qFAAqF;QACrF,6EAA6E;QAC7E,+EAA+E;QAC/E,2FAA2F,CAAC;IAE9F,MAAM,CAAU,QAAQ,GAAG;QACzB,wEAAwE;QACxE,gFAAgF;QAChF,iGAAiG;QACjG,wDAAwD;QACxD,kFAAkF;QAClF,wDAAwD;QACxD,4EAA4E;KAC7E,CAAC;IAEF,MAAM,CAAU,KAAK,GAAG;QACtB,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,wEAAwE;YACrF,SAAS,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;SAClC,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,2FAA2F;YACxG,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;SACrD,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,WAAW,EAAE,0FAA0F;YACvG,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;SACrD,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,WAAW,EAAE,+HAA+H;SAC7I,CAAC;QACF,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;YAChB,WAAW,EAAE,gEAAgE;SAC9E,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,qDAAqD;SACnE,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,yDAAyD;SACvE,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,8EAA8E;YAC3F,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,2EAA2E;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;QAE7C,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,IAAI,SAAS,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;QAC3B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;QACvD,MAAM,cAAc,GAAG,oBAAoB,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE/G,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,mBAAmB,CAAC;gBAC/B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC;YAEH,wBAAwB,CAAC,IAAI,EAAE;gBAC7B,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;YACrG,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;gBACnE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,QAAQ,CAAC,CAAC;gBAChE,CAAC;gBAED,MAAM,UAAU,GAAmB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC5E,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;YACvH,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,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACpH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,KAOC,EACD,UAOC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE9C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,mCAAmC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;YACtE,IAAI,CAAC,GAAG,CAAC,eAAe,QAAQ,KAAK,MAAM,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,GAAG,CAAC,eAAe,UAAU,CAAC,GAAG,KAAK,UAAU,CAAC,cAAc,GAAG,CAAC,CAAC;YACzE,IAAI,CAAC,GAAG,CAAC,eAAe,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;YAChD,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,GAAG,CAAC,eAAe,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnD,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,GAAG,CAAC,eAAe,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1C,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACf,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAC5D,MAAM,KAAK,KAAK;YACd,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,CAAC;YAC/B,CAAC,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEnC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAEnC,MAAM,YAAY,GAChB,KAAK,CAAC,MAAM,KAAK,SAAS;YACxB,CAAC,CAAC,MAAM,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC;iBAClC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;iBAC5C,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;gBACxB,MAAM,UAAU,GACd,KAAK,YAAY,KAAK;oBACtB,MAAM,IAAI,KAAK;oBACd,KAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;gBACrD,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,EAAE,KAAK,EAAE,EAAuB,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;gBAC3D,CAAC;gBAED,MAAM,KAAK,CAAC;YACd,CAAC,CAAC;YACN,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAEpC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACjF,IAAI,CAAC,GAAG,CACN,YAAY,CAAC,OAAO;gBAClB,CAAC,CAAC,yBAAyB,KAAK,CAAC,MAAM,0CAA0C;gBACjF,CAAC,CAAC,yBAAyB,KAAK,CAAC,MAAM,oCAAoC,CAC9E,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,KAAK,SAAS;YAC3C,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAC/C,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC;QACvB,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,UAAU,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEpD,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;YACtC,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,eAAe;YACf,gBAAgB;YAChB,WAAW;SACZ,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CACrB,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,EACvF,IAAI,EACJ,CAAC,CACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,OAAe,EACf,UAA0B,EAC1B,IAAmB,EACnB,KAAsE,EACtE,UAMC;QAED,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC;aAC/C,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5C,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,MAAM,UAAU,GACd,KAAK,YAAY,KAAK;gBACtB,MAAM,IAAI,KAAK;gBACd,KAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;YACrD,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,EAAE,KAAK,EAAE,EAAuB,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC3D,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QAEL,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,SAAS,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;oBACtB,OAAO,EAAE,IAAI;oBACb,IAAI;oBACJ,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG;oBAC3B,YAAY,EAAE,CAAC;oBACf,cAAc,EAAE,CAAC;oBACjB,OAAO,EAAE,EAAE;oBACX,IAAI,EAAE,GAAG,SAAS,2BAA2B;iBAC9C,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,OAAO,SAAS,eAAe,OAAO,wCAAwC,CAAC,CAAC;YAC3F,CAAC;YAED,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC;QACjC,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,KAAK,SAAS;YAC1C,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;oBACtB,OAAO,EAAE,IAAI;oBACb,IAAI;oBACJ,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG;oBAC3B,YAAY,EAAE,CAAC;oBACf,cAAc,EAAE,CAAC;oBACjB,OAAO,EAAE,EAAE;iBACZ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,sBAAsB,OAAO,IAAI,UAAU,kBAAkB,CAAC,CAAC;YAC1E,CAAC;YAED,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3D,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,SAAS,aAAa,OAAO,MAAM,CAAC,CAAC;YACzF,IAAI,CAAC,GAAG,CAAC,UAAU,UAAU,CAAC,GAAG,KAAK,UAAU,CAAC,cAAc,GAAG,CAAC,CAAC;YACpE,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACf,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAEvF,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;oBACtB,OAAO,EAAE,KAAK;oBACd,IAAI;oBACJ,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG;oBAC3B,YAAY,EAAE,SAAS,CAAC,MAAM;oBAC9B,cAAc,EAAE,OAAO,CAAC,MAAM;oBAC9B,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,OAAO;iBACR,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,iCAAiC,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACb,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;gBACtB,OAAO,EAAE,IAAI;gBACb,IAAI;gBACJ,SAAS,EAAE,OAAO;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG;gBAC3B,YAAY,EAAE,SAAS,CAAC,MAAM;gBAC9B,cAAc,EAAE,OAAO,CAAC,MAAM;gBAC9B,OAAO;aACR,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,SAAS,6BAA6B,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,wBAAwB,CACpC,SAA4B,EAC5B,UAA0B,EAC1B,UAIC;QAED,MAAM,WAAW,GAAG,KAAK,EACvB,SAA4B,EAC5B,WAAwC,EACF,EAAE;YACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,OAAO,WAAW,CAAC;YACrB,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAEpC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC;gBACpC,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,QAAQ;gBACR,OAAO;gBACP,UAAU;aACX,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,CAAC,GAAG,WAAW,EAAE,MAAM,CAAC,CAAC;YAEzC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,OAAO,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,OAAO,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC"}

package/dist/lib/components/cypress.js

@@ -18,7 +18,7 @@ export const cypress = {
     defaultTag: 'latest',
     ports: [],
     env: {
-        JAHIA_URL: 'http://jahia:8080',
+        JAHIA_URL: '${JAHIA_URL:-http://jahia:8080}',
         SUPER_USER_PASSWORD: '${SUPER_USER_PASSWORD:-root1234}',
         NEXUS_USERNAME: '${NEXUS_USERNAME:-}',
         NEXUS_PASSWORD: '${NEXUS_PASSWORD:-}',

package/dist/lib/components/cypress.js.map

@@ -1 +1 @@
-{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,gCAAgC;IAC7C,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE;QACH,SAAS,EAAE,mBAAmB;QAC9B,mBAAmB,EAAE,kCAAkC;QACvD,cAAc,EAAE,qBAAqB;QACrC,cAAc,EAAE,qBAAqB;QACrC,QAAQ,EAAE,eAAe;KAC1B;IACD,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,CAAC,OAAO,CAAC;IACpB,cAAc,EAAE,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;IAC3B,SAAS,EAAE,CAAC,uBAAuB,CAAC;CACrC,CAAC"}
+{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,gCAAgC;IAC7C,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE;QACH,SAAS,EAAE,iCAAiC;QAC5C,mBAAmB,EAAE,kCAAkC;QACvD,cAAc,EAAE,qBAAqB;QACrC,cAAc,EAAE,qBAAqB;QACrC,QAAQ,EAAE,eAAe;KAC1B;IACD,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,CAAC,OAAO,CAAC;IACpB,cAAc,EAAE,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;IAC3B,SAAS,EAAE,CAAC,uBAAuB,CAAC;CACrC,CAAC"}

package/dist/lib/state/detect-docker-context.d.ts

@@ -0,0 +1,18 @@
+import type { NetworkMode } from './resolve-url-types.js';
+/**
+ * Pure decision function: given environment signal and filesystem signal,
+ * determine the network mode.
+ *
+ * Priority: env var override > filesystem detection > default (host).
+ */
+export declare const resolveNetworkMode: (envOverride: string | undefined, dockerenvExists: boolean) => NetworkMode;
+/**
+ * Detects whether the CLI is running on the host or inside a Docker container.
+ *
+ * Detection order:
+ *   1. `JAHIA_CLI_NETWORK_MODE` env var (`'host'` or `'docker-network'`) — authoritative override
+ *   2. Presence of `/.dockerenv` file — best-effort autodetection
+ *   3. Default: `'host'`
+ */
+export declare const detectDockerContext: () => Promise<NetworkMode>;
+//# sourceMappingURL=detect-docker-context.d.ts.map

package/dist/lib/state/detect-docker-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-docker-context.d.ts","sourceRoot":"","sources":["../../../src/lib/state/detect-docker-context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,GAAG,SAAS,EAAE,iBAAiB,OAAO,KAAG,WAM9F,CAAC;AAcF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAAC,WAAW,CAI/D,CAAC"}

package/dist/lib/state/detect-docker-context.js

@@ -0,0 +1,39 @@
+import { access } from 'node:fs/promises';
+/**
+ * Pure decision function: given environment signal and filesystem signal,
+ * determine the network mode.
+ *
+ * Priority: env var override > filesystem detection > default (host).
+ */
+export const resolveNetworkMode = (envOverride, dockerenvExists) => {
+    if (envOverride === 'docker-network' || envOverride === 'host') {
+        return envOverride;
+    }
+    return dockerenvExists ? 'docker-network' : 'host';
+};
+/**
+ * Checks whether `/.dockerenv` exists on disk.
+ */
+const checkDockerenvExists = async () => {
+    try {
+        await access('/.dockerenv');
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+/**
+ * Detects whether the CLI is running on the host or inside a Docker container.
+ *
+ * Detection order:
+ *   1. `JAHIA_CLI_NETWORK_MODE` env var (`'host'` or `'docker-network'`) — authoritative override
+ *   2. Presence of `/.dockerenv` file — best-effort autodetection
+ *   3. Default: `'host'`
+ */
+export const detectDockerContext = async () => {
+    const envOverride = process.env['JAHIA_CLI_NETWORK_MODE'];
+    const dockerenvExists = await checkDockerenvExists();
+    return resolveNetworkMode(envOverride, dockerenvExists);
+};
+//# sourceMappingURL=detect-docker-context.js.map

package/dist/lib/state/detect-docker-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-docker-context.js","sourceRoot":"","sources":["../../../src/lib/state/detect-docker-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAA+B,EAAE,eAAwB,EAAe,EAAE;IAC3G,IAAI,WAAW,KAAK,gBAAgB,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;QAC/D,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC;AACrD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,oBAAoB,GAAG,KAAK,IAAsB,EAAE;IACxD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,IAA0B,EAAE;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,MAAM,oBAAoB,EAAE,CAAC;IACrD,OAAO,kBAAkB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;AAC1D,CAAC,CAAC"}

package/dist/lib/state/get-jahia-connection-defaults.d.ts

@@ -1,16 +1,42 @@
 import type { PersistedEnvironment } from './types.js';
+import type { NetworkMode, ResolvedUrl } from './resolve-url-types.js';
 /**
  * Connection details for a Jahia instance, derived from environment state.
+ * Backward-compatible interface — use `resolveJahiaConnection` for richer metadata.
  */
 export interface JahiaConnectionDefaults {
     readonly url: string;
     readonly username: string;
     readonly password: string;
 }
+/**
+ * Jahia connection with full provenance metadata for logging.
+ */
+export interface JahiaConnection {
+    readonly url: string;
+    readonly username: string;
+    readonly password: string;
+    readonly resolvedUrl: ResolvedUrl;
+}
+/**
+ * Resolves the Jahia password from config overrides, component definition, or default.
+ */
+export declare const resolveJahiaPassword: (env: PersistedEnvironment | undefined) => string;
 /**
  * Extracts Jahia connection defaults from the persisted environment state.
- * Looks for a 'jahia' component to determine the host port and password.
- * Falls back to hardcoded defaults when state is unavailable or incomplete.
+ * Backward-compatible wrapper — always resolves in 'host' mode.
+ *
+ * @deprecated Prefer `resolveJahiaConnection()` which is context-aware.
  */
 export declare const getJahiaConnectionDefaults: (env: PersistedEnvironment | undefined) => JahiaConnectionDefaults;
+/**
+ * Resolves a full Jahia connection with automatic network mode detection.
+ * Returns both the connection details and URL provenance metadata.
+ *
+ * When `urlFlag` is provided (user passed --url), it takes absolute priority
+ * and the result source is `'flag'`.
+ *
+ * When `networkModeOverride` is provided, it skips auto-detection.
+ */
+export declare const resolveJahiaConnection: (env: PersistedEnvironment | undefined, urlFlag?: string, networkModeOverride?: NetworkMode) => Promise<JahiaConnection>;
 //# sourceMappingURL=get-jahia-connection-defaults.d.ts.map

package/dist/lib/state/get-jahia-connection-defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-jahia-connection-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAIvD;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAMD;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,GACrC,KAAK,oBAAoB,GAAG,SAAS,KACpC,uBAqBF,CAAC"}
+{"version":3,"file":"get-jahia-connection-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMvE;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAKD;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,oBAAoB,GAAG,SAAS,KAAG,MAa5E,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GACrC,KAAK,oBAAoB,GAAG,SAAS,KACpC,uBAIF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,oBAAoB,GAAG,SAAS,EACrC,UAAU,MAAM,EAChB,sBAAsB,WAAW,KAChC,OAAO,CAAC,eAAe,CAsBzB,CAAC"}

package/dist/lib/state/get-jahia-connection-defaults.js

@@ -1,28 +1,62 @@
 import { COMPONENT_REGISTRY } from '../components/index.js';
 import { resolveEnvVars } from '../config/resolve-env-vars.js';
-const DEFAULT_URL = 'http://localhost:8080';
+import { resolveComponentUrl } from './resolve-component-url.js';
+import { detectDockerContext } from './detect-docker-context.js';
 const DEFAULT_USERNAME = 'root';
 const DEFAULT_PASSWORD = 'root1234';
 /**
- * Extracts Jahia connection defaults from the persisted environment state.
- * Looks for a 'jahia' component to determine the host port and password.
- * Falls back to hardcoded defaults when state is unavailable or incomplete.
+ * Resolves the Jahia password from config overrides, component definition, or default.
  */
-export const getJahiaConnectionDefaults = (env) => {
+export const resolveJahiaPassword = (env) => {
     if (env === undefined) {
-        return { url: DEFAULT_URL, username: DEFAULT_USERNAME, password: DEFAULT_PASSWORD };
+        return DEFAULT_PASSWORD;
     }
     const jahiaConfig = env.config.components.find((c) => c.name === 'jahia');
     const jahiaDef = COMPONENT_REGISTRY['jahia'];
-    // Resolve the host port: override → definition default → 8080
-    const portMapping = jahiaConfig?.overrides?.ports?.[0] ?? jahiaDef?.ports[0];
-    const port = portMapping?.host ?? 8080;
-    const url = `http://localhost:${String(port)}`;
-    // Resolve password: override env → definition env (with env var resolution) → default
     const rawPassword = jahiaConfig?.overrides?.env?.['SUPER_USER_PASSWORD'] ??
         jahiaDef?.env['SUPER_USER_PASSWORD'] ??
         DEFAULT_PASSWORD;
-    const password = resolveEnvVars(rawPassword);
-    return { url, username: DEFAULT_USERNAME, password };
+    return resolveEnvVars(rawPassword);
+};
+/**
+ * Extracts Jahia connection defaults from the persisted environment state.
+ * Backward-compatible wrapper — always resolves in 'host' mode.
+ *
+ * @deprecated Prefer `resolveJahiaConnection()` which is context-aware.
+ */
+export const getJahiaConnectionDefaults = (env) => {
+    const resolved = resolveComponentUrl('jahia', env, 'host');
+    const password = resolveJahiaPassword(env);
+    return { url: resolved.url, username: DEFAULT_USERNAME, password };
+};
+/**
+ * Resolves a full Jahia connection with automatic network mode detection.
+ * Returns both the connection details and URL provenance metadata.
+ *
+ * When `urlFlag` is provided (user passed --url), it takes absolute priority
+ * and the result source is `'flag'`.
+ *
+ * When `networkModeOverride` is provided, it skips auto-detection.
+ */
+export const resolveJahiaConnection = async (env, urlFlag, networkModeOverride) => {
+    const password = resolveJahiaPassword(env);
+    // CLI flag takes absolute priority
+    if (urlFlag !== undefined) {
+        const networkMode = networkModeOverride ?? await detectDockerContext();
+        return {
+            url: urlFlag,
+            username: DEFAULT_USERNAME,
+            password,
+            resolvedUrl: { url: urlFlag, source: 'flag', networkMode },
+        };
+    }
+    const networkMode = networkModeOverride ?? await detectDockerContext();
+    const resolved = resolveComponentUrl('jahia', env, networkMode);
+    return {
+        url: resolved.url,
+        username: DEFAULT_USERNAME,
+        password,
+        resolvedUrl: resolved,
+    };
 };
 //# sourceMappingURL=get-jahia-connection-defaults.js.map

package/dist/lib/state/get-jahia-connection-defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-jahia-connection-defaults.js","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAW/D,MAAM,WAAW,GAAG,uBAAuB,CAAC;AAC5C,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,GAAqC,EACZ,EAAE;IAC3B,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IACtF,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE7C,8DAA8D;IAC9D,MAAM,WAAW,GAAG,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC;IACvC,MAAM,GAAG,GAAG,oBAAoB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAE/C,sFAAsF;IACtF,MAAM,WAAW,GACf,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC;QACpD,QAAQ,EAAE,GAAG,CAAC,qBAAqB,CAAC;QACpC,gBAAgB,CAAC;IACnB,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IAE7C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC;AACvD,CAAC,CAAC"}
+{"version":3,"file":"get-jahia-connection-defaults.js","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAsBjE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAqC,EAAU,EAAE;IACpF,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE7C,MAAM,WAAW,GACf,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC;QACpD,QAAQ,EAAE,GAAG,CAAC,qBAAqB,CAAC;QACpC,gBAAgB,CAAC;IACnB,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,GAAqC,EACZ,EAAE;IAC3B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC;AACrE,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAqC,EACrC,OAAgB,EAChB,mBAAiC,EACP,EAAE;IAC5B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAE3C,mCAAmC;IACnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,mBAAmB,IAAI,MAAM,mBAAmB,EAAE,CAAC;QACvE,OAAO;YACL,GAAG,EAAE,OAAO;YACZ,QAAQ,EAAE,gBAAgB;YAC1B,QAAQ;YACR,WAAW,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;SAC3D,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,mBAAmB,IAAI,MAAM,mBAAmB,EAAE,CAAC;IACvE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;IAChE,OAAO;QACL,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,QAAQ,EAAE,gBAAgB;QAC1B,QAAQ;QACR,WAAW,EAAE,QAAQ;KACtB,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/state/index.d.ts

@@ -1,4 +1,5 @@
 export type { PersistedComponent, PersistedEnvironment, StateFile } from './types.js';
+export type { NetworkMode, UrlSource, ResolvedUrl } from './resolve-url-types.js';
 export { stateFilePath } from './state-file-path.js';
 export { loadState } from './load-state.js';
 export { saveState } from './save-state.js';
@@ -8,4 +9,8 @@ export { hasActiveEnvironment } from './has-active-environment.js';
 export { reconcileWithDocker } from './reconcile-with-docker.js';
 export type { ReconciledComponent, ReconciledEnvironment } from './reconcile-with-docker.js';
 export { stateFlag } from './state-flag.js';
+export { detectDockerContext, resolveNetworkMode } from './detect-docker-context.js';
+export { resolveComponentUrl, extractPort, extractHostname } from './resolve-component-url.js';
+export { resolveJahiaConnection, resolveJahiaPassword } from './get-jahia-connection-defaults.js';
+export type { JahiaConnection } from './get-jahia-connection-defaults.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/lib/state/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACtF,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAClG,YAAY,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC"}

package/dist/lib/state/index.js

@@ -6,4 +6,7 @@ export { getActiveEnvironment } from './get-active-environment.js';
 export { hasActiveEnvironment } from './has-active-environment.js';
 export { reconcileWithDocker } from './reconcile-with-docker.js';
 export { stateFlag } from './state-flag.js';
+export { detectDockerContext, resolveNetworkMode } from './detect-docker-context.js';
+export { resolveComponentUrl, extractPort, extractHostname } from './resolve-component-url.js';
+export { resolveJahiaConnection, resolveJahiaPassword } from './get-jahia-connection-defaults.js';
 //# sourceMappingURL=index.js.map

package/dist/lib/state/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC"}

package/dist/lib/state/resolve-component-url.d.ts

@@ -0,0 +1,34 @@
+import type { ComponentEndpoints, PersistedEnvironment } from './types.js';
+import type { NetworkMode, ResolvedUrl } from './resolve-url-types.js';
+/**
+ * Extracts the appropriate port number from endpoints based on network mode.
+ * For host mode → host port; for docker-network → container port.
+ * Uses portIndex to select among multiple port mappings (default: 0 = first port).
+ */
+export declare const extractPort: (endpoints: ComponentEndpoints | undefined, networkMode: NetworkMode, portIndex: number) => number | undefined;
+/**
+ * Extracts the hostname for the component based on network mode.
+ * For host mode → 'localhost'; for docker-network → first alias.
+ */
+export declare const extractHostname: (endpoints: ComponentEndpoints | undefined, networkMode: NetworkMode) => string;
+/**
+ * Resolves a component URL from the persisted environment state.
+ *
+ * Fallback chain for port:
+ *   1. Persisted endpoints in state file (populated at environment create)
+ *   2. Config override ports from the environment config
+ *   3. Component definition defaults from the registry
+ *   4. Hardcoded FALLBACK_PORT (8080)
+ *
+ * Fallback chain for hostname (docker-network mode only):
+ *   1. Persisted endpoint aliases
+ *   2. Component definition networkAliases from the registry
+ *   3. 'localhost'
+ *
+ * @param componentName - The component to resolve (e.g. 'jahia', 'pgsql')
+ * @param env - The persisted environment (or undefined if no state)
+ * @param networkMode - Whether running on host or inside Docker network
+ * @param portIndex - Which port mapping to use (default: 0 = primary port)
+ */
+export declare const resolveComponentUrl: (componentName: string, env: PersistedEnvironment | undefined, networkMode: NetworkMode, portIndex?: number) => ResolvedUrl;
+//# sourceMappingURL=resolve-component-url.d.ts.map

package/dist/lib/state/resolve-component-url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-component-url.d.ts","sourceRoot":"","sources":["../../../src/lib/state/resolve-component-url.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQvE;;;;GAIG;AACH,eAAO,MAAM,WAAW,GACtB,WAAW,kBAAkB,GAAG,SAAS,EACzC,aAAa,WAAW,EACxB,WAAW,MAAM,KAChB,MAAM,GAAG,SAOX,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,kBAAkB,GAAG,SAAS,EACzC,aAAa,WAAW,KACvB,MAOF,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,mBAAmB,GAC9B,eAAe,MAAM,EACrB,KAAK,oBAAoB,GAAG,SAAS,EACrC,aAAa,WAAW,EACxB,kBAAa,KACZ,WAiEF,CAAC"}

package/dist/lib/state/resolve-component-url.js

@@ -0,0 +1,106 @@
+import { COMPONENT_REGISTRY } from '../components/index.js';
+/**
+ * Default HTTP port used when no port mapping is available.
+ */
+const FALLBACK_PORT = 8080;
+/**
+ * Extracts the appropriate port number from endpoints based on network mode.
+ * For host mode → host port; for docker-network → container port.
+ * Uses portIndex to select among multiple port mappings (default: 0 = first port).
+ */
+export const extractPort = (endpoints, networkMode, portIndex) => {
+    const mapping = endpoints?.ports[portIndex];
+    if (mapping === undefined) {
+        return undefined;
+    }
+    return networkMode === 'host' ? mapping.host : mapping.container;
+};
+/**
+ * Extracts the hostname for the component based on network mode.
+ * For host mode → 'localhost'; for docker-network → first alias.
+ */
+export const extractHostname = (endpoints, networkMode) => {
+    if (networkMode === 'host') {
+        return 'localhost';
+    }
+    const alias = endpoints?.aliases[0];
+    return alias ?? 'localhost';
+};
+/**
+ * Resolves a component URL from the persisted environment state.
+ *
+ * Fallback chain for port:
+ *   1. Persisted endpoints in state file (populated at environment create)
+ *   2. Config override ports from the environment config
+ *   3. Component definition defaults from the registry
+ *   4. Hardcoded FALLBACK_PORT (8080)
+ *
+ * Fallback chain for hostname (docker-network mode only):
+ *   1. Persisted endpoint aliases
+ *   2. Component definition networkAliases from the registry
+ *   3. 'localhost'
+ *
+ * @param componentName - The component to resolve (e.g. 'jahia', 'pgsql')
+ * @param env - The persisted environment (or undefined if no state)
+ * @param networkMode - Whether running on host or inside Docker network
+ * @param portIndex - Which port mapping to use (default: 0 = primary port)
+ */
+export const resolveComponentUrl = (componentName, env, networkMode, portIndex = 0) => {
+    if (env === undefined) {
+        return {
+            url: `http://localhost:${String(FALLBACK_PORT)}`,
+            source: 'default',
+            networkMode,
+        };
+    }
+    const persisted = env.components.find((c) => c.name === componentName);
+    // Try persisted endpoints first
+    const endpointPort = extractPort(persisted?.endpoints, networkMode, portIndex);
+    const endpointHostname = extractHostname(persisted?.endpoints, networkMode);
+    if (endpointPort !== undefined) {
+        // In docker-network mode with no aliases, fall back to component name as hostname
+        const hostname = (networkMode === 'docker-network' && endpointHostname === 'localhost')
+            ? componentName
+            : endpointHostname;
+        return {
+            url: `http://${hostname}:${String(endpointPort)}`,
+            source: 'state',
+            networkMode,
+        };
+    }
+    // Fallback: config override ports
+    const configComponent = env.config.components.find((c) => c.name === componentName);
+    const configPort = configComponent?.overrides?.ports?.[portIndex];
+    if (configPort !== undefined) {
+        const port = networkMode === 'host' ? configPort.host : configPort.container;
+        const hostname = networkMode === 'host' ? 'localhost' : (persisted?.endpoints?.aliases[0] ?? componentName);
+        return {
+            url: `http://${hostname}:${String(port)}`,
+            source: 'state',
+            networkMode,
+        };
+    }
+    // Fallback: component definition defaults from registry
+    const definition = COMPONENT_REGISTRY[componentName];
+    if (definition !== undefined) {
+        const defPort = definition.ports[portIndex];
+        if (defPort !== undefined) {
+            const port = networkMode === 'host' ? defPort.host : defPort.container;
+            const hostname = networkMode === 'host'
+                ? 'localhost'
+                : (persisted?.endpoints?.aliases[0] ?? definition.networkAliases[0] ?? componentName);
+            return {
+                url: `http://${hostname}:${String(port)}`,
+                source: 'default',
+                networkMode,
+            };
+        }
+    }
+    // Final fallback
+    return {
+        url: `http://localhost:${String(FALLBACK_PORT)}`,
+        source: 'default',
+        networkMode,
+    };
+};
+//# sourceMappingURL=resolve-component-url.js.map

package/dist/lib/state/resolve-component-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-component-url.js","sourceRoot":"","sources":["../../../src/lib/state/resolve-component-url.ts"],"names":[],"mappings":"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"}

package/dist/lib/state/resolve-url-types.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Network access mode — how the CLI reaches containers.
+ *
+ * - `'host'`:           CLI runs on the host → use localhost:<hostPort>
+ * - `'docker-network'`: CLI runs inside a Docker container on the same network → use <alias>:<containerPort>
+ */
+export type NetworkMode = 'host' | 'docker-network';
+/**
+ * Where the resolved URL originated.
+ *
+ * - `'flag'`:    Explicitly provided via a CLI flag (e.g. --url)
+ * - `'state'`:   Derived from the persisted state file endpoints
+ * - `'default'`: Hardcoded fallback (no state, no flag)
+ */
+export type UrlSource = 'flag' | 'state' | 'default';
+/**
+ * Result of resolving a component URL from state + context.
+ */
+export interface ResolvedUrl {
+    readonly url: string;
+    readonly source: UrlSource;
+    readonly networkMode: NetworkMode;
+}
+//# sourceMappingURL=resolve-url-types.d.ts.map

package/dist/lib/state/resolve-url-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-url-types.d.ts","sourceRoot":"","sources":["../../../src/lib/state/resolve-url-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,CAAC;AAEpD;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC"}

package/dist/lib/state/resolve-url-types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=resolve-url-types.js.map

package/dist/lib/state/resolve-url-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-url-types.js","sourceRoot":"","sources":["../../../src/lib/state/resolve-url-types.ts"],"names":[],"mappings":""}

package/oclif.manifest.json

@@ -767,123 +767,6 @@
         "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 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 %> 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 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"
-        },
-        "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": {},
@@ -1113,7 +996,124 @@
         "jahia",
         "provision.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 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 %> 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 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"
+        },
+        "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.5.5"
+  "version": "0.5.6"
 }

package/package.json

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