@wix/cli 1.1.167 → 1.1.169

package/build/{chunk-TS26C7L2.js → chunk-EC2JRUEW.js}

@@ -1,17 +1,17 @@
 import { createRequire as _createRequire } from 'node:module';
 const require = _createRequire(import.meta.url);
 import {
-  require_ci_info,
+  createEnv,
   require_index_node,
   require_src,
   wixCliLoginEnd,
   wixCliLoginStart
-} from "./chunk-FMKZTAQP.js";
+} from "./chunk-NDPNW3G7.js";
 import {
   I18nProvider,
   Trans,
   useTranslation
-} from "./chunk-4L2S3TKG.js";
+} from "./chunk-NDLMWKGS.js";
 import {
   Alert,
   Box_default,
@@ -31,7 +31,7 @@ import {
   useAsyncCallback,
   useExit,
   use_input_default
-} from "./chunk-LMXQJCSZ.js";
+} from "./chunk-FIOP5PUA.js";
 import {
   require_react
 } from "./chunk-YAIN7HW3.js";
@@ -111,15 +111,15 @@ import {
 } from "./chunk-C4SUTB4O.js";
 import {
   getDataDirPath
-} from "./chunk-YAAQDCIO.js";
+} from "./chunk-Q5T35E2T.js";
 import {
   getTestOverrides
-} from "./chunk-66HL2PNX.js";
+} from "./chunk-SYNCBTVP.js";
 import {
   pathExists,
   readJson,
   writeJson
-} from "./chunk-LDXTI7WD.js";
+} from "./chunk-ZSN2UURP.js";
 import {
   external_exports
 } from "./chunk-F43XHKVL.js";
