@microsoft/managed-apps-cli 0.9.2 → 0.11.0

package/dist/Errors/GitHubErrorMap.js

@@ -2,193 +2,235 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  */
 /**
- * Maps structured server error codes from GRS into CLI-facing {@link AppError}
- * subclasses with user-actionable wording. The mapping table mirrors the
- * server error catalog; keep this file in lock-step with the GRS service contract.
+ * Maps structured GRS server error codes onto CLI-facing {@link AppError}
+ * subclasses. The server is the source of truth for human-readable text:
+ * we pass `payload.message` through verbatim for the 13 codes in
+ * {@link mapGitHubServerErrorToCliError}'s switch and the 5 codes recognized
+ * by {@link matchGitHubAuthError} (3 of which overlap with the switch). The
+ * AppError subclass we choose only determines the CLI exit code — wording
+ * is owned by GRS so it can be updated server-side without a CLI release.
  *
- * Two entry points:
- *   - {@link mapGitHubServerErrorToCliError} — call from a verb's catch block
- *     after a {@link GrsServerError}; returns `null` for unrecognized codes
- *     so the caller can fall back to its default error path.
- *   - {@link matchGitHubAuthError} — used by catch-and-retry callers (e.g.
- *     `app build` re-running DCF on a 401) to detect the recoverable
- *     mapping-error codes (`GitHubMappingMissing`, `GitHubMappingExpired`,
- *     `GitHubMappingStale`) regardless of whether the error came back as a
- *     {@link GrsServerError} or a legacy plain {@link Error}.
+ * One intentional exception to the passthrough contract: if a recognized
+ * code arrives with an empty / whitespace-only / missing `message`,
+ * {@link mapGitHubServerErrorToCliError} returns `null` rather than
+ * constructing an AppError with an empty body. Callers (e.g. the top-level
+ * CLI catch) use `?? rawErr` so the original error bubbles up untouched —
+ * preferable to swallowing it behind a blank typed error.
+ *
+ * Three entry points:
+ *   - {@link mapGitHubServerErrorToCliError} — given a parsed payload, return
+ *     the mapped AppError (or null for unrecognized codes / empty messages).
+ *   - {@link formatServerError} — given an arbitrary thrown value, detect a
+ *     recognized GRS envelope inside (GrsServerError, HttpClientError body, or
+ *     a plain Error whose message embeds the JSON envelope) and return the
+ *     mapped AppError. Wired into the global Cli.boot catch. Values that are
+ *     already an {@link AppError} (e.g. errors thrown directly by a verb) are
+ *     passed through untouched — we return `null` so the caller's `?? rawErr`
+ *     keeps the original typed error rather than risking the greedy
+ *     `\{[\s\S]*\}` regex matching braces inside an existing message.
+ *   - {@link matchGitHubAuthError} — used by the DCF auto-recovery path to
+ *     detect the recoverable mapping-error codes
+ *     ({@link RECOVERABLE_MAPPING_CODES}).
  */
 import { GrsServerError } from '@microsoft/managed-apps-actions';
-import { parseRemoteUrl } from '../Utils/RepoUrl.js';
-import { AuthenticationError, ConfigurationError, NetworkError, UsageError, } from './CliError.js';
+import { HttpClientError } from '@microsoft/managed-apps-common/services';
+import { AppError, AuthenticationError, ConfigurationError, NetworkError, UsageError, } from './CliError.js';
 /**
- * Map a structured server error code to a CLI-facing {@link AppError}.
+ * Server error codes that signal a recoverable GitHub mapping problem the
+ * CLI can resolve in-process via the Device Code Flow (DCF) auto-recovery
+ * path. {@link matchGitHubAuthError} uses this tuple to gate dispatch into
+ * the verb's catch-and-retry flow.
+ */
+const RECOVERABLE_MAPPING_CODES = [
+    'GitHubMappingMissing',
+    'GitHubMappingExpired',
+    'GitHubMappingStale',
+];
+function isRecoverableMappingCode(code) {
+    return (typeof code === 'string' && RECOVERABLE_MAPPING_CODES.includes(code));
+}
+/**
+ * Map a structured server error payload to a CLI-facing {@link AppError}.
+ * The AppError subclass selects the CLI exit code; the message is the
+ * server-supplied `payload.message` passed through verbatim (server is the
+ * source of truth for user-facing wording on these codes).
+ *
  * Returns `null` for codes the CLI doesn't recognize so callers can fall back
  * to generic error handling.
  */
