@shopify/cli 3.67.2 → 3.68.0

package/dist/index.js

@@ -123,7 +123,7 @@ import {
   unsetStorefront,
   waitForJob,
   writeDotEnv
-} from "./chunk-PAZH6CHQ.js";
+} from "./chunk-YKH4ILAB.js";
 import {
   require_lib as require_lib4
 } from "./chunk-NUP5TATA.js";
@@ -141,93 +141,72 @@ import {
 } from "./chunk-OXKHBIW7.js";
 import {
   KitchenSinkStatic
-} from "./chunk-562KSNGI.js";
+} from "./chunk-QIBFYG6F.js";
 import {
   Search
-} from "./chunk-FQIDK63N.js";
+} from "./chunk-G47SEBU3.js";
 import {
   Upgrade
-} from "./chunk-ZCKALXEF.js";
+} from "./chunk-C4FBYE7F.js";
 import {
   getOutputUpdateCLIReminder
-} from "./chunk-NSWINIBD.js";
+} from "./chunk-JJOZP7G6.js";
 import {
   Version
-} from "./chunk-ZBI666QU.js";
-import "./chunk-JAG2AX55.js";
-import "./chunk-7BYOY5N5.js";
+} from "./chunk-IL455HI5.js";
+import "./chunk-XCGES3AJ.js";
+import "./chunk-MXZ6B3TP.js";
 import {
   HelpCommand
-} from "./chunk-WETDRCPJ.js";
+} from "./chunk-VVY6VJR6.js";
 import {
   KitchenSinkAsync
-} from "./chunk-R3LRKILP.js";
+} from "./chunk-HTDUPJH5.js";
 import {
   KitchenSinkAll
-} from "./chunk-5RIQPY5J.js";
-import "./chunk-X2SV2NGT.js";
-import "./chunk-Z56WKKTE.js";
+} from "./chunk-6IS7OFWG.js";
+import "./chunk-ZJZ3SGOJ.js";
+import "./chunk-UCYJX4VB.js";
 import {
   KitchenSinkPrompts
-} from "./chunk-6PW7I4PG.js";
-import "./chunk-7IU4SQFO.js";
+} from "./chunk-4H7GRGC6.js";
+import "./chunk-E2OAY724.js";
 import {
   Logout
-} from "./chunk-B2FBI5M7.js";
+} from "./chunk-JAH3NBCG.js";
 import {
-  appManagementFqdn,
-  checkPort,
-  developerDashboardFqdn,
   ensureAuthenticatedAdmin,
   ensureAuthenticatedAppManagement,
   ensureAuthenticatedBusinessPlatform,
   ensureAuthenticatedPartners,
   ensureAuthenticatedStorefront,
-  ensureAuthenticatedThemes,
-  err,
-  getRandomPort,
-  graphqlRequest,
-  graphqlRequestDoc,
-  normalizeStoreFqdn,
-  ok,
-  partnersFqdn,
-  partnersRequest,
-  partnersRequestDoc,
-  require_lib as require_lib3
-} from "./chunk-3UX657AK.js";
-import {
-  setNextDeprecationDate
-} from "./chunk-LCWH3FW5.js";
+  ensureAuthenticatedThemes
+} from "./chunk-DD5ULVKP.js";
 import {
   CommandFlags
-} from "./chunk-EJNO7GOB.js";
+} from "./chunk-GDKBDEZV.js";
 import {
   Catalog
-} from "./chunk-BC6U7ADI.js";
+} from "./chunk-OBX5DIH4.js";
 import {
   GenerateFile
-} from "./chunk-STZTH6VQ.js";
+} from "./chunk-FKQTUQ3O.js";
 import {
   Demo
-} from "./chunk-VN52QBYW.js";
+} from "./chunk-JR6ZN4TY.js";
 import {
   PrintAIPrompt
-} from "./chunk-UU4VCC4D.js";
+} from "./chunk-DMM6NVLV.js";
 import "./chunk-QSUS3GJF.js";
-import "./chunk-JOCNTZDE.js";
-import {
-  deepStrict,
-  errorsToString,
-  z
-} from "./chunk-NLUGD7PZ.js";
+import "./chunk-WJBW5QHV.js";
 import {
   DocsGenerate
-} from "./chunk-DRZBXASC.js";
+} from "./chunk-5VZ6BLBM.js";
 import {
   base_command_default,
   decodeToml,
   encodeToml
-} from "./chunk-EFKO63JK.js";
+} from "./chunk-EUBA2XGP.js";
 import {
   require_byline,
   require_end_of_stream,
@@ -235,36 +214,52 @@ import {
   require_iserror,
   require_pump,
   require_stack_generator
-} from "./chunk-PMK54HHN.js";
+} from "./chunk-NCUKAORS.js";
 import {
-  ClientError,
-  FetchError,
-  buildHeaders,
   execCLI2,
   fanoutHooks,
+  getListOfTunnelPlugins,
+  reportAnalyticsEvent,
+  version
+} from "./chunk-WUA6LTEH.js";
+import {
+  ClientError,
+  FetchError,
+  appManagementFqdn,
+  checkPort,
+  developerDashboardFqdn,
+  err,
   fetch as fetch2,
+  fileHash,
   formData,
   getBackendPort,
   getEnvironmentVariables,
-  getListOfTunnelPlugins,
   getOrganization,
+  getRandomPort,
   gql,
-  reportAnalyticsEvent,
+  graphqlRequest,
+  graphqlRequestDoc,
+  hashString,
+  normalizeStoreFqdn,
+  ok,
+  partnersFqdn,
+  partnersRequest,
+  partnersRequestDoc,
+  randomUUID,
   require_graphql,
   require_lib as require_lib2,
+  require_lib2 as require_lib3,
   require_mime_types,
-  version
-} from "./chunk-3WDAYAS7.js";
+  restRequestBody,
+  restRequestHeaders,
+  restRequestUrl,
+  setNextDeprecationDate
+} from "./chunk-7PUJMPXN.js";
 import "./chunk-VSLR7ET4.js";
-import {
-  fileHash,
-  hashString,
-  randomUUID
-} from "./chunk-HH7KQOBX.js";
 import {
   platformAndArch,
   username
-} from "./chunk-J5YDWXWQ.js";
+} from "./chunk-JAQZDU4S.js";
 import {
   LocalStorage,
   UnknownPackageManagerError,
@@ -276,17 +271,17 @@ import {
   getPackageManager,
   getPackageName,
   getPackageVersion,
+  inferPackageManager,
   installNPMDependenciesRecursively,
   installNodeModules,
   lockfiles,
-  packageManager,
   packageManagerFromUserAgent,
   readAndParsePackageJson,
   require_ajv,
   usesWorkspaces,
   versionSatisfies,
   writePackageJSON
-} from "./chunk-V6H23CVU.js";
+} from "./chunk-RUR45G5U.js";
 import {
   require_semver
 } from "./chunk-BYPQXSAL.js";
@@ -295,7 +290,12 @@ import {
 } from "./chunk-O5K4AU7Q.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-2Q4KXXH7.js";