@@ -132,7 +132,7 @@ import {
   normalizeError,
   require_lib,
   require_verror
-} from "./chunk-ZT64C2HH.js";
+} from "./chunk-NOAYWPSU.js";
 import {
   __commonJS,
   __esm,
@@ -1432,15 +1432,15 @@ var init_TraceState = __esm({
 
 // ../../node_modules/@opentelemetry/core/build/esm/trace/W3CTraceContextPropagator.js
 function parseTraceParent(traceParent) {
-  var match11 = TRACE_PARENT_REGEX.exec(traceParent);
-  if (!match11)
+  var match12 = TRACE_PARENT_REGEX.exec(traceParent);
+  if (!match12)
     return null;
-  if (match11[1] === "00" && match11[5])
+  if (match12[1] === "00" && match12[5])
     return null;
   return {
-    traceId: match11[2],
-    spanId: match11[3],
-    traceFlags: parseInt(match11[4], 16)
+    traceId: match12[2],
+    spanId: match12[3],
+    traceFlags: parseInt(match12[4], 16)
   };
 }
 var TRACE_PARENT_HEADER, TRACE_STATE_HEADER, VERSION2, VERSION_PART, TRACE_ID_PART, PARENT_ID_PART, FLAGS_PART, TRACE_PARENT_REGEX, W3CTraceContextPropagator;
@@ -2542,8 +2542,8 @@ var require_semver = __commonJS({
           }
           if (identifier) {
             const r = new RegExp(`^${this.options.loose ? src[t.PRERELEASELOOSE] : src[t.PRERELEASE]}$`);
-            const match11 = `-${identifier}`.match(r);
-            if (!match11 || match11[1] !== identifier) {
+            const match12 = `-${identifier}`.match(r);
+            if (!match12 || match12[1] !== identifier) {
               throw new Error(`invalid identifier: ${identifier}`);
             }
           }
@@ -3026,28 +3026,28 @@ var require_coerce = __commonJS({
         return null;
       }
       options = options || {};
-      let match11 = null;
+      let match12 = null;
       if (!options.rtl) {
-        match11 = version.match(options.includePrerelease ? re[t.COERCEFULL] : re[t.COERCE]);
+        match12 = version.match(options.includePrerelease ? re[t.COERCEFULL] : re[t.COERCE]);
       } else {
         const coerceRtlRegex = options.includePrerelease ? re[t.COERCERTLFULL] : re[t.COERCERTL];
         let next;
-        while ((next = coerceRtlRegex.exec(version)) && (!match11 || match11.index + match11[0].length !== version.length)) {
-          if (!match11 || next.index + next[0].length !== match11.index + match11[0].length) {
-            match11 = next;
+        while ((next = coerceRtlRegex.exec(version)) && (!match12 || match12.index + match12[0].length !== version.length)) {
+          if (!match12 || next.index + next[0].length !== match12.index + match12[0].length) {
+            match12 = next;
           }
           coerceRtlRegex.lastIndex = next.index + next[1].length + next[2].length;
         }
         coerceRtlRegex.lastIndex = -1;
       }
-      if (match11 === null) {
+      if (match12 === null) {
         return null;
       }
-      const major = match11[2];
-      const minor = match11[3] || "0";
-      const patch = match11[4] || "0";
-      const prerelease = options.includePrerelease && match11[5] ? `-${match11[5]}` : "";
-      const build = options.includePrerelease && match11[6] ? `+${match11[6]}` : "";
+      const major = match12[2];
+      const minor = match12[3] || "0";
+      const patch = match12[4] || "0";
+      const prerelease = options.includePrerelease && match12[5] ? `-${match12[5]}` : "";
+      const build = options.includePrerelease && match12[6] ? `+${match12[6]}` : "";
       return parse(`${major}.${minor}.${patch}${prerelease}${build}`, options);
     };
     module2.exports = coerce;
@@ -14846,13 +14846,14 @@ function createApiKeyAuthState({
   siteId
 }) {
   return {
-    getAccessToken: async () => token2,
+    getAccessToken: async (_options) => token2,
     getRefreshToken: () => {
       throw new Error("API key auth does not support refresh tokens");
     },
-    getRequestHeaders: () => {
-      if (siteId) {
-        return { "wix-site-id": siteId };
+    getRequestHeaders: (options) => {
+      const siteIdToUse = siteId ?? options?.siteId;
+      if (siteIdToUse) {
+        return { "wix-site-id": siteIdToUse };
       }
       return { "wix-account-id": accountId };
     },
@@ -14889,7 +14890,7 @@ var apiKeyAuthStrategy = {
   }
 };
 
-// ../cli-auth/src/auth-strategies/account-auth-strategy.ts
+// ../cli-auth/src/auth-strategies/unified-auth-strategy.ts
 init_esm_shims();
 
 // ../../node_modules/p-limit/index.js
@@ -15027,7 +15028,11 @@ function validateConcurrency(concurrency) {
   }
 }
 
+// ../cli-auth/src/auth-strategies/unified-auth-strategy.ts
+var import_variant6 = __toESM(require_lib(), 1);
+
 // ../cli-auth/src/auth-strategies/account-auth-strategy.ts
+init_esm_shims();
 var import_variant4 = __toESM(require_lib(), 1);
 
 // ../../node_modules/p-wait-for/index.js
@@ -15170,7 +15175,16 @@ pWaitFor.resolveWith = (value) => ({ [resolveValue]: value });
 
 // ../cli-auth/src/auth-strategies/account-auth-strategy.ts
 var seconds = (n) => 1e3 * n;
-async function waitForLogin({ deviceCode: deviceCode2, expiresIn }, { signal }) {
+async function finalizeLogin(tokenData) {
+  const userInfo = await client.userInfo({
+    accessToken: tokenData.accessToken
+  });
+  const result = { ...tokenData, userInfo };
+  await deleteAuthData();
+  await saveAuthData(result);
+  return result;
+}
+async function loginWithDeviceCode({ deviceCode: deviceCode2, expiresIn }, { signal }) {
   try {
     const authData = await pWaitFor(
       async () => {
@@ -15187,17 +15201,11 @@ async function waitForLogin({ deviceCode: deviceCode2, expiresIn }, { signal })
         }
       },
       {
-        interval: getTestOverrides().waitForLoginInterval ?? seconds(3),
+        interval: getTestOverrides().loginWithDeviceCodeInterval ?? seconds(3),
         timeout: { milliseconds: seconds(expiresIn), signal }
       }
     );
-    const userInfo = await client.userInfo({
-      accessToken: authData.accessToken
-    });
-    const result = { ...authData, userInfo };
-    await deleteAuthData();
-    await saveAuthData(result);
-    return result;
+    return await finalizeLogin(authData);
   } catch (error) {
     if (error instanceof TimeoutError) {
       throw new CliError({
@@ -15208,7 +15216,22 @@ async function waitForLogin({ deviceCode: deviceCode2, expiresIn }, { signal })
     throw error;
   }
 }
-async function renewAccountAuth({ refreshToken, userInfo }) {
+async function loginWithRefreshToken({
+  refreshToken
+}) {
+  const renewTokenResult = await client.renewToken({ refreshToken });
+  if ((0, import_variant4.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
+    return await finalizeLogin(renewTokenResult.payload);
+  }
+  throw new CliError({
+    code: CliErrorCode.FailedToLoginWithRefreshToken(),
+    cause: null
+  });
+}
+async function renewAccountAuth({
+  refreshToken,
+  userInfo
+}) {
   const renewTokenResult = await client.renewToken({ refreshToken });
   if ((0, import_variant4.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
     await saveAuthData({ ...renewTokenResult.payload, userInfo });
@@ -15279,25 +15302,8 @@ var accountAuthStrategy = {
     return null;
   },
   async login({ deviceCode: deviceCode2, signal }) {
-    const accountAuth = await waitForLogin(deviceCode2, { signal });
+    const accountAuth = await loginWithDeviceCode(deviceCode2, { signal });
     return createAccountAuthState(accountAuth);
-  },
-  async loginWithRefreshToken({ refreshToken }) {
-    const renewTokenResult = await client.renewToken({ refreshToken });
-    if ((0, import_variant4.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
-      const newTokenData = renewTokenResult.payload;
-      const userInfo = await client.userInfo({
-        accessToken: newTokenData.accessToken
-      });
-      const result = { ...newTokenData, userInfo };
-      await deleteAuthData();
-      await saveAuthData(result);
-      return createAccountAuthState(result);
-    }
-    throw new CliError({
-      code: CliErrorCode.FailedToLoginWithRefreshToken(),
-      cause: null
-    });
   }
 };
 
@@ -15425,12 +15431,94 @@ var createSiteAuthStrategy = (siteId) => ({
   }
 });
 
+// ../cli-auth/src/auth-strategies/unified-auth-strategy.ts
+async function createAuthState({
+  userInfo,
+  ...initialTokenData
+}) {
+  const limiter = pLimit(1);
+  let accountTokenData = { ...initialTokenData };
+  const siteTokensDataCache = /* @__PURE__ */ new Map();
+  async function getOrEnsureSiteAuth(siteId) {
+    const cached = siteTokensDataCache.get(siteId);
+    if (cached && isValidToken(cached)) {
+      return cached;
+    }
+    const siteAuthResult = await ensureAuthenticatedToSite({
+      siteId,
+      accountRefreshToken: accountTokenData.refreshToken
+    });
+    if (!(0, import_variant6.isType)(siteAuthResult, AuthenticationResult.Ok)) {
+      throw new CliError({
+        code: CliErrorCode.FailedToRenewAuthTokenRefreshTokenRevoked(),
+        cause: siteAuthResult.cause
+      });
+    }
+    const siteTokenData = siteAuthResult.payload;
+    siteTokensDataCache.set(siteId, siteTokenData);
+    return siteTokenData;
+  }
+  return {
+    getAccessToken: ({ siteId } = {}) => {
+      return limiter(async () => {
+        if (siteId) {
+          return (await getOrEnsureSiteAuth(siteId)).accessToken;
+        }
+        if (isValidToken(accountTokenData)) {
+          return accountTokenData.accessToken;
+        }
+        const renewTokenResult = await renewAccountAuth({
+          ...accountTokenData,
+          userInfo
+        });
+        return (0, import_variant6.match)(renewTokenResult, {
+          TokenRenewed: ({ payload: newTokenData }) => {
+            accountTokenData = newTokenData;
+            return accountTokenData.accessToken;
+          },
+          RefreshTokenRevoked: ({ cause }) => {
+            throw new CliError({
+              code: CliErrorCode.FailedToRenewAuthTokenRefreshTokenRevoked(),
+              cause
+            });
+          }
+        });
+      });
+    },
+    getRefreshToken: () => accountTokenData.refreshToken,
+    userInfo
+  };
+}
+var unifiedAuthStrategy = {
+  async isLoggedIn() {
+    const apiKeyAuth = await apiKeyAuthStrategy.isLoggedIn();
+    if (apiKeyAuth) {
+      return apiKeyAuth;
+    }
+    const accountAuth = await getNonExpiredAccountAuth();
+    if (!accountAuth) {
+      return null;
+    }
+    return await createAuthState(accountAuth);
+  },
+  async login({ deviceCode: deviceCode2, signal }) {
+    const accountAuth = await loginWithDeviceCode(deviceCode2, {
+      signal
+    });
+    return await createAuthState(accountAuth);
+  },
+  async loginWithRefreshToken({ refreshToken }) {
+    const authData = await loginWithRefreshToken({ refreshToken });
+    return await createAuthState(authData);
+  }
+};
+
 // ../cli-auth/src/logout.ts
 init_esm_shims();
-var import_variant6 = __toESM(require_lib(), 1);
+var import_variant7 = __toESM(require_lib(), 1);
 async function logout() {
   const authData = await readAccountAuthData();
-  if (!(0, import_variant6.isType)(authData, AccountAuthData.Unauthenticated)) {
+  if (!(0, import_variant7.isType)(authData, AccountAuthData.Unauthenticated)) {
     await client.revokeRefreshToken(
       { token: authData.refreshToken },
       authData.userInfo
@@ -15484,7 +15572,7 @@ var useBiLogger = () => {
 };
 
 // ../cli-auth/src/components/ApiKeyLogin.tsx
-var import_variant7 = __toESM(require_lib(), 1);
+var import_variant8 = __toESM(require_lib(), 1);
 var ApiKeyLogin = ({ token: token2, onLogin, onError }) => {
   const biLogger = useBiLogger();
   const { status } = useAsync(
@@ -15518,7 +15606,7 @@ var ApiKeyLogin = ({ token: token2, onLogin, onError }) => {
       }
     }
   );
-  return (0, import_variant7.match)(status, {
+  return (0, import_variant8.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react4.default.createElement(Spinner, null),
     Success: () => null
@@ -15528,7 +15616,7 @@ var ApiKeyLogin = ({ token: token2, onLogin, onError }) => {
 // ../cli-auth/src/components/RefreshTokenLogin.tsx
 init_esm_shims();
 var import_react5 = __toESM(require_react(), 1);
-var import_variant8 = __toESM(require_lib(), 1);
+var import_variant9 = __toESM(require_lib(), 1);
 var RefreshTokenLogin = ({
   refreshToken,
   onLogin,
@@ -15538,7 +15626,7 @@ var RefreshTokenLogin = ({
   const { status } = useAsync(
     async () => {
       void biLogger.report(wixCliLoginStart({}));
-      return accountAuthStrategy.loginWithRefreshToken({ refreshToken });
+      return unifiedAuthStrategy.loginWithRefreshToken({ refreshToken });
     },
     [],
     {
@@ -15566,7 +15654,7 @@ var RefreshTokenLogin = ({
       }
     }
   );
-  return (0, import_variant8.match)(status, {
+  return (0, import_variant9.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react5.default.createElement(Spinner, null),
     Success: () => null
@@ -15576,7 +15664,7 @@ var RefreshTokenLogin = ({
 // ../cli-auth/src/components/Login.tsx
 init_esm_shims();
 var import_react21 = __toESM(require_react(), 1);
-var import_variant13 = __toESM(require_lib(), 1);
+var import_variant14 = __toESM(require_lib(), 1);
 
 // ../cli-auth/src/messages.json
 var messages_default = {
@@ -15712,8 +15800,8 @@ async function defaultBrowserId() {
     throw new Error("macOS only");
   }
   const { stdout } = await execFileAsync("defaults", ["read", "com.apple.LaunchServices/com.apple.launchservices.secure", "LSHandlers"]);
-  const match11 = /LSHandlerRoleAll = "(?!-)(?<id>[^"]+?)";\s+?LSHandlerURLScheme = (?:http|https);/.exec(stdout);
-  return match11?.groups.id ?? "com.apple.Safari";
+  const match12 = /LSHandlerRoleAll = "(?!-)(?<id>[^"]+?)";\s+?LSHandlerURLScheme = (?:http|https);/.exec(stdout);
+  return match12?.groups.id ?? "com.apple.Safari";
 }
 
 // ../../node_modules/bundle-name/index.js
@@ -15767,11 +15855,11 @@ async function defaultBrowser(_execFileAsync = execFileAsync3) {
     "/v",
     "ProgId"
   ]);
-  const match11 = /ProgId\s*REG_SZ\s*(?<id>\S+)/.exec(stdout);
-  if (!match11) {
+  const match12 = /ProgId\s*REG_SZ\s*(?<id>\S+)/.exec(stdout);
+  if (!match12) {
     throw new UnknownBrowserError(`Cannot find Windows browser in stdout: ${JSON.stringify(stdout)}`);
   }
-  const { id } = match11.groups;
+  const { id } = match12.groups;
   const browser = windowsBrowserProgIds[id];
   if (!browser) {
     throw new UnknownBrowserError(`Unknown browser ID: ${id}`);
@@ -16140,20 +16228,6 @@ var useDebugLog = () => {
   return context2;
 };
 
-// ../cli-env/src/index.ts
-init_esm_shims();
-var import_ci_info = __toESM(require_ci_info(), 1);
-var createEnv = () => {
-  const overrides = getTestOverrides();
-  return {
-    isCI: overrides.isCI ?? import_ci_info.default.isCI,
-    isPR: overrides.isPR ?? import_ci_info.default.isPR,
-    ciName: overrides.ciName ?? import_ci_info.default.name ?? process.env.CI_NAME ?? null,
-    cliEnvName: overrides.cliEnvName ?? process.env.WIX_RUNTIME_ENVIRONMENT ?? null,
-    cliTrackingId: overrides.cliTrackingId ?? process.env.TRACKING_ID ?? null
-  };
-};
-
 // ../cli-error-reporting/src/components/ErrorViewer.ts
 init_esm_shims();
 var import_react11 = __toESM(require_react(), 1);
@@ -16161,7 +16235,7 @@ var import_react11 = __toESM(require_react(), 1);
 // ../cli-error-reporting/src/get-error-component.tsx
 init_esm_shims();
 var import_react10 = __toESM(require_react(), 1);
-var import_variant9 = __toESM(require_lib(), 1);
+var import_variant10 = __toESM(require_lib(), 1);
 
 // ../../node_modules/outdent/lib-module/index.js
 init_esm_shims();
@@ -16208,9 +16282,9 @@ var reDetectIndentation = /(?:\r\n|\r|\n)([ \t]*)(?:[^ \t\r\n]|$)/;
 var reOnlyWhitespaceWithAtLeastOneNewline = /^[ \t]*[\r\n][ \t\r\n]*$/;
 function _outdentArray(strings, firstInterpolatedValueSetsIndentationLevel, options) {
   var indentationLevel = 0;
-  var match11 = strings[0].match(reDetectIndentation);
-  if (match11) {
-    indentationLevel = match11[1].length;
+  var match12 = strings[0].match(reDetectIndentation);
+  if (match12) {
+    indentationLevel = match12[1].length;
   }
   var reSource = "(\\r\\n|\\r|\\n).{0," + indentationLevel + "}";
   var reMatchIndent = new RegExp(reSource, "g");
@@ -16393,7 +16467,7 @@ var ServeDeprecationMessage = ({
 
 // ../cli-error-reporting/src/get-error-component.tsx
 function getErrorComponent(code, cause) {
-  return (0, import_variant9.match)(code, {
+  return (0, import_variant10.match)(code, {
     UnknownFailure: ({ error }) => {
       return () => /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null, /* @__PURE__ */ import_react10.default.createElement(Text, { skin: "error" }, "Oh no, seems like the CLI encountered an unexpected error:"), error instanceof Error ? /* @__PURE__ */ import_react10.default.createElement(Text, { skin: "error" }, error.message) : /* @__PURE__ */ import_react10.default.createElement(Text, null, JSON.stringify(error)));
     },
@@ -16935,7 +17009,7 @@ function getErrorComponent(code, cause) {
     },
     DuplicateComponentIdsError: ({ issues }) => {
       const Issue = ({ issue }) => {
-        const typeToName = (type) => (0, import_variant9.match)(type, {
+        const typeToName = (type) => (0, import_variant10.match)(type, {
           page: () => "page",
           plugin: () => "plugin",
           "menu-plugin": () => "menu plugin",
@@ -17065,6 +17139,15 @@ function getErrorComponent(code, cause) {
         }
       );
     },
+    FailedToBuildAstroApp: () => {
+      return () => /* @__PURE__ */ import_react10.default.createElement(
+        ErrorMessage,
+        {
+          message: "Failed to build the application.",
+          hint: "Please check the build output for more information"
+        }
+      );
+    },
     FailedToGetAppInstallationDetails: ({ appId }) => {
       return () => /* @__PURE__ */ import_react10.default.createElement(
         SystemErrorMessage,
@@ -17905,6 +17988,9 @@ ${errorMessage}`
     FailedToCreateRoutesWithMetaSiteUrl: () => {
       return () => /* @__PURE__ */ import_react10.default.createElement(SystemErrorMessage, { message: "Failed to create routes with meta site URL." });
     },
+    FailedToGetUrl: () => {
+      return () => /* @__PURE__ */ import_react10.default.createElement(SystemErrorMessage, { message: "Failed to get meta site URL." });
+    },
     FailedToUpdateExternalSiteUrl: () => {
       return () => /* @__PURE__ */ import_react10.default.createElement(SystemErrorMessage, { message: "Failed to update external site URL." });
     },
@@ -17986,7 +18072,7 @@ var ErrorViewer = ({
 
 // ../cli-error-reporting/src/error-reporter.ts
 init_esm_shims();
-var import_variant10 = __toESM(require_lib(), 1);
+var import_variant11 = __toESM(require_lib(), 1);
 
 // ../../node_modules/@sentry/node/build/esm/index.js
 init_esm_shims();
@@ -18608,8 +18694,8 @@ var LINUX_VERSIONS = {
   ubuntu: (content) => matchFirst(/distrib_release=(.*)/, content)
 };
 function matchFirst(regex, text) {
-  const match11 = regex.exec(text);
-  return match11 ? match11[1] : void 0;
+  const match12 = regex.exec(text);
+  return match12 ? match12[1] : void 0;
 }
 async function getDarwinInfo() {
   const darwinInfo = {
@@ -20665,15 +20751,15 @@ function normalizeRequestId(requestId) {
 }
 
 // ../cli-error-reporting/src/error-reporter.ts
-var ReportErrorResult = (0, import_variant10.variant)({
-  Reported: (0, import_variant10.fields)(),
+var ReportErrorResult = (0, import_variant11.variant)({
+  Reported: (0, import_variant11.fields)(),
   Ignored: {}
 });
 var reportError = (scope, originalError, { data } = {}) => {
   if (!isCliSystemError(originalError)) {
     return ReportErrorResult.Ignored();
   }
-  const error = (0, import_variant10.isType)(originalError.cliCode, CliSystemErrorCode.UnknownFailure) ? originalError.cliCode.error : originalError;
+  const error = (0, import_variant11.isType)(originalError.cliCode, CliSystemErrorCode.UnknownFailure) ? originalError.cliCode.error : originalError;
   const eventId = scope.captureException(error, {
     data,
     captureContext: (localScope) => {
@@ -20786,15 +20872,15 @@ function yesOrNo(value) {
 // ../cli-error-reporting/src/user-feedback.tsx
 init_esm_shims();
 var import_react15 = __toESM(require_react(), 1);
-var import_variant12 = __toESM(require_lib(), 1);
+var import_variant13 = __toESM(require_lib(), 1);
 import { stdin } from "node:process";
 
 // ../cli-fs-cache/src/index.ts
 init_esm_shims();
-var import_variant11 = __toESM(require_lib(), 1);
+var import_variant12 = __toESM(require_lib(), 1);
 import { join as join4 } from "node:path";
-var CacheState = (0, import_variant11.variant)({
-  Exists: (0, import_variant11.fields)(),
+var CacheState = (0, import_variant12.variant)({
+  Exists: (0, import_variant12.fields)(),
   NotExists: {}
 });
 var CacheData = external_exports.object({
@@ -20914,7 +21000,7 @@ async function collectUserFeedback({
   reportResult,
   errorReporter
 }) {
-  if (!stdin.isTTY || !cachePath || !(0, import_variant12.isType)(reportResult, ReportErrorResult.Reported)) {
+  if (!stdin.isTTY || !cachePath || !(0, import_variant13.isType)(reportResult, ReportErrorResult.Reported)) {
     return;
   }
   const fsCache = createFsCache({
@@ -20922,7 +21008,7 @@ async function collectUserFeedback({
     ttlInHours: 1
   });
   const cacheState = await fsCache.get();
-  if ((0, import_variant12.isType)(cacheState, CacheState.Exists)) {
+  if ((0, import_variant13.isType)(cacheState, CacheState.Exists)) {
     return;
   }
   const user = errorReporter.getUser();
@@ -21176,7 +21262,7 @@ var Login = ({ loginFn, onLogin, onError }) => {
       onError: handleError
     }
   );
-  return (0, import_variant13.match)(status, {
+  return (0, import_variant14.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react21.default.createElement(Spinner, null),
     Success: ({ result: { userCode, verificationUri } }) => /* @__PURE__ */ import_react21.default.createElement(
@@ -21189,26 +21275,26 @@ var Login = ({ loginFn, onLogin, onError }) => {
   });
 };
 function LoginWithI18n(props) {
-  return /* @__PURE__ */ import_react21.default.createElement(I18nProvider, { messages: messages_default }, /* @__PURE__ */ import_react21.default.createElement(Login, { loginFn: accountAuthStrategy.login, ...props }));
+  return /* @__PURE__ */ import_react21.default.createElement(I18nProvider, { messages: messages_default }, /* @__PURE__ */ import_react21.default.createElement(Login, { loginFn: unifiedAuthStrategy.login, ...props }));
 }
 
-// ../cli-auth/src/providers/AccountAuthProvider.tsx
+// ../cli-auth/src/providers/UnifiedAuthProvider.tsx
 init_esm_shims();
 var import_react24 = __toESM(require_react(), 1);
 
 // ../cli-auth/src/components/EnsureLoggedIn.tsx
 init_esm_shims();
 var import_react23 = __toESM(require_react(), 1);
-var import_variant15 = __toESM(require_lib(), 1);
+var import_variant16 = __toESM(require_lib(), 1);
 
 // ../cli-auth/src/components/WarnLegacyAuthData.tsx
 init_esm_shims();
 var import_react22 = __toESM(require_react(), 1);
-var import_variant14 = __toESM(require_lib(), 1);
+var import_variant15 = __toESM(require_lib(), 1);
 var WarnLegacyAuthData = ({ children }) => {
   const { status } = useAsync(hasLegacyAuthData, [], { onError: () => {
   } });
-  return (0, import_variant14.match)(status, {
+  return (0, import_variant15.match)(status, {
     Error: () => null,
     Loading: () => null,
     Success: ({ result }) => /* @__PURE__ */ import_react22.default.createElement(import_react22.default.Fragment, null, result && /* @__PURE__ */ import_react22.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react22.default.createElement(Trans, { i18nKey: "login.legacy_auth_notice" })), children)
@@ -21230,7 +21316,7 @@ var EnsureLoggedIn = ({
     },
     onError
   });
-  return (0, import_variant15.match)(status, {
+  return (0, import_variant16.match)(status, {
     Loading: () => /* @__PURE__ */ import_react23.default.createElement(Spinner, null),
     Error: () => null,
     Success: ({ result: accountAuth }) => {
@@ -21252,17 +21338,13 @@ var EnsureLoggedIn = ({
   });
 };
 
-// ../cli-auth/src/providers/AccountAuthProvider.tsx
-var AccountAuthProvider = ({
-  children,
-  onError,
-  onLogin
-}) => {
+// ../cli-auth/src/providers/UnifiedAuthProvider.tsx
+var AuthProvider = ({ children, onError, onLogin }) => {
   const exit = useExit();
   return /* @__PURE__ */ import_react24.default.createElement(
     EnsureLoggedIn,
     {
-      authStrategy: accountAuthStrategy,
+      authStrategy: unifiedAuthStrategy,
       onLogin: ({ userInfo }) => onLogin?.(userInfo),
       onError: onError ?? exit
     },
@@ -21311,7 +21393,7 @@ var SiteAuthProvider = ({
 // ../cli-auth/src/hooks/useSiteAuth.ts
 init_esm_shims();
 var import_react26 = __toESM(require_react(), 1);
-var import_variant16 = __toESM(require_lib(), 1);
+var import_variant17 = __toESM(require_lib(), 1);
 var useSiteAuth = ({
   siteId,
   onError,
@@ -21327,7 +21409,7 @@ var useSiteAuth = ({
     },
     onError: onError ?? exit
   });
-  if ((0, import_variant16.isType)(status, "Loading")) {
+  if ((0, import_variant17.isType)(status, "Loading")) {
     return {
       isLoading: true,
       isError: false,
@@ -21335,7 +21417,7 @@ var useSiteAuth = ({
       authState: null
     };
   }
-  if ((0, import_variant16.isType)(status, "Error")) {
+  if ((0, import_variant17.isType)(status, "Error")) {
     return {
       isLoading: false,
       isError: true,
@@ -21385,7 +21467,7 @@ function authenticateWithSiteId(siteId, biLogger, errorReporter) {
 }
 
 // ../cli-auth/src/index.ts
-var { isLoggedIn: isLoggedInToAccount } = accountAuthStrategy;
+var { isLoggedIn: isLoggedInToAccount } = unifiedAuthStrategy;
 
 export {
   pRetry,
@@ -21412,7 +21494,6 @@ export {
   writeCrashReport,
   DebugLogProvider,
   useDebugLog,
-  createEnv,
   defaultOutdent,
   OutdatedVersionMessage,
   ErrorViewer,
@@ -21427,10 +21508,10 @@ export {
   ErrorReporterProvider,
   useErrorReporter,
   LoginWithI18n,
-  AccountAuthProvider,
+  AuthProvider,
   SiteAuthProvider,
   useSiteAuth,
   authenticateWithSiteId,
   isLoggedInToAccount
 };
-//# sourceMappingURL=chunk-TS26C7L2.js.map
+//# sourceMappingURL=chunk-EC2JRUEW.js.map