-export function mapGitHubServerErrorToCliError(payload, context) {
+export function mapGitHubServerErrorToCliError(payload) {
     const code = payload.code;
     if (!code)
         return null;
-    const { host, ownerRepo } = parseRepoContext(context.repoUrl);
-    const details = payload.details ?? {};
+    // The server message is the source of truth. If it's missing or
+    // whitespace-only, return null so the caller's `?? rawErr` keeps the
+    // original (informative) error rather than replacing it with an AppError
+    // that has an empty message.
+    const message = payload.message;
+    if (!message || !message.trim())
+        return null;
     switch (code) {
+        // --- Authentication (exit 3) ----------------------------------------
         case 'GitHubMappingMissing':
-            return new AuthenticationError(`Your GitHub identity isn't established for ${ownerRepo}. ` +
-                `Run \`ms git auth refresh --repo ${host}/${ownerRepo}\` and retry.`);
         case 'GitHubMappingExpired':
-            return new AuthenticationError(`Your GitHub authentication for ${ownerRepo} has expired. ` +
-                `Run \`ms git auth refresh --repo ${host}/${ownerRepo}\` to refresh.`);
         case 'GitHubMappingStale':
-            return new AuthenticationError(`Your stored GitHub identity for ${ownerRepo} no longer matches your GitHub account ` +
-                `(it may have been renamed or reassigned). Run \`ms git auth refresh --repo ${host}/${ownerRepo}\` to refresh.`);
-        case 'GitHubAppNotInstalled': {
-            const appName = stringDetail(details, 'appName') ?? '<app-name>';
-            return new ConfigurationError(`The Managed Apps GitHub App isn't installed on the org owning ${ownerRepo}. ` +
-                `Ask an admin to install it: https://${host}/apps/${appName}/installations/new`);
-        }
         case 'GitHubUserLacksAccess':
-            return new AuthenticationError(`Your GitHub account doesn't have access to ${ownerRepo}. ` +
-                `Ask the repository admin to grant you access.`);
-        case 'GitHubUserLacksRequiredLevel': {
-            const minLevel = stringDetail(details, 'minLevel') ?? 'a higher level of';
-            const actualLevel = stringDetail(details, 'actualLevel') ?? 'lower';
-            return new AuthenticationError(`Operation requires ${minLevel} access on ${ownerRepo}; you have ${actualLevel}.`);
-        }
-        case 'GitHubRepoArchived':
-            return new UsageError(`${ownerRepo} is archived. Unarchive it before continuing.`);
-        case 'GitHubInstallationSuspended':
-            return new ConfigurationError(`The Managed Apps GitHub App installation for the org owning ${ownerRepo} is suspended. ` +
-                `Ask an admin to unsuspend it.`);
-        case 'GitHubAuthSessionExpired': {
-            const expiresIn = numericDetail(details, 'expiresIn');
-            const window = expiresIn !== undefined ? `${expiresIn} seconds` : 'the displayed time window';
-            return new AuthenticationError(`Authentication session expired before completion. Re-run the command and complete ` +
-                `the GitHub sign-in within ${window}.`);
-        }
+        case 'GitHubUserLacksRequiredLevel':
+        case 'GitHubAuthSessionExpired':
         case 'GitHubAuthSessionNotFound':
-            return new AuthenticationError('Authentication session was not found (the server may have restarted). Re-run the command.');
         case 'GitHubAuthDenied':
-            return new AuthenticationError("You declined to authorize the Managed Apps GitHub App. The repository binding can't proceed without authorization.");
         case 'GitHubAuthCancelled':
-            // Surfaced when the user hits Ctrl+C / SIGINT during the polling loop.
-            // Routed to AuthenticationError for consistent exitCode (3) with the
-            // other auth-flow terminations.
-            return new AuthenticationError('Authentication cancelled.');
-        case 'GitHubRateLimited': {
-            const retryAfter = numericDetail(details, 'retryAfterSeconds');
-            const window = retryAfter !== undefined ? `${retryAfter} seconds` : 'a few minutes';
-            return new NetworkError(`GitHub rate limit reached. Try again in ${window}.`);
-        }
-        case 'GitHubInvalidRepoUrl': {
-            // Sanitized rendering: never interpolate the raw user-supplied URL —
-            // it may carry userinfo credentials (e.g. https://user:token@host/...).
-            // parseRepoContext already extracts a credential-free `host` + `ownerRepo`;
-            // when parsing didn't yield clean components, fall back to a neutral
-            // placeholder rather than echoing the raw input.
-            const safeUrl = host !== '<tenant>.ghe.com' && ownerRepo !== '<owner>/<repo>'
-                ? `https://${host}/${ownerRepo}`
-                : 'The supplied repository URL';
-            return new UsageError(`${safeUrl} is not a valid GitHub repository URL. The server expects an https:// ` +
-                `URL on a *.ghe.com tenant (e.g. 'https://contoso.ghe.com/<owner>/<repo>') or ` +
-                `'https://github.com/<owner>/<repo>'.`);
-        }
-        case 'GitHubUpstreamError': {
-            // Upstream errors carry server diagnostics (e.g. Key Vault failures, GitHub
-            // API responses) that are the only useful diagnostic for the user. Surface
-            // the underlying message verbatim rather than swallowing it.
-            const detail = payload.message?.trim();
-            return new NetworkError(detail
-                ? `GitHub returned an unexpected error: ${detail}`
-                : 'GitHub returned an unexpected error. Try again.');
-        }
+            return new AuthenticationError(message);
+        // --- Configuration (exit 4) -----------------------------------------
+        case 'GitHubAppNotInstalled':
+        case 'GitHubInstallationSuspended':
+            return new ConfigurationError(message);
+        // --- Network (exit 5) -----------------------------------------------
+        case 'GitHubRateLimited':
+        case 'GitHubEvaluationError':
+        case 'GitHubUpstreamError':
+            return new NetworkError(message);
+        // --- Usage (exit 2) -------------------------------------------------
+        case 'GitHubRepoArchived':
+        case 'GitHubRepoNotEnterprise':
+        case 'GitHubRepoNotFound':
+            return new UsageError(message);
         default:
             return null;
     }
 }
+/**
+ * Inspect an arbitrary thrown value and, if it carries a recognized GRS
+ * envelope, return the mapped {@link AppError}. Returns `null` otherwise.
+ *
+ * Accepts:
+ *   - {@link GrsServerError} — direct field access.
+ *   - {@link HttpClientError} — parse `body` as JSON for `error.code|message`.
+ *   - Plain {@link Error} whose `.message` embeds `{"error":{...}}` (legacy
+ *     pre-`allowErrorResponse` path).
+ *
+ * Intended for the top-level CLI catch so all verbs get envelope handling for
+ * free without each having to special-case GrsServerError.
+ */
+export function formatServerError(error) {
+    // If the thrown value is already a CLI-typed AppError (e.g. a verb threw
+    // UsageError directly, or this function was previously invoked and the
+    // mapped error was re-thrown), don't try to re-parse it. The plain-Error
+    // branch's greedy `\{[\s\S]*\}` regex would otherwise risk matching
+    // unintended braces inside an existing message. Returning null here lets
+    // the top-level catch's `?? rawErr` fall through to the original AppError
+    // unchanged.
+    if (error instanceof AppError)
+        return null;
+    const payload = extractServerErrorPayload(error);
+    if (!payload)
+        return null;
+    return mapGitHubServerErrorToCliError(payload);
+}
 /**
  * Inspect an unknown error and decide whether the CLI should run the DCF
  * recovery flow (i.e. the verb's catch-and-retry path). Returns the parsed
  * payload + matched code, or `null` if the error is unrelated.
  *
  * Matches:
- *   - `GrsServerError` with `code === 'GitHubMappingMissing' | 'GitHubMappingExpired' | 'GitHubMappingStale'`
- *   - A plain `Error` with `.status === 401` whose message is JSON containing
- *     `error.code` of one of the above values (legacy path before catch-and-retry
- *     wires `allowErrorResponse` everywhere).
+ *   - `GrsServerError` with `code` in {@link RECOVERABLE_MAPPING_CODES}
+ *     (status accepted as-is from the typed envelope).
+ *   - Any other shape recognized by {@link extractServerErrorPayload}
+ *     (`HttpClientError`, or a plain `Error` whose message embeds the JSON
+ *     envelope) with a recoverable code AND HTTP status 401.
+ *
+ * Intentionally narrower than {@link extractServerErrorPayload}: that helper
+ * recovers any recognized envelope for generic error formatting, whereas this
+ * function exists solely to dispatch DCF auto-recovery and therefore gates on
+ * (a) the specific recoverable codes and (b) for legacy / untyped shapes,
+ * HTTP 401 only. A 401 with a non-recoverable code, or a recoverable code at
+ * a different status, must not trigger the recovery flow.
  */
 export function matchGitHubAuthError(error) {
-    if (error instanceof GrsServerError) {
-        if (error.code === 'GitHubMappingMissing' ||
-            error.code === 'GitHubMappingExpired' ||
-            error.code === 'GitHubMappingStale') {
-            return {
-                code: error.code,
-                payload: {
-                    code: error.code,
-                    message: error.message,
-                    status: error.status,
-                    details: error.details,
-                },
-            };
-        }
+    const payload = extractServerErrorPayload(error);
+    if (!payload)
         return null;
+    const code = payload.code;
+    if (!isRecoverableMappingCode(code))
+        return null;
+    // Status gating: GrsServerError carries an authoritative status from a
+    // typed envelope, so we trust whatever it reports. Every other wire shape
+    // (HttpClientError body, plain Error with embedded JSON) is the legacy
+    // fallback path and must additionally be HTTP 401 — a recoverable code at
+    // any other status indicates a different failure mode (e.g. a 500 echoing
+    // a mapping code in its body) that DCF recovery cannot fix.
+    if (!(error instanceof GrsServerError) && payload.status !== 401)
+        return null;
+    return { code, payload };
+}
+// === Helpers ==================================================================
+/**
+ * Extract a {@link ServerErrorPayload} from any of the supported wire-error
+ * shapes. Returns `null` if no envelope can be recovered.
+ */
+function extractServerErrorPayload(error) {
+    if (error instanceof GrsServerError) {
+        return {
+            code: error.code,
+            message: error.message,
+            status: error.status,
+            details: error.details,
+        };
     }
-    // Legacy fallback: a plain Error whose message embeds the JSON envelope.
-    if (error instanceof Error) {
-        const statusMatch = error.message.match(/status:\s*(\d+)/i);
-        if (!statusMatch || statusMatch[1] !== '401')
+    if (error instanceof HttpClientError) {
+        const parsed = parseEnvelope(error.body);
+        if (!parsed)
             return null;
+        // Intentionally do NOT fall back to `error.message`: on HttpClientError
+        // that's the verbose HTTP blob ("HTTP error status: 403 for POST ...:
+        // {...}") which we must never surface to the user. An empty string here
+        // makes the mapper's empty-message guard fire, so the caller's `?? rawErr`
+        // path preserves the original error instead.
+        return {
+            code: parsed.code,
+            message: parsed.message ?? '',
+            status: error.status,
+            details: parsed.details,
+        };
+    }
+    if (error instanceof Error) {
         const jsonMatch = error.message.match(/\{[\s\S]*\}/);
         if (!jsonMatch)
             return null;
-        try {
-            const parsed = JSON.parse(jsonMatch[0]);
-            const code = parsed?.error?.code;
-            if (code === 'GitHubMappingMissing' ||
-                code === 'GitHubMappingExpired' ||
-                code === 'GitHubMappingStale') {
-                return {
-                    code,
-                    payload: {
-                        code,
-                        message: parsed.error.message ?? error.message,
-                        status: 401,
-                        details: parsed.error.details,
-                    },
-                };
-            }
-        }
-        catch {
-            // Not JSON — not a match.
-        }
+        const parsed = parseEnvelope(jsonMatch[0]);
+        if (!parsed?.code)
+            return null;
+        const statusMatch = error.message.match(/status:\s*(\d+)/i);
+        // See HttpClientError branch above: `error.message` here is the same
+        // verbose blob (the envelope JSON was extracted *from* it), so falling
+        // back to it would defeat the mapper's empty-message guard.
+        return {
+            code: parsed.code,
+            message: parsed.message ?? '',
+            status: statusMatch ? Number(statusMatch[1]) : 0,
+            details: parsed.details,
+        };
     }
     return null;
 }
-// === Helpers ==================================================================
-function parseRepoContext(repoUrl) {
-    if (!repoUrl)
-        return { host: '<tenant>.ghe.com', ownerRepo: '<owner>/<repo>' };
-    const { host, owner, repo } = parseRemoteUrl(repoUrl);
-    if (!host || !owner || !repo) {
-        return { host: '<tenant>.ghe.com', ownerRepo: '<owner>/<repo>' };
+function parseEnvelope(body) {
+    if (!body)
+        return null;
+    try {
+        const data = JSON.parse(body);
+        const error = data?.error;
+        if (!error || typeof error !== 'object')
+            return null;
+        return {
+            code: typeof error.code === 'string' ? error.code : undefined,
+            message: typeof error.message === 'string' ? error.message : undefined,
+            details: error.details && typeof error.details === 'object'
+                ? error.details
+                : undefined,
+        };
     }
-    return { host, ownerRepo: `${owner}/${repo}` };
-}
-function stringDetail(details, key) {
-    const v = details[key];
-    return typeof v === 'string' ? v : undefined;
-}
-function numericDetail(details, key) {
-    const v = details[key];
-    if (typeof v === 'number' && Number.isFinite(v))
-        return v;
-    // Servers sometimes encode integer details as strings (e.g. JSON producers
-    // that stringify all `number | bigint` fields). Coerce on a best-effort basis
-    // so the user-facing message keeps the seconds/retry value instead of
-    // silently dropping it.
-    if (typeof v === 'string') {
-        const n = Number(v);
-        return Number.isFinite(n) ? n : undefined;
+    catch {
+        return null;
     }
-    return undefined;
 }
 //# sourceMappingURL=GitHubErrorMap.js.map

package/dist/Errors/GitHubErrorMap.js.map

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

package/dist/Logger/CliLogger.d.ts

@@ -29,7 +29,9 @@ import type { CliSettings, IAuthenticationProvider } from '../Types/Cli.types.js
 export declare class CliLogger implements ILogger {
     private _telemetryWriters;
     private _unauthWriter?;
+    private readonly _customDimensions;
     private _upgradeFired;
+    private readonly _sessionId;
     private _upgradeConfig?;
     private constructor();
     static create(cliSettings: CliSettings, httpClient: CliHttpClient, authenticationProvider: IAuthenticationProvider): Promise<CliLogger>;

package/dist/Logger/CliLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CliLogger.d.ts","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAIzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EACV,WAAW,EACX,uBAAuB,EAExB,MAAM,oBAAoB,CAAC;AA0F5B;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,SAAU,YAAW,OAAO;IACvC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,cAAc,CAAC,CAMrB;IAEF,OAAO;WAIa,MAAM,CACxB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,aAAa,EACzB,sBAAsB,EAAE,uBAAuB,GAC9C,OAAO,CAAC,SAAS,CAAC;IA0CrB;;;;;;;;;;;;;;OAcG;IACU,oBAAoB,CAC/B,sBAAsB,EAAE,uBAAuB,GAC9C,OAAO,CAAC,IAAI,CAAC;IAShB;;;;;;;;;OASG;YACW,2BAA2B;IAkDlC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAatD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAW/D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAW5D,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,eAAe;IAqBrE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAI5D,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIvD,YAAY,CAAC,SAAS,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAI5E,IAAW,SAAS,IAAI,MAAM,GAAG,SAAS,CAEzC;IAED,IAAW,SAAS,CAAC,MAAM,EAAE,MAAM,EAElC;IAEM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,OAAO;CAMjF"}
+{"version":3,"file":"CliLogger.d.ts","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAIzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EACV,WAAW,EACX,uBAAuB,EAExB,MAAM,oBAAoB,CAAC;AA0F5B;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,SAAU,YAAW,OAAO;IACvC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,cAAc,CAAC,CAMrB;IAEF,OAAO;WAKa,MAAM,CACxB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,aAAa,EACzB,sBAAsB,EAAE,uBAAuB,GAC9C,OAAO,CAAC,SAAS,CAAC;IA0CrB;;;;;;;;;;;;;;OAcG;IACU,oBAAoB,CAC/B,sBAAsB,EAAE,uBAAuB,GAC9C,OAAO,CAAC,IAAI,CAAC;IAShB;;;;;;;;;OASG;YACW,2BAA2B;IAuDlC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAetD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAW/D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAW5D,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,eAAe;IAqBrE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAI5D,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIvD,YAAY,CAAC,SAAS,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAI5E,IAAW,SAAS,IAAI,MAAM,GAAG,SAAS,CAEzC;IAED,IAAW,SAAS,CAAC,MAAM,EAAE,MAAM,EAElC;IAEM,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,OAAO;CAMjF"}

package/dist/Logger/CliLogger.js

@@ -108,10 +108,13 @@ function createScenarioLogger(telemetryWriters, name, data) {
 export class CliLogger {
     _telemetryWriters = [];
     _unauthWriter;
+    _customDimensions = {};
     _upgradeFired = false;
+    _sessionId;
     _upgradeConfig;
-    constructor(telemetryWriters) {
+    constructor(telemetryWriters, sessionId) {
         this._telemetryWriters = telemetryWriters;
+        this._sessionId = sessionId;
     }
     static async create(cliSettings, httpClient, authenticationProvider) {
         const environmentId = cliSettings.appConfig?.environmentId;
@@ -123,7 +126,7 @@ export class CliLogger {
         if (userTelemetrySettings.console) {
             telemetryWriters.push(new ConsoleWriter(sessionId, cliSettings.origin));
         }
-        const instance = new CliLogger(telemetryWriters);
+        const instance = new CliLogger(telemetryWriters, sessionId);
         if (userTelemetrySettings.remote && region && environmentId) {
             // Push the unauthenticated writer immediately. Defaults to the global 1DS endpoint
             // and omits `geoLocation`; if/when auth succeeds, the upgrade swaps in the EU-aware
@@ -195,6 +198,10 @@ export class CliLogger {
                 this._telemetryWriters.push(authed);
             }
             this._unauthWriter = authed;
+            // Re-apply previously set dimensions to the replacement writer.
+            for (const [key, value] of Object.entries(this._customDimensions)) {
+                authed.setCustomDimension(key, value);
+            }
             // Set the tenantId dimension AFTER the swap so it lands on the authed writer
             // (and any ConsoleWriter that's still in the list), not the discarded unauth one.
             const tenantId = authenticationProvider.getUserTenantId();
@@ -211,6 +218,8 @@ export class CliLogger {
             if (!_key || !_value) {
                 return;
             }
+            // not guarding on _upgradeFired to preserve dimensions set before the swap is complete
+            this._customDimensions[_key] = _value;
             this._telemetryWriters.forEach((writer) => {
                 writer.setCustomDimension(_key, _value);
             });
@@ -272,7 +281,7 @@ export class CliLogger {
         // No-op — CLI identifies users via setCustomDimension
     }
     get sessionId() {
-        return undefined;
+        return this._sessionId;
     }
     set sessionId(_value) {
         // No-op

package/dist/Logger/CliLogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAe,MAAM,yCAAyC,CAAC;AAEzF,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAQnE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,SAAS,uBAAuB,CAAC,KAAc;IAC7C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAC3B,gBAAoC,EACpC,IAAY,EACZ,IAAa;IAEb,MAAM,YAAY,GAAG,UAAU,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,IAAI,CAAC;QACH,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,CAAC,CACjF,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,4DAA4D;IAC9D,CAAC;IACD,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,CAAC,YAAqB,EAAE,EAAE;YAClC,IAAI,CAAC;gBACH,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClC,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE;oBAC5B,YAAY;oBACZ,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM;oBAChC,gBAAgB,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM;oBACrC,GAAG,YAAY;iBAChB,CAAC,CACH,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,4DAA4D;YAC9D,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC,KAAe,EAAE,WAAoB,EAAE,EAAE;YACjD,IAAI,CAAC;gBACH,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;oBAC1B,YAAY;oBACZ,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM;oBAChC,gBAAgB,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM;oBACrC,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC;oBACrC,GAAG,WAAW;iBACf,CAAC,CACH,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,4DAA4D;YAC9D,CAAC;QACH,CAAC;QACD,iBAAiB,EAAE,CAAC,WAAoB,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClC,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE;oBACtC,YAAY;oBACZ,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM;oBAChC,gBAAgB,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM;oBACrC,GAAG,WAAW;iBACf,CAAC,CACH,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,4DAA4D;YAC9D,CAAC;QACH,CAAC;KACF,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,OAAO,SAAS;IACZ,iBAAiB,GAAuB,EAAE,CAAC;IAC3C,aAAa,CAAe;IAC5B,aAAa,GAAG,KAAK,CAAC;IACtB,cAAc,CAMpB;IAEF,YAAoB,gBAAoC;QACtD,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,WAAwB,EACxB,UAAyB,EACzB,sBAA+C;QAE/C,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,EAAE,aAAa,CAAC;QAC3D,MAAM,MAAM,GAAuB,iBAAiB,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACnF,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC;QAC3C,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;QAC/B,MAAM,gBAAgB,GAAuB,EAAE,CAAC;QAChD,MAAM,qBAAqB,GAA0B,4BAA4B,EAAE,CAAC;QAEpF,IAAI,qBAAqB,CAAC,OAAO,EAAE,CAAC;YAClC,gBAAgB,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAEjD,IAAI,qBAAqB,CAAC,MAAM,IAAI,MAAM,IAAI,aAAa,EAAE,CAAC;YAC5D,mFAAmF;YACnF,oFAAoF;YACpF,gBAAgB;YAChB,MAAM,MAAM,GAAG,IAAI,WAAW,CAC5B,SAAS,EACT,MAAM,EACN,QAAQ,EACR,aAAa,EACb,KAAK,IAAI,EAAE,EACX,SAAS,EACT,WAAW,CAAC,OAAO,EACnB,WAAW,CAAC,MAAM,CACnB,CAAC;YACF,QAAQ,CAAC,aAAa,GAAG,MAAM,CAAC;YAChC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAExC,QAAQ,CAAC,cAAc,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YAEnF,iFAAiF;YACjF,kFAAkF;YAClF,iBAAiB;YACjB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAC7F,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACI,KAAK,CAAC,oBAAoB,CAC/B,sBAA+C;QAE/C,IAAI,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC/C,OAAO;QACT,CAAC;QACD,IAAI,MAAM,sBAAsB,CAAC,qBAAqB,EAAE,EAAE,CAAC;YACzD,MAAM,IAAI,CAAC,2BAA2B,CAAC,sBAAsB,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,2BAA2B,CACvC,sBAA+C;QAE/C,IAAI,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAE1B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC;QAErF,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;YAE3D,IAAI,iBAAiB,GAAsB,QAAQ,CAAC;YACpD,IAAI,QAAQ,EAAE,UAAU,EAAE,QAAQ,IAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrF,iBAAiB,GAAG,IAAI,CAAC;YAC3B,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,WAAW,CAC5B,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,aAAa,EACb,KAAK,IAAI,EAAE,EACX,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAC3C,WAAW,CAAC,OAAO,EACnB,WAAW,CAAC,MAAM,CACnB,CAAC;YAEF,2EAA2E;YAC3E,oEAAoE;YACpE,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC/D,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;gBACb,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YACD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;YAE5B,6EAA6E;YAC7E,kFAAkF;YAClF,MAAM,QAAQ,GAAG,sBAAsB,CAAC,eAAe,EAAE,CAAC;YAC1D,IAAI,QAAQ,EAAE,CAAC;gBACb,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,qFAAqF;QACvF,CAAC;IACH,CAAC;IAEM,kBAAkB,CAAC,IAAY,EAAE,MAAc;QACpD,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACxC,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;QAC9D,CAAC;IACH,CAAC;IAEM,kBAAkB,CAAC,SAAiB,EAAE,SAAkB;QAC7D,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,OAAO;YACT,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAC9F,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;QAC9D,CAAC;IACH,CAAC;IAEM,eAAe,CAAC,SAAiB,EAAE,SAAkB;QAC1D,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,OAAO;YACT,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3F,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;QAC9D,CAAC;IACH,CAAC;IAEM,aAAa,CAAC,SAAiB,EAAE,SAAkB;QACxD,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,yEAAyE;gBACzE,OAAO;oBACL,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;oBACzB,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;oBACxB,iBAAiB,EAAE,GAAG,EAAE,CAAC,SAAS;iBACnC,CAAC;YACJ,CAAC;YACD,OAAO,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC5E,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;YAC5D,OAAO;gBACL,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;gBACzB,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;gBACxB,iBAAiB,EAAE,GAAG,EAAE,CAAC,SAAS;aACnC,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,iBAAiB,CAAC,KAAa,EAAE,WAAoB;QAC1D,gEAAgE;IAClE,CAAC;IAEM,kBAAkB,CAAC,KAAa,EAAE,MAAc;QACrD,wDAAwD;IAC1D,CAAC;IAEM,YAAY,CAAC,SAAiD;QACnE,sDAAsD;IACxD,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAW,SAAS,CAAC,MAAc;QACjC,QAAQ;IACV,CAAC;IAEM,KAAK;QACV,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAC7E,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;IACJ,CAAC;IAEM,YAAY,CAAC,OAAkD;QACpE,oEAAoE;QACpE,wEAAwE;QACxE,+CAA+C;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"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"}

package/dist/Logger/ConsoleWriter.d.ts

@@ -7,6 +7,7 @@ export declare class ConsoleWriter implements ITelemetryWriter {
     private readonly _scenario;
     private readonly _error;
     private readonly _warn;
+    private readonly _customDimensions;
     constructor(sessionId: string, origin: string);
     trackActivityEvent(eventName: string, eventData?: object): void;
     trackErrorEvent(eventName: string, eventData?: object): void;
@@ -16,5 +17,6 @@ export declare class ConsoleWriter implements ITelemetryWriter {
     scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object): void;
     flush(): Promise<void>;
     setCustomDimension(_key: string, _value: string): void;
+    private _withCustomDimensions;
 }
 //# sourceMappingURL=ConsoleWriter.d.ts.map

package/dist/Logger/ConsoleWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/ConsoleWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAwBnE,qBAAa,aAAc,YAAW,gBAAgB;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAW;gBAEd,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAO7C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAI/D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAI5D,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAI7D,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IAInE,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAIhE,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAItF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAG9D"}
+{"version":3,"file":"ConsoleWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/ConsoleWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAwBnE,qBAAa,aAAc,YAAW,gBAAgB;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAW;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;gBAE7C,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAO7C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAI/D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAI5D,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAI7D,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IAInE,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAIhE,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAOtF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAO7D,OAAO,CAAC,qBAAqB;CAM9B"}

package/dist/Logger/ConsoleWriter.js

@@ -18,6 +18,7 @@ export class ConsoleWriter {
     _scenario;
     _error;
     _warn;
+    _customDimensions = {};
     constructor(sessionId, origin) {
         this._activity = makeLoggerFn(sessionId, origin, ['white', 'bold']);
         this._scenario = makeLoggerFn(sessionId, origin, ['cyan', 'bold']);
@@ -25,28 +26,37 @@ export class ConsoleWriter {
         this._warn = makeLoggerFn(sessionId, origin, ['yellow', 'bold']);
     }
     trackActivityEvent(eventName, eventData) {
-        this._activity(eventName, eventData || {});
+        this._activity(eventName, this._withCustomDimensions(eventData));
     }
     trackErrorEvent(eventName, eventData) {
-        this._error(eventName, eventData || {});
+        this._error(eventName, this._withCustomDimensions(eventData));
     }
     startScenario(scenarioName, startData) {
-        this._scenario(`[scenario:start] ${scenarioName}`, startData || {});
+        this._scenario(`[scenario:start] ${scenarioName}`, this._withCustomDimensions(startData));
     }
     completeScenario(scenarioName, completeData) {
-        this._scenario(`[scenario:complete] ${scenarioName}`, completeData || {});
+        this._scenario(`[scenario:complete] ${scenarioName}`, this._withCustomDimensions(completeData));
     }
     scenarioFailed(scenarioName, failureData) {
-        this._error(`[scenario:failure] ${scenarioName}`, failureData || {});
+        this._error(`[scenario:failure] ${scenarioName}`, this._withCustomDimensions(failureData));
     }
     scenarioCompletedWithError(scenarioName, completeWithErrorData) {
-        this._warn(`[scenario:completeWithError] ${scenarioName}`, completeWithErrorData || {});
+        this._warn(`[scenario:completeWithError] ${scenarioName}`, this._withCustomDimensions(completeWithErrorData));
     }
     flush() {
         return Promise.resolve();
     }
     setCustomDimension(_key, _value) {
-        // No-op for console writer
+        if (!_key || !_value) {
+            return;
+        }
+        this._customDimensions[_key] = _value;
+    }
+    _withCustomDimensions(eventData) {
+        return {
+            ...this._customDimensions,
+            ...(eventData ?? {}),
+        };
     }
 }
 /* eslint-enable @typescript-eslint/no-explicit-any */