+} from "./chunk-A3DV6VXO.js";
+import {
+  deepStrict,
+  errorsToString,
+  z
+} from "./chunk-NLUGD7PZ.js";
 import {
   AbortController as AbortController2,
   AbortError,
@@ -472,13 +472,11 @@ import {
   use_stdin_default,
   writeFile,
   writeFileSync
-} from "./chunk-FH3MZSH6.js";
+} from "./chunk-D72SCNZ2.js";
 import {
   require_signal_exit
 } from "./chunk-QETDXAFX.js";
 import {
-  defaultThemeKitAccessDomain,
-  environmentVariables,
   logsFolder
 } from "./chunk-NZDBLGNM.js";
 import {
@@ -144612,7 +144610,7 @@ import { fileURLToPath } from "url";
 async function warnIfOldNodeVersion() {
   let nodeVersion = process.versions.node, nodeMajorVersion = Number(nodeVersion.split(".")[0]);
   if (nodeMajorVersion < 18) {
-    let { renderWarning: renderWarning2 } = await import("./ui-XXPOXZHJ.js");
+    let { renderWarning: renderWarning2 } = await import("./ui-JUVEDXYN.js");
     renderWarning2({
       headline: "Upgrade to a supported Node version now.",
       body: [
@@ -144637,7 +144635,7 @@ function forceNoColor() {
 }
 async function runCLI(options) {
   setupEnvironmentVariables(options), forceNoColor(), await warnIfOldNodeVersion();
-  let { errorHandler: errorHandler2 } = await import("./error-handler-64WEMROQ.js"), { isDevelopment } = await import("./local-XTOGAMBD.js"), oclif = await import("./lib-4WCTNKJK.js"), { ShopifyConfig } = await import("./custom-oclif-loader-YYAVL5FV.js");
+  let { errorHandler: errorHandler2 } = await import("./error-handler-EORUUIBK.js"), { isDevelopment } = await import("./local-4NQ3UGM2.js"), oclif = await import("./lib-4WCTNKJK.js"), { ShopifyConfig } = await import("./custom-oclif-loader-Y5TLP3GI.js");
   isDevelopment() && (oclif.default.settings.debug = !0);
   try {
     let config2 = new ShopifyConfig({ root: fileURLToPath(options.moduleURL) });
@@ -144647,8 +144645,8 @@ async function runCLI(options) {
   }
 }
 async function useLocalCLIIfDetected(filepath) {
-  let { environmentVariables: environmentVariables2 } = await import("./constants-TR6ABVLJ.js"), { joinPath: join6 } = await import("./path-T2RCZTRE.js"), { exec: exec2 } = await import("./system-OLJOMCQB.js");
-  if (!isTruthy(process.env[environmentVariables2.enableCliRedirect]) || isTruthy(process.env[environmentVariables2.skipCliRedirect]) || process.env.npm_config_user_agent)
+  let { environmentVariables } = await import("./constants-TR6ABVLJ.js"), { joinPath: join6 } = await import("./path-T2RCZTRE.js"), { exec: exec2 } = await import("./system-WDT2XUAD.js");
+  if (!isTruthy(process.env[environmentVariables.enableCliRedirect]) || isTruthy(process.env[environmentVariables.skipCliRedirect]) || process.env.npm_config_user_agent)
     return !1;
   let cliPackage = await localCliPackage();
   if (!cliPackage)
@@ -144659,7 +144657,7 @@ async function useLocalCLIIfDetected(filepath) {
   try {
     await exec2(correctExecutablePath, process.argv.slice(2, process.argv.length), {
       stdio: "inherit",
-      env: { [environmentVariables2.skipCliRedirect]: "1" }
+      env: { [environmentVariables.skipCliRedirect]: "1" }
     });
   } catch (processError) {
     process.exit(processError.exitCode);
@@ -144667,7 +144665,7 @@ async function useLocalCLIIfDetected(filepath) {
   return !0;
 }
 async function localCliPackage() {
-  let { captureOutput } = await import("./system-OLJOMCQB.js"), npmListOutput = "", localShopifyCLI = {};
+  let { captureOutput } = await import("./system-WDT2XUAD.js"), npmListOutput = "", localShopifyCLI = {};
   try {
     npmListOutput = await captureOutput("npm", ["list", "@shopify/cli", "--json", "-l"]), localShopifyCLI = JSON.parse(npmListOutput);
   } catch {
@@ -145061,26 +145059,6 @@ function header(response, name) {
 
 // ../cli-kit/dist/public/node/api/admin.js
 init_cjs_shims();
-
-// ../cli-kit/dist/private/node/api/rest.js
-init_cjs_shims();
-function restRequestBody(requestBody) {
-  if (requestBody)
-    return JSON.stringify(requestBody);
-}
-function restRequestUrl(session, apiVersion, path3, searchParams = {}, env = process.env) {
-  let themeKitAccessDomain = env[environmentVariables.themeKitAccessDomain] || defaultThemeKitAccessDomain, url = new URL(isThemeAccessSession(session) ? `https://${themeKitAccessDomain}/cli/admin/api/${apiVersion}${path3}.json` : `https://${session.storeFqdn}/admin/api/${apiVersion}${path3}.json`);
-  return Object.entries(searchParams).forEach(([name, value]) => url.searchParams.set(name, value)), url.toString();
-}
-function restRequestHeaders(session) {
-  let store = session.storeFqdn, token = session.token, headers = buildHeaders(session.token);
-  return isThemeAccessSession(session) && (headers["X-Shopify-Shop"] = store, headers["X-Shopify-Access-Token"] = token), headers;
-}
-function isThemeAccessSession(session) {
-  return session.token.startsWith("shptka_");
-}
-
-// ../cli-kit/dist/public/node/api/admin.js
 async function adminRequest2(query, session, variables) {
   let api = "Admin", version2 = await fetchLatestSupportedApiVersion(session), url = adminUrl(session.storeFqdn, version2);
   return graphqlRequest({ query, api, url, token: session.token, variables });
@@ -146454,7 +146432,7 @@ function toNodeListener(app) {
 async function render2(session, context) {
   let url = buildStorefrontUrl(session, context), replaceTemplates = Object.keys({ ...context.replaceTemplates, ...context.replaceExtensionTemplates });
   outputDebug(`\u2192 Rendering ${url} (with ${replaceTemplates})...`);
-  let bodyParams = storefrontReplaceTemplatesParams(context), headers = await buildHeaders2(session, context), response = await fetch2(url, {
+  let bodyParams = storefrontReplaceTemplatesParams(context), headers = await buildHeaders(session, context), response = await fetch2(url, {
     method: "POST",
     body: bodyParams,
     headers: {
@@ -146471,8 +146449,8 @@ async function render2(session, context) {
   }), requestId = response.headers.get("x-request-id");
   return outputDebug(`\u2190 ${response.status} (request_id: ${requestId})`), response.headers.delete("Content-Type"), response;
 }
-async function buildHeaders2(session, context) {
-  return isThemeAccessSession2(session) ? buildThemeAccessHeaders(session, context) : buildStandardHeaders(session, context);
+async function buildHeaders(session, context) {
+  return isThemeAccessSession(session) ? buildThemeAccessHeaders(session, context) : buildStandardHeaders(session, context);
 }
 async function buildStandardHeaders(session, context) {
   let cookies = await buildCookies(session, context), storefrontToken = session.storefrontToken;
@@ -146510,9 +146488,9 @@ function buildStorefrontUrl(session, { path: path3, sectionId, appBlockId, query
   return sectionId ? params.append("section_id", sectionId) : appBlockId && params.append("app_block_id", appBlockId), `${url}?${params}`;
 }
 function buildBaseStorefrontUrl(session) {
-  return isThemeAccessSession2(session) ? "https://theme-kit-access.shopifyapps.com/cli/sfr" : `https://${session.storeFqdn}`;
+  return isThemeAccessSession(session) ? "https://theme-kit-access.shopifyapps.com/cli/sfr" : `https://${session.storeFqdn}`;
 }
-function isThemeAccessSession2(session) {
+function isThemeAccessSession(session) {
   return session.token.startsWith("shptka_");
 }
 function themeAccessHeaders(session) {
@@ -146813,6 +146791,10 @@ init_cjs_shims();
 // ../theme/dist/cli/utilities/theme-selector/fetch.js
 init_cjs_shims();
 var ALLOWED_ROLES = ["live", "unpublished", "development"];
+async function publicFetchStoreThemes(store, password) {
+  let adminSession = await ensureAuthenticatedThemes(store, password);
+  return fetchStoreThemes(adminSession);
+}
 async function fetchStoreThemes(session) {
   let store = session.storeFqdn, themes = (await fetchThemes(session)).filter(isRoleAllowed);
   if (themes.length === 0)
@@ -147039,9 +147021,17 @@ init_cjs_shims();
 // ../theme/dist/cli/utilities/asset-checksum.js
 init_cjs_shims();
 function calculateChecksum(fileKey, fileContent) {
+  return fileContent ? Buffer.isBuffer(fileContent) ? md5(fileContent) : isSettingsData(fileKey) ? minifiedJSONFileChecksum(fileContent) : regularFileChecksum(fileKey, fileContent) : "";
+}
+function minifiedJSONFileChecksum(fileContent) {
   let content = fileContent;
-  return content ? (Buffer.isBuffer(content) || (isTextFile(fileKey) && (content = content.replace(/\r\n/g, `
-`)), isJson(fileKey) && !isThemeAsset(fileKey) && !isSettingsSchema(fileKey) && (content = normalizeJson(content), content = content.replace(/(?<!\\)\//g, "\\/"))), md5(content)) : "";
+  return content = content.replace(/\r\n/g, `
+`), content = content.replace(/\/\*[\s\S]*?\*\//, ""), content = normalizeJson(content), md5(content);
+}
+function regularFileChecksum(fileKey, fileContent) {
+  let content = fileContent;
+  return isTextFile(fileKey) && (content = content.replace(/\r\n/g, `
+`)), md5(content);
 }
 function normalizeJson(jsonStr) {
   let inStr = !1, wasBackslash = !1, formattedStr = "";
@@ -147060,8 +147050,8 @@ function rejectGeneratedStaticAssets(themeChecksums) {
 function hasLiquidSource(checksums, key) {
   return checksums.some((checksum) => checksum.key === `${key}.liquid`);
 }
-function isSettingsSchema(path3) {
-  return path3.endsWith("/settings_schema.json");
+function isSettingsData(path3) {
+  return path3.endsWith("/settings_data.json");
 }
 
 // ../theme/dist/cli/utilities/asset-ignore.js
@@ -147674,10 +147664,10 @@ ${result.errors.asset.map((error) => `- ${error}`).join(`
   }, handleFileDelete = (themeId, adminSession, fileKey) => {
     isFileIgnored(fileKey) || (files.delete(fileKey), unsyncedFileKeys.add(fileKey), emitEvent("unlink", { fileKey }), deleteThemeAsset(Number(themeId), fileKey, adminSession).then(async (success) => {
       if (!success)
-        throw new Error("Unknown issue.");
+        throw new Error(`Failed to delete file "${fileKey}" from remote theme.`);
       unsyncedFileKeys.delete(fileKey), outputSyncResult("delete", fileKey);
     }).catch((error) => {
-      renderWarning({ headline: `Failed to delete file "${fileKey}".`, body: error.message });
+      outputDebug(error.message);
     }));
   }, directoriesToWatch = new Set(THEME_DIRECTORY_PATTERNS.map((pattern) => joinPath(root, pattern.split("/").shift() ?? "")));
   return {
@@ -147689,7 +147679,12 @@ ${result.errors.asset.map((error) => `- ${error}`).join(`
       files.delete(fileKey), await removeThemeFile(root, fileKey);
     },
     write: async (asset) => {
-      files.set(asset.key, asset), await writeThemeFile(root, asset);
+      files.set(asset.key, buildThemeAsset({
+        key: asset.key,
+        checksum: asset.checksum,
+        value: asset.value ?? "",
+        attachment: asset.attachment ?? ""
+      })), await writeThemeFile(root, asset);
     },
     read,
     applyIgnoreFilters: (files2) => applyIgnoreFilters(files2, filterPatterns),
@@ -147730,12 +147725,6 @@ async function removeThemeFile(root, path3) {
   }
   await removeFile(absolutePath);
 }
-function isThemeAsset(path3) {
-  return path3.startsWith("assets/");
-}
-function isJson(path3) {
-  return lookupMimeType(path3) === "application/json";
-}
 function partitionThemeFiles(files) {
   let sectionLiquidFiles = [], otherLiquidFiles = [], sectionJsonFiles = [], templateJsonFiles = [], otherJsonFiles = [], contextualizedJsonFiles = [], configFiles = [], staticAssetFiles = [];
   return files.forEach((file) => {
@@ -147763,7 +147752,8 @@ function isTextFile(path3) {
     "application/liquid",
     "text/css",
     "text/x-sass",
-    "text/x-scss"
+    "text/x-scss",
+    "image/svg+xml"
   ].includes(lookupMimeType(path3));
 }
 async function hasRequiredThemeDirectories(path3) {
@@ -147900,7 +147890,7 @@ function getStoreFqdnForRegEx(ctx) {
 function injectCdnProxy(originalContent, ctx) {
   let content = originalContent, vanityCdnRE = new RegExp(`(https?:)?//${getStoreFqdnForRegEx(ctx)}${VANITY_CDN_PREFIX}`, "g");
   content = content.replace(vanityCdnRE, VANITY_CDN_PREFIX);
-  let mainCdnRE = /(?:https?:)?\/\/cdn\.shopify\.com\/(.*?\/(assets\/[^?">]+)(?:\?|"|>|$))/g, filterAssets = (key) => key.startsWith("assets"), existingAssets = new Set([...ctx.localThemeFileSystem.files.keys()].filter(filterAssets)), existingExtAssets = new Set([...ctx.localThemeExtensionFileSystem.files.keys()].filter(filterAssets));
+  let mainCdnRE = /(?:https?:)?\/\/cdn\.shopify\.com\/(.*?\/(assets\/[^?#"'`>\s]+))/g, filterAssets = (key) => key.startsWith("assets/"), existingAssets = new Set([...ctx.localThemeFileSystem.files.keys()].filter(filterAssets)), existingExtAssets = new Set([...ctx.localThemeExtensionFileSystem.files.keys()].filter(filterAssets));
   return content = content.replace(mainCdnRE, (matchedUrl, pathname, matchedAsset) => {
     let isLocalAsset = matchedAsset && existingAssets.has(matchedAsset), isLocalExtAsset = matchedAsset && existingExtAssets.has(matchedAsset) && pathname.startsWith("extensions/");
     return lookupMimeType(matchedAsset).startsWith("image/") ? matchedUrl : isLocalExtAsset ? `${EXTENSION_CDN_PREFIX}${pathname}` : isLocalAsset ? `${VANITY_CDN_PREFIX}${pathname}` : matchedUrl;
@@ -147917,7 +147907,7 @@ function patchCookieDomains(cookieHeader, ctx) {
 async function patchRenderingResponse(ctx, event, response) {
   setResponseStatus(event, response.status, response.statusText), setResponseHeaders(event, Object.fromEntries(response.headers.entries())), patchProxiedResponseHeaders(ctx, event, response);
   let html = await response.text();
-  return removeResponseHeader(event, "content-encoding"), html = injectCdnProxy(html, ctx), html = patchBaseUrlAttributes(html, ctx), html;
+  return removeResponseHeader(event, "content-encoding"), setResponseHeader(event, "content-type", "text/html; charset=utf-8"), html = injectCdnProxy(html, ctx), html = patchBaseUrlAttributes(html, ctx), html;
 }
 var HOP_BY_HOP_HEADERS = [
   "connection",
@@ -147928,7 +147918,9 @@ var HOP_BY_HOP_HEADERS = [
   "trailer",
   "transfer-encoding",
   "upgrade",
-  "content-security-policy"
+  "expect",
+  "content-security-policy",
+  "host"
 ];
 function patchProxiedResponseHeaders(ctx, event, response) {
   clearResponseHeaders(event, HOP_BY_HOP_HEADERS);
@@ -147947,7 +147939,7 @@ function patchProxiedResponseHeaders(ctx, event, response) {
   }
 }
 function getProxyStorefrontHeaders(event) {
-  let proxyRequestHeaders = getProxyRequestHeaders(event);
+  let proxyRequestHeaders = getRequestHeaders(event);
   for (let headerKey of HOP_BY_HOP_HEADERS)
     delete proxyRequestHeaders[headerKey];
   delete proxyRequestHeaders["upgrade-insecure-requests"];
@@ -148081,7 +148073,7 @@ function getAssetsHandler(_theme, ctx) {
       isUnsynced && sendError(event, createError({ statusCode: 404, statusMessage: "Not found" }));
       return;
     }
-    let fileContent = file.value ? injectCdnProxy(file.value, ctx) : Buffer.from(file.attachment ?? "", "base64");
+    let fileContent = file.value ? Buffer.from(injectCdnProxy(file.value, ctx)) : Buffer.from(file.attachment ?? "", "base64");
     return serveStatic(event, {
       getContents: () => fileContent,
       // Note: stats.size is the length of the base64 string for attachments,
@@ -148099,7 +148091,7 @@ function findLocalFile(event, ctx) {
         return { file, isUnsynced, fileKey };
     }
   };
-  return tryGetFile(/^\/cdn\/.*?\/assets\/([^?]+)(\?|$)/, ctx.localThemeFileSystem) ?? tryGetFile(/^\/ext\/cdn\/extensions\/.*?\/.*?\/assets\/([^?]+)(\?|$)/, ctx.localThemeExtensionFileSystem) ?? {
+  return tryGetFile(/^\/cdn\/.*?\/assets\/([^?]+)/, ctx.localThemeFileSystem) ?? tryGetFile(/^\/ext\/cdn\/extensions\/.*?\/assets\/([^?]+)/, ctx.localThemeExtensionFileSystem) ?? {
     isUnsynced: !1,
     fileKey: void 0,
     file: void 0
@@ -148213,7 +148205,7 @@ function getHtmlHandler(theme, ctx) {
       replaceTemplates: getInMemoryTemplates(ctx, browserPathname, getCookie2(event, "localization")?.toLowerCase())
     }).then(async (response) => {
       let html = await patchRenderingResponse(ctx, event, response);
-      return html = prettifySyntaxErrors(html), ctx.options.liveReload !== "off" && (html = injectHotReloadScript(html)), html;
+      return html = prettifySyntaxErrors(html), assertThemeId(response, html, String(theme.id)), ctx.options.liveReload !== "off" && (html = injectHotReloadScript(html)), html;
     }).catch(async (error) => {
       let headline = `Failed to render storefront with status ${error.statusCode} (${error.statusMessage}).`;
       error.data?.requestId && (headline += `
@@ -148225,7 +148217,7 @@ URL: ${error.data.url}`);
 `), errorPageHtml = getErrorPage({
         title,
         header: title,
-        message: [...rest, error.message].join("<br>"),
+        message: [...rest, cause?.message ?? error.message].join("<br>"),
         code: error.stack?.replace(`${error.message}
 `, "") ?? ""
       });
@@ -148262,6 +148254,14 @@ function getErrorPage(options) {
     </body>
   </html>`;
 }
+function assertThemeId(response, html, expectedThemeId) {
+  let obtainedThemeId = html.match(/Shopify\.theme\s*=\s*{[^}]+?"id":\s*"?(\d+)"?(}|,)/)?.[1];
+  obtainedThemeId && obtainedThemeId !== expectedThemeId && (renderFatalError(new AbortError(`Theme ID mismatch: expected ${expectedThemeId} but got ${obtainedThemeId}.
+Request ID: ${response.headers.get("x-request-id")}
+URL: ${response.url}`, `This is likely related to an issue in upstream Shopify APIs.
+Please try again in a few minutes and report this issue:
+https://github.com/Shopify/cli/issues/new?template=bug-report.yml`)), process.exit(1));
+}
 
 // ../theme/dist/cli/utilities/theme-environment/hot-reload/server.js
 var import_theme_check_node3 = __toESM(require_dist5(), 1);
@@ -148295,7 +148295,7 @@ function getInMemoryTemplates(ctx, currentRoute, locale) {
     }
   return inMemoryTemplates;
 }
-function setupInMemoryTemplateWatcher2(theme, ctx) {
+function setupInMemoryTemplateWatcher2(ctx) {
   let handleFileUpdate = ({ fileKey, onContent, onSync }) => {
     let extension = extname(fileKey);
     fileKey.startsWith("assets/") ? extension === ".liquid" ? onSync(() => triggerHotReload(fileKey, ctx)) : triggerHotReload(fileKey, ctx) : needsTemplateUpdate(fileKey) ? onContent((content) => {
@@ -148305,7 +148305,6 @@ function setupInMemoryTemplateWatcher2(theme, ctx) {
   return ctx.localThemeFileSystem.addEventListener("add", handleFileUpdate), ctx.localThemeFileSystem.addEventListener("change", handleFileUpdate), ctx.localThemeFileSystem.addEventListener("unlink", ({ fileKey }) => {
     sectionNamesByFile.delete(fileKey), triggerHotReload(fileKey, ctx);
   }), ctx.localThemeFileSystem.ready().then(async () => {
-    await ctx.localThemeFileSystem.startWatcher(theme.id.toString(), ctx.session);
     let files = [...ctx.localThemeFileSystem.files];
     return Promise.allSettled(files.map(async ([fileKey, file]) => {
       if (fileKey.endsWith(".json")) {
@@ -148408,7 +148407,7 @@ function hotReloadSections(key, ctx) {
         for (let [type, name] of sections)
           type === sectionId && sectionsToUpdate.add(name);
   }
-  sectionsToUpdate.size > 0 && emitHotReloadEvent({ type: "section", key, names: [...sectionsToUpdate] });
+  sectionsToUpdate.size > 0 ? emitHotReloadEvent({ type: "section", key, names: [...sectionsToUpdate] }) : emitHotReloadEvent({ type: "full", key });
 }
 function injectHotReloadScript(html) {
   return html.replace(/<\/head>/, `${getClientScripts()}</head>`);
@@ -148781,8 +148780,7 @@ function reportFailedUploads(uploadResults) {
 // ../theme/dist/cli/utilities/theme-environment/theme-environment.js
 import { createServer as createServer2 } from "node:http";
 function setupDevServer(theme, ctx) {
-  let watcherPromise = setupInMemoryTemplateWatcher2(theme, ctx), envSetup = ensureThemeEnvironmentSetup(theme, ctx), workPromise = Promise.all([watcherPromise, envSetup.workPromise]).then(() => {
-  }), server = createDevelopmentServer(theme, ctx, workPromise);
+  let watcherPromise = setupInMemoryTemplateWatcher2(ctx), envSetup = ensureThemeEnvironmentSetup(theme, ctx), workPromise = Promise.all([watcherPromise, envSetup.workPromise]).then(() => ctx.localThemeFileSystem.startWatcher(theme.id.toString(), ctx.session)), server = createDevelopmentServer(theme, ctx, workPromise);
   return {
     workPromise,
     serverStart: server.start,
@@ -149735,7 +149733,24 @@ function notNull(value) {
 }
 
 // ../theme/dist/cli/services/pull.js
-async function pull(theme, session, options) {
+async function pull(flags) {
+  showEmbeddedCLIWarning();
+  let store = ensureThemeStore({ store: flags.store }), adminSession = await ensureAuthenticatedThemes(store, flags.password), developmentThemeManager = new DevelopmentThemeManager(adminSession), developmentTheme = await (flags.development ? developmentThemeManager.find() : developmentThemeManager.fetch()), { path: path3, nodelete, live, development, only, ignore, force } = flags, theme = await findOrSelectTheme(adminSession, {
+    header: "Select a theme to open",
+    filter: {
+      live,
+      theme: development ? `${developmentTheme?.id}` : flags.theme
+    }
+  });
+  await executePull(theme, adminSession, {
+    path: path3 || cwd(),
+    nodelete: nodelete || !1,
+    only: only || [],
+    ignore: ignore || [],
+    force: force || !1
+  });
+}
+async function executePull(theme, session, options) {
   let path3 = options.path, force = options.force;
   if (!await isEmptyDir(path3) && !await hasRequiredThemeDirectories(path3) && !await currentDirectoryConfirmed(force))
     return;
@@ -149775,21 +149790,25 @@ var import_core12 = __toESM(require_lib(), 1);
 var _a10, Pull = class extends ThemeCommand {
   async run() {
     showEmbeddedCLIWarning();
-    let { flags } = await this.parse(_a10), store = ensureThemeStore(flags), adminSession = await ensureAuthenticatedThemes(store, flags.password), developmentThemeManager = new DevelopmentThemeManager(adminSession), developmentTheme = await (flags.development ? developmentThemeManager.find() : developmentThemeManager.fetch());
-    if (!flags.legacy) {
-      let { path: path3, nodelete, live, development, only, ignore, force } = flags, theme = await findOrSelectTheme(adminSession, {
-        header: "Select a theme to open",
-        filter: {
-          live,
-          theme: development ? `${developmentTheme?.id}` : flags.theme
-        }
-      });
-      await pull(theme, adminSession, { path: path3, nodelete, only, ignore, force });
-      return;
-    }
-    let flagsForCli2 = flags;
+    let { flags } = await this.parse(_a10), pullFlags = {
+      path: flags.path,
+      password: flags.password,
+      environment: flags.environment,
+      store: flags.store,
+      theme: flags.theme,
+      development: flags.development,
+      live: flags.live,
+      nodelete: flags.nodelete,
+      only: flags.only,
+      ignore: flags.ignore,
+      force: flags.force
+    };
+    flags.legacy ? await this.execLegacy() : await pull(pullFlags);
+  }
+  async execLegacy() {
+    let { flags } = await this.parse(_a10), store = ensureThemeStore({ store: flags.store }), adminSession = await ensureAuthenticatedThemes(store, flags.password), developmentThemeManager = new DevelopmentThemeManager(adminSession), developmentTheme = await (flags.development ? developmentThemeManager.find() : developmentThemeManager.fetch()), flagsForCli2 = flags;
     developmentTheme && (flagsForCli2.development && (flagsForCli2.theme = `${developmentTheme.id}`, flagsForCli2.development = !1), useEmbeddedThemeCLI() && (flagsForCli2["development-theme-id"] = developmentTheme.id));
-    let flagsToPass = this.passThroughFlags(flagsForCli2, { allowedFlags: _a10.cli2Flags }), command = ["theme", "pull", flagsForCli2.path, ...flagsToPass];
+    let flagsToPass = this.passThroughFlags(flagsForCli2, { allowedFlags: _a10.cli2Flags }), command = ["theme", "pull", flagsForCli2.path, ...flagsToPass].filter((arg) => arg !== void 0);
     await execCLI2(command, { store, adminToken: adminSession.token });
   }
 };
@@ -149854,7 +149873,22 @@ init_cjs_shims();
 
 // ../theme/dist/cli/services/push.js
 init_cjs_shims();
-async function push(theme, session, options) {
+async function push(flags) {
+  let { path: path3 } = flags, force = flags.force ?? !1, store = ensureThemeStore({ store: flags.store }), adminSession = await ensureAuthenticatedThemes(store, flags.password), workingDirectory = path3 ? resolvePath(path3) : cwd();
+  if (!await hasRequiredThemeDirectories(workingDirectory) && !await currentDirectoryConfirmed(force))
+    return;
+  let selectedTheme = await createOrSelectTheme(adminSession, flags);
+  selectedTheme && await executePush(selectedTheme, adminSession, {
+    path: workingDirectory,
+    nodelete: flags.nodelete || !1,
+    publish: flags.publish || !1,
+    json: flags.json || !1,
+    force,
+    ignore: flags.ignore || [],
+    only: flags.only || []
+  });
+}
+async function executePush(theme, session, options) {
   let themeChecksums = await fetchChecksums(theme.id, session), themeFileSystem = mountThemeFileSystem(options.path, { filters: options }), { uploadResults, renderThemeSyncProgress } = await uploadTheme(theme, session, themeChecksums, themeFileSystem, options);
   await renderThemeSyncProgress(), options.publish && await publishTheme(theme.id, session), await handlePushOutput(uploadResults, theme, session, options);
 }
@@ -149915,29 +149949,76 @@ function handleOutput(theme, hasErrors, session) {
     nextSteps
   });
 }
+async function createOrSelectTheme(adminSession, flags) {
+  let { live, development, unpublished, theme } = flags;
+  if (development)
+    return new DevelopmentThemeManager(adminSession).findOrCreate();
+  if (unpublished) {
+    let themeName = theme || await promptThemeName("Name of the new theme");
+    return createTheme({
+      name: themeName,
+      role: UNPUBLISHED_THEME_ROLE
+    }, adminSession);
+  } else {
+    let selectedTheme = await findOrSelectTheme(adminSession, {
+      header: "Select a theme to push to:",
+      filter: {
+        live,
+        theme
+      }
+    });
+    if (await confirmPushToTheme(selectedTheme.role, flags["allow-live"], adminSession.storeFqdn))
+      return selectedTheme;
+  }
+}
+async function confirmPushToTheme(themeRole, allowLive, storeFqdn) {
+  if (themeRole === LIVE_THEME_ROLE) {
+    if (allowLive)
+      return !0;
+    let options = {
+      message: `Push theme files to the ${themeRole} theme on ${storeFqdn}?`,
+      confirmationMessage: "Yes, confirm changes",
+      cancellationMessage: "Cancel"
+    };
+    return renderConfirmationPrompt(options);
+  }
+  return !0;
+}
 
 // ../theme/dist/cli/commands/theme/push.js
 var import_core13 = __toESM(require_lib(), 1);
 var _a11, Push = class extends ThemeCommand {
   async run() {
-    let { flags } = await this.parse(_a11), { path: path3, force } = flags, store = ensureThemeStore(flags), adminSession = await ensureAuthenticatedThemes(store, flags.password), workingDirectory = path3 ? resolvePath(path3) : cwd();
-    if (!await hasRequiredThemeDirectories(workingDirectory) && !await currentDirectoryConfirmed(force))
-      return;
-    if (!flags.legacy && !flags.password) {
-      let { path: path4, nodelete, publish: publish2, json, force: force2, ignore, only } = flags, selectedTheme = await createOrSelectTheme(adminSession, flags);
-      if (!selectedTheme)
-        return;
-      await push(selectedTheme, adminSession, {
-        path: path4,
-        nodelete,
-        publish: publish2,
-        json,
-        force: force2,
-        ignore,
-        only
-      });
+    let { flags } = await this.parse(_a11);
+    if (flags.password || flags.legacy) {
+      await this.execLegacyPush();
       return;
     }
+    let pushFlags = {
+      path: flags.path,
+      password: flags.password,
+      store: flags.store,
+      environment: flags.environment,
+      theme: flags.theme,
+      development: flags.development,
+      live: flags.live,
+      unpublished: flags.unpublished,
+      nodelete: flags.nodelete,
+      only: flags.only,
+      ignore: flags.ignore,
+      json: flags.json,
+      allowLive: flags["allow-live"],
+      publish: flags.publish,
+      force: flags.force,
+      noColor: flags["no-color"],
+      verbose: flags.verbose
+    };
+    await push(pushFlags);
+  }
+  async execLegacyPush() {
+    let { flags } = await this.parse(_a11), path3 = flags.path || cwd(), force = flags.force || !1, store = ensureThemeStore({ store: flags.store }), adminSession = await ensureAuthenticatedThemes(store, flags.password), workingDirectory = path3 ? resolvePath(path3) : cwd();
+    if (!await hasRequiredThemeDirectories(workingDirectory) && !await currentDirectoryConfirmed(force))
+      return;
     let flagsForCli2 = flags;
     showEmbeddedCLIWarning();
     let developmentThemeManager = new DevelopmentThemeManager(adminSession), targetTheme = await (flagsForCli2.development ? developmentThemeManager.findOrCreate() : developmentThemeManager.fetch());
@@ -150062,41 +150143,6 @@ Push.cli2Flags = [
   "development-theme-id"
 ];
 var push_default = Push;
-async function createOrSelectTheme(adminSession, flags) {
-  let { live, development, unpublished, theme } = flags;
-  if (development)
-    return new DevelopmentThemeManager(adminSession).findOrCreate();
-  if (unpublished) {
-    let themeName = theme || await promptThemeName("Name of the new theme");
-    return createTheme({
-      name: themeName,
-      role: UNPUBLISHED_THEME_ROLE
-    }, adminSession);
-  } else {
-    let selectedTheme = await findOrSelectTheme(adminSession, {
-      header: "Select a theme to push to:",
-      filter: {
-        live,
-        theme
-      }
-    });
-    if (await confirmPushToTheme(selectedTheme.role, flags["allow-live"], adminSession.storeFqdn))
-      return selectedTheme;
-  }
-}
-async function confirmPushToTheme(themeRole, allowLive, storeFqdn) {
-  if (themeRole === LIVE_THEME_ROLE) {
-    if (allowLive)
-      return !0;
-    let options = {
-      message: `Push theme files to the ${themeRole} theme on ${storeFqdn}?`,
-      confirmationMessage: "Yes, confirm changes",
-      cancellationMessage: "Cancel"
-    };
-    return renderConfirmationPrompt(options);
-  }
-  return !0;
-}
 
 // ../theme/dist/cli/commands/theme/rename.js
 init_cjs_shims();
@@ -150477,8 +150523,8 @@ async function checkLockfileStatus(directory, shouldExit = !1) {
   if (isHydrogenMonorepo && !process.env.SHOPIFY_UNIT_TEST)
     return;
   let foundPackageManagers = [];
-  for (let packageManager2 of packageManagers)
-    await fileExists(resolvePath(directory, packageManager2.lockfile)) && foundPackageManagers.push(packageManager2);
+  for (let packageManager of packageManagers)
+    await fileExists(resolvePath(directory, packageManager.lockfile)) && foundPackageManagers.push(packageManager);
   if (foundPackageManagers.length === 0)
     return missingLockfileWarning(shouldExit);
   if (foundPackageManagers.length > 1)
@@ -150954,7 +151000,7 @@ async function runClassicCompilerBuild({
   if (!disableRouteWarning) {
     let missingRoutes = findMissingRoutes(remixConfig);
     if (missingRoutes.length) {
-      let packageManager2 = await getPackageManager(root), exec2 = packageManager2 === "npm" ? "npx" : packageManager2;
+      let packageManager = await getPackageManager(root), exec2 = packageManager === "npm" ? "npx" : packageManager;
       outputWarn(
         `Heads up: Shopify stores have a number of standard routes that aren\u2019t set up yet.
 Some functionality and backlinks might not work as expected until these are created or redirects are set up.
@@ -151299,7 +151345,7 @@ async function runBuild({
   if (!watch && !disableRouteWarning) {
     let missingRoutes = findMissingRoutes(remixConfig);
     if (missingRoutes.length) {
-      let packageManager2 = await getPackageManager(root), exec2 = packageManager2 === "npm" ? "npx" : packageManager2;
+      let packageManager = await getPackageManager(root), exec2 = packageManager === "npm" ? "npx" : packageManager;
       outputWarn(
         `Heads up: Shopify stores have a number of standard routes that aren\u2019t set up yet.
 Some functionality and backlinks might not work as expected until these are created or redirects are set up.
@@ -153613,7 +153659,7 @@ file://${instrunctionsFilePath}`;
   let releaseNotesUrl = `https://hydrogen.shopify.dev/releases/${selectedRelease.version}`;
   nextSteps.push(`Release notes:
 ${releaseNotesUrl}`);
-  let currentPinnedVersion = getAbsoluteVersion(currentVersion), selectedPinnedVersion = getAbsoluteVersion(selectedRelease.version), upgradedDependenciesOnly = currentPinnedVersion === selectedPinnedVersion, fromToMsg = `${currentPinnedVersion} \u2192 ${selectedPinnedVersion}`, headline = upgradedDependenciesOnly ? `You've have upgraded Hydrogen ${selectedPinnedVersion} dependencies` : `You've have upgraded from ${fromToMsg}`, packageManager2 = await getPackageManager(appPath);
+  let currentPinnedVersion = getAbsoluteVersion(currentVersion), selectedPinnedVersion = getAbsoluteVersion(selectedRelease.version), upgradedDependenciesOnly = currentPinnedVersion === selectedPinnedVersion, fromToMsg = `${currentPinnedVersion} \u2192 ${selectedPinnedVersion}`, headline = upgradedDependenciesOnly ? `You've have upgraded Hydrogen ${selectedPinnedVersion} dependencies` : `You've have upgraded from ${fromToMsg}`, packageManager = await getPackageManager(appPath);
   return renderSuccess({
     headline,
     // @ts-ignore we know that filter(Boolean) will always return an array
@@ -153644,7 +153690,7 @@ ${releaseNotesUrl}`);
           {
             list: {
               items: [
-                `Run \`git restore . && git clean -df && ${packageManager2} i\``
+                `Run \`git restore . && git clean -df && ${packageManager} i\``
               ]
             }
           }
@@ -153834,10 +153880,10 @@ async function buildAssetsUrl(port, root) {
 async function startMiniOxygen(options, useNodeRuntime = !1) {
   if (useNodeRuntime) {
     process.env.MINIFLARE_SUBREQUEST_LIMIT = 100;
-    let { startNodeServer } = await import("./node-7GXTBJVP.js");
+    let { startNodeServer } = await import("./node-NWOSUD3V.js");
     return startNodeServer(options);
   }
-  let { startWorkerdServer } = await import("./workerd-PZPTMVQ4.js");
+  let { startWorkerdServer } = await import("./workerd-VWTWLJIV.js");
   return startWorkerdServer(options);
 }
 
@@ -154937,27 +154983,27 @@ async function runEnvPush({
       ({ id }) => id === pushToBranchSelection
     );
   }
-  let { environmentVariables: environmentVariables2 = [] } = await getStorefrontEnvVariables(
+  let { environmentVariables = [] } = await getStorefrontEnvVariables(
     session,
     config2.storefront.id,
     validatedEnvironment.handle
-  ) ?? {}, comparableRemoteVars = environmentVariables2.filter(
+  ) ?? {}, comparableRemoteVars = environmentVariables.filter(
     ({ isSecret, readOnly }) => !isSecret && !readOnly
   ).sort((a, b) => a.key.localeCompare(b.key)).map(({ key, value }) => createDotEnvFileLine(key, value)).join(`
 `) + `
 `, compareableLocalVars = Object.keys(localVariables).sort((a, b) => a.localeCompare(b)).reduce((acc, key) => {
-    let { isSecret, readOnly } = environmentVariables2.find((variable) => variable.key === key) ?? {};
+    let { isSecret, readOnly } = environmentVariables.find((variable) => variable.key === key) ?? {};
     return isSecret || readOnly ? acc : [...acc, createDotEnvFileLine(key, localVariables[key])];
   }, []).join(`
 `) + `
 `;
   if (!validatedEnvironment.name)
     throw new AbortError("Missing environment name");
-  let remoteReadOnlyOrSecrets = environmentVariables2.reduce(
+  let remoteReadOnlyOrSecrets = environmentVariables.reduce(
     (acc, { isSecret, readOnly, key }) => {
       if (!isSecret && !readOnly)
         return acc;
-      let localVar = localVariables[key], remoteVar = environmentVariables2.find(
+      let localVar = localVariables[key], remoteVar = environmentVariables.find(
         (variable) => variable.key === key
       );
       return localVar === remoteVar?.value ? acc : [...acc, key];
@@ -155138,9 +155184,9 @@ async function checkCurrentCLIVersion() {
       label: "Global CLI reference",
       url: "https://shopify.dev/docs/api/shopify-cli/"
     }
-  }), (packageManager2) => {
-    packageManager2 ??= packageManagerFromUserAgent(), (packageManager2 === "unknown" || !packageManager2) && (packageManager2 = inferPackageManagerForGlobalCLI()), packageManager2 === "unknown" && (packageManager2 = "npm");
-    let installMessage = pkgName === UPGRADABLE_CLI_NAMES.cli ? `Please install the latest Shopify CLI version with \`${packageManager2 === "yarn" ? `yarn global add ${UPGRADABLE_CLI_NAMES.cli}` : `${packageManager2} install -g ${UPGRADABLE_CLI_NAMES.cli}`}\` and try again.` : `Please use the latest version with \`${packageManager2} create @shopify/hydrogen@latest\``;
+  }), (packageManager) => {
+    packageManager ??= packageManagerFromUserAgent(), (packageManager === "unknown" || !packageManager) && (packageManager = inferPackageManagerForGlobalCLI()), packageManager === "unknown" && (packageManager = "npm");
+    let installMessage = pkgName === UPGRADABLE_CLI_NAMES.cli ? `Please install the latest Shopify CLI version with \`${packageManager === "yarn" ? `yarn global add ${UPGRADABLE_CLI_NAMES.cli}` : `${packageManager} install -g ${UPGRADABLE_CLI_NAMES.cli}`}\` and try again.` : `Please use the latest version with \`${packageManager} create @shopify/hydrogen@latest\``;
     return renderInfo({
       headline: "Upgrade available",
       body: `Version ${newVersionAvailable} of ${pkgName} is now available.
@@ -155272,17 +155318,17 @@ async function setupLocalStarterTemplate(options, controller) {
       "Setup " + CSS_STRATEGY_NAME_MAP[cssStrategy]
     ) : void 0
   ));
-  let { packageManager: packageManager2, shouldInstallDeps, installDeps } = await handleDependencies(
+  let { packageManager, shouldInstallDeps, installDeps } = await handleDependencies(
     project.directory,
     controller,
     options.packageManager,
     options.installDeps
   ), setupSummary = {
     language,
-    packageManager: packageManager2,
+    packageManager,
     cssStrategy,
     depsInstalled: !1,
-    cliCommand: await getCliCommand("", packageManager2)
+    cliCommand: await getCliCommand("", packageManager)
   };
   if (shouldInstallDeps) {
     let installingDepsPromise = backgroundWorkPromise.then(async () => {
@@ -155517,16 +155563,16 @@ async function setupRemoteTemplate(options, controller) {
   backgroundWorkPromise = backgroundWorkPromise.then(() => transpileProject().catch(abort2)).then(
     () => options.git ? createInitialCommit(project.directory) : void 0
   );
-  let { packageManager: packageManager2, shouldInstallDeps, installDeps } = await handleDependencies(
+  let { packageManager, shouldInstallDeps, installDeps } = await handleDependencies(
     project.directory,
     controller,
     options.packageManager,
     options.installDeps
   ), setupSummary = {
     language,
-    packageManager: packageManager2,
+    packageManager,
     depsInstalled: !1,
-    cliCommand: await getCliCommand("", packageManager2)
+    cliCommand: await getCliCommand("", packageManager)
   }, tasks = [
     {
       title: "Downloading template",
@@ -156085,10 +156131,10 @@ ${CSS_STRATEGY_HELP_URL_MAP[strategy]}`
     tasks.push({
       title: "Installing new dependencies",
       task: async () => {
-        let packageManager2 = await gettingPkgManagerPromise;
-        isNpm = packageManager2 === "npm" || packageManager2 === "unknown", await installNodeModules({
+        let packageManager = await gettingPkgManagerPromise;
+        isNpm = packageManager === "npm" || packageManager === "unknown", await installNodeModules({
           directory: remixConfig.rootDirectory,
-          packageManager: packageManager2,
+          packageManager,
           args: []
         });
       }
@@ -158275,7 +158321,7 @@ init_cjs_shims();
 
 // ../app/dist/cli/models/extensions/schemas.js
 init_cjs_shims();
-var MAX_EXTENSION_HANDLE_LENGTH = 30, MetafieldSchema = z.object({
+var MAX_EXTENSION_HANDLE_LENGTH = 50, MetafieldSchema = z.object({
   namespace: z.string(),
   key: z.string()
 }), CollectBuyerConsentCapabilitySchema = z.object({
@@ -158464,6 +158510,17 @@ function createContractBasedConfigModuleSpecification(identifier, ...topLevelKey
     }
   });
 }
+function createContractBasedModuleSpecification(identifier, appModuleFeatures) {
+  return createExtensionSpecification({
+    identifier,
+    schema: z.any({}),
+    appModuleFeatures: () => appModuleFeatures ?? [],
+    deployConfig: async (config2, _2) => {
+      let { type, handle, uid, ...configWithoutFirstClassFields } = config2;
+      return configWithoutFirstClassFields;
+    }
+  });
+}
 function resolveAppConfigTransform(transformConfig) {
   return transformConfig ? Object.keys(transformConfig).includes("forward") ? transformConfig.forward : (content) => appConfigTransform(content, transformConfig) : (content) => defaultAppConfigTransform(content);
 }
@@ -159589,9 +159646,9 @@ async function handlePartnersErrors(request2) {
     return await request2();
   } catch (error) {
     if (error.errors?.[0]?.extensions?.type === "unsupported_client_version") {
-      let packageManager2 = await getPackageManager(cwd());
+      let packageManager = await getPackageManager(cwd());
       throw new AbortError(["Upgrade your CLI version to run the", { command: "deploy" }, "command."], null, [
-        ["Run", { command: formatPackageManagerCommand(packageManager2, "shopify upgrade") }]
+        ["Run", { command: formatPackageManagerCommand(packageManager, "shopify upgrade") }]
       ]);
     }
     throw error;
@@ -159794,7 +159851,7 @@ var CONFIG_EXTENSION_IDS = [
         return this.configuration.handle ?? slugify(this.configuration.name ?? "");
       case "dynamic":
         let subscription = this.configuration, handle = `${subscription.topic}${subscription.uri}${subscription.filter}`;
-        return hashString(handle).substring(0, 30);
+        return hashString(handle).substring(0, MAX_EXTENSION_HANDLE_LENGTH);
     }
   }
 };
@@ -160905,8 +160962,8 @@ var WebConfigurationAuthCallbackPathSchema = z.preprocess(ensurePathStartsWithSl
   baseWebConfigurationSchema.extend({ roles: z.array(webTypes) }),
   baseWebConfigurationSchema.extend({ type: webTypes })
 ]), ProcessedWebConfigurationSchema = baseWebConfigurationSchema.extend({ roles: z.array(webTypes) }), App = class {
-  constructor({ name, directory, packageManager: packageManager2, configuration, nodeDependencies, webs, modules, usesWorkspaces: usesWorkspaces2, dotenv, errors: errors2, specifications, configSchema, remoteFlags }) {
-    this.idEnvironmentVariableName = "SHOPIFY_API_KEY", this.name = name, this.directory = directory, this.packageManager = packageManager2, this.configuration = configuration, this.nodeDependencies = nodeDependencies, this.webs = webs, this.dotenv = dotenv, this.realExtensions = modules, this.errors = errors2, this.usesWorkspaces = usesWorkspaces2, this.specifications = specifications, this.configSchema = configSchema ?? AppSchema, this.remoteFlags = remoteFlags ?? [];
+  constructor({ name, directory, packageManager, configuration, nodeDependencies, webs, modules, usesWorkspaces: usesWorkspaces2, dotenv, errors: errors2, specifications, configSchema, remoteFlags }) {
+    this.idEnvironmentVariableName = "SHOPIFY_API_KEY", this.name = name, this.directory = directory, this.packageManager = packageManager, this.configuration = configuration, this.nodeDependencies = nodeDependencies, this.webs = webs, this.dotenv = dotenv, this.realExtensions = modules, this.errors = errors2, this.usesWorkspaces = usesWorkspaces2, this.specifications = specifications, this.configSchema = configSchema ?? AppSchema, this.remoteFlags = remoteFlags ?? [];
   }
   get allExtensions() {
     return this.remoteFlags.includes(Flag.DeclarativeWebhooks) || this.filterDeclarativeWebhooksConfig(), this.includeConfigOnDeploy ? this.realExtensions : this.realExtensions.filter((ext) => !ext.isAppConfigExtension);
@@ -161267,9 +161324,7 @@ function updateURLsPrompt(currentAppUrl, currentRedirectUrls) {
 // ../app/dist/cli/services/dev/select-app.js
 async function selectOrCreateApp(localAppName, apps, hasMorePages, org, developerPlatformClient, options) {
   let createNewApp = apps.length === 0;
-  if (createNewApp || (outputInfo(`
-Before proceeding, your project needs to be associated with an app.
-`), createNewApp = await createAsNewAppPrompt()), createNewApp) {
+  if (createNewApp || (createNewApp = await createAsNewAppPrompt()), createNewApp) {
     let name = await appNamePrompt(localAppName);
     return developerPlatformClient.createApp(org, name, options);
   } else {
@@ -163053,170 +163108,7 @@ var TaxCalculationsSchema = BaseSchema.extend({
 
 // ../app/dist/cli/models/extensions/specifications/marketing_activity.js
 init_cjs_shims();
-
-// ../app/dist/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.js
-init_cjs_shims();
-var BaseFieldSchema = z.object({
-  ui_type: z.string()
-}), CommonFieldSchema = BaseFieldSchema.extend({
-  name: z.string(),
-  label: z.string(),
-  help_text: z.string().optional(),
-  required: z.boolean()
-}), BudgetScheduleFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("budget-schedule"),
-  use_scheduling: z.boolean(),
-  use_end_date: z.boolean(),
-  use_daily_budget: z.boolean(),
-  use_lifetime_budget: z.boolean()
-}), DiscountPickerFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("discount-picker"),
-  min_resources: z.number().nullable(),
-  max_resources: z.number().nullable()
-}), ScheduleFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("schedule"),
-  use_end_date: z.boolean()
-}), ProductPickerFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("product-picker"),
-  allow_product_image_selection: z.boolean(),
-  allow_uploaded_image_as_product_image: z.boolean(),
-  allow_free_image_as_product_image: z.boolean(),
-  min_resources: z.number().optional(),
-  max_resources: z.number().optional(),
-  min_image_select_per_product: z.number().optional(),
-  max_image_select_per_product: z.number().optional()
-}), SingleLineTextFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.enum(["text-single-line", "text-email", "text-tel", "text-url"]),
-  placeholder: z.string().optional(),
-  min_length: z.number(),
-  max_length: z.number()
-}), TextMultiLineFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("text-multi-line"),
-  placeholder: z.string(),
-  min_length: z.number(),
-  max_length: z.number()
-}), DividerFieldSchema = BaseFieldSchema.extend({
-  ui_type: z.literal("divider"),
-  title: z.string(),
-  name: z.string()
-}), SelectFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.enum(["select-single", "select-multiple"]),
-  choices: z.array(z.object({
-    label: z.string(),
-    value: z.string()
-  }))
-}), ParagraphFieldSchema = BaseFieldSchema.extend({
-  ui_type: z.literal("paragraph"),
-  heading: z.string().optional(),
-  body: z.string().optional()
-}), TypeAheadFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("type-ahead"),
-  placeholder: z.string()
-}), NumberFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.enum(["number-float", "number-integer"]),
-  min: z.number(),
-  max: z.number(),
-  step: z.number()
-}), ImagePickerFieldSchema = CommonFieldSchema.extend({
-  ui_type: z.literal("image-picker"),
-  min_resources: z.number(),
-  max_resources: z.number(),
-  allow_free_images: z.boolean(),
-  alt_text_required: z.boolean()
-}), UISchemaMapping = {
-  "budget-schedule": BudgetScheduleFieldSchema,
-  "discount-picker": DiscountPickerFieldSchema,
-  schedule: ScheduleFieldSchema,
-  "product-picker": ProductPickerFieldSchema,
-  "text-single-line": SingleLineTextFieldSchema,
-  "text-email": SingleLineTextFieldSchema,
-  "text-tel": SingleLineTextFieldSchema,
-  "text-url": SingleLineTextFieldSchema,
-  "text-multi-line": TextMultiLineFieldSchema,
-  "select-single": SelectFieldSchema,
-  "select-multiple": SelectFieldSchema,
-  paragraph: ParagraphFieldSchema,
-  "type-ahead": TypeAheadFieldSchema,
-  "number-float": NumberFieldSchema,
-  "number-integer": NumberFieldSchema,
-  "image-picker": ImagePickerFieldSchema,
-  divider: DividerFieldSchema
-}, MarketingActivityExtensionSchema = BaseSchema.extend({
-  title: z.string().min(1),
-  description: z.string().min(1),
-  api_path: z.string(),
-  tactic: z.enum([
-    "ad",
-    "retargeting",
-    "post",
-    "message",
-    "transactional",
-    "newsletter",
-    "abandoned_cart",
-    "affililate",
-    "loyalty",
-    "link",
-    "storefront_app"
-  ]),
-  marketing_channel: z.enum(["social", "search", "email", "sms", "display", "marketplace"]),
-  referring_domain: z.string().optional(),
-  is_automation: z.boolean().optional(),
-  use_external_editor: z.boolean().optional(),
-  preview_data: z.object({
-    types: z.array(z.object({
-      label: z.string(),
-      value: z.string()
-    })).max(3).min(1)
-  }),
-  fields: z.array(z.any().superRefine((val, ctx) => {
-    if (typeof val != "object")
-      return ctx.addIssue({
-        message: "Field must be an object",
-        code: z.ZodIssueCode.custom
-      });
-    if (val.ui_type === void 0)
-      return ctx.addIssue({
-        message: "Field must have a ui_type",
-        code: z.ZodIssueCode.custom
-      });
-    let schema = UISchemaMapping[val.ui_type];
-    if (schema === void 0)
-      return ctx.addIssue({
-        message: `Unknown ui_type for Field: ${val.ui_type}`,
-        code: z.ZodIssueCode.custom
-      });
-    let result = schema.safeParse(val);
-    if (!result.success)
-      return ctx.addIssue({
-        message: `Error found on Field "${val.name}": ${result.error.message}`,
-        code: z.ZodIssueCode.custom
-      });
-  })).min(1)
-});
-
-// ../app/dist/cli/models/extensions/specifications/marketing_activity.js
-var spec2 = createExtensionSpecification({
-  identifier: "marketing_activity",
-  schema: MarketingActivityExtensionSchema,
-  appModuleFeatures: (_2) => ["bundling"],
-  deployConfig: async (config2, _2) => ({
-    title: config2.title,
-    description: config2.description,
-    api_path: config2.api_path,
-    tactic: config2.tactic,
-    marketing_channel: config2.marketing_channel,
-    referring_domain: config2.referring_domain,
-    is_automation: config2.is_automation,
-    use_external_editor: config2.use_external_editor,
-    preview_data: config2.preview_data,
-    fields: config2.fields.map((field) => ({
-      ...field,
-      // NOTE: we're not using this id anywhere, generating it to satisfy the schema
-      // decided not to remove it from the schema for now to minimize the risk of breaking changes
-      id: randomUUID()
-    }))
-  })
-}), marketing_activity_default = spec2;
+var spec2 = createContractBasedModuleSpecification("marketing_activity"), marketing_activity_default = spec2;
 
 // ../app/dist/cli/models/extensions/specifications/theme.js
 init_cjs_shims();
@@ -163629,7 +163521,7 @@ async function unifiedConfigurationParserFactory(merged) {
     return merged.parseConfigurationObject;
   let contract = await normaliseJsonSchema(contractJsonSchema);
   return (config2) => {
-    let zodParse = merged.parseConfigurationObject(config2), zodValidatedData = zodParse.state === "ok" ? zodParse.data : void 0, jsonSchemaParse = jsonSchemaValidate(zodValidatedData ?? config2, contract), errors2 = zodParse.errors || [];
+    let zodParse = merged.parseConfigurationObject(config2), zodValidatedData = zodParse.state === "ok" ? zodParse.data : void 0, subjectForAjv = zodValidatedData ?? config2, { type, handle, uid, ...subjectForAjvWithoutFirstClassFields } = subjectForAjv, jsonSchemaParse = jsonSchemaValidate(subjectForAjvWithoutFirstClassFields, contract), errors2 = zodParse.errors || [];
     jsonSchemaParse.state === "error" && (errors2 = errors2.concat(jsonSchemaParse.errors));
     let errorSet = /* @__PURE__ */ new Set();
     return errors2 = errors2.filter((error) => {
@@ -163695,7 +163587,12 @@ async function link(options, shouldRenderSuccess = !0) {
 async function selectOrCreateRemoteAppToLinkTo(options) {
   let developerPlatformClient = await sniffServiceOptionsAndAppConfigToSelectPlatformClient(options), { creationOptions, appDirectory: possibleAppDirectory } = await getAppCreationDefaultsFromLocalApp(options), appDirectory = possibleAppDirectory || options.directory;
   if (options.apiKey) {
-    let remoteApp2 = await appFromId({ apiKey: options.apiKey, developerPlatformClient });
+    let remoteApp2 = await appFromId({
+      apiKey: options.apiKey,
+      id: options.appId,
+      developerPlatformClient,
+      organizationId: options.organizationId
+    });
     if (!remoteApp2) {
       let errorMessage2 = InvalidApiKeyErrorMessage(options.apiKey);
       throw new AbortError(errorMessage2.message, errorMessage2.tryMessage);
@@ -163833,7 +163730,7 @@ function buildOptionsForGeneratedConfigFile(options) {
   if (!isEmpty(buildOptions))
     return buildOptions;
 }
-function renderSuccessMessage(configFileName, appName, packageManager2) {
+function renderSuccessMessage(configFileName, appName, packageManager) {
   renderSuccess({
     headline: `${configFileName} is now linked to "${appName}" on Shopify`,
     body: `Using ${configFileName} as your default config.`,
@@ -163842,7 +163739,7 @@ function renderSuccessMessage(configFileName, appName, packageManager2) {
       [
         "To upload your config, run",
         {
-          command: formatPackageManagerCommand(packageManager2, "shopify app deploy")
+          command: formatPackageManagerCommand(packageManager, "shopify app deploy")
         }
       ]
     ],
@@ -164316,12 +164213,12 @@ async function fetchDevDataFromOptions(options, orgId, developerPlatformClient)
   ]), selectedStore;
   return options.storeFqdn && (selectedStore = orgWithStore.store, await convertToTransferDisabledStoreIfNeeded(selectedStore, orgWithStore.organization.id, developerPlatformClient, "never")), { app: selectedApp, store: selectedStore };
 }
-async function getAppContext({ reset, directory, developerPlatformClient, configName, enableLinkingPrompt = !0 }) {
+async function getAppContext({ reset, directory, configName, enableLinkingPrompt = !0 }) {
   await linkIfNecessary(directory, reset, enableLinkingPrompt);
   let cachedInfo = getCachedAppInfo(directory), { configuration } = await loadAppConfiguration({
     directory,
     userProvidedConfigName: configName
-  }), remoteApp;
+  }), developerPlatformClient = selectDeveloperPlatformClient({ configuration }), remoteApp;
   return isCurrentAppSchema(configuration) && (remoteApp = await appFromId({
     apiKey: configuration.client_id,
     id: configuration.app_id,
@@ -164426,12 +164323,12 @@ async function developerPreviewUpdate({ apiKey, developerPlatformClient, enabled
 async function use2({ directory, configName, warningContent, shouldRenderSuccess = !0, reset = !1 }) {
   if (reset) {
     clearCurrentConfigFile(directory);
-    let packageManager2 = await getPackageManager(directory);
+    let packageManager = await getPackageManager(directory);
     renderSuccess({
       headline: "Cleared current configuration.",
       body: [
         "In order to set a new current configuration, please run",
-        { command: formatPackageManagerCommand(packageManager2, "shopify app config use CONFIG_NAME") },
+        { command: formatPackageManagerCommand(packageManager, "shopify app config use CONFIG_NAME") },
         { char: "." }
       ]
     });
@@ -164674,12 +164571,12 @@ var alreadyShownCLIWarning = !1, AppLoader = class {
   async loaded() {
     let { configuration, directory, configurationLoadResultMetadata, configSchema } = this.loadedConfiguration;
     await logMetadataFromAppLoadingProcess(configurationLoadResultMetadata);
-    let dotenv = await loadDotEnv(directory, configuration.path), extensions = await this.loadExtensions(directory, configuration), packageJSONPath = joinPath(directory, "package.json"), name = await loadAppName(directory), nodeDependencies = await getDependencies(packageJSONPath), packageManager2 = await getPackageManager(directory);
-    this.showGlobalCLIWarningIfNeeded(nodeDependencies, packageManager2);
+    let dotenv = await loadDotEnv(directory, configuration.path), extensions = await this.loadExtensions(directory, configuration), packageJSONPath = joinPath(directory, "package.json"), name = await loadAppName(directory), nodeDependencies = await getDependencies(packageJSONPath), packageManager = await getPackageManager(directory);
+    this.showGlobalCLIWarningIfNeeded(nodeDependencies, packageManager);
     let { webs, usedCustomLayout: usedCustomLayoutForWeb } = await this.loadWebs(directory, configuration.web_directories), usesWorkspaces2 = await usesWorkspaces(directory), appClass = new App({
       name,
       directory,
-      packageManager: packageManager2,
+      packageManager,
       configuration,
       nodeDependencies,
       webs,
@@ -164701,13 +164598,13 @@ var alreadyShownCLIWarning = !1, AppLoader = class {
   parseConfigurationFile(schema, filepath, decode3 = decodeToml) {
     return parseConfigurationFile(schema, filepath, this.abortOrReport.bind(this), decode3);
   }
-  showGlobalCLIWarningIfNeeded(nodeDependencies, packageManager2) {
+  showGlobalCLIWarningIfNeeded(nodeDependencies, packageManager) {
     let hasLocalCLI = nodeDependencies["@shopify/cli"] !== void 0;
     if (currentProcessIsGlobal() && hasLocalCLI && !sniffForJson() && !alreadyShownCLIWarning) {
       let warningContent = {
         headline: "You are running a global installation of Shopify CLI",
         body: [
-          `This project has Shopify CLI as a local dependency in package.json. If you prefer to use that version, run the command with your package manager (e.g. ${packageManager2} run shopify).`
+          `This project has Shopify CLI as a local dependency in package.json. If you prefer to use that version, run the command with your package manager (e.g. ${packageManager} run shopify).`
         ],
         link: {
           label: "For more information, see Shopify CLI documentation",
@@ -164780,7 +164677,7 @@ var alreadyShownCLIWarning = !1, AppLoader = class {
       let directory = dirname(configurationPath), obj = await loadConfigurationFileContent(configurationPath), { extensions, type } = ExtensionsArraySchema.parse(obj);
       if (extensions) {
         let configuration = await this.parseConfigurationFile(UnifiedSchema, configurationPath), extensionsInstancesPromises = configuration.extensions.map(async (extensionConfig) => {
-          let mergedConfig = { ...configuration, ...extensionConfig }, { extensions: extensions2, ...restConfig } = mergedConfig;
+          let mergedConfig = { ...configuration, ...extensionConfig }, { extensions: extensions2, path: path3, ...restConfig } = mergedConfig;
           return restConfig.handle || (this.abortOrReport(outputContent`Missing handle for extension "${restConfig.name}" at ${relativePath(appDirectory, configurationPath)}`, void 0, configurationPath), restConfig.handle = "unknown-handle"), this.createExtensionInstance(mergedConfig.type, restConfig, configurationPath, directory);
         });
         return Promise.all(extensionsInstancesPromises);
@@ -165120,14 +165017,6 @@ async function build(options) {
 }
 var build_default = build;
 
-// ../app/dist/cli/utilities/app-command.js
-init_cjs_shims();
-var AppCommand = class extends base_command_default {
-  environmentsFilename() {
-    return configurationFileNames.appEnvironments;
-  }
-};
-
 // ../app/dist/cli/prompts/deprecation-warnings.js
 init_cjs_shims();
 async function showApiKeyDeprecationWarning() {
@@ -165138,6 +165027,14 @@ async function showApiKeyDeprecationWarning() {
   });
 }
 
+// ../app/dist/cli/utilities/app-command.js
+init_cjs_shims();
+var AppCommand = class extends base_command_default {
+  environmentsFilename() {
+    return configurationFileNames.appEnvironments;
+  }
+};
+
 // ../app/dist/cli/commands/app/build.js
 var import_core29 = __toESM(require_lib(), 1);
 var _a14, Build2 = class extends AppCommand {
@@ -165153,7 +165050,7 @@ var _a14, Build2 = class extends AppCommand {
       directory: flags.path,
       userProvidedConfigName: flags.config
     });
-    await build_default({ app, skipDependenciesInstallation: flags["skip-dependencies-installation"], apiKey });
+    return await build_default({ app, skipDependenciesInstallation: flags["skip-dependencies-installation"], apiKey }), { app };
   }
 };
 _a14 = Build2;
@@ -165194,6 +165091,12 @@ var _a15, ConfigLink = class extends AppCommand {
       apiKey: flags["client-id"]
     };
     await link(options);
+    let specifications = await loadLocalExtensionsSpecifications();
+    return { app: await loadApp({
+      specifications,
+      directory: flags.path,
+      userProvidedConfigName: void 0
+    }) };
   }
 };
 _a15 = ConfigLink;
@@ -165221,6 +165124,12 @@ var _a16, { config, ...appFlagsWithoutConfig } = appFlags, ConfigUse = class ext
   async run() {
     let { flags, args } = await this.parse(_a16);
     await checkFolderIsValidApp(flags.path), await use2({ directory: flags.path, configName: args.config, reset: flags.reset });
+    let specifications = await loadLocalExtensionsSpecifications();
+    return { app: await loadApp({
+      specifications,
+      directory: flags.path,
+      userProvidedConfigName: void 0
+    }) };
   }
 };
 _a16 = ConfigUse;
@@ -165411,7 +165320,7 @@ var DemoWatcher = class _DemoWatcher extends AppCommand {
       userProvidedConfigName: flags.config,
       mode: "report"
     }), watcher = new AppEventWatcher(app);
-    await watcher.start(), outputInfo(`Watching for changes in ${app.name}...`), watcher.onEvent(async ({ app: _newApp, extensionEvents, startTime, path: path3 }) => {
+    return await watcher.start(), outputInfo(`Watching for changes in ${app.name}...`), watcher.onEvent(async ({ app: _newApp, extensionEvents, startTime, path: path3 }) => {
       outputInfo(`\u{1F195} Event [${endHRTimeInMs(startTime)}ms]`), outputInfo(`  \u{1F4C2} ${path3}`), extensionEvents.forEach((event) => {
         switch (event.type) {
           case EventType.Created:
@@ -165429,7 +165338,7 @@ var DemoWatcher = class _DemoWatcher extends AppCommand {
         }
       });
     }), setInterval(() => {
-    }, 1 << 30);
+    }, 1 << 30), { app };
   }
 };
 DemoWatcher.summary = "Watch and prints out changes to an app.";
@@ -165477,7 +165386,7 @@ async function deploy(options) {
   let apiKey = identifiers?.app ?? remoteApp.apiKey;
   outputNewline(), release2 ? outputInfo(`Releasing a new app version as part of ${remoteApp.title}`) : outputInfo(`Creating a new app version as part of ${remoteApp.title}`), outputNewline();
   let uploadExtensionsBundleResult;
-  await inTemporaryDirectory(async (tmpDir) => {
+  return await inTemporaryDirectory(async (tmpDir) => {
     try {
       let bundle = app.allExtensions.some((ext) => ext.features.includes("bundling")), bundlePath;
       bundle && (bundlePath = joinPath(tmpDir, "bundle.zip"), await mkdir(dirname(bundlePath))), await bundleAndBuildExtensions({ app, bundlePath, identifiers });
@@ -165521,7 +165430,7 @@ async function deploy(options) {
     } catch (error) {
       throw await updateAppIdentifiers({ app, identifiers, command: "deploy", developerPlatformClient }), error;
     }
-  });
+  }), { app };
 }
 async function outputCompletionMessage({ app, release: release2, uploadExtensionsBundleResult }) {
   let linkAndMessage = [
@@ -165599,7 +165508,7 @@ var _a17, Deploy2 = class extends AppCommand {
       userProvidedConfigName: flags.config,
       specifications: await loadLocalExtensionsSpecifications()
     }), requiredNonTTYFlags = ["force"];
-    !apiKey && !app.configuration.client_id && requiredNonTTYFlags.push("client-id"), this.failMissingNonTTYFlags(flags, requiredNonTTYFlags), await deploy({
+    return !apiKey && !app.configuration.client_id && requiredNonTTYFlags.push("client-id"), this.failMissingNonTTYFlags(flags, requiredNonTTYFlags), { app: (await deploy({
       app,
       apiKey,
       reset: flags.reset,
@@ -165608,7 +165517,7 @@ var _a17, Deploy2 = class extends AppCommand {
       message: flags.message,
       version: flags.version,
       commitReference: flags["source-control-url"]
-    });
+    })).app };
   }
 };
 _a17 = Deploy2;
@@ -165683,6 +165592,13 @@ init_cjs_shims();
 
 // ../cli-kit/dist/public/common/url.js
 init_cjs_shims();
+function safeParseURL(url) {
+  try {
+    return new URL(url);
+  } catch {
+    return;
+  }
+}
 
 // ../app/dist/cli/services/dev/urls.js
 async function generateFrontendURL(options) {
@@ -166434,7 +166350,9 @@ async function reloadExtensionConfig({ extension }) {
     extensionConfig || abort2(`ERROR: Invalid handle
   - Expected handle: "${extension.handle}"
   - Configuration file path: ${relativizePath(extension.configurationPath)}.
-  - Handles are immutable, you can't change them once they are set.`), configObject = { ...configuration, ...extensionConfig };
+  - Handles are immutable, you can't change them once they are set.`);
+    let mergedConfig = { ...configuration, ...extensionConfig }, { extensions: extensions2, path: path3, ...restConfig } = mergedConfig;
+    configObject = restConfig;
   }
   let newConfig = await parseConfigurationObjectAgainstSpecification(extension.specification, extension.configurationPath, configObject, abort2), previousConfig = extension.configuration;
   return extension.configuration = newConfig, {
@@ -169280,7 +169198,7 @@ async function dev2(commandOptions) {
   let config2 = await prepareForDev(commandOptions);
   await actionsBeforeSettingUpDevProcesses(config2);
   let { processes, graphiqlUrl, previewUrl } = await setupDevProcesses(config2);
-  await actionsBeforeLaunchingDevProcesses(config2), await launchDevProcesses({ processes, previewUrl, graphiqlUrl, config: config2 });
+  return await actionsBeforeLaunchingDevProcesses(config2), await launchDevProcesses({ processes, previewUrl, graphiqlUrl, config: config2 }), { app: config2.localApp };
 }
 async function prepareForDev(commandOptions) {
   let tunnelPort = await getAvailableTCPPort(), tunnelClient;
@@ -169529,13 +169447,15 @@ var _a18, Dev4 = class extends AppCommand {
       graphiqlKey: flags["graphiql-key"],
       devPreview: !flags.legacy
     };
-    await dev2(devOptions);
+    return { app: (await dev2(devOptions)).app };
   }
 };
 _a18 = Dev4;
 Dev4.summary = "Run the app.";
 Dev4.descriptionWithMarkdown = `[Builds the app](https://shopify.dev/docs/api/shopify-cli/app/app-build) and lets you preview it on a [development store](https://shopify.dev/docs/apps/tools/development-stores) or [Plus sandbox store](https://help.shopify.com/partners/dashboard/managing-stores/plus-sandbox-store).
 
+> Note: Development store preview of extension drafts is not supported for Plus sandbox stores. You must \`deploy\` your app.
+
   To preview your app on a development store or Plus sandbox store, Shopify CLI walks you through the following steps. If you've run \`dev\` before, then your settings are saved and some of these steps are skipped. You can reset these configurations using \`dev --reset\` to go through all of them again:
 
 - Associating your project with an app associated with your Partner account or organization, or creating a new app.
@@ -169998,7 +169918,7 @@ async function logs(commandOptions) {
     jwtToken,
     filters
   };
-  commandOptions.format === "json" ? (consoleLog(JSON.stringify({ subscribedToStores: commandOptions.storeFqdns })), consoleLog(JSON.stringify({ message: "Waiting for app logs..." })), await renderJsonLogs({
+  return commandOptions.format === "json" ? (consoleLog(JSON.stringify({ subscribedToStores: commandOptions.storeFqdns })), consoleLog(JSON.stringify({ message: "Waiting for app logs..." })), await renderJsonLogs({
     options: {
       variables,
       developerPlatformClient: logsConfig.developerPlatformClient
@@ -170013,7 +169933,7 @@ async function logs(commandOptions) {
     },
     pollOptions,
     storeNameById: logsConfig.storeNameById
-  }));
+  })), logsConfig.localApp;
 }
 async function prepareForLogs(commandOptions) {
   let { configuration } = await loadAppConfiguration({
@@ -170053,19 +169973,19 @@ function renderAppLogsConfigInfo(appName, storeFqdn, storeFqdns, configFile, org
 var import_core34 = __toESM(require_lib(), 1);
 var _a19, Logs2 = class extends AppCommand {
   async run() {
-    let { flags } = await this.parse(_a19), apiKey = flags["client-id"] || flags["api-key"], sources2 = flags.source;
+    let { flags } = await this.parse(_a19), apiKey = flags["client-id"] || flags["api-key"];
     await checkFolderIsValidApp(flags.path);
     let logOptions = {
       apiKey,
       directory: flags.path,
       storeFqdns: flags.store,
-      sources: sources2,
+      sources: flags.source,
       status: flags.status,
       configName: flags.config,
       reset: flags.reset,
       format: flags.json ? "json" : "text"
     };
-    await logs(logOptions);
+    return { app: await logs(logOptions) };
   }
 };
 _a19 = Logs2;
@@ -170085,10 +170005,6 @@ Logs2.flags = {
     parse: async (input) => normalizeStoreFqdn(input)
   }),
   reset: dev_default2.flags.reset,
-  "no-tunnel": dev_default2.flags["no-tunnel"],
-  "graphiql-port": dev_default2.flags["graphiql-port"],
-  "graphiql-key": dev_default2.flags["graphiql-key"],
-  stable: dev_default2.flags.legacy,
   source: import_core34.Flags.string({
     description: "Filters output to the specified log source.",
     env: "SHOPIFY_FLAG_SOURCE",
@@ -170135,7 +170051,7 @@ var _a20, Sources = class extends AppCommand {
       userProvidedConfigName: flags.config,
       mode: "report"
     });
-    app.errors ? process.exit(2) : sources(app);
+    return app.errors ? process.exit(2) : sources(app), { app };
   }
 };
 _a20 = Sources;
@@ -170220,7 +170136,7 @@ var _a21, EnvPull2 = class extends AppCommand {
       userProvidedConfigName: flags.config,
       mode: "report"
     }), envFile = joinPath(app.directory, flags["env-file"] ?? getDotEnvFileName(app.configuration.path));
-    outputInfo(await pullEnv(app, { envFile }));
+    return outputInfo(await pullEnv(app, { envFile })), { app };
   }
 };
 _a21 = EnvPull2;
@@ -170268,7 +170184,7 @@ var _a22, EnvShow = class extends AppCommand {
       userProvidedConfigName: flags.config,
       mode: "report"
     });
-    outputInfo(await showEnv(app));
+    return outputInfo(await showEnv(app)), { app };
   }
 };
 _a22 = EnvShow;
@@ -170376,22 +170292,20 @@ async function getOrGenerateSchemaPath(extension, app) {
 }
 
 // ../app/dist/cli/commands/app/function/build.js
-var _a23, FunctionBuild = class extends base_command_default {
+var _a23, FunctionBuild = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a23);
-    await inFunctionContext({
+    return { app: await inFunctionContext({
       path: flags.path,
       userProvidedConfigName: flags.config,
-      callback: async (app, ourFunction) => {
-        await buildFunctionExtension(ourFunction, {
-          app,
-          stdout: process.stdout,
-          stderr: process.stderr,
-          useTasks: !0,
-          environment: "production"
-        }), renderSuccess({ headline: "Function built successfully." });
-      }
-    });
+      callback: async (app2, ourFunction) => (await buildFunctionExtension(ourFunction, {
+        app: app2,
+        stdout: process.stdout,
+        stderr: process.stderr,
+        useTasks: !0,
+        environment: "production"
+      }), renderSuccess({ headline: "Function built successfully." }), app2)
+    }) };
   }
 };
 _a23 = FunctionBuild;
@@ -170760,26 +170674,24 @@ function getIdentifierFromFilename(fileName) {
 }
 
 // ../app/dist/cli/commands/app/function/replay.js
-var import_core37 = __toESM(require_lib(), 1), _a24, FunctionReplay = class extends base_command_default {
+var import_core37 = __toESM(require_lib(), 1), _a24, FunctionReplay = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a24);
     flags["api-key"] && await showApiKeyDeprecationWarning();
     let apiKey = flags["client-id"] || flags["api-key"];
-    await inFunctionContext({
+    return { app: await inFunctionContext({
       path: flags.path,
       userProvidedConfigName: flags.config,
-      callback: async (app, ourFunction) => {
-        await replay({
-          app,
-          extension: ourFunction,
-          apiKey,
-          path: flags.path,
-          log: flags.log,
-          json: flags.json,
-          watch: flags.watch
-        });
-      }
-    });
+      callback: async (app2, ourFunction) => (await replay({
+        app: app2,
+        extension: ourFunction,
+        apiKey,
+        path: flags.path,
+        log: flags.log,
+        json: flags.json,
+        watch: flags.watch
+      }), app2)
+    }) };
   }
 };
 _a24 = FunctionReplay;
@@ -170827,13 +170739,13 @@ var replay_default = FunctionReplay;
 // ../app/dist/cli/commands/app/function/run.js
 init_cjs_shims();
 var import_core38 = __toESM(require_lib(), 1);
-var _a25, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends base_command_default {
+var _a25, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a25);
-    await inFunctionContext({
+    return { app: await inFunctionContext({
       path: flags.path,
       userProvidedConfigName: flags.config,
-      callback: async (app, ourFunction) => {
+      callback: async (app2, ourFunction) => {
         let functionExport = DEFAULT_FUNCTION_EXPORT;
         if (flags.export !== void 0)
           outputDebug(`Using export ${flags.export} from the --export flag.`), functionExport = flags.export;
@@ -170852,8 +170764,8 @@ var _a25, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends base_c
             functionExport = targeting?.[0]?.export || DEFAULT_FUNCTION_EXPORT, outputDebug(`Using export '${functionExport}'. Use the --export flag or an interactive terminal to select a different export.`);
         } else
           outputDebug(`No targeting information found. Using the default export '${functionExport}'. Use the --export flag or an interactive terminal to select a different export.`);
-        let inputQueryPath = ourFunction?.configuration.targeting?.[0]?.input_query, queryPath = inputQueryPath && `${ourFunction?.directory}/${inputQueryPath}`, schemaPath = await getOrGenerateSchemaPath(ourFunction, app);
-        await runFunction({
+        let inputQueryPath = ourFunction?.configuration.targeting?.[0]?.input_query, queryPath = inputQueryPath && `${ourFunction?.directory}/${inputQueryPath}`, schemaPath = await getOrGenerateSchemaPath(ourFunction, app2);
+        return await runFunction({
           functionExtension: ourFunction,
           json: flags.json,
           inputPath: flags.input,
@@ -170861,9 +170773,9 @@ var _a25, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends base_c
           stdin: "inherit",
           schemaPath,
           queryPath
-        });
+        }), app2;
       }
-    });
+    }) };
   }
 };
 _a25 = FunctionRun;
@@ -170897,24 +170809,22 @@ var run_default = FunctionRun;
 // ../app/dist/cli/commands/app/function/schema.js
 init_cjs_shims();
 var import_core39 = __toESM(require_lib(), 1);
-var _a26, FetchSchema = class extends base_command_default {
+var _a26, FetchSchema = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a26);
     flags["api-key"] && await showApiKeyDeprecationWarning();
     let apiKey = flags["client-id"] || flags["api-key"];
-    await inFunctionContext({
+    return { app: await inFunctionContext({
       path: flags.path,
       userProvidedConfigName: flags.config,
-      callback: async (app, ourFunction) => {
-        await generateSchemaService({
-          app,
-          extension: ourFunction,
-          apiKey,
-          stdout: flags.stdout,
-          path: flags.path
-        });
-      }
-    });
+      callback: async (app2, ourFunction) => (await generateSchemaService({
+        app: app2,
+        extension: ourFunction,
+        apiKey,
+        stdout: flags.stdout,
+        path: flags.path
+      }), app2)
+    }) };
   }
 };
 _a26 = FetchSchema;
@@ -170949,16 +170859,14 @@ var schema_default = FetchSchema;
 
 // ../app/dist/cli/commands/app/function/typegen.js
 init_cjs_shims();
-var _a27, FunctionTypegen = class extends base_command_default {
+var _a27, FunctionTypegen = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a27);
-    await inFunctionContext({
+    return { app: await inFunctionContext({
       path: flags.path,
       userProvidedConfigName: flags.config,
-      callback: async (app, ourFunction) => {
-        await buildGraphqlTypes(ourFunction, { stdout: process.stdout, stderr: process.stderr, app }), renderSuccess({ headline: "GraphQL types generated successfully." });
-      }
-    });
+      callback: async (app2, ourFunction) => (await buildGraphqlTypes(ourFunction, { stdout: process.stdout, stderr: process.stderr, app: app2 }), renderSuccess({ headline: "GraphQL types generated successfully." }), app2)
+    }) };
   }
 };
 _a27 = FunctionTypegen;
@@ -171148,17 +171056,17 @@ async function uiExtensionInit({ directory, url, app, name, extensionFlavor, uid
     {
       title: "Installing dependencies",
       task: async () => {
-        let packageManager2 = app.packageManager;
+        let packageManager = app.packageManager;
         if (app.usesWorkspaces)
           getTemplateLanguage(extensionFlavor?.value) === "javascript" && await installNodeModules({
-            packageManager: packageManager2,
+            packageManager,
             directory: app.directory
           });
         else {
           await addResolutionOrOverrideIfNeeded(app.directory, extensionFlavor?.value);
           let extensionPackageJsonPath = joinPath(directory, "package.json"), requiredDependencies = await getProdDependencies(extensionPackageJsonPath);
           await addNPMDependenciesIfNeeded(requiredDependencies, {
-            packageManager: packageManager2,
+            packageManager,
             type: "prod",
             directory: app.directory
           }), await removeFile(extensionPackageJsonPath);
@@ -171225,7 +171133,7 @@ async function generate(options) {
   }), availableSpecifications = specifications.map((spec3) => spec3.identifier), extensionTemplates = await fetchExtensionTemplates(developerPlatformClient, remoteApp, availableSpecifications), promptOptions = await buildPromptOptions(extensionTemplates, specifications, app, options), promptAnswers = await extension_default(promptOptions);
   await saveAnalyticsMetadata(promptAnswers, options.template);
   let generateExtensionOptions = buildGenerateOptions(promptAnswers, app, options, developerPlatformClient), generatedExtension = await generateExtensionTemplate(generateExtensionOptions);
-  renderSuccessMessage2(generatedExtension, app.packageManager);
+  return renderSuccessMessage2(generatedExtension, app.packageManager), { app };
 }
 async function buildPromptOptions(extensionTemplates, specifications, app, options) {
   let extensionTemplate = await handleTypeParameter(options.template, app, extensionTemplates, specifications);
@@ -171266,8 +171174,8 @@ function buildGenerateOptions(promptAnswers, app, options, developerPlatformClie
     developerPlatformClient
   };
 }
-function renderSuccessMessage2(extension, packageManager2) {
-  let formattedSuccessfulMessage = formatSuccessfulRunMessage(extension.extensionTemplate, extension.directory, packageManager2);
+function renderSuccessMessage2(extension, packageManager) {
+  let formattedSuccessfulMessage = formatSuccessfulRunMessage(extension.extensionTemplate, extension.directory, packageManager);
   renderSuccess(formattedSuccessfulMessage);
 }
 function validateExtensionFlavor(extensionTemplate, flavor) {
@@ -171316,18 +171224,14 @@ var _a28, AppGenerateExtension = class extends AppCommand {
     let { flags } = await this.parse(_a28);
     flags["api-key"] && await showApiKeyDeprecationWarning();
     let apiKey = flags["client-id"] || flags["api-key"];
-    if (await metadata_default.addPublicMetadata(() => ({
+    return await metadata_default.addPublicMetadata(() => ({
       cmd_scaffold_required_auth: !0,
       cmd_scaffold_template_custom: flags["clone-url"] !== void 0,
       cmd_scaffold_type_owner: "@shopify/app"
-    })), flags.type) {
-      renderWarning({
-        headline: ["The flag --type has been deprecated in favor of --template."],
-        body: ["Please use --template instead."]
-      });
-      return;
-    }
-    await checkFolderIsValidApp(flags.path), await generate_default({
+    })), flags.type && (renderWarning({
+      headline: ["The flag --type has been deprecated in favor of --template."],
+      body: ["Please use --template instead."]
+    }), process.exit(2)), await checkFolderIsValidApp(flags.path), { app: (await generate_default({
       directory: flags.path,
       reset: flags.reset,
       apiKey,
@@ -171336,7 +171240,7 @@ var _a28, AppGenerateExtension = class extends AppCommand {
       template: flags.template,
       flavor: flags.flavor,
       configName: flags.config
-    });
+    })).app };
   }
 };
 _a28 = AppGenerateExtension;
@@ -171682,16 +171586,12 @@ var getMigrationChoices = (isShopifolk) => [
       directory: flags.path,
       userProvidedConfigName: flags.config
     }), isShopifolk = await isShopify(), migrationChoices = getMigrationChoices(isShopifolk), choices = migrationChoices.map((choice) => ({ label: choice.label, value: choice.value })), promptAnswer = await renderSelectPrompt({ message: "Extension type to migrate", choices }), migrationChoice = migrationChoices.find((choice) => choice.value === promptAnswer);
-    if (migrationChoice === void 0) {
-      renderFatalError(new AbortError("Invalid migration choice"));
-      return;
-    }
-    await importExtensions({
+    return migrationChoice === void 0 ? (renderFatalError(new AbortError("Invalid migration choice")), { app }) : (await importExtensions({
       app,
       apiKey: flags["client-id"],
       extensionTypes: migrationChoice.extensionTypes,
       buildTomlObject: migrationChoice.buildTomlObject
-    });
+    }), { app });
   }
 };
 ImportExtensions.description = "Import dashboard-managed extensions into your app.";
@@ -171762,15 +171662,12 @@ var UNKNOWN_TEXT = outputContent`${outputToken.italic("unknown")}`.value, NOT_CO
 `);
   }
   async devConfigsSection() {
-    let title = "Current app configuration", developerPlatformClient = this.options.developerPlatformClient, { cachedInfo, remoteApp } = await getAppContext({
-      developerPlatformClient,
+    let title = "Current app configuration", { cachedInfo, remoteApp } = await getAppContext({
       directory: this.app.directory,
       reset: !1,
       configName: this.options.configName,
       enableLinkingPrompt: !1
-    });
-    developerPlatformClient = remoteApp?.developerPlatformClient ?? developerPlatformClient;
-    let postscript = outputContent`💡 To change these, run ${outputToken.packagejsonScript(this.app.packageManager, "dev", "--reset")}`.value, updateUrls;
+    }), developerPlatformClient = remoteApp?.developerPlatformClient ?? this.options.developerPlatformClient, postscript = outputContent`💡 To change these, run ${outputToken.packagejsonScript(this.app.packageManager, "dev", "--reset")}`.value, updateUrls;
     cachedInfo?.updateURLs === void 0 ? updateUrls = NOT_CONFIGURED_TEXT : updateUrls = cachedInfo.updateURLs ? "Yes" : "No";
     let partnersAccountInfo = ["Partners account", "unknown"], retrievedAccountInfo = await developerPlatformClient.accountInfo();
     isServiceAccount(retrievedAccountInfo) ? partnersAccountInfo = ["Service account", retrievedAccountInfo.orgName] : isUserAccount(retrievedAccountInfo) && (partnersAccountInfo = ["Partners account", retrievedAccountInfo.email]);
@@ -171882,11 +171779,11 @@ var _a30, AppInfo2 = class extends AppCommand {
       userProvidedConfigName: flags.config,
       mode: "report"
     });
-    outputInfo(await info(app, {
+    return outputInfo(await info(app, {
       format: flags.json ? "json" : "text",
       webEnv: flags["web-env"],
       configName: flags.config
-    })), app.errors && process.exit(2);
+    })), app.errors && process.exit(2), { app };
   }
 };
 _a30 = AppInfo2;
@@ -171918,10 +171815,7 @@ var info_default2 = AppInfo2;
 // ../app/dist/cli/commands/app/init.js
 init_cjs_shims();
 
-// ../create-app/dist/commands/init.js
-init_cjs_shims();
-
-// ../create-app/dist/prompts/init.js
+// ../app/dist/cli/prompts/init/init.js
 init_cjs_shims();
 var templates = {
   remix: {
@@ -171954,24 +171848,10 @@ var templates = {
     visible: !1
   }
 }, allTemplates = Object.keys(templates), visibleTemplates = allTemplates.filter((key) => templates[key].visible), templateOptionsInOrder = ["remix", "none"], init = async (options) => {
-  let name = options.name, template2 = options.template, flavor = options.flavor, defaults = {
-    name: await generateRandomNameForSubdirectory({ suffix: "app", directory: options.directory }),
+  let template2 = options.template, flavor = options.flavor, defaults = {
     template: templates.remix.url
-  }, welcomed = !1;
-  name || (renderText({ text: `
-Welcome. Let\u2019s get started by naming your app project. You can change it later.` }), welcomed = !0, name = await renderTextPrompt({
-    message: "Your project name?",
-    defaultValue: defaults.name,
-    validate: (value) => {
-      if (value.length === 0)
-        return "App name can't be empty";
-      if (value.length > 30)
-        return "Enter a shorter name (30 character max.)";
-      if (value.toLowerCase().includes("shopify"))
-        return "App name can't include the word 'shopify'";
-    }
-  })), template2 || (welcomed || (renderText({ text: `
-Welcome. Let\u2019s get started by choosing a template for your app project.` }), welcomed = !0), template2 = await renderSelectPrompt({
+  };
+  template2 || (template2 = await renderSelectPrompt({
     choices: templateOptionsInOrder.map((key) => ({
       label: templates[key].label || key,
       value: key
@@ -171981,7 +171861,6 @@ Welcome. Let\u2019s get started by choosing a template for your app project.` })
   }));
   let answers = {
     ...options,
-    name,
     template: template2,
     templateType: isPredefinedTemplate(template2) ? template2 : "custom",
     globalCLIResult: { install: !1, alreadyInstalled: !1 }
@@ -172002,10 +171881,10 @@ function isPredefinedTemplate(template2) {
   return allTemplates.includes(template2);
 }
 
-// ../create-app/dist/services/init.js
+// ../app/dist/cli/services/init/init.js
 init_cjs_shims();
 
-// ../create-app/dist/utils/template/npm.js
+// ../app/dist/cli/services/init/template/npm.js
 init_cjs_shims();
 import { platform } from "os";
 async function updateCLIDependencies({ packageJSON, local, useGlobalCLI }) {
@@ -172025,12 +171904,12 @@ async function packagePath(packageName) {
     cwd: moduleDirectory(import.meta.url)
   })}`;
 }
-async function getDeepInstallNPMTasks({ from, packageManager: packageManager2 }) {
-  let args = platform() === "win32" && packageManager2 === "yarn" ? ["--network-concurrency", "1"] : [];
-  return installNodeModules({ directory: normalizePath(from), packageManager: packageManager2, args });
+async function getDeepInstallNPMTasks({ from, packageManager }) {
+  let args = platform() === "win32" && packageManager === "yarn" ? ["--network-concurrency", "1"] : [];
+  return installNodeModules({ directory: normalizePath(from), packageManager, args });
 }
 
-// ../create-app/dist/utils/template/cleanup.js
+// ../app/dist/cli/services/init/template/cleanup.js
 init_cjs_shims();
 async function cleanup(webOutputDirectory) {
   let gitPaths = await glob([
@@ -172050,13 +171929,13 @@ async function cleanup(webOutputDirectory) {
   });
 }
 
-// ../create-app/dist/services/init.js
+// ../app/dist/cli/services/init/init.js
 async function init2(options) {
-  let packageManager2 = options.packageManager, hyphenizedName = hyphenate(options.name), outputDirectory = joinPath(options.directory, hyphenizedName), githubRepo = parseGitHubRepositoryReference(options.template);
-  await ensureAppDirectoryIsAvailable(outputDirectory, hyphenizedName), await clearCache(outputDirectory), renderInfo({
+  let packageManager = options.packageManager, hyphenizedName = hyphenate(options.name), outputDirectory = joinPath(options.directory, hyphenizedName), githubRepo = parseGitHubRepositoryReference(options.template);
+  return await ensureAppDirectoryIsAvailable(outputDirectory, hyphenizedName), await clearCache(outputDirectory), renderInfo({
     body: [
       "Initializing project with",
-      { command: packageManager2 },
+      { command: packageManager },
       `
 Use the`,
       { command: "--package-manager" },
@@ -172081,7 +171960,7 @@ Use the`,
       title: "Parsing liquid",
       task: async () => {
         await recursiveLiquidTemplateCopy(templatePathDir, templateScaffoldDir, {
-          dependency_manager: packageManager2,
+          dependency_manager: packageManager,
           app_name: options.name
         });
       }
@@ -172091,7 +171970,7 @@ Use the`,
         let packageJSON = (await findUpAndReadPackageJson(templateScaffoldDir)).content;
         packageJSON.name = hyphenizedName, packageJSON.author = await username() ?? "", packageJSON.private = !0;
         let workspacesFolders = ["extensions/*"].concat(detectAdditionalWorkspacesFolders(templateScaffoldDir));
-        switch (packageManager2) {
+        switch (packageManager) {
           case "npm":
           case "yarn":
           case "bun":
@@ -172135,9 +172014,9 @@ ${workspacesContent}`), await appendFile(joinPath(templateScaffoldDir, ".npmrc")
 `);
       }
     }), tasks.push({
-      title: `Installing dependencies with ${packageManager2}`,
+      title: `Installing dependencies with ${packageManager}`,
       task: async () => {
-        await getDeepInstallNPMTasks({ from: templateScaffoldDir, packageManager: packageManager2 });
+        await getDeepInstallNPMTasks({ from: templateScaffoldDir, packageManager });
       }
     }, {
       title: "Cleaning up",
@@ -172150,21 +172029,28 @@ ${workspacesContent}`), await appendFile(joinPath(templateScaffoldDir, ".npmrc")
         await initializeGitRepository(templateScaffoldDir);
       }
     }), await renderTasks(tasks), await moveFile(templateScaffoldDir, outputDirectory);
-  }), renderSuccess({
+  }), await link({
+    directory: outputDirectory,
+    apiKey: options.app.apiKey,
+    appId: options.app.id,
+    organizationId: options.app.organizationId,
+    configName: "shopify.app.toml",
+    developerPlatformClient: options.developerPlatformClient
+  }, !1), renderSuccess({
     headline: [{ userInput: hyphenizedName }, "is ready for you to build!"],
     nextSteps: [
       ["Run", { command: `cd ${hyphenizedName}` }],
-      ["For extensions, run", { command: formatPackageManagerCommand(packageManager2, "shopify app generate extension") }],
-      ["To see your app, run", { command: formatPackageManagerCommand(packageManager2, "shopify app dev") }]
+      ["For extensions, run", { command: formatPackageManagerCommand(packageManager, "shopify app generate extension") }],
+      ["To see your app, run", { command: formatPackageManagerCommand(packageManager, "shopify app dev") }]
     ],
     reference: [
       { link: { label: "Shopify docs", url: "https://shopify.dev" } },
       [
         "For an overview of commands, run",
-        { command: `${formatPackageManagerCommand(packageManager2, "shopify app", "--help")}` }
+        { command: `${formatPackageManagerCommand(packageManager, "shopify app", "--help")}` }
       ]
     ]
-  });
+  }), { outputDirectory };
 }
 async function ensureAppDirectoryIsAvailable(directory, name) {
   if (await fileExists(directory))
@@ -172181,73 +172067,75 @@ function detectAdditionalWorkspacesFolders(directory) {
 }
 var init_default4 = init2;
 
-// ../create-app/dist/commands/init.js
+// ../app/dist/cli/services/init/validate.js
+init_cjs_shims();
+function validateTemplateValue(template2) {
+  if (!template2)
+    return;
+  let url = safeParseURL(template2);
+  if (url && url.origin !== "https://github.com")
+    throw new AbortError("Only GitHub repository references are supported, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]");
+  if (!url && !isPredefinedTemplate(template2))
+    throw new AbortError(outputContent`Only ${visibleTemplates.map((alias) => outputContent`${outputToken.yellow(alias)}`.value).join(", ")} template aliases are supported, please provide a valid URL`);
+}
+function validateFlavorValue(template2, flavor) {
+  if (!template2) {
+    if (flavor)
+      throw new AbortError(outputContent`The ${outputToken.yellow("--flavor")} flag requires the ${outputToken.yellow("--template")} flag to be set`);
+    return;
+  }
+  if (!flavor)
+    return;
+  if (!isPredefinedTemplate(template2))
+    throw new AbortError(outputContent`The ${outputToken.yellow("--flavor")} flag is not supported for custom templates`);
+  let templateConfig = templates[template2];
+  if (!templateConfig.branches)
+    throw new AbortError(outputContent`The ${outputToken.yellow(template2)} template does not support flavors`);
+  if (!templateConfig.branches.options[flavor])
+    throw new AbortError(outputContent`Invalid option for ${outputToken.yellow("--flavor")}\nThe ${outputToken.yellow("--flavor")} flag for ${outputToken.yellow(template2)} accepts only ${Object.keys(templateConfig.branches.options).map((alias) => outputContent`${outputToken.yellow(alias)}`.value).join(", ")}`);
+}
+
+// ../app/dist/cli/commands/app/init.js
 var import_core43 = __toESM(require_lib(), 1);
-var _a31, Init3 = class extends base_command_default {
+var _a31, Init3 = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a31);
-    this.validateTemplateValue(flags.template), this.validateFlavorValue(flags.template, flags.flavor);
-    let inferredPackageManager = this.inferPackageManager(flags["package-manager"]), promptAnswers = await init_default3({
-      name: flags.name,
+    validateTemplateValue(flags.template), validateFlavorValue(flags.template, flags.flavor);
+    let inferredPackageManager = inferPackageManager(flags["package-manager"]), name = flags.name ?? await generateRandomNameForSubdirectory({ suffix: "app", directory: flags.path }), developerPlatformClient = selectDeveloperPlatformClient(), selectedApp;
+    if (flags["client-id"])
+      selectedApp = await appFromId({ apiKey: flags["client-id"], developerPlatformClient });
+    else {
+      renderText({ text: `
+Welcome. Let's get started by linking this new project to an app in your organization.` });
+      let org = await selectOrg(), { organization, apps, hasMorePages } = await developerPlatformClient.orgAndApps(org.id);
+      selectedApp = await selectOrCreateApp(name, apps, hasMorePages, organization, developerPlatformClient);
+    }
+    let promptAnswers = await init_default3({
       template: flags.template,
-      flavor: flags.flavor,
-      directory: flags.path
+      flavor: flags.flavor
     });
     promptAnswers.globalCLIResult.install && await installGlobalShopifyCLI(inferredPackageManager), await addPublicMetadata(() => ({
       cmd_create_app_template: promptAnswers.templateType,
       cmd_create_app_template_url: promptAnswers.template
-    })), await init_default4({
-      name: promptAnswers.name,
+    }));
+    let platformClient = selectedApp.developerPlatformClient ?? developerPlatformClient, result = await init_default4({
+      name: selectedApp.title,
+      app: selectedApp,
       packageManager: inferredPackageManager,
       template: promptAnswers.template,
       local: flags.local,
       directory: flags.path,
       useGlobalCLI: promptAnswers.globalCLIResult.alreadyInstalled || promptAnswers.globalCLIResult.install,
+      developerPlatformClient: platformClient,
       postCloneActions: {
         removeLockfilesFromGitignore: promptAnswers.templateType !== "custom"
       }
-    });
-  }
-  validateTemplateValue(template2) {
-    if (!template2)
-      return;
-    let url = this.parseURL(template2);
-    if (url && url.origin !== "https://github.com")
-      throw new AbortError("Only GitHub repository references are supported, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]");
-    if (!url && !isPredefinedTemplate(template2))
-      throw new AbortError(outputContent`Only ${visibleTemplates.map((alias) => outputContent`${outputToken.yellow(alias)}`.value).join(", ")} template aliases are supported, please provide a valid URL`);
-  }
-  validateFlavorValue(template2, flavor) {
-    if (!template2) {
-      if (flavor)
-        throw new AbortError(outputContent`The ${outputToken.yellow("--flavor")} flag requires the ${outputToken.yellow("--template")} flag to be set`);
-      return;
-    }
-    if (!flavor)
-      return;
-    if (!isPredefinedTemplate(template2))
-      throw new AbortError(outputContent`The ${outputToken.yellow("--flavor")} flag is not supported for custom templates`);
-    let templateConfig = templates[template2];
-    if (!templateConfig.branches)
-      throw new AbortError(outputContent`The ${outputToken.yellow(template2)} template does not support flavors`);
-    if (!templateConfig.branches.options[flavor])
-      throw new AbortError(outputContent`Invalid option for ${outputToken.yellow("--flavor")}\nThe ${outputToken.yellow("--flavor")} flag for ${outputToken.yellow(template2)} accepts only ${Object.keys(templateConfig.branches.options).map((alias) => outputContent`${outputToken.yellow(alias)}`.value).join(", ")}`);
-  }
-  parseURL(url) {
-    try {
-      return new URL(url);
-    } catch {
-      return;
-    }
-  }
-  inferPackageManager(optionsPackageManager) {
-    if (optionsPackageManager && packageManager.includes(optionsPackageManager))
-      return optionsPackageManager;
-    let usedPackageManager = packageManagerFromUserAgent();
-    if (usedPackageManager !== "unknown")
-      return usedPackageManager;
-    let globalPackageManager = inferPackageManagerForGlobalCLI();
-    return globalPackageManager !== "unknown" ? globalPackageManager : "npm";
+    }), specifications = await loadLocalExtensionsSpecifications();
+    return { app: await loadApp({
+      specifications,
+      directory: result.outputDirectory,
+      userProvidedConfigName: void 0
+    }) };
   }
 };
 _a31 = Init3;
@@ -172287,6 +172175,12 @@ Init3.flags = {
     env: "SHOPIFY_FLAG_LOCAL",
     default: !1,
     hidden: !0
+  }),
+  "client-id": import_core43.Flags.string({
+    hidden: !1,
+    description: "The Client ID of your app. Use this to automatically link your new project to an existing app. Using this flag avoids the app selection prompt.",
+    env: "SHOPIFY_FLAG_CLIENT_ID",
+    exclusive: ["config"]
   })
 };
 var init_default5 = Init3;
@@ -172363,13 +172257,13 @@ var _a32, Release = class extends AppCommand {
       directory: flags.path,
       userProvidedConfigName: flags.config
     }), requiredNonTTYFlags = ["force"];
-    !apiKey && !app.configuration.client_id && requiredNonTTYFlags.push("client-id"), this.failMissingNonTTYFlags(flags, requiredNonTTYFlags), await release({
+    return !apiKey && !app.configuration.client_id && requiredNonTTYFlags.push("client-id"), this.failMissingNonTTYFlags(flags, requiredNonTTYFlags), await release({
       app,
       apiKey,
       reset: flags.reset,
       force: flags.force,
       version: flags.version
-    });
+    }), { app };
   }
 };
 _a32 = Release;
@@ -172487,12 +172381,12 @@ var import_core45 = __toESM(require_lib(), 1), _a33, VersionsList = class extend
       directory: flags.path,
       userProvidedConfigName: flags.config
     });
-    await versionList({
+    return await versionList({
       app,
       apiKey,
       reset: !1,
       json: flags.json
-    });
+    }), { app };
   }
 };
 _a33 = VersionsList;
@@ -172620,7 +172514,7 @@ async function webhookTriggerService(flags) {
     userProvidedConfigName: flags.config,
     specifications: await loadLocalExtensionsSpecifications()
   }), developerPlatformClient = flags.developerPlatformClient ?? selectDeveloperPlatformClient({ configuration: app.configuration }), options = await validateAndCollectFlags(flags, developerPlatformClient, app);
-  await sendSample(options);
+  return await sendSample(options), { app };
 }
 async function validateAndCollectFlags(flags, developerPlatformClient, app) {
   let apiVersion = await collectApiVersion(developerPlatformClient, flags.apiVersion), topic = await collectTopic(developerPlatformClient, apiVersion, flags.topic), [address, deliveryMethod] = await collectAddressAndMethod(flags.deliveryMethod, flags.address), clientCredentials = await collectCredentials(flags.clientId, flags.clientSecret, app, deliveryMethod);
@@ -172670,7 +172564,7 @@ function formatErrors(errors2) {
 
 // ../app/dist/cli/commands/app/webhook/trigger.js
 var import_core46 = __toESM(require_lib(), 1);
-var _a34, WebhookTrigger = class extends base_command_default {
+var _a34, WebhookTrigger = class extends AppCommand {
   async run() {
     let { flags } = await this.parse(_a34), usedFlags = {
       topic: flags.topic,
@@ -172682,12 +172576,12 @@ var _a34, WebhookTrigger = class extends base_command_default {
       path: flags.path,
       config: flags.config
     };
-    flags["shared-secret"] && renderWarning({
+    return flags["shared-secret"] && renderWarning({
       headline: [
         "The flag shared-secret has been deprecated in favor of client-secret and will eventually be deleted."
       ],
       body: ["Please use --client-secret instead."]
-    }), await webhookTriggerService(usedFlags);
+    }), { app: (await webhookTriggerService(usedFlags)).app };
   }
 };
 _a34 = WebhookTrigger;
@@ -174329,7 +174223,10 @@ export {
   hooks as PluginHook,
   provider_default as TunnelProviderHook,
   tunnel_default as TunnelStartHook,
-  src_default as default
+  src_default as default,
+  publicFetchStoreThemes as fetchStoreThemes,
+  pull,
+  push
 };
 /*! Bundled license information: