@wix/create-app 0.0.173 → 0.0.175

package/build/index.js

@@ -99,7 +99,7 @@ import {
   setupTestEnv,
   writeJson,
   zod_default
-} from "./chunk-6UZL2DGQ.js";
+} from "./chunk-YJZMSH2X.js";
 import {
   __commonJS,
   __dirname,
@@ -6841,21 +6841,21 @@ var require_stack_utils = __commonJS({
         return res;
       }
       parseLine(line) {
-        const match22 = line && line.match(re);
-        if (!match22) {
+        const match24 = line && line.match(re);
+        if (!match24) {
           return null;
         }
-        const ctor = match22[1] === "new";
-        let fname = match22[2];
-        const evalOrigin = match22[3];
-        const evalFile = match22[4];
-        const evalLine = Number(match22[5]);
-        const evalCol = Number(match22[6]);
-        let file = match22[7];
-        const lnum = match22[8];
-        const col = match22[9];
-        const native = match22[10] === "native";
-        const closeParen = match22[11] === ")";
+        const ctor = match24[1] === "new";
+        let fname = match24[2];
+        const evalOrigin = match24[3];
+        const evalFile = match24[4];
+        const evalLine = Number(match24[5]);
+        const evalCol = Number(match24[6]);
+        let file = match24[7];
+        const lnum = match24[8];
+        const col = match24[9];
+        const native = match24[10] === "native";
+        const closeParen = match24[11] === ")";
         let method;
         const res = {};
         if (lnum) {
@@ -7279,12 +7279,12 @@ var require_lodash = __commonJS({
     Stack.prototype.has = stackHas;
     Stack.prototype.set = stackSet;
     function arrayLikeKeys(value2, inherited) {
-      var isArr = isArray2(value2), isArg = !isArr && isArguments(value2), isBuff = !isArr && !isArg && isBuffer(value2), isType13 = !isArr && !isArg && !isBuff && isTypedArray(value2), skipIndexes = isArr || isArg || isBuff || isType13, result = skipIndexes ? baseTimes(value2.length, String) : [], length = result.length;
+      var isArr = isArray2(value2), isArg = !isArr && isArguments(value2), isBuff = !isArr && !isArg && isBuffer(value2), isType15 = !isArr && !isArg && !isBuff && isTypedArray(value2), skipIndexes = isArr || isArg || isBuff || isType15, result = skipIndexes ? baseTimes(value2.length, String) : [], length = result.length;
       for (var key in value2) {
         if ((inherited || hasOwnProperty2.call(value2, key)) && !(skipIndexes && // Safari 9 has enumerable `arguments.length` in strict mode.
         (key == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
         isBuff && (key == "offset" || key == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
-        isType13 && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
+        isType15 && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
         isIndex(key, length)))) {
           result.push(key);
         }
@@ -11304,14 +11304,14 @@ var require_ms = __commonJS({
       if (str.length > 100) {
         return;
       }
-      var match22 = /^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
+      var match24 = /^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
         str
       );
-      if (!match22) {
+      if (!match24) {
         return;
       }
-      var n2 = parseFloat(match22[1]);
-      var type = (match22[2] || "ms").toLowerCase();
+      var n2 = parseFloat(match24[1]);
+      var type = (match24[2] || "ms").toLowerCase();
       switch (type) {
         case "years":
         case "year":
@@ -11444,19 +11444,19 @@ var require_common = __commonJS({
             args.unshift("%O");
           }
           let index = 0;
-          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match22, format2) => {
-            if (match22 === "%%") {
+          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match24, format2) => {
+            if (match24 === "%%") {
               return "%";
             }
             index++;
             const formatter = createDebug.formatters[format2];
             if (typeof formatter === "function") {
               const val = args[index];
-              match22 = formatter.call(self2, val);
+              match24 = formatter.call(self2, val);
               args.splice(index, 1);
               index--;
             }
-            return match22;
+            return match24;
           });
           createDebug.formatArgs.call(self2, args);
           const logFn = self2.log || createDebug.log;
@@ -11693,12 +11693,12 @@ var require_browser = __commonJS({
       args.splice(1, 0, c2, "color: inherit");
       let index = 0;
       let lastC = 0;
-      args[0].replace(/%[a-zA-Z%]/g, (match22) => {
-        if (match22 === "%%") {
+      args[0].replace(/%[a-zA-Z%]/g, (match24) => {
+        if (match24 === "%%") {
           return;
         }
         index++;
-        if (match22 === "%c") {
+        if (match24 === "%c") {
           lastC = index;
         }
       });
@@ -12884,8 +12884,8 @@ var require_cookies = __commonJS({
             document.cookie = cookie.join("; ");
           },
           read: function read(name) {
-            var match22 = document.cookie.match(new RegExp("(^|;\\s*)(" + name + ")=([^;]*)"));
-            return match22 ? decodeURIComponent(match22[3]) : null;
+            var match24 = document.cookie.match(new RegExp("(^|;\\s*)(" + name + ")=([^;]*)"));
+            return match24 ? decodeURIComponent(match24[3]) : null;
           },
           remove: function remove(name) {
             this.write(name, "", Date.now() - 864e5);
@@ -13691,8 +13691,8 @@ var require_isAxiosError = __commonJS({
   "../../node_modules/axios/lib/helpers/isAxiosError.js"(exports, module2) {
     "use strict";
     init_esm_shims();
-    module2.exports = function isAxiosError(payload5) {
-      return typeof payload5 === "object" && payload5.isAxiosError === true;
+    module2.exports = function isAxiosError(payload6) {
+      return typeof payload6 === "object" && payload6.isAxiosError === true;
     };
   }
 });
@@ -13845,8 +13845,8 @@ var require_http_client = __commonJS({
           sanitizerPocEnabled: checkSanitizerPocEnabled()
         };
       }
-      static isHttpError(payload5) {
-        return !!(payload5 === null || payload5 === void 0 ? void 0 : payload5.isWixHttpError);
+      static isHttpError(payload6) {
+        return !!(payload6 === null || payload6 === void 0 ? void 0 : payload6.isWixHttpError);
       }
       async request(requestOptionsOrFactory, overrides2) {
         var _a3, _b;
@@ -15632,15 +15632,15 @@ var init_TraceState = __esm({
 
 // ../../node_modules/@opentelemetry/core/build/esm/trace/W3CTraceContextPropagator.js
 function parseTraceParent(traceParent) {
-  var match22 = TRACE_PARENT_REGEX.exec(traceParent);
-  if (!match22)
+  var match24 = TRACE_PARENT_REGEX.exec(traceParent);
+  if (!match24)
     return null;
-  if (match22[1] === "00" && match22[5])
+  if (match24[1] === "00" && match24[5])
     return null;
   return {
-    traceId: match22[2],
-    spanId: match22[3],
-    traceFlags: parseInt(match22[4], 16)
+    traceId: match24[2],
+    spanId: match24[3],
+    traceFlags: parseInt(match24[4], 16)
   };
 }
 var TRACE_PARENT_HEADER, TRACE_STATE_HEADER, VERSION2, VERSION_PART, TRACE_ID_PART, PARENT_ID_PART, FLAGS_PART, TRACE_PARENT_REGEX, W3CTraceContextPropagator;
@@ -16742,8 +16742,8 @@ var require_semver = __commonJS({
           }
           if (identifier) {
             const r2 = new RegExp(`^${this.options.loose ? src[t3.PRERELEASELOOSE] : src[t3.PRERELEASE]}$`);
-            const match22 = `-${identifier}`.match(r2);
-            if (!match22 || match22[1] !== identifier) {
+            const match24 = `-${identifier}`.match(r2);
+            if (!match24 || match24[1] !== identifier) {
               throw new Error(`invalid identifier: ${identifier}`);
             }
           }
@@ -17226,28 +17226,28 @@ var require_coerce = __commonJS({
         return null;
       }
       options = options || {};
-      let match22 = null;
+      let match24 = null;
       if (!options.rtl) {
-        match22 = version.match(options.includePrerelease ? re[t3.COERCEFULL] : re[t3.COERCE]);
+        match24 = version.match(options.includePrerelease ? re[t3.COERCEFULL] : re[t3.COERCE]);
       } else {
         const coerceRtlRegex = options.includePrerelease ? re[t3.COERCERTLFULL] : re[t3.COERCERTL];
         let next;
-        while ((next = coerceRtlRegex.exec(version)) && (!match22 || match22.index + match22[0].length !== version.length)) {
-          if (!match22 || next.index + next[0].length !== match22.index + match22[0].length) {
-            match22 = next;
+        while ((next = coerceRtlRegex.exec(version)) && (!match24 || match24.index + match24[0].length !== version.length)) {
+          if (!match24 || next.index + next[0].length !== match24.index + match24[0].length) {
+            match24 = next;
           }
           coerceRtlRegex.lastIndex = next.index + next[1].length + next[2].length;
         }
         coerceRtlRegex.lastIndex = -1;
       }
-      if (match22 === null) {
+      if (match24 === null) {
         return null;
       }
-      const major = match22[2];
-      const minor = match22[3] || "0";
-      const patch = match22[4] || "0";
-      const prerelease = options.includePrerelease && match22[5] ? `-${match22[5]}` : "";
-      const build = options.includePrerelease && match22[6] ? `+${match22[6]}` : "";
+      const major = match24[2];
+      const minor = match24[3] || "0";
+      const patch = match24[4] || "0";
+      const prerelease = options.includePrerelease && match24[5] ? `-${match24[5]}` : "";
+      const build = options.includePrerelease && match24[6] ? `+${match24[6]}` : "";
       return parse2(`${major}.${minor}.${patch}${prerelease}${build}`, options);
     };
     module2.exports = coerce;
@@ -23248,10 +23248,10 @@ var require_utils6 = __commonJS({
       if (!type || typeof type.getFields !== "function" || type[symbols_1.OTEL_PATCHED_SYMBOL]) {
         return;
       }
-      const fields8 = type.getFields();
+      const fields9 = type.getFields();
       type[symbols_1.OTEL_PATCHED_SYMBOL] = true;
-      Object.keys(fields8).forEach((key) => {
-        const field = fields8[key];
+      Object.keys(fields9).forEach((key) => {
+        const field = fields9[key];
         if (!field) {
           return;
         }
@@ -24952,7 +24952,7 @@ var require_instrumentation5 = __commonJS({
       }
       _patchCallbackQuery(span, parentContext) {
         return (originalCallback) => {
-          return function(err, results, fields8) {
+          return function(err, results, fields9) {
             if (err) {
               span.setStatus({
                 code: api_1.SpanStatusCode.ERROR,
@@ -25265,7 +25265,7 @@ var require_instrumentation6 = __commonJS({
       }
       _patchCallbackQuery(endSpan) {
         return (originalCallback) => {
-          return function(err, results, fields8) {
+          return function(err, results, fields9) {
             endSpan(err, results);
             return originalCallback(...arguments);
           };
@@ -30873,20 +30873,20 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let debugOption;
         let debugHost = "127.0.0.1";
         let debugPort = "9229";
-        let match22;
-        if ((match22 = arg.match(/^(--inspect(-brk)?)$/)) !== null) {
-          debugOption = match22[1];
-        } else if ((match22 = arg.match(/^(--inspect(-brk|-port)?)=([^:]+)$/)) !== null) {
-          debugOption = match22[1];
-          if (/^\d+$/.test(match22[3])) {
-            debugPort = match22[3];
+        let match24;
+        if ((match24 = arg.match(/^(--inspect(-brk)?)$/)) !== null) {
+          debugOption = match24[1];
+        } else if ((match24 = arg.match(/^(--inspect(-brk|-port)?)=([^:]+)$/)) !== null) {
+          debugOption = match24[1];
+          if (/^\d+$/.test(match24[3])) {
+            debugPort = match24[3];
           } else {
-            debugHost = match22[3];
+            debugHost = match24[3];
           }
-        } else if ((match22 = arg.match(/^(--inspect(-brk|-port)?)=([^:]+):(\d+)$/)) !== null) {
-          debugOption = match22[1];
-          debugHost = match22[3];
-          debugPort = match22[4];
+        } else if ((match24 = arg.match(/^(--inspect(-brk|-port)?)=([^:]+):(\d+)$/)) !== null) {
+          debugOption = match24[1];
+          debugHost = match24[3];
+          debugPort = match24[4];
         }
         if (debugOption && debugPort !== "0") {
           return `${debugOption}=${debugHost}:${parseInt(debugPort) + 1}`;
@@ -31789,7 +31789,7 @@ var require_batch_queue = __commonJS({
       var fieldCounts = {};
       var batchLen = batch.e.length;
       var events = batch.e.map(function(event) {
-        var fields8 = Object.keys(event.f).map(function(field) {
+        var fields9 = Object.keys(event.f).map(function(field) {
           var value2 = event.f[field];
           var key = field + "|" + value2;
           fieldCounts[key] = fieldCounts[key] || 0;
@@ -31797,12 +31797,12 @@ var require_batch_queue = __commonJS({
           return [field, value2, key];
         });
         return _extends2({}, event, {
-          f: fields8
+          f: fields9
         });
       });
       var globalFields = {};
       events = events.map(function(event) {
-        var fields8 = event.f.reduce(function(res, _ref) {
+        var fields9 = event.f.reduce(function(res, _ref) {
           var _ref2 = _slicedToArray(_ref, 3), field = _ref2[0], value2 = _ref2[1], key = _ref2[2];
           if (fieldCounts[key] === batchLen) {
             globalFields[field] = value2;
@@ -31812,7 +31812,7 @@ var require_batch_queue = __commonJS({
           return res;
         }, {});
         return _extends2({}, event, {
-          f: fields8
+          f: fields9
         });
       });
       return _extends2({}, batch, {
@@ -31996,8 +31996,8 @@ var require_bi_logger = __commonJS({
         this._eventTransformer = options.eventTransformer || function(event) {
           return event;
         };
-        this._payloadTransformer = options.payloadTransformer || function(payload5) {
-          return payload5;
+        this._payloadTransformer = options.payloadTransformer || function(payload6) {
+          return payload6;
         };
         this._consentPolicyGetter = options.consentPolicyGetter || function() {
           return null;
@@ -32072,17 +32072,17 @@ var require_bi_logger = __commonJS({
         }
       }, {
         key: "_send",
-        value: function _send(payload5) {
+        value: function _send(payload6) {
           var _this2 = this;
           var context2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
           return Promise.all(this._publishers.map(function(publisher) {
-            var cloned = _extends2({}, payload5);
+            var cloned = _extends2({}, payload6);
             return Promise.resolve().then(function() {
               return publisher(cloned, context2);
             }).catch(function(error) {
               return _this2._onPublisherFailHandler(error, {
                 publisherName: publisher.name,
-                payload: payload5
+                payload: payload6
               });
             });
           })).then(function() {
@@ -32605,11 +32605,11 @@ var require_ini = __commonJS({
       lines.forEach(function(line, _2, __) {
         if (!line || line.match(/^\s*[;#]/))
           return;
-        var match22 = line.match(re);
-        if (!match22)
+        var match24 = line.match(re);
+        if (!match24)
           return;
-        if (match22[1] !== void 0) {
-          section = unsafe(match22[1]);
+        if (match24[1] !== void 0) {
+          section = unsafe(match24[1]);
           if (section === "__proto__") {
             p = {};
             return;
@@ -32617,10 +32617,10 @@ var require_ini = __commonJS({
           p = out[section] = out[section] || {};
           return;
         }
-        var key = unsafe(match22[2]);
+        var key = unsafe(match24[2]);
         if (key === "__proto__")
           return;
-        var value2 = match22[3] ? unsafe(match22[4]) : true;
+        var value2 = match24[3] ? unsafe(match24[4]) : true;
         switch (value2) {
           case "true":
           case "false":
@@ -35480,12 +35480,12 @@ var getAllProperties = (object) => {
 };
 function autoBind(self2, { include, exclude } = {}) {
   const filter = (key) => {
-    const match22 = (pattern) => typeof pattern === "string" ? key === pattern : pattern.test(key);
+    const match24 = (pattern) => typeof pattern === "string" ? key === pattern : pattern.test(key);
     if (include) {
-      return include.some(match22);
+      return include.some(match24);
     }
     if (exclude) {
-      return !exclude.some(match22);
+      return !exclude.some(match24);
     }
     return true;
   };
@@ -42111,12 +42111,12 @@ init_esm_shims();
 function schemaSerializer(rootSchema, depSchemas = {}, converterSets) {
   return function serialize(json = {}, converterType) {
     return typeof json === "string" ? json : transformSchema(rootSchema, json);
-    function transformSchema(schema3, payload5) {
+    function transformSchema(schema3, payload6) {
       const result = {};
-      if ([null, void 0].includes(payload5)) {
-        return payload5;
+      if ([null, void 0].includes(payload6)) {
+        return payload6;
       }
-      Object.entries(payload5).forEach(([key, val]) => {
+      Object.entries(payload6).forEach(([key, val]) => {
         const renderedSchemaName = schema3[key];
         const { schemaName, schemaType } = parseLeanSchemaRef(renderedSchemaName);
         const isMap = schemaType === "Map";
@@ -42446,12 +42446,12 @@ function resolveComWixpressAccountApiAccountServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function getMyAccount(payload5) {
+function getMyAccount(payload6) {
   var _a3 = serializer(_getMyAccountRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_accountResponse, { _account }).fromJSON;
   function __getMyAccount(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.identity.account.v2.account",
       method: "GET",
@@ -42587,12 +42587,12 @@ function resolveWixIdentityOauth2V1Oauth2NgUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function token(payload5) {
+function token(payload6) {
   var _a3 = serializer(_rawHttpRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_rawHttpResponse, {}).fromJSON;
   function __token(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.identity.oauth.v1.refresh_token",
       method: "POST",
@@ -42614,12 +42614,12 @@ function token(payload5) {
   __token.__isAmbassador = true;
   return __token;
 }
-function deviceCode(payload5) {
+function deviceCode(payload6) {
   var _a3 = serializer(_deviceCodeRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_deviceCodeResponse, {}).fromJSON;
   function __deviceCode(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.identity.oauth.v1.refresh_token",
       method: "GET",
@@ -42641,12 +42641,12 @@ function deviceCode(payload5) {
   __deviceCode.__isAmbassador = true;
   return __deviceCode;
 }
-function revokeRefreshToken(payload5) {
+function revokeRefreshToken(payload6) {
   var _a3 = serializer(_revokeRefreshTokenRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_revokeRefreshTokenResponse, {}).fromJSON;
   function __revokeRefreshToken(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.identity.oauth.v1.refresh_token",
       method: "POST",
@@ -42898,7 +42898,7 @@ var AuthClient = class {
   }
   async createToken(req) {
     try {
-      const payload5 = {
+      const payload6 = {
         clientId,
         grantType: "urn:ietf:params:oauth:grant-type:device_code",
         scope: "offline_access",
@@ -42907,7 +42907,7 @@ var AuthClient = class {
       const tokenData = await pRetry(async () => {
         const { data, requestId } = await this.httpClient.request(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          token(payload5)
+          token(payload6)
         );
         const result = tokenSchema.safeParse(data);
         if (result.success) {
@@ -42938,7 +42938,7 @@ var AuthClient = class {
   }
   async renewToken(req) {
     try {
-      const payload5 = {
+      const payload6 = {
         clientId,
         grantType: "refresh_token",
         ...req
@@ -42946,7 +42946,7 @@ var AuthClient = class {
       const { data } = await pRetry(
         () => this.httpClient.request(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          token(payload5)
+          token(payload6)
         ),
         this.retryOptions
       );
@@ -43112,6 +43112,18 @@ var SiteAuthData = (0, import_variant12.variant)({
   Unauthenticated: {},
   Expired: (0, import_variant12.fields)()
 });
+async function readSiteAuthData(siteId) {
+  const siteAuthDataFilePath = getSiteAuthDataFilePath(siteId);
+  if (!await pathExists(siteAuthDataFilePath)) {
+    return SiteAuthData.Unauthenticated();
+  }
+  const authFileContents = await readJson(siteAuthDataFilePath);
+  const savedSiteAuthData = siteAuthSchema.parse(authFileContents);
+  if (!isValidToken(savedSiteAuthData)) {
+    return SiteAuthData.Expired(savedSiteAuthData);
+  }
+  return SiteAuthData.Authenticated(savedSiteAuthData);
+}
 async function saveAuthData(authData, siteId) {
   try {
     const targetFilePath = siteId ? getSiteAuthDataFilePath(siteId) : getAccountAuthDataFilePath();
@@ -43175,13 +43187,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 };
     },
@@ -43192,8 +43205,8 @@ var apiKeyAuthStrategy = {
   async isLoggedIn({ siteId } = {}) {
     const apiKeyAuth = await readApiKeyAuthData();
     return (0, import_variant13.match)(apiKeyAuth, {
-      Authenticated: ({ payload: payload5 }) => {
-        return createApiKeyAuthState({ authData: payload5, siteId });
+      Authenticated: ({ payload: payload6 }) => {
+        return createApiKeyAuthState({ authData: payload6, siteId });
       },
       Unauthenticated: () => null
     });
@@ -43218,7 +43231,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
@@ -43356,7 +43369,11 @@ function validateConcurrency(concurrency) {
   }
 }
 
+// ../cli-auth/src/auth-strategies/unified-auth-strategy.ts
+var import_variant16 = __toESM(require_lib(), 1);
+
 // ../cli-auth/src/auth-strategies/account-auth-strategy.ts
+init_esm_shims();
 var import_variant14 = __toESM(require_lib(), 1);
 
 // ../../node_modules/p-wait-for/index.js
@@ -43499,7 +43516,16 @@ pWaitFor.resolveWith = (value2) => ({ [resolveValue]: value2 });
 
 // ../cli-auth/src/auth-strategies/account-auth-strategy.ts
 var seconds = (n2) => 1e3 * n2;
-async function waitForLogin({ deviceCode: deviceCode2, expiresIn }, { signal }) {
+async function finalizeLogin(tokenData) {
+  const userInfo2 = await client.userInfo({
+    accessToken: tokenData.accessToken
+  });
+  const result = { ...tokenData, userInfo: userInfo2 };
+  await deleteAuthData();
+  await saveAuthData(result);
+  return result;
+}
+async function loginWithDeviceCode({ deviceCode: deviceCode2, expiresIn }, { signal }) {
   try {
     const authData = await pWaitFor(
       async () => {
@@ -43516,17 +43542,11 @@ async function waitForLogin({ deviceCode: deviceCode2, expiresIn }, { signal })
         }
       },
       {
-        interval: getTestOverrides().waitForLoginInterval ?? seconds(3),
+        interval: getTestOverrides().loginWithDeviceCodeInterval ?? seconds(3),
         timeout: { milliseconds: seconds(expiresIn), signal }
       }
     );
-    const userInfo2 = await client.userInfo({
-      accessToken: authData.accessToken
-    });
-    const result = { ...authData, userInfo: userInfo2 };
-    await deleteAuthData();
-    await saveAuthData(result);
-    return result;
+    return await finalizeLogin(authData);
   } catch (error) {
     if (error instanceof TimeoutError) {
       throw new CliError({
@@ -43537,7 +43557,22 @@ async function waitForLogin({ deviceCode: deviceCode2, expiresIn }, { signal })
     throw error;
   }
 }
-async function renewAccountAuth({ refreshToken, userInfo: userInfo2 }) {
+async function loginWithRefreshToken({
+  refreshToken
+}) {
+  const renewTokenResult = await client.renewToken({ refreshToken });
+  if ((0, import_variant14.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
+    return await finalizeLogin(renewTokenResult.payload);
+  }
+  throw new CliError({
+    code: CliErrorCode.FailedToLoginWithRefreshToken(),
+    cause: null
+  });
+}
+async function renewAccountAuth({
+  refreshToken,
+  userInfo: userInfo2
+}) {
   const renewTokenResult = await client.renewToken({ refreshToken });
   if ((0, import_variant14.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
     await saveAuthData({ ...renewTokenResult.payload, userInfo: userInfo2 });
@@ -43561,26 +43596,90 @@ async function getNonExpiredAccountAuth() {
     }
   });
 }
-function createAccountAuthState({
+
+// ../cli-auth/src/auth-strategies/site-auth-strategy.ts
+init_esm_shims();
+var import_variant15 = __toESM(require_lib(), 1);
+async function renewSiteAuth({
+  accountRefreshToken,
+  siteId
+}) {
+  const renewTokenResult = await client.renewToken({
+    refreshToken: accountRefreshToken,
+    siteId
+  });
+  if ((0, import_variant15.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
+    await saveAuthData(renewTokenResult.payload, siteId);
+  }
+  return renewTokenResult;
+}
+var AuthenticationResult = (0, import_variant15.variant)({
+  Ok: (0, import_variant15.payload)(),
+  RefreshTokenRevoked: (0, import_variant15.fields)()
+});
+async function ensureAuthenticatedToSite({
+  siteId,
+  accountRefreshToken
+}) {
+  const siteAuthStatus = await readSiteAuthData(siteId);
+  return (0, import_variant15.matcher)(siteAuthStatus).with({ Authenticated: (data) => AuthenticationResult.Ok(data) }).when(["Unauthenticated", "Expired"], async () => {
+    const renewTokenResult = await renewSiteAuth({
+      accountRefreshToken,
+      siteId
+    });
+    return (0, import_variant15.match)(renewTokenResult, {
+      TokenRenewed: ({ payload: payload6 }) => AuthenticationResult.Ok(payload6),
+      RefreshTokenRevoked: ({ cause }) => {
+        return AuthenticationResult.RefreshTokenRevoked({ cause });
+      }
+    });
+  }).complete();
+}
+
+// ../cli-auth/src/auth-strategies/unified-auth-strategy.ts
+async function createAuthState({
   userInfo: userInfo2,
   ...initialTokenData
 }) {
   const limiter = pLimit(1);
-  let tokenData = { ...initialTokenData };
+  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_variant16.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: () => {
+    getAccessToken: ({ siteId } = {}) => {
       return limiter(async () => {
-        if (isValidToken(tokenData)) {
-          return tokenData.accessToken;
+        if (siteId) {
+          return (await getOrEnsureSiteAuth(siteId)).accessToken;
+        }
+        if (isValidToken(accountTokenData)) {
+          return accountTokenData.accessToken;
         }
         const renewTokenResult = await renewAccountAuth({
-          ...tokenData,
+          ...accountTokenData,
           userInfo: userInfo2
         });
-        return (0, import_variant14.match)(renewTokenResult, {
+        return (0, import_variant16.match)(renewTokenResult, {
           TokenRenewed: ({ payload: newTokenData }) => {
-            tokenData = newTokenData;
-            return tokenData.accessToken;
+            accountTokenData = newTokenData;
+            return accountTokenData.accessToken;
           },
           RefreshTokenRevoked: ({ cause }) => {
             throw new CliError({
@@ -43591,42 +43690,31 @@ function createAccountAuthState({
         });
       });
     },
-    getRefreshToken: () => tokenData.refreshToken,
+    getRefreshToken: () => accountTokenData.refreshToken,
     userInfo: userInfo2
   };
 }
-var accountAuthStrategy = {
+var unifiedAuthStrategy = {
   async isLoggedIn() {
     const apiKeyAuth = await apiKeyAuthStrategy.isLoggedIn();
     if (apiKeyAuth) {
       return apiKeyAuth;
     }
     const accountAuth = await getNonExpiredAccountAuth();
-    if (accountAuth) {
-      return createAccountAuthState(accountAuth);
+    if (!accountAuth) {
+      return null;
     }
-    return null;
+    return await createAuthState(accountAuth);
   },
   async login({ deviceCode: deviceCode2, signal }) {
-    const accountAuth = await waitForLogin(deviceCode2, { signal });
-    return createAccountAuthState(accountAuth);
+    const accountAuth = await loginWithDeviceCode(deviceCode2, {
+      signal
+    });
+    return await createAuthState(accountAuth);
   },
   async loginWithRefreshToken({ refreshToken }) {
-    const renewTokenResult = await client.renewToken({ refreshToken });
-    if ((0, import_variant14.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
-      const newTokenData = renewTokenResult.payload;
-      const userInfo2 = await client.userInfo({
-        accessToken: newTokenData.accessToken
-      });
-      const result = { ...newTokenData, userInfo: userInfo2 };
-      await deleteAuthData();
-      await saveAuthData(result);
-      return createAccountAuthState(result);
-    }
-    throw new CliError({
-      code: CliErrorCode.FailedToLoginWithRefreshToken(),
-      cause: null
-    });
+    const authData = await loginWithRefreshToken({ refreshToken });
+    return await createAuthState(authData);
   }
 };
 
@@ -44630,9 +44718,9 @@ init_esm_shims();
 var DATE_TIME_REGEX = /(?:[Eec]{1,6}|G{1,5}|[Qq]{1,5}|(?:[yYur]+|U{1,5})|[ML]{1,5}|d{1,2}|D{1,3}|F{1}|[abB]{1,5}|[hkHK]{1,2}|w{1,2}|W{1}|m{1,2}|s{1,2}|[zZOvVxX]{1,4})(?=([^']*'[^']*')*[^']*$)/g;
 function parseDateTimeSkeleton(skeleton) {
   var result = {};
-  skeleton.replace(DATE_TIME_REGEX, function(match22) {
-    var len = match22.length;
-    switch (match22[0]) {
+  skeleton.replace(DATE_TIME_REGEX, function(match24) {
+    var len = match24.length;
+    switch (match24[0]) {
       // Era
       case "G":
         result.era = len === 4 ? "long" : len === 5 ? "narrow" : "short";
@@ -46642,21 +46730,21 @@ if (REGEX_SUPPORTS_U_AND_Y) {
   matchIdentifierAtIndex = function matchIdentifierAtIndex2(s2, index) {
     var _a3;
     IDENTIFIER_PREFIX_RE_1.lastIndex = index;
-    var match22 = IDENTIFIER_PREFIX_RE_1.exec(s2);
-    return (_a3 = match22[1]) !== null && _a3 !== void 0 ? _a3 : "";
+    var match24 = IDENTIFIER_PREFIX_RE_1.exec(s2);
+    return (_a3 = match24[1]) !== null && _a3 !== void 0 ? _a3 : "";
   };
 } else {
   matchIdentifierAtIndex = function matchIdentifierAtIndex2(s2, index) {
-    var match22 = [];
+    var match24 = [];
     while (true) {
       var c2 = codePointAt(s2, index);
       if (c2 === void 0 || _isWhiteSpace(c2) || _isPatternSyntax(c2)) {
         break;
       }
-      match22.push(c2);
+      match24.push(c2);
       index += c2 >= 65536 ? 2 : 1;
     }
-    return fromCodePoint.apply(void 0, match22);
+    return fromCodePoint.apply(void 0, match24);
   };
 }
 var IDENTIFIER_PREFIX_RE_1;
@@ -49079,7 +49167,7 @@ var Interpolator = class {
     this.nestingRegexp = getOrResetRegExp(this.nestingRegexp, `${this.nestingPrefix}(.+?)${this.nestingSuffix}`);
   }
   interpolate(str, data, lng, options) {
-    let match22;
+    let match24;
     let value2;
     let replaces;
     const defaultData = this.options && this.options.interpolation && this.options.interpolation.defaultVariables || {};
@@ -49113,17 +49201,17 @@ var Interpolator = class {
     }];
     todos.forEach((todo) => {
       replaces = 0;
-      while (match22 = todo.regex.exec(str)) {
-        const matchedVar = match22[1].trim();
+      while (match24 = todo.regex.exec(str)) {
+        const matchedVar = match24[1].trim();
         value2 = handleFormat(matchedVar);
         if (value2 === void 0) {
           if (typeof missingInterpolationHandler === "function") {
-            const temp = missingInterpolationHandler(str, match22, options);
+            const temp = missingInterpolationHandler(str, match24, options);
             value2 = isString2(temp) ? temp : "";
           } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
             value2 = "";
           } else if (skipOnVariables) {
-            value2 = match22[0];
+            value2 = match24[0];
             continue;
           } else {
             this.logger.warn(`missed to pass in variable ${matchedVar} for interpolating ${str}`);
@@ -49133,10 +49221,10 @@ var Interpolator = class {
           value2 = makeString(value2);
         }
         const safeValue = todo.safeValue(value2);
-        str = str.replace(match22[0], safeValue);
+        str = str.replace(match24[0], safeValue);
         if (skipOnVariables) {
           todo.regex.lastIndex += value2.length;
-          todo.regex.lastIndex -= match22[0].length;
+          todo.regex.lastIndex -= match24[0].length;
         } else {
           todo.regex.lastIndex = 0;
         }
@@ -49150,7 +49238,7 @@ var Interpolator = class {
   }
   nest(str, fc) {
     let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-    let match22;
+    let match24;
     let value2;
     let clonedOptions;
     const handleHasOptions = (key, inheritedOptions) => {
@@ -49178,7 +49266,7 @@ var Interpolator = class {
       if (clonedOptions.defaultValue && clonedOptions.defaultValue.indexOf(this.prefix) > -1) delete clonedOptions.defaultValue;
       return key;
     };
-    while (match22 = this.nestingRegexp.exec(str)) {
+    while (match24 = this.nestingRegexp.exec(str)) {
       let formatters = [];
       clonedOptions = {
         ...options
@@ -49187,26 +49275,26 @@ var Interpolator = class {
       clonedOptions.applyPostProcessor = false;
       delete clonedOptions.defaultValue;
       let doReduce = false;
-      if (match22[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(match22[1])) {
-        const r2 = match22[1].split(this.formatSeparator).map((elem) => elem.trim());
-        match22[1] = r2.shift();
+      if (match24[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(match24[1])) {
+        const r2 = match24[1].split(this.formatSeparator).map((elem) => elem.trim());
+        match24[1] = r2.shift();
         formatters = r2;
         doReduce = true;
       }
-      value2 = fc(handleHasOptions.call(this, match22[1].trim(), clonedOptions), clonedOptions);
-      if (value2 && match22[0] === str && !isString2(value2)) return value2;
+      value2 = fc(handleHasOptions.call(this, match24[1].trim(), clonedOptions), clonedOptions);
+      if (value2 && match24[0] === str && !isString2(value2)) return value2;
       if (!isString2(value2)) value2 = makeString(value2);
       if (!value2) {
-        this.logger.warn(`missed to resolve ${match22[1]} for nesting ${str}`);
+        this.logger.warn(`missed to resolve ${match24[1]} for nesting ${str}`);
         value2 = "";
       }
       if (doReduce) {
         value2 = formatters.reduce((v, f) => this.format(v, f, options.lng, {
           ...options,
-          interpolationkey: match22[1].trim()
+          interpolationkey: match24[1].trim()
         }), value2.trim());
       }
-      str = str.replace(match22[0], value2);
+      str = str.replace(match24[0], value2);
       this.regexp.lastIndex = 0;
     }
     return str;
@@ -50193,7 +50281,7 @@ var I18nProvider = ({
 };
 
 // ../cli-auth/src/components/Login.tsx
-var import_variant19 = __toESM(require_lib(), 1);
+var import_variant21 = __toESM(require_lib(), 1);
 
 // ../cli-auth/src/messages.json
 var messages_default = {
@@ -50329,8 +50417,8 @@ async function defaultBrowserId() {
     throw new Error("macOS only");
   }
   const { stdout } = await execFileAsync("defaults", ["read", "com.apple.LaunchServices/com.apple.launchservices.secure", "LSHandlers"]);
-  const match22 = /LSHandlerRoleAll = "(?!-)(?<id>[^"]+?)";\s+?LSHandlerURLScheme = (?:http|https);/.exec(stdout);
-  return match22?.groups.id ?? "com.apple.Safari";
+  const match24 = /LSHandlerRoleAll = "(?!-)(?<id>[^"]+?)";\s+?LSHandlerURLScheme = (?:http|https);/.exec(stdout);
+  return match24?.groups.id ?? "com.apple.Safari";
 }
 
 // ../../node_modules/bundle-name/index.js
@@ -50384,11 +50472,11 @@ async function defaultBrowser(_execFileAsync = execFileAsync3) {
     "/v",
     "ProgId"
   ]);
-  const match22 = /ProgId\s*REG_SZ\s*(?<id>\S+)/.exec(stdout);
-  if (!match22) {
+  const match24 = /ProgId\s*REG_SZ\s*(?<id>\S+)/.exec(stdout);
+  if (!match24) {
     throw new UnknownBrowserError(`Cannot find Windows browser in stdout: ${JSON.stringify(stdout)}`);
   }
-  const { id } = match22.groups;
+  const { id } = match24.groups;
   const browser = windowsBrowserProgIds[id];
   if (!browser) {
     throw new UnknownBrowserError(`Unknown browser ID: ${id}`);
@@ -50744,6 +50832,19 @@ var DebugLogContext = (0, import_react73.createContext)(null);
 // ../cli-env/src/index.ts
 init_esm_shims();
 var import_ci_info = __toESM(require_ci_info2(), 1);
+var remoteLogContextSchema = zod_default.record(zod_default.string(), zod_default.unknown());
+function getRemoteLogContext() {
+  const remoteContext = process.env.REMOTE_MACHINE_LOG_CONTEXT;
+  if (!remoteContext) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(remoteContext);
+    return remoteLogContextSchema.parse(parsed);
+  } catch {
+    return {};
+  }
+}
 var createEnv = () => {
   const overrides2 = getTestOverrides();
   return {
@@ -50751,7 +50852,8 @@ var createEnv = () => {
     isPR: overrides2.isPR ?? import_ci_info.default.isPR,
     ciName: overrides2.ciName ?? import_ci_info.default.name ?? process.env.CI_NAME ?? null,
     cliEnvName: overrides2.cliEnvName ?? process.env.WIX_RUNTIME_ENVIRONMENT ?? null,
-    cliTrackingId: overrides2.cliTrackingId ?? process.env.TRACKING_ID ?? null
+    cliTrackingId: overrides2.cliTrackingId ?? process.env.TRACKING_ID ?? null,
+    remoteLogContext: getRemoteLogContext()
   };
 };
 
@@ -50762,7 +50864,7 @@ var import_react78 = __toESM(require_react(), 1);
 // ../cli-error-reporting/src/get-error-component.tsx
 init_esm_shims();
 var import_react77 = __toESM(require_react(), 1);
-var import_variant15 = __toESM(require_lib(), 1);
+var import_variant17 = __toESM(require_lib(), 1);
 
 // ../../node_modules/outdent/lib-module/index.js
 init_esm_shims();
@@ -50809,9 +50911,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 match22 = strings[0].match(reDetectIndentation);
-  if (match22) {
-    indentationLevel = match22[1].length;
+  var match24 = strings[0].match(reDetectIndentation);
+  if (match24) {
+    indentationLevel = match24[1].length;
   }
   var reSource = "(\\r\\n|\\r|\\n).{0," + indentationLevel + "}";
   var reMatchIndent = new RegExp(reSource, "g");
@@ -50994,7 +51096,7 @@ var ServeDeprecationMessage = ({
 
 // ../cli-error-reporting/src/get-error-component.tsx
 function getErrorComponent(code, cause) {
-  return (0, import_variant15.match)(code, {
+  return (0, import_variant17.match)(code, {
     UnknownFailure: ({ error }) => {
       return () => /* @__PURE__ */ import_react77.default.createElement(import_react77.default.Fragment, null, /* @__PURE__ */ import_react77.default.createElement(Text2, { skin: "error" }, "Oh no, seems like the CLI encountered an unexpected error:"), error instanceof Error ? /* @__PURE__ */ import_react77.default.createElement(Text2, { skin: "error" }, error.message) : /* @__PURE__ */ import_react77.default.createElement(Text2, null, JSON.stringify(error)));
     },
@@ -51536,7 +51638,7 @@ function getErrorComponent(code, cause) {
     },
     DuplicateComponentIdsError: ({ issues }) => {
       const Issue = ({ issue }) => {
-        const typeToName = (type) => (0, import_variant15.match)(type, {
+        const typeToName = (type) => (0, import_variant17.match)(type, {
           page: () => "page",
           plugin: () => "plugin",
           "menu-plugin": () => "menu plugin",
@@ -51666,6 +51768,15 @@ function getErrorComponent(code, cause) {
         }
       );
     },
+    FailedToBuildAstroApp: () => {
+      return () => /* @__PURE__ */ import_react77.default.createElement(
+        ErrorMessage,
+        {
+          message: "Failed to build the application.",
+          hint: "Please check the build output for more information"
+        }
+      );
+    },
     FailedToGetAppInstallationDetails: ({ appId }) => {
       return () => /* @__PURE__ */ import_react77.default.createElement(
         SystemErrorMessage,
@@ -52506,6 +52617,9 @@ ${errorMessage2}`
     FailedToCreateRoutesWithMetaSiteUrl: () => {
       return () => /* @__PURE__ */ import_react77.default.createElement(SystemErrorMessage, { message: "Failed to create routes with meta site URL." });
     },
+    FailedToGetUrl: () => {
+      return () => /* @__PURE__ */ import_react77.default.createElement(SystemErrorMessage, { message: "Failed to get meta site URL." });
+    },
     FailedToUpdateExternalSiteUrl: () => {
       return () => /* @__PURE__ */ import_react77.default.createElement(SystemErrorMessage, { message: "Failed to update external site URL." });
     },
@@ -52587,7 +52701,7 @@ var ErrorViewer = ({
 
 // ../cli-error-reporting/src/error-reporter.ts
 init_esm_shims();
-var import_variant16 = __toESM(require_lib(), 1);
+var import_variant18 = __toESM(require_lib(), 1);
 
 // ../../node_modules/@sentry/node/build/esm/index.js
 init_esm_shims();
@@ -53209,8 +53323,8 @@ var LINUX_VERSIONS = {
   ubuntu: (content) => matchFirst(/distrib_release=(.*)/, content)
 };
 function matchFirst(regex2, text) {
-  const match22 = regex2.exec(text);
-  return match22 ? match22[1] : void 0;
+  const match24 = regex2.exec(text);
+  return match24 ? match24[1] : void 0;
 }
 async function getDarwinInfo() {
   const darwinInfo = {
@@ -54901,7 +55015,7 @@ var HttpsProxyAgent = class extends Agent2 {
     }
     const headers = typeof this.proxyHeaders === "function" ? this.proxyHeaders() : { ...this.proxyHeaders };
     const host = net.isIPv6(opts.host) ? `[${opts.host}]` : opts.host;
-    let payload5 = `CONNECT ${host}:${opts.port} HTTP/1.1\r
+    let payload6 = `CONNECT ${host}:${opts.port} HTTP/1.1\r
 `;
     if (proxy.username || proxy.password) {
       const auth = `${decodeURIComponent(proxy.username)}:${decodeURIComponent(proxy.password)}`;
@@ -54912,11 +55026,11 @@ var HttpsProxyAgent = class extends Agent2 {
       headers["Proxy-Connection"] = this.keepAlive ? "Keep-Alive" : "close";
     }
     for (const name of Object.keys(headers)) {
-      payload5 += `${name}: ${headers[name]}\r
+      payload6 += `${name}: ${headers[name]}\r
 `;
     }
     const proxyResponsePromise = parseProxyResponse(socket);
-    socket.write(`${payload5}\r
+    socket.write(`${payload6}\r
 `);
     const { connect: connect3, buffered } = await proxyResponsePromise;
     req.emit("proxyConnect", connect3);
@@ -55266,15 +55380,15 @@ function normalizeRequestId(requestId) {
 }
 
 // ../cli-error-reporting/src/error-reporter.ts
-var ReportErrorResult = (0, import_variant16.variant)({
-  Reported: (0, import_variant16.fields)(),
+var ReportErrorResult = (0, import_variant18.variant)({
+  Reported: (0, import_variant18.fields)(),
   Ignored: {}
 });
 var reportError = (scope, originalError, { data } = {}) => {
   if (!isCliSystemError(originalError)) {
     return ReportErrorResult.Ignored();
   }
-  const error = (0, import_variant16.isType)(originalError.cliCode, CliSystemErrorCode.UnknownFailure) ? originalError.cliCode.error : originalError;
+  const error = (0, import_variant18.isType)(originalError.cliCode, CliSystemErrorCode.UnknownFailure) ? originalError.cliCode.error : originalError;
   const eventId = scope.captureException(error, {
     data,
     captureContext: (localScope) => {
@@ -55387,14 +55501,14 @@ function yesOrNo(value2) {
 // ../cli-error-reporting/src/user-feedback.tsx
 init_esm_shims();
 var import_react82 = __toESM(require_react(), 1);
-var import_variant18 = __toESM(require_lib(), 1);
+var import_variant20 = __toESM(require_lib(), 1);
 import { stdin } from "node:process";
 
 // ../cli-fs-cache/src/index.ts
 init_esm_shims();
-var import_variant17 = __toESM(require_lib(), 1);
-var CacheState = (0, import_variant17.variant)({
-  Exists: (0, import_variant17.fields)(),
+var import_variant19 = __toESM(require_lib(), 1);
+var CacheState = (0, import_variant19.variant)({
+  Exists: (0, import_variant19.fields)(),
   NotExists: {}
 });
 var CacheData = external_exports.object({
@@ -55507,7 +55621,7 @@ async function collectUserFeedback({
   reportResult,
   errorReporter: errorReporter2
 }) {
-  if (!stdin.isTTY || !cachePath || !(0, import_variant18.isType)(reportResult, ReportErrorResult.Reported)) {
+  if (!stdin.isTTY || !cachePath || !(0, import_variant20.isType)(reportResult, ReportErrorResult.Reported)) {
     return;
   }
   const fsCache = createFsCache({
@@ -55515,7 +55629,7 @@ async function collectUserFeedback({
     ttlInHours: 1
   });
   const cacheState = await fsCache.get();
-  if ((0, import_variant18.isType)(cacheState, CacheState.Exists)) {
+  if ((0, import_variant20.isType)(cacheState, CacheState.Exists)) {
     return;
   }
   const user = errorReporter2.getUser();
@@ -55769,7 +55883,7 @@ var Login = ({ loginFn, onLogin, onError }) => {
       onError: handleError
     }
   );
-  return (0, import_variant19.match)(status, {
+  return (0, import_variant21.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react88.default.createElement(Spinner2, null),
     Success: ({ result: { userCode, verificationUri } }) => /* @__PURE__ */ import_react88.default.createElement(
@@ -55782,23 +55896,23 @@ var Login = ({ loginFn, onLogin, onError }) => {
   });
 };
 
-// ../cli-auth/src/providers/AccountAuthProvider.tsx
+// ../cli-auth/src/providers/UnifiedAuthProvider.tsx
 init_esm_shims();
 var import_react91 = __toESM(require_react(), 1);
 
 // ../cli-auth/src/components/EnsureLoggedIn.tsx
 init_esm_shims();
 var import_react90 = __toESM(require_react(), 1);
-var import_variant21 = __toESM(require_lib(), 1);
+var import_variant23 = __toESM(require_lib(), 1);
 
 // ../cli-auth/src/components/WarnLegacyAuthData.tsx
 init_esm_shims();
 var import_react89 = __toESM(require_react(), 1);
-var import_variant20 = __toESM(require_lib(), 1);
+var import_variant22 = __toESM(require_lib(), 1);
 var WarnLegacyAuthData = ({ children }) => {
   const { status } = useAsync2(hasLegacyAuthData, [], { onError: () => {
   } });
-  return (0, import_variant20.match)(status, {
+  return (0, import_variant22.match)(status, {
     Error: () => null,
     Loading: () => null,
     Success: ({ result }) => /* @__PURE__ */ import_react89.default.createElement(import_react89.default.Fragment, null, result && /* @__PURE__ */ import_react89.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react89.default.createElement(Trans2, { i18nKey: "login.legacy_auth_notice" })), children)
@@ -55820,7 +55934,7 @@ var EnsureLoggedIn = ({
     },
     onError
   });
-  return (0, import_variant21.match)(status, {
+  return (0, import_variant23.match)(status, {
     Loading: () => /* @__PURE__ */ import_react90.default.createElement(Spinner2, null),
     Error: () => null,
     Success: ({ result: accountAuth }) => {
@@ -55842,17 +55956,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_react91.default.createElement(
     EnsureLoggedIn,
     {
-      authStrategy: accountAuthStrategy,
+      authStrategy: unifiedAuthStrategy,
       onLogin: ({ userInfo: userInfo2 }) => onLogin?.(userInfo2),
       onError: onError ?? exit
     },
@@ -55867,7 +55977,7 @@ var AccountAuthProvider = ({
 };
 
 // ../cli-auth/src/index.ts
-var { isLoggedIn: isLoggedInToAccount } = accountAuthStrategy;
+var { isLoggedIn: isLoggedInToAccount } = unifiedAuthStrategy;
 
 // ../../node_modules/@commander-js/extra-typings/esm.mjs
 init_esm_shims();
@@ -55916,20 +56026,21 @@ var HttpClientProvider = ({
 
 // ../cli-http-client-react/src/useHttpClient.ts
 function useHttpClient({
-  type
+  type,
+  siteId
 }) {
   const context2 = (0, import_react93.useContext)(HttpClientContext);
   const { getAccessToken: getAppToken, getRequestHeaders: createAuthHeaders } = useAuth();
   return (0, import_react93.useMemo)(
     () => createHttpClient({
       type,
-      getAppToken,
+      getAppToken: () => getAppToken({ siteId }),
       createHeaders: () => ({
-        ...createAuthHeaders?.(),
+        ...createAuthHeaders?.({ siteId }),
         ...context2?.headers
       })
     }),
-    [type, getAppToken, createAuthHeaders, context2]
+    [type, getAppToken, createAuthHeaders, context2, siteId]
   );
 }
 
@@ -56543,26 +56654,26 @@ var MAX_STACK_TRACE_SIZE_BYTES = 32 * 1024;
 var MAX_SESSION_TIME_MS = 24 * 60 * 60 * 1e3;
 
 // ../../node_modules/@wix/panorama-client-node/node_modules/@wix/panorama-client/dist/esm/lib/payload-sanitizer.js
-var sanitizePayload = (payload5) => {
+var sanitizePayload = (payload6) => {
   const {
     errorStack,
     sessionTime
-  } = payload5;
+  } = payload6;
   if (errorStack && errorStack.length > MAX_STACK_TRACE_SIZE_BYTES) {
     const truncationMessage = `...[truncated by Panorama client to ${MAX_STACK_TRACE_SIZE_BYTES / 1024}kb]`;
     const truncatedErrorStack = errorStack.substring(0, MAX_STACK_TRACE_SIZE_BYTES - truncationMessage.length);
-    payload5 = {
-      ...payload5,
+    payload6 = {
+      ...payload6,
       errorStack: `${truncatedErrorStack}${truncationMessage}`
     };
   }
   if (sessionTime && sessionTime > MAX_SESSION_TIME_MS) {
-    payload5 = {
-      ...payload5,
+    payload6 = {
+      ...payload6,
       sessionTime: MAX_SESSION_TIME_MS
     };
   }
-  return payload5;
+  return payload6;
 };
 
 // ../../node_modules/@wix/panorama-client-node/node_modules/@wix/panorama-client/dist/esm/lib/payload-builder.js
@@ -56727,12 +56838,12 @@ var BasePanoramaClient = class {
       componentId
     } = this.baseParams;
     this.durationTracker.markTransactionStart(fullArtifactId, componentId, name, id);
-    const payload5 = buildTransactionPayload(this.globalConfig, this.baseParams, {
+    const payload6 = buildTransactionPayload(this.globalConfig, this.baseParams, {
       transactionName: name,
       transactionAction: TransactionAction.Start
     }, dataWithDefault);
-    this.report(payload5);
-    this.hooksManager.invoke(Hook2.afterReportTransactionStart, name, payload5);
+    this.report(payload6);
+    this.hooksManager.invoke(Hook2.afterReportTransactionStart, name, payload6);
   }
   reportTransactionFinish(name, options, data) {
     if (options === void 0) {
@@ -56750,13 +56861,13 @@ var BasePanoramaClient = class {
       componentId
     } = this.baseParams;
     const duration2 = this.durationTracker.markTransactionFinish(fullArtifactId, componentId, name, id);
-    const payload5 = buildTransactionPayload(this.globalConfig, this.baseParams, {
+    const payload6 = buildTransactionPayload(this.globalConfig, this.baseParams, {
       transactionName: name,
       transactionAction: TransactionAction.Finish,
       transactionDuration: duration2
     }, dataWithDefault);
-    this.report(payload5);
-    this.hooksManager.invoke(Hook2.afterReportTransactionFinish, name, payload5);
+    this.report(payload6);
+    this.hooksManager.invoke(Hook2.afterReportTransactionFinish, name, payload6);
   }
   reportPhaseStart(name, data) {
     const dataWithDefault = this.data.addDataScope(data).getData();
@@ -56768,12 +56879,12 @@ var BasePanoramaClient = class {
       componentId
     } = this.baseParams;
     this.durationTracker.markPhaseStart(fullArtifactId, componentId, name);
-    const payload5 = buildPhasePayload(this.globalConfig, this.baseParams, {
+    const payload6 = buildPhasePayload(this.globalConfig, this.baseParams, {
       phaseName: name,
       transactionAction: TransactionAction.Start
     }, dataWithDefault);
-    this.report(payload5);
-    this.hooksManager.invoke(Hook2.afterReportPhaseStart, name, payload5);
+    this.report(payload6);
+    this.hooksManager.invoke(Hook2.afterReportPhaseStart, name, payload6);
   }
   reportPhaseFinish(name, data) {
     const dataWithDefault = this.data.addDataScope(data).getData();
@@ -56785,13 +56896,13 @@ var BasePanoramaClient = class {
       componentId
     } = this.baseParams;
     const duration2 = this.durationTracker.markPhaseFinish(fullArtifactId, componentId, name);
-    const payload5 = buildPhasePayload(this.globalConfig, this.baseParams, {
+    const payload6 = buildPhasePayload(this.globalConfig, this.baseParams, {
       phaseName: name,
       transactionAction: TransactionAction.Finish,
       transactionDuration: duration2
     }, dataWithDefault);
-    this.report(payload5);
-    this.hooksManager.invoke(Hook2.afterReportPhaseFinish, name, payload5);
+    this.report(payload6);
+    this.hooksManager.invoke(Hook2.afterReportPhaseFinish, name, payload6);
   }
   reportError(error, data, options) {
     if (!(error instanceof Error)) {
@@ -56801,8 +56912,8 @@ var BasePanoramaClient = class {
     if (!this.hooksManager.invoke(Hook2.beforeReportError, error, data, options)) {
       return;
     }
-    const payload5 = buildErrorPayload(this.globalConfig, this.baseParams, error, data);
-    this.report(payload5);
+    const payload6 = buildErrorPayload(this.globalConfig, this.baseParams, error, data);
+    this.report(payload6);
     this.hooksManager.invoke(Hook2.afterReportError, error, data, options);
   }
   addBreadcrumb(breadcrumb) {
@@ -56824,8 +56935,8 @@ var BasePanoramaClient = class {
     if (!this.hooksManager.invoke(Hook2.beforeReportLog, logLevel, message, dataWithDefault)) {
       return;
     }
-    const payload5 = buildLoggerPayload(this.globalConfig, this.baseParams, loggerParams);
-    this.report(payload5);
+    const payload6 = buildLoggerPayload(this.globalConfig, this.baseParams, loggerParams);
+    this.report(payload6);
     this.hooksManager.invoke(Hook2.afterReportLog, logLevel, message, dataWithDefault);
   }
 };
@@ -57007,23 +57118,27 @@ if (overrides.panoramaReporterUrl) {
     nodeReporter(overrides.panoramaReporterUrl, { silent: true })
   );
 }
-var remoteLogContextSchema = zod_default.record(zod_default.string(), zod_default.unknown());
-function getRemoteLogContext() {
-  const remoteContext = process.env.REMOTE_MACHINE_LOG_CONTEXT;
-  if (!remoteContext) {
-    return {};
-  }
-  try {
-    const parsed = JSON.parse(remoteContext);
-    return remoteLogContextSchema.parse(parsed);
-  } catch {
-    return {};
-  }
+function createPanoramaWrapper(factory) {
+  let defaultData = {};
+  return {
+    withGlobalConfig: (...args) => factory.withGlobalConfig(...args),
+    withReporter: (...args) => factory.withReporter(...args),
+    setMuted: (...args) => factory.setMuted(...args),
+    setDefaultClientData(data) {
+      defaultData = { ...defaultData, ...data };
+    },
+    client(options) {
+      return factory.client({
+        ...options,
+        data: { ...defaultData, ...options?.data }
+      });
+    }
+  };
 }
 async function createPanorama(options) {
-  const { version, artifact, userId, errorReporter: errorReporter2 } = options;
+  const { version, artifact, userId, errorReporter: errorReporter2, cliSessionId } = options;
   const userConfig = await readUserConfig();
-  const remoteLogContext = getRemoteLogContext();
+  const env2 = createEnv();
   const factory = panoramaClientFactory({
     baseParams: {
       platform: Platform.Standalone,
@@ -57037,21 +57152,25 @@ async function createPanorama(options) {
       silent: true
     },
     data: {
-      trackingId: process.env.TRACKING_ID,
-      ...remoteLogContext
+      cliTrackingId: env2.cliTrackingId,
+      cliEnvName: env2.cliEnvName,
+      cliSessionId,
+      ...env2.remoteLogContext
     }
   }).withGlobalConfig(globalConfig).setMuted(!userConfig.telemetry);
-  const hasRemoteLogContext = Object.keys(remoteLogContext).length > 0;
-  if (errorReporter2 && hasRemoteLogContext) {
-    const panoramaClient2 = factory.client({
-      baseParams: {
-        componentId: "error-reporter"
-      }
+  const panorama = createPanoramaWrapper(factory);
+  if (errorReporter2) {
+    errorReporter2.on("errorReported", (error) => {
+      const panoramaClient2 = panorama.client({
+        baseParams: {
+          componentId: "error-reporter"
+        }
+      });
+      const errorMonitor = panoramaClient2.errorMonitor();
+      errorMonitor.reportError(error);
     });
-    const errorMonitor = panoramaClient2.errorMonitor();
-    errorReporter2.on("errorReported", errorMonitor.reportError);
   }
-  return factory;
+  return panorama;
 }
 
 // ../cli-panorama/src/createCommandTransaction.ts
@@ -57077,6 +57196,9 @@ function getFullCommandName(command) {
   return command.name();
 }
 
+// src/index.tsx
+import { randomUUID as randomUUID2 } from "node:crypto";
+
 // src/bi/index.ts
 init_esm_shims();
 
@@ -57129,7 +57251,6 @@ function useCreateAppBi() {
 
 // src/bi/createBiLogger.ts
 init_esm_shims();
-import { randomUUID as randomUUID2 } from "node:crypto";
 
 // ../cli-telemetry/src/index.ts
 init_esm_shims();
@@ -57339,7 +57460,7 @@ function reportCommandStartEvent({
 var package_default = {
   name: "@wix/create-app",
   description: "Create Wix apps",
-  version: "0.0.173",
+  version: "0.0.175",
   author: "Ihor Machuzhak",
   bin: "bin/index.cjs",
   devDependencies: {
@@ -57431,11 +57552,15 @@ var package_default = {
 };
 
 // src/bi/createBiLogger.ts
-var createBiLogger2 = async (errorReporter2, userId) => {
+var createBiLogger2 = async ({
+  errorReporter: errorReporter2,
+  cliSessionId,
+  userId
+}) => {
   const biLogger = await createBiLogger(
     {
       command: "create-app",
-      cliSessionId: randomUUID2(),
+      cliSessionId,
       cliVersion: package_default.version
     },
     userId
@@ -57471,7 +57596,7 @@ var createBiLogger2 = async (errorReporter2, userId) => {
 // src/components/CreateAppCommand.tsx
 init_esm_shims();
 var import_react120 = __toESM(require_react(), 1);
-var import_variant35 = __toESM(require_lib(), 1);
+var import_variant37 = __toESM(require_lib(), 1);
 
 // src/components/WelcomeMessage.tsx
 init_esm_shims();
@@ -58145,11 +58270,11 @@ var import_validate_npm_package_name = __toESM(require_lib2(), 1);
 
 // src/validations/result.ts
 init_esm_shims();
-var import_variant22 = __toESM(require_lib(), 1);
-var Result = (0, import_variant22.variant)(
-  (0, import_variant22.onTerms)(({ T }) => ({
-    Error: (0, import_variant22.payload)(T),
-    Ok: import_variant22.nil
+var import_variant24 = __toESM(require_lib(), 1);
+var Result = (0, import_variant24.variant)(
+  (0, import_variant24.onTerms)(({ T }) => ({
+    Error: (0, import_variant24.payload)(T),
+    Ok: import_variant24.nil
   }))
 );
 
@@ -58223,7 +58348,7 @@ var LoginRequiredWarning = () => {
 };
 
 // src/components/AuthProvider.tsx
-var AuthProvider = ({ userInfo: userInfo2, children }) => {
+var AuthProvider2 = ({ userInfo: userInfo2, children }) => {
   const biLogger = useBiLogger();
   const errorReporter2 = useErrorReporter();
   const handleLogin = (0, import_react99.useCallback)(
@@ -58233,13 +58358,13 @@ var AuthProvider = ({ userInfo: userInfo2, children }) => {
     },
     [biLogger, errorReporter2]
   );
-  return /* @__PURE__ */ import_react99.default.createElement(import_react99.default.Fragment, null, userInfo2 == null && /* @__PURE__ */ import_react99.default.createElement(LoginRequiredWarning, null), /* @__PURE__ */ import_react99.default.createElement(AccountAuthProvider, { onLogin: handleLogin, children }));
+  return /* @__PURE__ */ import_react99.default.createElement(import_react99.default.Fragment, null, userInfo2 == null && /* @__PURE__ */ import_react99.default.createElement(LoginRequiredWarning, null), /* @__PURE__ */ import_react99.default.createElement(AuthProvider, { onLogin: handleLogin, children }));
 };
 
 // src/components/Questions/Questions.tsx
 init_esm_shims();
 var import_react115 = __toESM(require_react(), 1);
-var import_variant32 = __toESM(require_lib(), 1);
+var import_variant34 = __toESM(require_lib(), 1);
 
 // ../dev-center-client/src/index.ts
 init_esm_shims();
@@ -58754,7 +58879,7 @@ function resolveComWixpressAppserviceApiAppsUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function getAppByVersion(payload5) {
+function getAppByVersion(payload6) {
   var _a3 = serializer(_getAppByVersionRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_getAppResponse, {
     __Array,
@@ -58917,7 +59042,7 @@ function getAppByVersion(payload5) {
   }).fromJSON;
   function __getAppByVersion(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app_old",
       method: "GET",
@@ -59044,14 +59169,14 @@ function resolveWixDevcenterAppsV1AppsServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function createApp(payload5) {
+function createApp(payload6) {
   var _a3 = serializer(_v1CreateAppRequest, {
     _v1App
   }), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_v1CreateAppResponse, { _v1App }).fromJSON;
   function __createApp(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app",
       method: "POST",
@@ -59073,12 +59198,12 @@ function createApp(payload5) {
   __createApp.__isAmbassador = true;
   return __createApp;
 }
-function getApp(payload5) {
+function getApp(payload6) {
   var _a3 = serializer(_v1GetAppRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_v1GetAppResponse, { _v1App }).fromJSON;
   function __getApp(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app",
       method: "GET",
@@ -59100,12 +59225,12 @@ function getApp(payload5) {
   __getApp.__isAmbassador = true;
   return __getApp;
 }
-function queryApp(payload5) {
+function queryApp(payload6) {
   var _a3 = serializer(_queryAppRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_queryAppResponse, { _v1App }).fromJSON;
   function __queryApp(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app",
       method: "POST",
@@ -59183,14 +59308,14 @@ function resolveWixHeadlessV1OAuthAppServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function createOAuthApp(payload5) {
+function createOAuthApp(payload6) {
   var _a3 = serializer(_createOAuthAppRequest, { _oAuthApp }), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_createOAuthAppResponse, {
     _oAuthApp
   }).fromJSON;
   function __createOAuthApp(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.headless.v1.o_auth_app",
       method: "POST",
@@ -59212,14 +59337,14 @@ function createOAuthApp(payload5) {
   __createOAuthApp.__isAmbassador = true;
   return __createOAuthApp;
 }
-function updateOAuthApp(payload5) {
+function updateOAuthApp(payload6) {
   var _a3 = serializer(_updateOAuthAppRequest, { _oAuthApp }), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_updateOAuthAppResponse, {
     _oAuthApp
   }).fromJSON;
   function __updateOAuthApp(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.headless.v1.o_auth_app",
       method: "PATCH",
@@ -59287,7 +59412,7 @@ function resolveWixDevcenterMyappsV1MyAppsServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function queryMyApps(payload5) {
+function queryMyApps(payload6) {
   var _a3 = serializer(_queryMyAppsRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_queryMyAppsResponse, {
     _myApp,
@@ -59295,7 +59420,7 @@ function queryMyApps(payload5) {
   }).fromJSON;
   function __queryMyApps(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.myapps.v1.my_app",
       method: "POST",
@@ -59484,12 +59609,12 @@ function resolveComWixpressDevcenterDsmDevelopmentSitesManagerUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function createDevelopmentSite(payload5) {
+function createDevelopmentSite(payload6) {
   var _a3 = serializer(_createDevelopmentSiteRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_createDevelopmentSiteResponse, {}).fromJSON;
   function __createDevelopmentSite(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.dsm.v1.development_site",
       method: "POST",
@@ -59511,12 +59636,12 @@ function createDevelopmentSite(payload5) {
   __createDevelopmentSite.__isAmbassador = true;
   return __createDevelopmentSite;
 }
-function getDevelopmentSites(payload5) {
+function getDevelopmentSites(payload6) {
   var _a3 = serializer(_getDevelopmentSitesRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_getDevelopmentSitesResponse, {}).fromJSON;
   function __getDevelopmentSites(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.dsm.v1.development_site",
       method: "GET",
@@ -59538,12 +59663,12 @@ function getDevelopmentSites(payload5) {
   __getDevelopmentSites.__isAmbassador = true;
   return __getDevelopmentSites;
 }
-function getDevelopmentSitesLimit(payload5) {
+function getDevelopmentSitesLimit(payload6) {
   var _a3 = serializer(_getDevelopmentSitesLimitRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_getDevelopmentSitesLimitResponse, {}).fromJSON;
   function __getDevelopmentSitesLimit(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.dsm.v1.development_site",
       method: "GET",
@@ -59660,14 +59785,14 @@ function resolveComWixpressDevcenterAppmarketlistingMarketListingServiceUrl(opts
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function updateMarketListing(payload5) {
+function updateMarketListing(payload6) {
   var _a3 = serializer(_updateMarketListingRequest, { _marketListing }), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_updateMarketListingResponse, {
     _marketListing
   }).fromJSON;
   function __updateMarketListing(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.app_market_listing.v1.market_listing",
       method: "PUT",
@@ -59686,14 +59811,14 @@ function updateMarketListing(payload5) {
   __updateMarketListing.__isAmbassador = true;
   return __updateMarketListing;
 }
-function queryMarketListing(payload5) {
+function queryMarketListing(payload6) {
   var _a3 = serializer(_queryMarketListingRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_queryMarketListingResponse, {
     _marketListing
   }).fromJSON;
   function __queryMarketListing(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.app_market_listing.v1.market_listing",
       method: "POST",
@@ -59742,14 +59867,14 @@ function resolveWixDevcenterAppsTemplatesV1AppTemplatesServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function createAppFromTemplate(payload5) {
+function createAppFromTemplate(payload6) {
   var _a3 = serializer(_createAppFromTemplateRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_createAppFromTemplateResponse, {
     _app
   }).fromJSON;
   function __createAppFromTemplate(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app_template",
       method: "POST",
@@ -59771,12 +59896,12 @@ function createAppFromTemplate(payload5) {
   __createAppFromTemplate.__isAmbassador = true;
   return __createAppFromTemplate;
 }
-function createBlocksAppFromTemplate(payload5) {
+function createBlocksAppFromTemplate(payload6) {
   var _a3 = serializer(_createBlocksAppFromTemplateRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_createBlocksAppFromTemplateResponse, { _app }).fromJSON;
   function __createBlocksAppFromTemplate(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app_template",
       method: "POST",
@@ -59798,12 +59923,12 @@ function createBlocksAppFromTemplate(payload5) {
   __createBlocksAppFromTemplate.__isAmbassador = true;
   return __createBlocksAppFromTemplate;
 }
-function listAppTemplates(payload5) {
+function listAppTemplates(payload6) {
   var _a3 = serializer(_listAppTemplatesRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_listAppTemplatesResponse, {}).fromJSON;
   function __listAppTemplates(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app_template",
       method: "GET",
@@ -60249,7 +60374,7 @@ function resolveComWixpressDevcenterManagedappsManagedAppsUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function managedApps(payload5) {
+function managedApps(payload6) {
   var _a3 = serializer(_managedAppsRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_managedAppsResponse, {
     __Array: __Array2,
@@ -60400,7 +60525,7 @@ function managedApps(payload5) {
   }).fromJSON;
   function __managedApps(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.managedapps.v1.managed_app",
       method: "GET",
@@ -63087,14 +63212,14 @@ function resolveWixDevcenterAppsPermissionsV1AppPermissionsServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function createAppPermission(payload5) {
+function createAppPermission(payload6) {
   var _a3 = serializer(_createAppPermissionRequest, { _appPermission }), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_createAppPermissionResponse, {
     _appPermission
   }).fromJSON;
   function __createAppPermission(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.apps.v1.app_permission",
       method: "POST",
@@ -63150,14 +63275,14 @@ function resolveWixDevcenterV1AppShareUrlServiceUrl(opts) {
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
 }
-function createShareUrl(payload5) {
+function createShareUrl(payload6) {
   var _a3 = serializer(_createShareUrlRequest, { _shareUrl }), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_createShareUrlResponse, {
     _shareUrl
   }).fromJSON;
   function __createShareUrl(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.v1.share_url",
       method: "POST",
@@ -63179,14 +63304,14 @@ function createShareUrl(payload5) {
   __createShareUrl.__isAmbassador = true;
   return __createShareUrl;
 }
-function listShareUrls(payload5) {
+function listShareUrls(payload6) {
   var _a3 = serializer(_listShareUrlsRequest, {}), toReq = _a3.toJSON, fromReq = _a3.fromJSON;
   var fromRes = serializer(_listShareUrlsResponse, {
     _shareUrl
   }).fromJSON;
   function __listShareUrls(_a4) {
     var host = _a4.host;
-    var serializedData = toReq(payload5);
+    var serializedData = toReq(payload6);
     var metadata = {
       entityFqdn: "wix.devcenter.v1.share_url",
       method: "GET",
@@ -66265,7 +66390,11 @@ var DevCenterClient = class {
       const { data } = await this.httpClient.request(
         updateOAuthApp({
           oAuthApp,
-          mask: ["allowedDomains", "allowedRedirectUris"]
+          mask: [
+            "allowedDomains",
+            "allowedRedirectUris",
+            "redirectUrlWixPages"
+          ]
         })
       );
       return createOAuthAppSchema.parse(data).oAuthApp;
@@ -66627,22 +66756,24 @@ var DevCenterClient = class {
 // ../dev-center-client/src/useDevCenterClient.ts
 init_esm_shims();
 var import_react100 = __toESM(require_react(), 1);
-function useDevCenterClient() {
-  const httpClient = useHttpClient({ type: "backoffice" });
+function useDevCenterClient({
+  siteId
+} = {}) {
+  const httpClient = useHttpClient({ type: "backoffice", siteId });
   const client2 = (0, import_react100.useMemo)(() => new DevCenterClient(httpClient), [httpClient]);
   return usePanoramaMethodLogger(client2);
 }
 
 // src/parse-command-options.ts
 init_esm_shims();
-var import_variant23 = __toESM(require_lib(), 1);
+var import_variant25 = __toESM(require_lib(), 1);
 var import_kebabCase2 = __toESM(require_kebabCase(), 1);
 import { join as join6, resolve as resolve3 } from "node:path";
-var TemplateSource = (0, import_variant23.variant)({
-  App: (0, import_variant23.payload)(),
-  GitRepo: (0, import_variant23.fields)(),
-  Local: (0, import_variant23.fields)(),
-  Default: (0, import_variant23.constant)({ path: resolve3(__dirname, "../templates/app") })
+var TemplateSource = (0, import_variant25.variant)({
+  App: (0, import_variant25.payload)(),
+  GitRepo: (0, import_variant25.fields)(),
+  Local: (0, import_variant25.fields)(),
+  Default: (0, import_variant25.constant)({ path: resolve3(__dirname, "../templates/app") })
 });
 async function parseTemplateOptions(options, { devCenterClient }) {
   if (options.template) {
@@ -66675,8 +66806,8 @@ async function parseTemplateOptions(options, { devCenterClient }) {
     return TemplateSource.Local({ path: options.templatePath });
   }
 }
-var AppNameOptions = (0, import_variant23.variant)({
-  Provided: (0, import_variant23.fields)(),
+var AppNameOptions = (0, import_variant25.variant)({
+  Provided: (0, import_variant25.fields)(),
   Missing: {}
 });
 async function parseAppNameOptions(targetParentFolder2, options) {
@@ -66692,7 +66823,7 @@ async function parseAppNameOptions(targetParentFolder2, options) {
       });
     }
     const npmValidationErrors = await validatePackageName(packageName);
-    if ((0, import_variant23.isType)(npmValidationErrors, "Error")) {
+    if ((0, import_variant25.isType)(npmValidationErrors, "Error")) {
       throw new CliError({
         code: CliErrorCode.AppNameArgumentIsInvalid({
           errorMessage: `Invalid package name "${packageName}". Please fix the following issues: ${npmValidationErrors.payload.join(", ")}`
@@ -66707,7 +66838,7 @@ async function parseAppNameOptions(targetParentFolder2, options) {
 async function parseCommandOptions(targetParentFolder2, options, clients) {
   const template = await parseTemplateOptions(options, clients);
   const appNameOptions = await parseAppNameOptions(targetParentFolder2, options);
-  if ((0, import_variant23.isType)(appNameOptions, "Provided") && !template) {
+  if ((0, import_variant25.isType)(appNameOptions, "Provided") && !template) {
     throw new CliError({
       code: CliErrorCode.AppNameArgumentIsInvalid({
         errorMessage: "An application name was provided, but no template was specified. Please specify a template when defining the application name."
@@ -66720,8 +66851,8 @@ async function parseCommandOptions(targetParentFolder2, options, clients) {
 
 // src/types.ts
 init_esm_shims();
-var import_variant24 = __toESM(require_lib(), 1);
-var DeveloperAppsStatus = (0, import_variant24.variant)({
+var import_variant26 = __toESM(require_lib(), 1);
+var DeveloperAppsStatus = (0, import_variant26.variant)({
   NoApps: {},
   FailedLoadingApps: {},
   Available: {}
@@ -66730,16 +66861,16 @@ var DeveloperAppsStatus = (0, import_variant24.variant)({
 // src/components/CreateAppOrExtendExisting.tsx
 init_esm_shims();
 var import_react101 = __toESM(require_react(), 1);
-var import_variant25 = __toESM(require_lib(), 1);
+var import_variant27 = __toESM(require_lib(), 1);
 var CreateAppOrExtendExisting = ({
   developerAppsStatus,
   onStartCreationFlow
 }) => {
   const { t: t3 } = useTranslation();
   const { cliFlowStepAnswered } = useCreateAppBi();
-  const exisitingAvailabilty = (0, import_variant25.match)(
+  const exisitingAvailabilty = (0, import_variant27.match)(
     developerAppsStatus,
-    (0, import_variant25.lookup)({
+    (0, import_variant27.lookup)({
       FailedLoadingApps: SelectOptionAvailability.Disabled({
         reason: t3("create_app.create_new_or_extend.failed_fetching_apps")
       }),
@@ -66780,7 +66911,7 @@ var CreateAppOrExtendExisting = ({
 // src/components/Questions/NewAppFlow.tsx
 init_esm_shims();
 var import_react111 = __toESM(require_react(), 1);
-var import_variant30 = __toESM(require_lib(), 1);
+var import_variant32 = __toESM(require_lib(), 1);
 
 // src/components/ChooseAppName.tsx
 init_esm_shims();
@@ -66810,7 +66941,7 @@ var ChooseAppName = ({ onSubmit }) => {
 // src/components/ChoosePackageName.tsx
 init_esm_shims();
 var import_react104 = __toESM(require_react(), 1);
-var import_variant26 = __toESM(require_lib(), 1);
+var import_variant28 = __toESM(require_lib(), 1);
 import { join as join7, relative } from "node:path";
 var import_kebabCase3 = __toESM(require_kebabCase(), 1);
 
@@ -66859,16 +66990,16 @@ var ChoosePackageName = ({
   const defaultPackageName = (0, import_react104.useMemo)(() => {
     return (0, import_kebabCase3.default)(appName);
   }, [appName]);
-  const isMonorepo = (0, import_variant26.isType)(repoType, RepoType.Monorepo);
+  const isMonorepo = (0, import_variant28.isType)(repoType, RepoType.Monorepo);
   async function validate3(packageName2) {
     if (!await validateDirectory(join7(targetParentFolder2, packageName2))) {
       return t3("validation_errors.invalid_directory");
     }
     const npmValidationErrors = await validatePackageName(packageName2);
-    return (0, import_variant26.match)(npmValidationErrors, {
+    return (0, import_variant28.match)(npmValidationErrors, {
       Ok: () => true,
-      Error: ({ payload: payload5 }) => t3("validation_errors.invalid_package_name", {
-        errors: payload5.join(", ")
+      Error: ({ payload: payload6 }) => t3("validation_errors.invalid_package_name", {
+        errors: payload6.join(", ")
       })
     });
   }
@@ -66963,7 +67094,7 @@ var ChooseAppCreationSource = ({
 // src/components/ChooseTemplate.tsx
 init_esm_shims();
 var import_react106 = __toESM(require_react(), 1);
-var import_variant27 = __toESM(require_lib(), 1);
+var import_variant29 = __toESM(require_lib(), 1);
 var ChooseTemplate = ({ onSelected }) => {
   const { t: t3 } = useTranslation();
   const { cliFlowStepAnswered } = useCreateAppBi();
@@ -66982,7 +67113,7 @@ var ChooseTemplate = ({ onSelected }) => {
       })
     };
   }, []);
-  return /* @__PURE__ */ import_react106.default.createElement(import_react106.default.Fragment, null, (0, import_variant27.match)(status, {
+  return /* @__PURE__ */ import_react106.default.createElement(import_react106.default.Fragment, null, (0, import_variant29.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react106.default.createElement(Spinner2, null),
     Success: ({ result: { appTemplatesOptions } }) => /* @__PURE__ */ import_react106.default.createElement(import_react106.default.Fragment, null, /* @__PURE__ */ import_react106.default.createElement(
@@ -67063,8 +67194,8 @@ var AppRegistered = ({ appName }) => {
 // src/components/mcp/ConfigMcp.tsx
 init_esm_shims();
 var import_react110 = __toESM(require_react(), 1);
-var import_variant28 = __toESM(require_lib(), 1);
-var IdeForMcp = (0, import_variant28.variant)({
+var import_variant30 = __toESM(require_lib(), 1);
+var IdeForMcp = (0, import_variant30.variant)({
   VsCode: {},
   Cursor: {},
   ClaudeCode: {}
@@ -67121,17 +67252,17 @@ var ConfigMcp = ({ onSelected }) => {
 
 // src/components/mcp/getMcpResult.ts
 init_esm_shims();
-var import_variant29 = __toESM(require_lib(), 1);
+var import_variant31 = __toESM(require_lib(), 1);
 import { join as join8 } from "node:path";
-var McpConfigResult = (0, import_variant29.variant)({
-  Created: (0, import_variant29.fields)(),
+var McpConfigResult = (0, import_variant31.variant)({
+  Created: (0, import_variant31.fields)(),
   Canceled: {}
 });
 var getMcpData = ({
   ideForMcp,
   packageFolder
 }) => {
-  const mcpPath = (0, import_variant29.match)(ideForMcp, {
+  const mcpPath = (0, import_variant31.match)(ideForMcp, {
     Cursor: () => join8(packageFolder, ".cursor", "mcp.json"),
     VsCode: () => join8(packageFolder, ".vscode", "mcp.json"),
     ClaudeCode: () => join8(packageFolder, ".mcp.json")
@@ -67139,9 +67270,9 @@ var getMcpData = ({
   return McpConfigResult.Created({
     mcpPath,
     ideForMcp,
-    docsUrl: (0, import_variant29.match)(
+    docsUrl: (0, import_variant31.match)(
       ideForMcp,
-      (0, import_variant29.lookup)({
+      (0, import_variant31.lookup)({
         Cursor: "https://cursor.com/docs/context/mcp",
         VsCode: "https://code.visualstudio.com/docs/copilot/chat/mcp-servers",
         ClaudeCode: "https://docs.anthropic.com/en/docs/claude-code/mcp"
@@ -67178,15 +67309,15 @@ var NewAppFlow = ({
   const [packageName, setPackageName] = (0, import_react111.useState)();
   const createAppCallback = useAsyncCallback3(
     async (_2, { appName: appName2, packageName: packageName2, template, mcpConfigResult }) => {
-      const { id: appId } = await (0, import_variant30.match)(
+      const { id: appId } = await (0, import_variant32.match)(
         template,
-        (0, import_variant30.partial)({
-          App: ({ payload: payload5 }) => devCenterClient.createAppFromTemplate(
+        (0, import_variant32.partial)({
+          App: ({ payload: payload6 }) => devCenterClient.createAppFromTemplate(
             {
               name: appName2,
-              templateId: payload5.id
+              templateId: payload6.id
             },
-            payload5
+            payload6
           ),
           default: () => devCenterClient.createApp({ name: appName2 })
         })
@@ -67206,7 +67337,7 @@ var NewAppFlow = ({
       };
     }
   );
-  const autoCreateApp = (0, import_variant30.isType)(appNameFromOptions, "Provided") && !!templateFromOptions;
+  const autoCreateApp = (0, import_variant32.isType)(appNameFromOptions, "Provided") && !!templateFromOptions;
   useAsync2(async () => {
     if (autoCreateApp) {
       return createAppCallback.execute({
@@ -67224,7 +67355,7 @@ var NewAppFlow = ({
       targetParentFolder: targetParentFolder2,
       repoType,
       onSelected: (userPackageName) => {
-        if ((0, import_variant30.isType)(repoType, RepoType.Monorepo)) {
+        if ((0, import_variant32.isType)(repoType, RepoType.Monorepo)) {
           void createAppCallback.execute({
             appName,
             packageName: userPackageName,
@@ -67252,7 +67383,7 @@ var NewAppFlow = ({
         });
       }
     }
-  )), (0, import_variant30.match)(createAppCallback.status, {
+  )), (0, import_variant32.match)(createAppCallback.status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react111.default.createElement(RegisteringApp, null),
     Success: ({ result }) => /* @__PURE__ */ import_react111.default.createElement(AppRegistered, { ...result }),
@@ -67341,17 +67472,17 @@ var ExistingAppFlow = ({
 // src/components/StartFromTemplateMessage.tsx
 init_esm_shims();
 var import_react114 = __toESM(require_react(), 1);
-var import_variant31 = __toESM(require_lib(), 1);
+var import_variant33 = __toESM(require_lib(), 1);
 var StartFromTemplateMessage = ({
   template
 }) => {
-  const messageComponent = (0, import_variant31.match)(template, {
-    App: ({ payload: payload5 }) => /* @__PURE__ */ import_react114.default.createElement(
+  const messageComponent = (0, import_variant33.match)(template, {
+    App: ({ payload: payload6 }) => /* @__PURE__ */ import_react114.default.createElement(
       Trans2,
       {
         i18nKey: "create_app.template_is_set_from_options.template_id",
         values: {
-          templateName: payload5.title
+          templateName: payload6.title
         },
         components: [/* @__PURE__ */ import_react114.default.createElement(Text2, { bold: true })]
       }
@@ -67423,7 +67554,7 @@ var Questions = ({
       };
     }
   }, []);
-  return (0, import_variant32.match)(status, {
+  return (0, import_variant34.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react115.default.createElement(Spinner2, { text: t3("general.loading") }),
     Success: ({
@@ -67441,7 +67572,7 @@ var Questions = ({
           }
         ));
       }
-      if ((0, import_variant32.isType)(developerAppsStatus, "NoApps")) {
+      if ((0, import_variant34.isType)(developerAppsStatus, "NoApps")) {
         return /* @__PURE__ */ import_react115.default.createElement(
           NewAppFlow,
           {
@@ -67479,7 +67610,7 @@ var Questions = ({
 
 // src/tasks.ts
 init_esm_shims();
-var import_variant33 = __toESM(require_lib(), 1);
+var import_variant35 = __toESM(require_lib(), 1);
 import { mkdir } from "node:fs/promises";
 import { join as join9 } from "node:path";
 function getTasks({
@@ -67504,7 +67635,7 @@ function getTasks({
         cause: e2
       });
     }
-    const { generateApp } = await import("./generator-HVPUF3CK.js");
+    const { generateApp } = await import("./generator-WYU6PW63.js");
     await generateApp({
       packageName,
       packageFolder,
@@ -67513,7 +67644,7 @@ function getTasks({
       repoType,
       template,
       templateParams,
-      ideForMcp: (0, import_variant33.match)(mcpConfigResult, {
+      ideForMcp: (0, import_variant35.match)(mcpConfigResult, {
         Created: ({ ideForMcp }) => ideForMcp,
         Canceled: () => {
         }
@@ -67606,7 +67737,7 @@ function getTasks({
     successText: t3("create_app.generate_project.git_commit.done")
   };
   const optionalInstallTask = skipInstall ? [] : [installDependenciesTask, addWixSkillsTask];
-  return (0, import_variant33.match)(repoType, {
+  return (0, import_variant35.match)(repoType, {
     None: () => [
       generateProjectTask,
       ...skipGit ? [] : [initializeGitTask],
@@ -67702,8 +67833,8 @@ var TaskList = ({ tasks, totalTaskCount }) => {
 // src/task-runner.ts
 init_esm_shims();
 var import_react118 = __toESM(require_react(), 1);
-var import_variant34 = __toESM(require_lib(), 1);
-var TaskRunnerStatus = (0, import_variant34.variant)({
+var import_variant36 = __toESM(require_lib(), 1);
+var TaskRunnerStatus = (0, import_variant36.variant)({
   Idle: {},
   Running: (runningTasks, totalTaskCount) => {
     const taskStatuses = runningTasks.map((task, index) => {
@@ -67788,7 +67919,7 @@ var CreateAppCommand = ({ userInfo: userInfo2, targetParentFolder: targetParentF
     const tasks = getTasks(data, t3);
     await executeTaskRunner(tasks);
   }
-  return (0, import_variant35.match)(status, {
+  return (0, import_variant37.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react120.default.createElement(Spinner2, { text: t3("general.loading") }),
     Success: ({ result: { repoType, packageManager } }) => {
@@ -67804,7 +67935,7 @@ var CreateAppCommand = ({ userInfo: userInfo2, targetParentFolder: targetParentF
           paddingLeft: 1
         },
         /* @__PURE__ */ import_react120.default.createElement(WelcomeMessage, null),
-        /* @__PURE__ */ import_react120.default.createElement(AuthProvider, { userInfo: userInfo2 }, /* @__PURE__ */ import_react120.default.createElement(
+        /* @__PURE__ */ import_react120.default.createElement(AuthProvider2, { userInfo: userInfo2 }, /* @__PURE__ */ import_react120.default.createElement(
           Questions,
           {
             repoType,
@@ -67821,10 +67952,10 @@ var CreateAppCommand = ({ userInfo: userInfo2, targetParentFolder: targetParentF
             })
           }
         )),
-        generationData && (0, import_variant35.match)(taskRunnerStatus, {
+        generationData && (0, import_variant37.match)(taskRunnerStatus, {
           Idle: () => null,
           Running: (status2) => /* @__PURE__ */ import_react120.default.createElement(GenerationProgress, { ...status2 }),
-          Done: (status2) => /* @__PURE__ */ import_react120.default.createElement(import_react120.default.Fragment, null, /* @__PURE__ */ import_react120.default.createElement(GenerationProgress, { ...status2 }), (0, import_variant35.match)(generationData.mcpConfigResult, {
+          Done: (status2) => /* @__PURE__ */ import_react120.default.createElement(import_react120.default.Fragment, null, /* @__PURE__ */ import_react120.default.createElement(GenerationProgress, { ...status2 }), (0, import_variant37.match)(generationData.mcpConfigResult, {
             Created: ({ mcpPath, docsUrl }) => /* @__PURE__ */ import_react120.default.createElement(McpConfigCreated, { mcpPath, docsUrl }),
             Canceled: () => null
           }), /* @__PURE__ */ import_react120.default.createElement(
@@ -67967,10 +68098,12 @@ var program2 = new Command().name(package_default.name).description("Create Wix
     Arguments: command.args,
     Options: command.opts()
   });
-  const { biLogger, reportCommandStartEvent: reportCommandStartEvent2 } = await createBiLogger2(
+  const cliSessionId = randomUUID2();
+  const { biLogger, reportCommandStartEvent: reportCommandStartEvent2 } = await createBiLogger2({
     errorReporter,
-    userInfo?.userId
-  );
+    cliSessionId,
+    userId: userInfo?.userId
+  });
   const commandStatus = reportCommandStartEvent2(command);
   const commandOptions = {
     ...options,
@@ -67986,7 +68119,8 @@ var program2 = new Command().name(package_default.name).description("Create Wix
     artifact: package_default.wix.artifact,
     version: package_default.version,
     userId: userInfo?.userId,
-    errorReporter
+    errorReporter,
+    cliSessionId
   });
   const transaction = createCommandTransaction(panorama, command);
   try {