@shopify/create-app 3.69.4 → 3.71.0

package/dist/{chunk-ZYFGLOXH.js → chunk-PUMOQDXS.js}

@@ -12,7 +12,7 @@ import {
   removeSession,
   setCachedPartnerAccountStatus,
   setSession
-} from "./chunk-A7RFWXE2.js";
+} from "./chunk-PATNPZAL.js";
 import {
   AbortError,
   BugError,
@@ -23,9 +23,11 @@ import {
   ciPlatform,
   cloudEnvironment,
   currentProcessIsGlobal,
+  environmentVariables,
   execa,
   firstPartyDev,
   import_ts_error,
+  isAppManagementEnabled,
   isCloudEnvironment,
   isSpin,
   isTTY,
@@ -41,19 +43,17 @@ import {
   outputWarn,
   runWithTimer,
   serviceEnvironment,
+  sessionConstants,
   spinFqdn,
   stringifyMessage,
+  systemEnvironmentVariables,
+  themeKitAccessDomain,
   themeToken
-} from "./chunk-CZRFEKLZ.js";
+} from "./chunk-JPPYUT6M.js";
 import {
-  defaultThemeKitAccessDomain,
-  environmentVariables,
-  sessionConstants,
-  systemEnvironmentVariables
-} from "./chunk-G6AY2JW5.js";
-import {
-  cwd
-} from "./chunk-BB6N2XSA.js";
+  cwd,
+  sniffForJson
+} from "./chunk-X36SPRUS.js";
 import {
   __commonJS,
   __require,
@@ -61,6 +61,57 @@ import {
   init_cjs_shims
 } from "./chunk-POZ5MGPT.js";
 
+// ../../node_modules/.pnpm/network-interfaces@1.1.0/node_modules/network-interfaces/index.js
+var require_network_interfaces = __commonJS({
+  "../../node_modules/.pnpm/network-interfaces@1.1.0/node_modules/network-interfaces/index.js"(exports2) {
+    "use strict";
+    init_cjs_shims();
+    var os2 = __require("os");
+    function isValid2(address, options2) {
+      return !(typeof options2.internal == "boolean" && address.internal !== options2.internal || options2.ipVersion === 4 && address.family !== "IPv4" || options2.ipVersion === 6 && address.family !== "IPv6");
+    }
+    function findAddresses(interfaceName, options2 = {}) {
+      let addresses = os2.networkInterfaces()[interfaceName];
+      if (!addresses)
+        throw new Error(`Network interface "${interfaceName}" does not exist`);
+      let result = [];
+      for (let address of addresses)
+        isValid2(address, options2) && result.push(address);
+      return result;
+    }
+    exports2.toIp = function(interfaceName, options2) {
+      let addresses = findAddresses(interfaceName, options2);
+      if (addresses.length === 0)
+        throw new Error(`No suitable IP address found on interface "${interfaceName}"`);
+      return addresses[0].address;
+    };
+    exports2.toIps = function(interfaceName, options2) {
+      return findAddresses(interfaceName, options2).map((address) => address.address);
+    };
+    exports2.fromIp = function(ip, options2) {
+      let interfaces = os2.networkInterfaces(), interfaceNames = Object.keys(interfaces);
+      for (let interfaceName of interfaceNames)
+        for (let address of interfaces[interfaceName])
+          if (address.address === ip && isValid2(address, options2))
+            return interfaceName;
+      throw new Error(`No suitable interfaces were found with IP address "${ip}"`);
+    };
+    exports2.getInterface = function(options2) {
+      let interfaces = os2.networkInterfaces(), interfaceNames = Object.keys(interfaces);
+      for (let interfaceName of interfaceNames)
+        if (findAddresses(interfaceName, options2).length > 0)
+          return interfaceName;
+      throw new Error("No suitable interfaces were found");
+    };
+    exports2.getInterfaces = function(options2) {
+      let interfaces = os2.networkInterfaces(), interfaceNames = Object.keys(interfaces), result = [];
+      for (let interfaceName of interfaceNames)
+        findAddresses(interfaceName, options2).length > 0 && result.push(interfaceName);
+      return result;
+    };
+  }
+});
+
 // ../../node_modules/.pnpm/extract-files@9.0.0/node_modules/extract-files/public/ReactNativeFile.js
 var require_ReactNativeFile = __commonJS({
   "../../node_modules/.pnpm/extract-files@9.0.0/node_modules/extract-files/public/ReactNativeFile.js"(exports2, module2) {
@@ -9100,7 +9151,7 @@ var require_populate = __commonJS({
 var require_form_data = __commonJS({
   "../../node_modules/.pnpm/form-data@3.0.1/node_modules/form-data/lib/form_data.js"(exports2, module2) {
     init_cjs_shims();
-    var CombinedStream = require_combined_stream(), util2 = __require("util"), path = __require("path"), http3 = __require("http"), https3 = __require("https"), parseUrl = __require("url").parse, fs = __require("fs"), mime = require_mime_types(), asynckit = require_asynckit(), populate = require_populate();
+    var CombinedStream = require_combined_stream(), util2 = __require("util"), path = __require("path"), http3 = __require("http"), https3 = __require("https"), parseUrl = __require("url").parse, fs2 = __require("fs"), mime = require_mime_types(), asynckit = require_asynckit(), populate = require_populate();
     module2.exports = FormData4;
     util2.inherits(FormData4, CombinedStream);
     function FormData4(options2) {
@@ -9128,7 +9179,7 @@ var require_form_data = __commonJS({
       options2.knownLength != null ? valueLength += +options2.knownLength : Buffer.isBuffer(value) ? valueLength = value.length : typeof value == "string" && (valueLength = Buffer.byteLength(value)), this._valueLength += valueLength, this._overheadLength += Buffer.byteLength(header) + FormData4.LINE_BREAK.length, !(!value || !value.path && !(value.readable && value.hasOwnProperty("httpVersion"))) && (options2.knownLength || this._valuesToMeasure.push(value));
     };
     FormData4.prototype._lengthRetriever = function(value, callback) {
-      value.hasOwnProperty("fd") ? value.end != null && value.end != 1 / 0 && value.start != null ? callback(null, value.end + 1 - (value.start ? value.start : 0)) : fs.stat(value.path, function(err2, stat) {
+      value.hasOwnProperty("fd") ? value.end != null && value.end != 1 / 0 && value.start != null ? callback(null, value.end + 1 - (value.start ? value.start : 0)) : fs2.stat(value.path, function(err2, stat) {
         var fileSize;
         if (err2) {
           callback(err2);
@@ -26686,7 +26737,7 @@ var require_populate2 = __commonJS({
 var require_form_data2 = __commonJS({
   "../../node_modules/.pnpm/form-data@4.0.0/node_modules/form-data/lib/form_data.js"(exports2, module2) {
     init_cjs_shims();
-    var CombinedStream = require_combined_stream(), util2 = __require("util"), path = __require("path"), http3 = __require("http"), https3 = __require("https"), parseUrl = __require("url").parse, fs = __require("fs"), Stream3 = __require("stream").Stream, mime = require_mime_types(), asynckit = require_asynckit(), populate = require_populate2();
+    var CombinedStream = require_combined_stream(), util2 = __require("util"), path = __require("path"), http3 = __require("http"), https3 = __require("https"), parseUrl = __require("url").parse, fs2 = __require("fs"), Stream3 = __require("stream").Stream, mime = require_mime_types(), asynckit = require_asynckit(), populate = require_populate2();
     module2.exports = FormData4;
     util2.inherits(FormData4, CombinedStream);
     function FormData4(options2) {
@@ -26714,7 +26765,7 @@ var require_form_data2 = __commonJS({
       options2.knownLength != null ? valueLength += +options2.knownLength : Buffer.isBuffer(value) ? valueLength = value.length : typeof value == "string" && (valueLength = Buffer.byteLength(value)), this._valueLength += valueLength, this._overheadLength += Buffer.byteLength(header) + FormData4.LINE_BREAK.length, !(!value || !value.path && !(value.readable && value.hasOwnProperty("httpVersion")) && !(value instanceof Stream3)) && (options2.knownLength || this._valuesToMeasure.push(value));
     };
     FormData4.prototype._lengthRetriever = function(value, callback) {
-      value.hasOwnProperty("fd") ? value.end != null && value.end != 1 / 0 && value.start != null ? callback(null, value.end + 1 - (value.start ? value.start : 0)) : fs.stat(value.path, function(err2, stat) {
+      value.hasOwnProperty("fd") ? value.end != null && value.end != 1 / 0 && value.start != null ? callback(null, value.end + 1 - (value.start ? value.start : 0)) : fs2.stat(value.path, function(err2, stat) {
         var fileSize;
         if (err2) {
           callback(err2);
@@ -29291,7 +29342,7 @@ var require_lib3 = __commonJS({
 
 // ../cli-kit/dist/public/common/version.js
 init_cjs_shims();
-var CLI_KIT_VERSION = "3.69.4";
+var CLI_KIT_VERSION = "3.71.0";
 
 // ../cli-kit/dist/private/node/analytics.js
 init_cjs_shims();
@@ -32054,10 +32105,6 @@ function deepStrict(schema) {
   } else
     return schema instanceof ZodOptional ? deepStrict(schema._def.innerType).optional() : schema;
 }
-function errorsToString(errors) {
-  return errors.map((error) => error.path.join(".").concat(": ").concat(error.message ?? "Unknow error")).join(`
-`);
-}
 
 // ../cli-kit/dist/private/node/session/schema.js
 var DateSchema = z.preprocess((arg) => typeof arg == "string" || arg instanceof Date ? new Date(arg) : null, z.date()), IdentityTokenSchema = z.object({
@@ -32092,12 +32139,148 @@ init_cjs_shims();
 
 // ../cli-kit/dist/public/node/context/fqdn.js
 init_cjs_shims();
+
+// ../cli-kit/dist/public/node/vendor/dev_server/DevServer.js
+init_cjs_shims();
+var ni = __toESM(require_network_interfaces(), 1);
+import fs from "fs";
+import * as os from "os";
+import { execSync } from "child_process";
+var DevServerUtils = class _DevServerUtils {
+  static assertConnectable(name, addr, port) {
+    try {
+      execSync(`nc -z -v -w 1 ${addr} ${port}`, {
+        timeout: _DevServerUtils.CONNECT_TIMEOUT,
+        stdio: "ignore"
+      });
+    } catch {
+      throw new Error(`NET FAILED DevServer for '${name}' is not running on ${port} / ${addr}: \`dev up ${name}\` to start it.`);
+    }
+  }
+  static inferenceModeAndProjectIsEdition2016(name) {
+    try {
+      fs.accessSync(_DevServerUtils.INFERENCE_MODE_SENTINEL);
+      try {
+        return fs.accessSync(`/opt/nginx/etc/manifest/${name}/current/edition-2024`), !1;
+      } catch {
+        return !0;
+      }
+    } catch {
+      return !1;
+    }
+  }
+  static getIpFromHosts(hostname) {
+    try {
+      let lines = fs.readFileSync(_DevServerUtils.HOSTS_FILE, "utf8").split(/\r?\n/);
+      for (let line of lines) {
+        let matches = /^\s*?([^#]+?)\s+([^#]+?)$/.exec(line);
+        if (matches && matches.length === 3 && matches[2] === hostname)
+          return matches[1];
+      }
+    } catch (error) {
+      console.error("Error reading hosts file:", error);
+    }
+    throw new Error(`No IP found for hostname: ${hostname}`);
+  }
+  static getAddrPort2024(name) {
+    try {
+      let backendIp = _DevServerUtils.resolveBackendHost(name), interfaceName = ni.fromIp(backendIp, {
+        internal: !0,
+        ipVersion: 4
+      });
+      return [backendIp, _DevServerUtils.BACKEND_PORT];
+    } catch {
+      throw new Error(`DevServer for '${name}' is not running: \`dev up ${name}\` to start it.`);
+    }
+  }
+  static getAddrPort2016(name) {
+    try {
+      let portContent = fs.readFileSync(`${os.homedir()}/.local/run/services/${name}/server/port`, "utf-8");
+      return ["localhost", parseInt(portContent, 10)];
+    } catch {
+      throw new Error(`DevServer for '${name}' is not running: \`dev up ${name}\` to start it.`);
+    }
+  }
+  static resolveBackendHost(name) {
+    let host;
+    try {
+      host = fs.readlinkSync(`/opt/nginx/etc/manifest/${name}/current`);
+    } catch {
+      host = `${name}.root.shopify.dev.internal`;
+    }
+    try {
+      return _DevServerUtils.getIpFromHosts(host);
+    } catch {
+      return host;
+    }
+  }
+};
+DevServerUtils.INFERENCE_MODE_SENTINEL = "/opt/dev/misc/dev-server-inference-mode";
+DevServerUtils.BACKEND_PORT = 8080;
+DevServerUtils.CONNECT_TIMEOUT = 100;
+DevServerUtils.HOSTS_FILE = "/etc/hosts";
+var DevServer = class {
+  constructor(name) {
+    if (!process.env.SPIN && !process.env.USING_DEV)
+      throw new Error("DevServer is not supported in this environment");
+    if (name === "shopify")
+      throw new Error("Use DevServer.core for the 'shopify' project");
+    this.name = name;
+  }
+  url({ nonstandardHostPrefix } = {}) {
+    return `https://${this.host({ nonstandardHostPrefix })}`;
+  }
+  host({ nonstandardHostPrefix } = {}) {
+    let prefix = nonstandardHostPrefix || this.name;
+    if (process.env.SPIN === "1") {
+      let services = fs.readdirSync("/run/ports2").filter((file) => file.endsWith(`--${this.name}`));
+      if (services.length === 0)
+        throw new Error(`DevServer for '${this.name}' not present in this spin environment`);
+      let match = new RegExp(`^(.+)${this.name}$`).exec(services[0]), organization = match ? match[1] : "";
+      return `${organization !== "shopify--" ? `${organization}` : ""}${this.name}.${process.env.SPIN_FQDN}`;
+    } else
+      return DevServerUtils.inferenceModeAndProjectIsEdition2016(this.name) ? (this.assertRunningLocally2016(), `${prefix}.myshopify.io`) : (this.assertRunningLocally2024(), `${prefix}.shop.dev`);
+  }
+  assertRunningLocally2024() {
+    let [addr, port] = DevServerUtils.getAddrPort2024(this.name);
+    DevServerUtils.assertConnectable(this.name, addr, port);
+  }
+  assertRunningLocally2016() {
+    let [addr, port] = DevServerUtils.getAddrPort2016(this.name);
+    DevServerUtils.assertConnectable(this.name, addr, port);
+  }
+}, DevServerCore = class {
+  constructor() {
+    this.name = "shopify";
+  }
+  url(prefix) {
+    return `https://${this.host(prefix)}`;
+  }
+  host(prefix) {
+    if (process.env.SPIN === "1") {
+      if (!fs.readdirSync("/run/ports2").find((file) => file.endsWith(`--${this.name}`)))
+        throw new Error(`DevServer for '${this.name}' not present in this spin environment`);
+      return `${prefix}.${this.name}.${process.env.SPIN_FQDN}`;
+    } else
+      return DevServerUtils.inferenceModeAndProjectIsEdition2016("shopify") ? (this.assertRunningLocally2016(), `${prefix}.myshopify.io`) : (this.assertRunningLocally2024(), `${prefix}.my.shop.dev`);
+  }
+  assertRunningLocally2024() {
+    let [addr, port] = DevServerUtils.getAddrPort2024("shopify");
+    DevServerUtils.assertConnectable("shopify", addr, port);
+  }
+  assertRunningLocally2016() {
+    let [addr, port] = DevServerUtils.getAddrPort2016("shopify");
+    DevServerUtils.assertConnectable("shopify", addr, port);
+  }
+};
+
+// ../cli-kit/dist/public/node/context/fqdn.js
 var CouldntObtainPartnersSpinFQDNError = new AbortError("Couldn't obtain the Spin FQDN for Partners when the CLI is not running from a Spin environment."), CouldntObtainIdentitySpinFQDNError = new AbortError("Couldn't obtain the Spin FQDN for Identity when the CLI is not running from a Spin environment."), CouldntObtainShopifySpinFQDNError = new AbortError("Couldn't obtain the Spin FQDN for Shopify when the CLI is not running from a Spin environment."), NotProvidedStoreFQDNError = new AbortError("Couldn't obtain the Shopify FQDN because the store FQDN was not provided.");
 async function partnersFqdn() {
   let environment = serviceEnvironment(), productionFqdn = "partners.shopify.com";
   switch (environment) {
     case "local":
-      return "partners.myshopify.io";
+      return new DevServer("partners").host();
     case "spin":
       return `partners.${await spinFqdn()}`;
     default:
@@ -32108,7 +32291,7 @@ async function appManagementFqdn() {
   let environment = serviceEnvironment(), productionFqdn = "app.shopify.com";
   switch (environment) {
     case "local":
-      return "app.shopify.myshopify.io";
+      return new DevServerCore().host("app");
     case "spin":
       return `app.shopify.${await spinFqdn()}`;
     default:
@@ -32119,7 +32302,7 @@ async function developerDashboardFqdn() {
   let environment = serviceEnvironment(), productionFqdn = "dev.shopify.com";
   switch (environment) {
     case "local":
-      return "dev.shopify.myshopify.io";
+      return new DevServerCore().host("dev");
     case "spin":
       return `dev.shopify.${await spinFqdn()}`;
     default:
@@ -32130,7 +32313,7 @@ async function businessPlatformFqdn() {
   let environment = serviceEnvironment(), productionFqdn = "destinations.shopifysvc.com";
   switch (environment) {
     case "local":
-      return "business-platform.myshopify.io";
+      return new DevServer("business-platform").host();
     case "spin":
       return `business-platform.${await spinFqdn()}`;
     default:
@@ -32141,7 +32324,7 @@ async function identityFqdn() {
   let environment = serviceEnvironment(), productionFqdn = "accounts.shopify.com";
   switch (environment) {
     case "local":
-      return "identity.myshopify.io";
+      return new DevServer("identity").host();
     case "spin":
       return `identity.${await spinFqdn()}`;
     default:
@@ -32152,14 +32335,14 @@ async function normalizeStoreFqdn(store2) {
   let storeFqdn = store2.replace(/^https?:\/\//, "").replace(/\/$/, ""), addDomain = async (storeFqdn2) => {
     switch (serviceEnvironment()) {
       case "local":
-        return `${storeFqdn2}.myshopify.io`;
+        return new DevServerCore().host(storeFqdn2);
       case "spin":
         return `${storeFqdn2}.shopify.${await spinFqdn()}`;
       default:
         return `${storeFqdn2}.myshopify.com`;
     }
   };
-  return ((storeFqdn2) => storeFqdn2.includes(".myshopify.com") || storeFqdn2.includes("spin.dev") || storeFqdn2.includes("shopify.io"))(storeFqdn) ? storeFqdn : addDomain(storeFqdn);
+  return ((storeFqdn2) => storeFqdn2.includes(".myshopify.com") || storeFqdn2.includes("spin.dev") || storeFqdn2.includes("shopify.io") || storeFqdn2.includes(".shop.dev"))(storeFqdn) ? storeFqdn : addDomain(storeFqdn);
 }
 
 // ../cli-kit/dist/public/node/http.js
@@ -32195,7 +32378,7 @@ function buildHeaders(token) {
     ...firstPartyDev() && { "X-Shopify-Cli-Employee": "1" }
   };
   if (token) {
-    let authString = token.match(/^shp(at|ua|ca)/) ? token : `Bearer ${token}`;
+    let authString = token.match(/^shp(at|ua|ca|tka)/) ? token : `Bearer ${token}`;
     headers.authorization = authString, headers["X-Shopify-Access-Token"] = authString;
   }
   return headers;
@@ -32627,7 +32810,7 @@ async function makeVerboseRequest({ request, url }) {
         for (let [key, value] of err2.response.headers)
           responseHeaderIsInteresting(key) && (responseHeaders[key] = value);
       let sanitizedHeaders = sanitizedHeadersOutput(responseHeaders);
-      if (err2.response.errors?.some((error) => error.extensions.code === "429") || err2.response.status === 429) {
+      if (errorsIncludeStatus429(err2)) {
         let delayMs;
         try {
           delayMs = responseHeaders["retry-after"] ? Number.parseInt(responseHeaders["retry-after"], 10) : void 0;
@@ -32642,7 +32825,16 @@ async function makeVerboseRequest({ request, url }) {
           requestId: responseHeaders["x-request-id"],
           delayMs
         };
-      }
+      } else if (err2.response.status === 401)
+        return {
+          status: "unauthorized",
+          clientError: err2,
+          duration,
+          sanitizedHeaders,
+          sanitizedUrl,
+          requestId: responseHeaders["x-request-id"],
+          delayMs: 500
+        };
       return {
         status: "client-error",
         clientError: err2,
@@ -32671,6 +32863,9 @@ async function makeVerboseRequest({ request, url }) {
     requestId: responseHeaders["x-request-id"]
   };
 }
+function errorsIncludeStatus429(error) {
+  return error.response.status === 429 ? !0 : typeof error.response.errors == "string" ? !1 : error.response.errors?.some((error2) => error2.extensions?.code === "429") ?? !1;
+}
 async function simpleRequestWithDebugLog({ request, url }, errorHandler2) {
   let result = await makeVerboseRequest({ request, url });
   switch (outputDebug(`Request to ${result.sanitizedUrl} completed in ${result.duration} ms
@@ -32685,9 +32880,11 @@ ${result.sanitizedHeaders}
       throw errorHandler2 ? errorHandler2(result.error, result.requestId) : result.error;
     case "can-retry":
       throw errorHandler2 ? errorHandler2(result.clientError, result.requestId) : result.clientError;
+    case "unauthorized":
+      throw errorHandler2 ? errorHandler2(result.clientError, result.requestId) : result.clientError;
   }
 }
-async function retryAwareRequest({ request, url }, errorHandler2, retryOptions = {
+async function retryAwareRequest({ request, url }, errorHandler2, unauthorizedHandler, retryOptions = {
   scheduleDelay: setTimeout
 }) {
   let retriesUsed = 0, limitRetriesTo = retryOptions.limitRetriesTo ?? DEFAULT_RETRY_LIMIT, result = await makeVerboseRequest({ request, url });
@@ -32701,6 +32898,11 @@ ${result.sanitizedHeaders}
       throw errorHandler2 ? errorHandler2(result.clientError, result.requestId) : result.clientError;
     if (result.status === "unknown-error")
       throw errorHandler2 ? errorHandler2(result.error, result.requestId) : result.error;
+    if (result.status === "unauthorized")
+      if (unauthorizedHandler)
+        await unauthorizedHandler();
+      else
+        throw result.clientError;
     if (limitRetriesTo <= retriesUsed)
       throw outputDebug(`${limitRetriesTo} retries exhausted for request to ${result.sanitizedUrl}`), errorHandler2 ? errorHandler2(result.clientError, result.requestId) : result.clientError;
     retriesUsed += 1;
@@ -33813,9 +34015,9 @@ function defaultApiScopes(api, systemEnvironment = process.env) {
     case "partners":
       return ["cli"];
     case "business-platform":
-      return isTruthy(systemEnvironment.USE_APP_MANAGEMENT_API) ? ["destinations", "store-management"] : ["destinations"];
+      return isAppManagementEnabled(systemEnvironment) ? ["destinations", "store-management"] : ["destinations"];
     case "app-management":
-      return isTruthy(systemEnvironment.USE_APP_MANAGEMENT_API) ? ["app-management"] : [];
+      return isAppManagementEnabled(systemEnvironment) ? ["app-management"] : [];
     default:
       throw new BugError(`Unknown API: ${api}`);
   }
@@ -33962,7 +34164,7 @@ var InvalidGrantError = class extends import_ts_error.ExtendableError {
 }, InvalidTargetError = class extends AbortError {
 };
 async function exchangeAccessForApplicationTokens(identityToken, scopes, store2) {
-  let token = identityToken.accessToken, appManagementEnabled = isTruthy(process.env.USE_APP_MANAGEMENT_API), [partners, storefront, businessPlatform, admin, appManagement] = await Promise.all([
+  let token = identityToken.accessToken, appManagementEnabled = isAppManagementEnabled(), [partners, storefront, businessPlatform, admin, appManagement] = await Promise.all([
     requestAppToken("partners", token, scopes.partners),
     requestAppToken("storefront-renderer", token, scopes.storefront),
     requestAppToken("business-platform", token, scopes.businessPlatform),
@@ -34140,8 +34342,8 @@ function restRequestBody(requestBody) {
   if (requestBody)
     return JSON.stringify(requestBody);
 }
-function restRequestUrl(session, apiVersion, path, searchParams = {}, env = process.env) {
-  let themeKitAccessDomain = env[environmentVariables.themeKitAccessDomain] || defaultThemeKitAccessDomain, url = new URL(isThemeAccessSession(session) ? `https://${themeKitAccessDomain}/cli/admin/api/${apiVersion}${path}.json` : `https://${session.storeFqdn}/admin/api/${apiVersion}${path}.json`);
+function restRequestUrl(session, apiVersion, path, searchParams = {}) {
+  let url = new URL(isThemeAccessSession(session) ? `https://${themeKitAccessDomain}/cli/admin/api/${apiVersion}${path}.json` : `https://${session.storeFqdn}/admin/api/${apiVersion}${path}.json`);
   return Object.entries(searchParams).forEach(([name, value]) => {
     url.searchParams.set(name, value);
   }), url.toString();
@@ -34162,7 +34364,7 @@ init_cjs_shims();
 
 // ../cli-kit/dist/private/node/api/graphql.js
 init_cjs_shims();
-function debugLogRequestInfo(api, query, variables, headers = {}) {
+function debugLogRequestInfo(api, query, url, variables, headers = {}) {
   outputDebug(outputContent`Sending ${outputToken.json(api)} GraphQL request:
   ${outputToken.raw(query.toString().trim())}
 ${variables ? `
@@ -34170,8 +34372,8 @@ With variables:
 ${sanitizeVariables(variables)}
 ` : ""}
 With request headers:
-${sanitizedHeadersOutput(headers)}
-`);
+${sanitizedHeadersOutput(headers)}\n
+to ${sanitizeURL(url)}`);
 }
 function sanitizeVariables(variables) {
   let result = { ...variables };
@@ -34197,14 +34399,14 @@ Request ID: ${requestId}
 
 // ../cli-kit/dist/public/node/api/graphql.js
 async function performGraphQLRequest(options2) {
-  let { token, addedHeaders, queryAsString, variables, api, url, responseOptions } = options2, headers = {
+  let { token, addedHeaders, queryAsString, variables, api, url, responseOptions, unauthorizedHandler } = options2, headers = {
     ...addedHeaders,
     ...buildHeaders(token)
   };
-  debugLogRequestInfo(api, queryAsString, variables, headers);
+  debugLogRequestInfo(api, queryAsString, url, variables, headers);
   let clientOptions = { agent: await httpsAgent(), headers }, client = new GraphQLClient(url, clientOptions);
   return runWithTimer("cmd_all_timing_network_ms")(async () => {
-    let response = await retryAwareRequest({ request: () => client.rawRequest(queryAsString, variables), url }, responseOptions?.handleErrors === !1 ? void 0 : errorHandler(api));
+    let response = await retryAwareRequest({ request: () => client.rawRequest(queryAsString, variables), url }, responseOptions?.handleErrors === !1 ? void 0 : errorHandler(api), unauthorizedHandler);
     responseOptions?.onResponse && responseOptions.onResponse(response);
     try {
       let requestId = response.headers.get("x-request-id");
@@ -34300,9 +34502,6 @@ function getEnvironmentVariables() {
 function getPartnersToken() {
   return getEnvironmentVariables()[environmentVariables.partnersToken];
 }
-function getOrganization() {
-  return getEnvironmentVariables()[environmentVariables.organization];
-}
 function getBackendPort() {
   let backendPort = getEnvironmentVariables()[systemEnvironmentVariables.backendPort];
   if (backendPort && !isNaN(Number(backendPort)))
@@ -34317,6 +34516,9 @@ function getIdentityTokenInformation() {
       userId: nonRandomUUID(identityToken)
     };
 }
+function jsonOutputEnabled(environment = getEnvironmentVariables()) {
+  return sniffForJson() || isTruthy(environment[environmentVariables.json]);
+}
 
 // ../cli-kit/dist/private/node/session.js
 var userId, authMethod = "none";
@@ -34405,7 +34607,7 @@ async function executeCompleteFlow(applications, identityFqdn2) {
   return outputCompleted("Logged in."), session;
 }
 async function ensureUserHasPartnerAccount(partnersToken, userId2) {
-  if (!isTruthy(process.env.USE_APP_MANAGEMENT_API) && (outputDebug(outputContent`Verifying that the user has a Partner organization`), !await hasPartnerAccount(partnersToken, userId2) && (outputInfo(`
+  if (!isAppManagementEnabled() && (outputDebug(outputContent`Verifying that the user has a Partner organization`), !await hasPartnerAccount(partnersToken, userId2) && (outputInfo(`
 A Shopify Partners organization is needed to proceed.`), outputInfo("\u{1F449} Press any key to create one"), await keypress(), await openURL(`https://${await partnersFqdn()}/signup`), outputInfo(outputContent`👉 Press any key when you have ${outputToken.cyan("created the organization")}`), outputWarn(outputContent`Make sure you've confirmed your Shopify and the Partner organization from the email`), await keypress(), !await hasPartnerAccount(partnersToken, userId2))))
     throw new AbortError("Couldn't find your Shopify Partners organization", "Have you confirmed your accounts from the emails you received?");
 }
@@ -34591,16 +34793,6 @@ function flagIncluded(flag, commandClass) {
 export {
   getNextDeprecationDate,
   setNextDeprecationDate,
-  username,
-  platformAndArch,
-  hashString,
-  fileHash,
-  randomUUID,
-  nonRandomUUID,
-  getEnvironmentVariables,
-  getPartnersToken,
-  getOrganization,
-  getBackendPort,
   CLI_KIT_VERSION,
   require_mime_types,
   require_graphql2 as require_graphql,
@@ -34612,7 +34804,6 @@ export {
   fetch2 as fetch,
   z,
   deepStrict,
-  errorsToString,
   partnersFqdn,
   appManagementFqdn,
   developerDashboardFqdn,
@@ -34620,6 +34811,10 @@ export {
   normalizeStoreFqdn,
   ok,
   err,
+  hashString,
+  fileHash,
+  randomUUID,
+  nonRandomUUID,
   exchangeCustomPartnerToken,
   restRequestBody,
   restRequestUrl,
@@ -34631,10 +34826,16 @@ export {
   partnersRequest,
   partnersRequestDoc,
   handleDeprecations,
+  getEnvironmentVariables,
+  getPartnersToken,
+  getBackendPort,
+  jsonOutputEnabled,
   getLastSeenUserIdAfterAuth,
   setLastSeenUserIdAfterAuth,
   setLastSeenAuthMethod,
   ensureAuthenticated,
+  username,
+  platformAndArch,
   startAnalytics,
   getEnvironmentData,
   getSensitiveEnvironmentData
@@ -34657,4 +34858,4 @@ mime-types/index.js:
    * MIT Licensed
    *)
 */
-//# sourceMappingURL=chunk-ZYFGLOXH.js.map
+//# sourceMappingURL=chunk-PUMOQDXS.js.map