@shopify/cli 3.81.1 → 3.82.0

package/dist/index.js

@@ -136,7 +136,7 @@ import {
   supressNodeExperimentalWarnings,
   unsetStorefront,
   waitForJob
-} from "./chunk-5LMBCQDG.js";
+} from "./chunk-BSTZYPZU.js";
 import {
   require_fs,
   require_glob,
@@ -151,69 +151,69 @@ import {
 } from "./chunk-3GXB4ZRP.js";
 import {
   List
-} from "./chunk-JV3N43QW.js";
+} from "./chunk-FYDURVQO.js";
 import {
   Search
-} from "./chunk-B44H2P6E.js";
+} from "./chunk-EEYW5FSA.js";
 import {
   Upgrade
-} from "./chunk-PLXKIAXS.js";
-import "./chunk-H37YPI3Y.js";
+} from "./chunk-VWOOMRYF.js";
+import "./chunk-AJDONTSK.js";
 import {
   Version
-} from "./chunk-NZVDI2PG.js";
-import "./chunk-6NGGBF47.js";
-import "./chunk-VANXFY34.js";
+} from "./chunk-MFC6MLP7.js";
+import "./chunk-UQXK6QDK.js";
+import "./chunk-WDBIXJF6.js";
 import {
   KitchenSinkAll
-} from "./chunk-E6T6HFSE.js";
+} from "./chunk-7ZNBHIYT.js";
 import {
   KitchenSinkPrompts
-} from "./chunk-5NWUTFCV.js";
-import "./chunk-O66CPW2Z.js";
+} from "./chunk-PRSTYBLZ.js";
+import "./chunk-25WAB7NJ.js";
 import {
   KitchenSinkStatic
-} from "./chunk-WSP4T6BG.js";
-import "./chunk-5CZUSVND.js";
+} from "./chunk-HOYO6JKN.js";
+import "./chunk-RLS2ONCK.js";
 import {
   Generate
-} from "./chunk-B5JZHKPR.js";
-import "./chunk-ALHM5GST.js";
+} from "./chunk-TCCRXQUU.js";
+import "./chunk-XYELYAVC.js";
 import {
   Logout
-} from "./chunk-CN7P6XXP.js";
+} from "./chunk-KUAANQ7T.js";
 import {
   ensureAuthenticatedAdmin,
   ensureAuthenticatedAppManagementAndBusinessPlatform,
   ensureAuthenticatedPartners,
   ensureAuthenticatedStorefront,
   ensureAuthenticatedThemes
-} from "./chunk-R7PQLQRT.js";
+} from "./chunk-MSSZWK63.js";
 import {
   ClearCache,
   globalFlags,
   jsonFlag,
   runCLI
-} from "./chunk-NEQJPNB5.js";
+} from "./chunk-YUXFQXPK.js";
 import {
   CommandFlags
-} from "./chunk-6CJ6BGWA.js";
+} from "./chunk-R2LEUYIF.js";
 import {
   DocsGenerate
-} from "./chunk-X2GG47RT.js";
+} from "./chunk-JLKSXSVY.js";
 import {
   HelpCommand
-} from "./chunk-JKKYVUPT.js";
+} from "./chunk-6C6ZDQRA.js";
 import {
   KitchenSinkAsync
-} from "./chunk-GMFX4XJF.js";
-import "./chunk-5OBLOY7U.js";
+} from "./chunk-74CFIJBV.js";
+import "./chunk-QEIHQ2YM.js";
 import {
   base_command_default,
   decodeToml,
   encodeToml,
   loadEnvironment
-} from "./chunk-KJXXNUND.js";
+} from "./chunk-YUBYB2KK.js";
 import {
   require_byline,
   require_end_of_stream,
@@ -221,7 +221,7 @@ import {
   require_iserror,
   require_pump,
   require_stack_generator
-} from "./chunk-OU2VE5NL.js";
+} from "./chunk-MWVORSD7.js";
 import {
   require_once
 } from "./chunk-SHWOPMLQ.js";
@@ -229,7 +229,7 @@ import {
   fanoutHooks,
   getListOfTunnelPlugins,
   reportAnalyticsEvent
-} from "./chunk-5RPSJUXQ.js";
+} from "./chunk-7MYG46RI.js";
 import {
   adminFqdn,
   appDevFqdn,
@@ -240,10 +240,10 @@ import {
   normalizeStoreFqdn,
   ok,
   partnersFqdn
-} from "./chunk-6GAIDVJR.js";
+} from "./chunk-JLJTVUDK.js";
 import {
   showNotificationsIfNeeded
-} from "./chunk-PINTEIWG.js";
+} from "./chunk-KB5GMUHY.js";
 import {
   ClientError,
   FetchError,
@@ -265,11 +265,11 @@ import {
   require_mime_types,
   shopifyFetch,
   z
-} from "./chunk-27MYZBXV.js";
+} from "./chunk-QIECGUO5.js";
 import "./chunk-25IMI7TH.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-DDYH6337.js";
+} from "./chunk-CFNCXOAV.js";
 import {
   LocalStorage,
   UnknownPackageManagerError,
@@ -293,7 +293,7 @@ import {
   usesWorkspaces,
   versionSatisfies,
   writePackageJSON
-} from "./chunk-ZARNHYRC.js";
+} from "./chunk-6AJRDC5C.js";
 import {
   AbortController as AbortController2,
   AbortError,
@@ -507,7 +507,7 @@ import {
   username,
   writeFile,
   writeFileSync
-} from "./chunk-2Y3UFXD6.js";
+} from "./chunk-3Q5VPXT5.js";
 import {
   require_semver
 } from "./chunk-HMDWNGIV.js";
@@ -193626,7 +193626,7 @@ init_cjs_shims();
 var import_core = __toESM(require_lib(), 1);
 var themeFlags = {
   path: import_core.Flags.string({
-    description: "The path to your theme directory.",
+    description: "The path where you want to run the command. Defaults to the current working directory.",
     env: "SHOPIFY_FLAG_PATH",
     parse: async (input) => resolvePath(input),
     default: async () => cwd(),
@@ -193904,7 +193904,7 @@ function assertThemeStoreExists(storage = themeLocalStorage()) {
 function ensureThemeStore(flags) {
   let store = flags.store || getThemeStore();
   if (!store)
-    throw new AbortError("A store is required", `Specify the store passing ${outputContent`${outputToken.genericShellCommand(`--${themeFlags.store.name}={your_store_url}`)}`.value} or set the ${outputContent`${outputToken.genericShellCommand(themeFlags.store.env)}`.value} environment variable.`);
+    throw new AbortError("A store is required", `Specify the store passing ${outputContent`${outputToken.genericShellCommand(`--${themeFlags.store.name}=example.myshopify.com`)}`.value} or set the ${outputContent`${outputToken.genericShellCommand(themeFlags.store.env)}`.value} environment variable.`);
   return setThemeStore(store), store;
 }
 
@@ -193946,33 +193946,53 @@ var ThemeCommand = class extends base_command_default {
   environmentsFilename() {
     return configurationFileName;
   }
-  async command(_flags, _session) {
+  async command(_flags, _session, _context) {
   }
   async run(_opts) {
     let klass = this.constructor, requiredFlags = klass.multiEnvironmentsFlags, { flags } = await this.parse(klass);
-    if (!flags.environment) {
+    if (!flags.environment?.length) {
       let session = await this.ensureAuthenticated(flags);
       await this.command(flags, session);
       return;
     }
-    let sessions = {}, environments = Array.isArray(flags.environment) ? flags.environment : [flags.environment];
+    let environments = Array.isArray(flags.environment) ? flags.environment : [flags.environment];
+    if (environments.length === 1) {
+      let session = await this.ensureAuthenticated(flags);
+      await this.command(flags, session);
+      return;
+    }
+    let sessions = {};
     for (let environmentName of environments) {
-      let environmentConfig = await loadEnvironment(environmentName, "shopify.theme.toml", { from: flags.path });
+      let environmentConfig = await loadEnvironment(environmentName, "shopify.theme.toml", {
+        from: flags.path,
+        silent: !0
+      });
       sessions[environmentName] = await this.ensureAuthenticated(environmentConfig);
     }
-    await Promise.all(environments.map(async (environment) => {
-      let environmentConfig = await loadEnvironment(environment, "shopify.theme.toml", { from: flags.path }), environmentFlags = {
-        ...flags,
-        ...environmentConfig,
-        environment: [environment]
-      };
-      if (!this.validConfig(environmentConfig, requiredFlags, environment))
-        return;
-      let session = sessions[environment];
-      if (!session)
-        throw new AbortError(`No session found for environment ${environment}`);
-      return this.command(environmentFlags, session);
-    }));
+    let abortController = new AbortController2();
+    await renderConcurrent({
+      processes: environments.map((environment) => ({
+        prefix: environment,
+        action: async (stdout, stderr, _signal) => {
+          let environmentConfig = await loadEnvironment(environment, "shopify.theme.toml", {
+            from: flags.path,
+            silent: !0
+          }), environmentFlags = {
+            ...flags,
+            ...environmentConfig,
+            environment: [environment]
+          };
+          if (!this.validConfig(environmentConfig, requiredFlags, environment))
+            return;
+          let session = sessions[environment];
+          if (!session)
+            throw new AbortError(`No session found for environment ${environment}`);
+          await this.command(environmentFlags, session, { stdout, stderr });
+        }
+      })),
+      abortSignal: abortController.signal,
+      showTimestamps: !0
+    });
   }
   async ensureAuthenticated(flags) {
     let store = flags.store, password = flags.password;
@@ -195570,7 +195590,7 @@ async function getStorefrontSessionCookies(storeUrl, themeId, password, headers
   let storefrontDigest = await enrichSessionWithStorefrontPassword(shopifyEssential, storeUrl, password, headers);
   return cookieRecord.storefront_digest = storefrontDigest, cookieRecord;
 }
-async function sessionEssentialCookie(storeUrl, themeId, headers) {
+async function sessionEssentialCookie(storeUrl, themeId, headers, retries = 1) {
   let params = new URLSearchParams({
     preview_theme_id: themeId,
     _fd: "0",
@@ -195583,12 +195603,18 @@ async function sessionEssentialCookie(storeUrl, themeId, headers) {
       ...defaultHeaders()
     }
   }), setCookies = response.headers.raw()["set-cookie"] ?? [], shopifyEssential = getCookie(setCookies, "_shopify_essential");
-  if (!shopifyEssential)
-    throw outputDebug(`Failed to obtain _shopify_essential cookie.
+  if (!shopifyEssential) {
+    if (outputDebug(`Failed to obtain _shopify_essential cookie.
 
        -Request ID: ${response.headers.get("x-request-id") ?? "unknown"}
 
-       -Body: ${await response.text()}`), new ShopifyEssentialError('Your development session could not be created because the "_shopify_essential" could not be defined. Please, check your internet connection.');
+       -Body: ${await response.text()}
+
+       -Status: ${response.status}
+`), retries > 3)
+      throw new ShopifyEssentialError('Your development session could not be created because the "_shopify_essential" could not be defined. Please, check your internet connection.');
+    return outputDebug("Retrying to obtain the _shopify_essential cookie..."), await sleep(retries), sessionEssentialCookie(storeUrl, themeId, headers, retries + 1);
+  }
   return shopifyEssential;
 }
 async function enrichSessionWithStorefrontPassword(shopifyEssential, storeUrl, password, headers) {
@@ -197146,9 +197172,7 @@ Console.descriptionWithMarkdown = `Starts the Shopify Liquid REPL (read-eval-pri
 Console.description = _a2.descriptionWithoutMarkdown();
 Console.flags = {
   ...globalFlags,
-  store: themeFlags.store,
-  password: themeFlags.password,
-  environment: themeFlags.environment,
+  ...themeFlags,
   url: import_core3.Flags.string({
     description: "The url to be used as context",
     env: "SHOPIFY_FLAG_URL",
@@ -197379,7 +197403,7 @@ Delete.description = _a3.descriptionWithoutMarkdown();
 Delete.strict = !1;
 Delete.flags = {
   ...globalFlags,
-  password: themeFlags.password,
+  ...themeFlags,
   development: import_core4.Flags.boolean({
     char: "d",
     description: "Delete your development theme.",
@@ -197400,9 +197424,7 @@ Delete.flags = {
     description: "Theme ID or name of the remote theme.",
     env: "SHOPIFY_FLAG_THEME_ID",
     multiple: !0
-  }),
-  store: themeFlags.store,
-  environment: themeFlags.environment
+  })
 };
 var delete_default = Delete;
 
@@ -200083,7 +200105,7 @@ You can run this command only in a directory that matches the [default Shopify t
 Dev.description = _a4.descriptionWithoutMarkdown();
 Dev.flags = {
   ...globalFlags,
-  path: themeFlags.path,
+  ...themeFlags,
   host: import_core5.Flags.string({
     description: "Set which network interface the web server listens on. The default value is 127.0.0.1.",
     env: "SHOPIFY_FLAG_HOST"
@@ -200119,7 +200141,6 @@ Dev.flags = {
     description: "Local port to serve theme preview from.",
     env: "SHOPIFY_FLAG_PORT"
   }),
-  store: themeFlags.store,
   theme: import_core5.Flags.string({
     char: "t",
     description: "Theme ID or name of the remote theme.",
@@ -200148,8 +200169,6 @@ Dev.flags = {
     description: "Proceed without confirmation, if current directory does not seem to be theme directory.",
     env: "SHOPIFY_FLAG_FORCE"
   }),
-  password: themeFlags.password,
-  environment: themeFlags.environment,
   notify: import_core5.Flags.string({
     description: "The file path or URL. The file path is to a file that you want updated on idle. The URL path is where you want a webhook posted to report on file changes.",
     env: "SHOPIFY_FLAG_NOTIFY"
@@ -200266,9 +200285,7 @@ Info.description = "Displays information about your theme environment, including
 Info.flags = {
   ...globalFlags,
   ...jsonFlag,
-  store: themeFlags.store,
-  password: themeFlags.password,
-  environment: themeFlags.environment,
+  ...themeFlags,
   development: import_core6.Flags.boolean({
     char: "d",
     description: "Retrieve info from your development theme.",
@@ -200474,8 +200491,7 @@ List2.description = "Lists the themes in your store, along with their IDs and st
 List2.flags = {
   ...globalFlags,
   ...jsonFlag,
-  password: themeFlags.password,
-  store: themeFlags.store,
+  ...themeFlags,
   role: import_core8.Flags.custom({
     description: "Only list themes with the given role.",
     options: ALLOWED_ROLES,
@@ -200488,8 +200504,7 @@ List2.flags = {
   id: import_core8.Flags.integer({
     description: "Only list theme with the given ID.",
     env: "SHOPIFY_FLAG_ID"
-  }),
-  environment: themeFlags.environment
+  })
 };
 List2.multiEnvironmentsFlags = ["store", "password"];
 var list_default = List2;
@@ -200545,7 +200560,7 @@ Open.descriptionWithMarkdown = `Returns links that let you preview the specified
 Open.description = _a8.descriptionWithoutMarkdown();
 Open.flags = {
   ...globalFlags,
-  password: themeFlags.password,
+  ...themeFlags,
   development: import_core9.Flags.boolean({
     char: "d",
     description: "Open your development theme.",
@@ -200565,9 +200580,7 @@ Open.flags = {
     char: "t",
     description: "Theme ID or name of the remote theme.",
     env: "SHOPIFY_FLAG_THEME_ID"
-  }),
-  store: themeFlags.store,
-  environment: themeFlags.environment
+  })
 };
 var open_default = Open;
 
@@ -200646,6 +200659,7 @@ var import_theme_check_node4 = __toESM(require_dist6(), 1), themeFilesPattern =
   "blocks/**",
   "config/**",
   "layout/**",
+  "listings/**/*",
   "locales/**",
   "sections/**",
   "snippets/**",
@@ -200693,6 +200707,8 @@ Package.descriptionWithMarkdown = `Packages your local theme files into a ZIP fi
 
   Only folders that match the [default Shopify theme folder structure](https://shopify.dev/docs/storefronts/themes/tools/cli#directory-structure) are included in the package.
 
+  The package includes the \`listings\` directory if present (required for multi-preset themes per [Theme Store requirements](https://shopify.dev/docs/storefronts/themes/store/requirements#adding-presets-to-your-theme-zip-submission)).
+
   The ZIP file uses the name \`theme_name-theme_version.zip\`, based on parameters in your [settings_schema.json](https://shopify.dev/docs/storefronts/themes/architecture/config/settings-schema-json) file.`;
 Package.description = _a9.descriptionWithoutMarkdown();
 Package.flags = {
@@ -200775,8 +200791,7 @@ Profile.descriptionWithMarkdown = `Profile the Shopify Liquid on a given page.
 Profile.description = _a10.descriptionWithoutMarkdown();
 Profile.flags = {
   ...globalFlags,
-  store: themeFlags.store,
-  password: themeFlags.password,
+  ...themeFlags,
   theme: import_core10.Flags.string({
     char: "t",
     description: "Theme ID or name of the remote theme.",
@@ -200791,7 +200806,6 @@ Profile.flags = {
     description: "The password for storefronts with password protection.",
     env: "SHOPIFY_FLAG_STORE_PASSWORD"
   }),
-  environment: themeFlags.environment,
   ...jsonFlag
 };
 var profile_default = Profile;
@@ -200864,7 +200878,7 @@ Publish.description = _a11.descriptionWithoutMarkdown();
 Publish.strict = !1;
 Publish.flags = {
   ...globalFlags,
-  password: themeFlags.password,
+  ...themeFlags,
   force: import_core11.Flags.boolean({
     char: "f",
     description: "Skip confirmation.",
@@ -200874,9 +200888,7 @@ Publish.flags = {
     char: "t",
     description: "Theme ID or name of the remote theme.",
     env: "SHOPIFY_FLAG_THEME_ID"
-  }),
-  store: themeFlags.store,
-  environment: themeFlags.environment
+  })
 };
 var publish_default = Publish;
 
@@ -201377,9 +201389,7 @@ Rename.descriptionWithMarkdown = `Renames a theme in your store.
 Rename.description = _a15.descriptionWithoutMarkdown();
 Rename.flags = {
   ...globalFlags,
-  store: themeFlags.store,
-  password: themeFlags.password,
-  environment: themeFlags.environment,
+  ...themeFlags,
   name: import_core15.Flags.string({
     char: "n",
     description: "The new name for the theme.",
@@ -205153,10 +205163,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-OFSPLONP.js");
+    let { startNodeServer } = await import("./node-GHBQEWAW.js");
     return startNodeServer(options);
   }
-  let { startWorkerdServer } = await import("./workerd-IDTCFUND.js");
+  let { startWorkerdServer } = await import("./workerd-BCMLUCF7.js");
   return startWorkerdServer(options);
 }
 
@@ -208092,7 +208102,6 @@ var environmentVariableNames = {
   enableAppLogPolling: "SHOPIFY_CLI_ENABLE_APP_LOG_POLLING",
   templatesJsonPath: "SHOPIFY_CLI_APP_TEMPLATES_JSON_PATH",
   mkcertBinaryPath: "SHOPIFY_CLI_MKCERT_BINARY",
-  enableUnsupportedConfigPropertyChecks: "SHOPIFY_CLI_ENABLE_UNSUPPORTED_CONFIG_PROPERTY_CHECKS",
   disableUnsupportedConfigPropertyChecks: "SHOPIFY_CLI_DISABLE_UNSUPPORTED_CONFIG_PROPERTY_CHECKS",
   disableMinificationOnDev: "SHOPIFY_CLI_DISABLE_MINIFICATION_ON_DEV",
   disableWasmTomlPatch: "SHOPIFY_CLI_DISABLE_WASM_TOML_PATCH"
@@ -208441,14 +208450,6 @@ 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/services/app-context.js
 init_cjs_shims();
 
@@ -209070,6 +209071,7 @@ var WebConfigurationAuthCallbackPathSchema = z.preprocess(ensurePathStartsWithSl
     await patchAppHiddenConfigFile(path4, String(this.configuration.client_id), this.hiddenConfig);
   }
   async preDeployValidation() {
+    this.validateWebhookLegacyFlowCompatibility();
     let functionExtensionsWithUiHandle = this.allExtensions.filter((ext) => ext.isFunctionExtension && ext.configuration.ui?.handle);
     if (functionExtensionsWithUiHandle.length > 0) {
       let errors = validateFunctionExtensionsWithUiHandle(functionExtensionsWithUiHandle, this.allExtensions);
@@ -209138,6 +209140,25 @@ var WebConfigurationAuthCallbackPathSchema = z.preprocess(ensurePathStartsWithSl
       prefix: devApplicationURLs.appProxy.proxySubPathPrefix
     }), this.configuration.auth?.redirect_urls && (this.configuration.auth.redirect_urls = devApplicationURLs.redirectUrlWhitelist));
   }
+  /**
+   * Validates that app-specific webhooks are not used with legacy install flow.
+   * This incompatibility exists because app-specific webhooks require declarative
+   * scopes in the Partner Dashboard, which aren't synced when using legacy flow.
+   * @throws When app-specific webhooks are used with legacy install flow
+   */
+  validateWebhookLegacyFlowCompatibility() {
+    if (!isCurrentAppSchema(this.configuration))
+      return;
+    let hasAppSpecificWebhooks = (this.configuration.webhooks?.subscriptions?.length ?? 0) > 0, usesLegacyInstallFlow = this.configuration.access_scopes?.use_legacy_install_flow === !0;
+    if (hasAppSpecificWebhooks && usesLegacyInstallFlow)
+      throw new AbortError("App-specific webhook subscriptions are not supported when use_legacy_install_flow is enabled.", `To use app-specific webhooks, you need to:
+1. Remove 'use_legacy_install_flow = true' from your configuration
+2. Run 'shopify app deploy' to sync your scopes with the Partner Dashboard
+
+Alternatively, continue using shop-specific webhooks with the legacy install flow.
+
+Learn more: https://shopify.dev/docs/apps/build/authentication-authorization/app-installation`);
+  }
 };
 function validateFunctionExtensionsWithUiHandle(functionExtensionsWithUiHandle, allExtensions) {
   let errors = [];
@@ -210826,7 +210847,7 @@ var CUSTOM_CREDIT_CARD_TARGET = "payments.custom-credit-card.render", MAX_CHECKO
   multiple_capture: z.boolean(),
   checkout_hosted_fields: z.array(z.string()).optional(),
   ui_extension_handle: z.string().optional(),
-  encryption_certificate_fingerprint: z.string().min(1, { message: "Encryption certificate fingerprint can't be blank" }),
+  encryption_certificate_fingerprint: z.string(),
   checkout_payment_method_fields: z.array(z.object({
     type: z.union([z.literal("string"), z.literal("number"), z.literal("boolean")]),
     required: z.boolean(),
@@ -210895,7 +210916,7 @@ var CREDIT_CARD_TARGET = "payments.credit-card.render", MAX_CHECKOUT_PAYMENT_MET
     required_error: "supports_moto is required",
     invalid_type_error: "Value must be Boolean"
   }),
-  encryption_certificate_fingerprint: z.string().min(1, { message: "Encryption certificate fingerprint can't be blank" }),
+  encryption_certificate_fingerprint: z.string(),
   checkout_payment_method_fields: z.array(z.object({
     type: z.union([z.literal("string"), z.literal("number"), z.literal("boolean")]),
     required: z.boolean(),
@@ -211692,12 +211713,7 @@ function parseConfigurationObjectAgainstSpecification(spec2, filepath, configura
   }
 }
 async function shouldFailIfUnsupportedConfigProperty() {
-  let env4 = getEnvironmentVariables(), enableUnsupportedConfigPropertyChecks = env4[environmentVariableNames.enableUnsupportedConfigPropertyChecks];
-  if (isTruthy(enableUnsupportedConfigPropertyChecks))
-    return !0;
-  if (!await isShopify())
-    return !1;
-  let disableUnsupportedConfigPropertyChecks = env4[environmentVariableNames.disableUnsupportedConfigPropertyChecks];
+  let disableUnsupportedConfigPropertyChecks = getEnvironmentVariables()[environmentVariableNames.disableUnsupportedConfigPropertyChecks];
   return !isTruthy(disableUnsupportedConfigPropertyChecks);
 }
 var AppErrors = class {
@@ -213453,13 +213469,16 @@ var PartnersClient = class {
   }
   async templateSpecifications({ apiKey }) {
     let variables = { apiKey };
-    return (await this.request(RemoteTemplateSpecificationsQuery, variables)).templateSpecifications.map((template) => {
-      let { types, ...rest } = template;
-      return {
-        ...rest,
-        ...types[0]
-      };
-    });
+    return {
+      templates: (await this.request(RemoteTemplateSpecificationsQuery, variables)).templateSpecifications.map((template) => {
+        let { types, ...rest } = template;
+        return {
+          ...rest,
+          ...types[0]
+        };
+      }),
+      groupOrder: []
+    };
   }
   async createApp(org, options) {
     let variables = getAppVars(org, options.name, options.isLaunchable, options.scopesArray), result = await this.request(CreateAppQuery, variables);
@@ -216038,8 +216057,13 @@ var TEMPLATE_JSON_URL = "https://cdn.shopify.com/static/cli/extensions/templates
           "This likely means a problem with your internet connection."
         ]);
       }
-    let counter = 0;
-    return (await allowedTemplates(templates2, async (betaFlags) => this.organizationBetaFlags(organizationId, betaFlags))).map((template) => ({ ...template, sortPriority: counter++ }));
+    let counter = 0, filteredTemplates = (await allowedTemplates(templates2, async (betaFlags) => this.organizationBetaFlags(organizationId, betaFlags))).map((template) => ({ ...template, sortPriority: counter++ })), groupOrder = [];
+    for (let template of templates2)
+      template.group && !groupOrder.includes(template.group) && groupOrder.push(template.group);
+    return {
+      templates: filteredTemplates,
+      groupOrder
+    };
   }
   async createApp(org, options) {
     let apiVersion = (await this.apiVersions(org.id)).publicApiVersions.filter((version) => version !== "unstable").sort().at(-1) ?? "unstable", variables = createAppVars(options, apiVersion), mutation = CreateApp, result = await this.appManagementRequest({
@@ -218176,10 +218200,34 @@ async function logMetadata(app, organization, resetUsed) {
     cmd_app_reset_used: resetUsed
   }));
 }
+async function localAppContext({ directory, userProvidedConfigName, unsafeReportMode = !1 }) {
+  let specifications = await loadLocalExtensionsSpecifications();
+  return loadApp({
+    directory,
+    userProvidedConfigName,
+    specifications,
+    mode: unsafeReportMode ? "report" : "strict"
+  });
+}
+
+// ../app/dist/cli/utilities/app-unlinked-command.js
+init_cjs_shims();
+
+// ../app/dist/cli/utilities/app-command.js
+init_cjs_shims();
+var AppCommand = class extends base_command_default {
+  environmentsFilename() {
+    return configurationFileNames.appEnvironments;
+  }
+};
+
+// ../app/dist/cli/utilities/app-unlinked-command.js
+var AppUnlinkedCommand = class extends AppCommand {
+};
 
 // ../app/dist/cli/commands/app/build.js
 var import_core30 = __toESM(require_lib(), 1);
-var _a17, Build2 = class extends AppCommand {
+var _a17, Build2 = class extends AppUnlinkedCommand {
   async run() {
     let { flags } = await this.parse(_a17);
     flags["api-key"] && await showApiKeyDeprecationWarning();
@@ -218187,10 +218235,8 @@ var _a17, Build2 = class extends AppCommand {
     await addPublicMetadata(() => ({
       cmd_app_dependency_installation_skipped: flags["skip-dependencies-installation"]
     }));
-    let { app } = await linkedAppContext({
+    let app = await localAppContext({
       directory: flags.path,
-      clientId: apiKey,
-      forceRelink: flags.reset,
       userProvidedConfigName: flags.config
     });
     return await build_default({ app, skipDependenciesInstallation: flags["skip-dependencies-installation"], apiKey }), { app };
@@ -218220,7 +218266,14 @@ var build_default2 = Build2;
 
 // ../app/dist/cli/commands/app/config/link.js
 init_cjs_shims();
-var _a18, ConfigLink = class extends AppCommand {
+
+// ../app/dist/cli/utilities/app-linked-command.js
+init_cjs_shims();
+var AppLinkedCommand = class extends AppCommand {
+};
+
+// ../app/dist/cli/commands/app/config/link.js
+var _a18, ConfigLink = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a18), options = {
       directory: flags.path,
@@ -218251,7 +218304,7 @@ var link_default = ConfigLink;
 // ../app/dist/cli/commands/app/config/use.js
 init_cjs_shims();
 var import_core31 = __toESM(require_lib(), 1);
-var _a19, { config, ...appFlagsWithoutConfig } = appFlags, ConfigUse = class extends AppCommand {
+var _a19, { config, ...appFlagsWithoutConfig } = appFlags, ConfigUse = class extends AppLinkedCommand {
   async run() {
     let { flags, args } = await this.parse(_a19);
     await checkFolderIsValidApp(flags.path), await use2({ directory: flags.path, configName: args.config, reset: flags.reset });
@@ -218673,7 +218726,7 @@ var AppEventWatcher = class extends EventEmitter4 {
 };
 
 // ../app/dist/cli/commands/app/demo/watcher.js
-var DemoWatcher = class _DemoWatcher extends AppCommand {
+var DemoWatcher = class _DemoWatcher extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_DemoWatcher), { app } = await linkedAppContext({
       directory: flags.path,
@@ -218975,7 +219028,7 @@ function validateMessage(message) {
 
 // ../app/dist/cli/commands/app/deploy.js
 var import_core32 = __toESM(require_lib(), 1);
-var _a20, Deploy2 = class extends AppCommand {
+var _a20, Deploy2 = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a20);
     await metadata_default.addPublicMetadata(() => ({
@@ -219634,7 +219687,7 @@ init_cjs_shims();
 init_cjs_shims();
 var EventType2;
 (function(EventType3) {
-  EventType3.Update = "update", EventType3.Dispatch = "dispatch";
+  EventType3.Update = "update", EventType3.Dispatch = "dispatch", EventType3.Log = "log";
 })(EventType2 || (EventType2 = {}));
 
 // ../app/dist/cli/services/dev/extension/websocket/handlers.js
@@ -219654,12 +219707,49 @@ function getConnectionDoneHandler(wss, options) {
     outputDebug(outputContent`Sending connected payload: ${outputToken.json(connectedPayload)}`, options.stdout), ws.send(JSON.stringify(connectedPayload)), ws.on("message", getOnMessageHandler(wss, options));
   };
 }
+function parseLogMessage(message) {
+  try {
+    let parsed = JSON.parse(message);
+    if (!Array.isArray(parsed))
+      return message;
+    let formatted = parsed.map((arg) => typeof arg == "object" && arg !== null ? outputToken.json(arg).output() : String(arg)).join(" ");
+    return outputContent`${formatted}`.value;
+  } catch (error) {
+    if (error instanceof SyntaxError)
+      return message;
+    throw error;
+  }
+}
+var consoleTypeColors = {
+  debug: (text) => outputToken.gray(text),
+  warn: (text) => outputToken.yellow(text),
+  error: (text) => outputToken.errorText(text)
+};
+function getOutput({ type, message }) {
+  let formattedMessage = parseLogMessage(message);
+  switch (type) {
+    case "debug":
+    case "warn":
+    case "error":
+      return outputContent`${consoleTypeColors[type](type.toUpperCase())}: ${formattedMessage}`.value;
+    case "log":
+    case "info":
+      return formattedMessage;
+    default:
+      return `${type.toUpperCase()}: ${formattedMessage}`;
+  }
+}
+function handleLogEvent(eventData, options) {
+  useConcurrentOutputContext({ outputPrefix: eventData.extensionName, stripAnsi: !1 }, () => {
+    options.stdout.write(getOutput(eventData));
+  });
+}
 function getOnMessageHandler(wss, options) {
   return (data) => {
     let jsonData = JSON.parse(data.toString()), { event: eventType, data: eventData } = jsonData;
     if (outputDebug(outputContent`Received websocket message with event type ${eventType} and data:
 ${outputToken.json(eventData)}
-          `, options.stdout), eventType === "update") {
+          `, options.stdout), eventType === EventType2.Update) {
       let payloadStoreApiKey = options.payloadStore.getRawPayload().app.apiKey, eventAppApiKey = eventData.app?.apiKey;
       if (eventData.app) {
         if (payloadStoreApiKey !== eventAppApiKey)
@@ -219667,10 +219757,10 @@ ${outputToken.json(eventData)}
         options.payloadStore.updateApp(eventData.app);
       }
       eventData.extensions && options.payloadStore.updateExtensions(eventData.extensions);
-    } else if (eventType === "dispatch") {
+    } else if (eventType === EventType2.Dispatch) {
       let outGoingMessage = getOutgoingDispatchMessage(jsonData, options);
       notifyClients(wss, outGoingMessage, options);
-    }
+    } else eventType === EventType2.Log && handleLogEvent(eventData, options);
   };
 }
 function getPayloadUpdateHandler(wss, options) {
@@ -223448,7 +223538,7 @@ async function getTunnelMode({ useLocalhost, localhostPort, tunnelUrl }) {
 
 // ../app/dist/cli/commands/app/dev.js
 var import_core33 = __toESM(require_lib(), 1);
-var _a21, Dev4 = class extends AppCommand {
+var _a21, Dev4 = class extends AppLinkedCommand {
   static analyticsStopCommand() {
     return "app dev stop";
   }
@@ -224058,7 +224148,7 @@ function renderAppLogsConfigInfo(appName, storeFqdn, storeFqdns, configFile, org
 
 // ../app/dist/cli/commands/app/logs.js
 var import_core34 = __toESM(require_lib(), 1);
-var _a22, Logs2 = class extends AppCommand {
+var _a22, Logs2 = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a22), apiKey = flags["client-id"] ?? flags["api-key"];
     await checkFolderIsValidApp(flags.path);
@@ -224131,7 +224221,7 @@ function sources(app) {
 }
 
 // ../app/dist/cli/commands/app/app-logs/sources.js
-var _a23, Sources = class extends AppCommand {
+var _a23, Sources = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a23), { app } = await linkedAppContext({
       directory: flags.path,
@@ -224191,7 +224281,7 @@ ${newEnvFileContent}
 
 // ../app/dist/cli/commands/app/env/pull.js
 var import_core35 = __toESM(require_lib(), 1);
-var _a24, EnvPull2 = class extends AppCommand {
+var _a24, EnvPull2 = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a24), { app, remoteApp, organization } = await linkedAppContext({
       directory: flags.path,
@@ -224238,7 +224328,7 @@ async function outputEnv(app, remoteApp, organization, format5) {
 }
 
 // ../app/dist/cli/commands/app/env/show.js
-var _a25, EnvShow = class extends AppCommand {
+var _a25, EnvShow = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a25), { app, remoteApp, organization } = await linkedAppContext({
       directory: flags.path,
@@ -224328,17 +224418,21 @@ async function inFunctionContext({ path: path4, userProvidedConfigName, apiKey,
     clientId: apiKey,
     forceRelink: reset2 ?? !1,
     userProvidedConfigName
-  }), allFunctions = app.allExtensions.filter((ext) => ext.isFunctionExtension), ourFunction = allFunctions.find((fun) => fun.directory === path4);
+  }), ourFunction = await chooseFunction(app, path4);
+  return callback(app, developerPlatformClient, ourFunction, organization.id);
+}
+async function chooseFunction(app, path4) {
+  let allFunctions = app.allExtensions.filter((ext) => ext.isFunctionExtension), ourFunction = allFunctions.find((fun) => fun.directory === path4);
   if (ourFunction)
-    return callback(app, developerPlatformClient, ourFunction, organization.id);
-  if (isTerminalInteractive()) {
-    let selectedFunction = await renderAutocompletePrompt({
+    return ourFunction;
+  if (allFunctions.length === 1 && allFunctions[0])
+    return allFunctions[0];
+  if (isTerminalInteractive())
+    return await renderAutocompletePrompt({
       message: "Which function?",
       choices: allFunctions.map((shopifyFunction) => ({ label: shopifyFunction.handle, value: shopifyFunction }))
     });
-    return callback(app, developerPlatformClient, selectedFunction, organization.id);
-  } else
-    throw new AbortError("Run this command from a function directory or use `--path` to specify a function directory.");
+  throw new AbortError("Run this command from a function directory or use `--path` to specify a function directory.");
 }
 async function getOrGenerateSchemaPath(extension, app, developerPlatformClient, orgId) {
   let path4 = joinPath(extension.directory, "schema.graphql");
@@ -224353,22 +224447,19 @@ async function getOrGenerateSchemaPath(extension, app, developerPlatformClient,
 }
 
 // ../app/dist/cli/commands/app/function/build.js
-var _a26, FunctionBuild = class extends AppCommand {
+var _a26, FunctionBuild = class extends AppUnlinkedCommand {
   async run() {
-    let { flags } = await this.parse(_a26);
-    return { app: await inFunctionContext({
-      path: flags.path,
-      userProvidedConfigName: flags.config,
-      apiKey: flags["client-id"],
-      reset: flags.reset,
-      callback: async (app2, _3, ourFunction) => (await buildFunctionExtension(ourFunction, {
-        app: app2,
-        stdout: process.stdout,
-        stderr: process.stderr,
-        useTasks: !0,
-        environment: "production"
-      }), renderSuccess({ headline: "Function built successfully." }), app2)
-    }) };
+    let { flags } = await this.parse(_a26), app = await localAppContext({
+      directory: flags.path,
+      userProvidedConfigName: flags.config
+    }), ourFunction = await chooseFunction(app, flags.path);
+    return await buildFunctionExtension(ourFunction, {
+      app,
+      stdout: process.stdout,
+      stderr: process.stderr,
+      useTasks: !0,
+      environment: "production"
+    }), renderSuccess({ headline: "Function built successfully." }), { app };
   }
 };
 _a26 = FunctionBuild;
@@ -224746,7 +224837,7 @@ function getAllFunctionRunFileNames(functionRunsDir) {
 }
 
 // ../app/dist/cli/commands/app/function/replay.js
-var import_core37 = __toESM(require_lib(), 1), _a27, FunctionReplay = class extends AppCommand {
+var import_core37 = __toESM(require_lib(), 1), _a27, FunctionReplay = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a27);
     flags["api-key"] && await showApiKeyDeprecationWarning();
@@ -224801,7 +224892,7 @@ var replay_default = FunctionReplay;
 // ../app/dist/cli/commands/app/function/run.js
 init_cjs_shims();
 var import_core38 = __toESM(require_lib(), 1);
-var _a28, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends AppCommand {
+var _a28, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a28);
     return { app: await inFunctionContext({
@@ -224868,7 +224959,7 @@ var run_default = FunctionRun;
 // ../app/dist/cli/commands/app/function/schema.js
 init_cjs_shims();
 var import_core39 = __toESM(require_lib(), 1);
-var _a29, FetchSchema = class extends AppCommand {
+var _a29, FetchSchema = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a29);
     flags["api-key"] && await showApiKeyDeprecationWarning();
@@ -224915,7 +225006,7 @@ var schema_default = FetchSchema;
 
 // ../app/dist/cli/commands/app/function/typegen.js
 init_cjs_shims();
-var _a30, FunctionTypegen = class extends AppCommand {
+var _a30, FunctionTypegen = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a30);
     return { app: await inFunctionContext({
@@ -224955,11 +225046,14 @@ function isPolarisUnifiedEnabled() {
 
 // ../app/dist/cli/services/generate/fetch-template-specifications.js
 async function fetchExtensionTemplates(developerPlatformClient, app, availableSpecifications) {
-  let remoteTemplates = await developerPlatformClient.templateSpecifications(app), polarisUnifiedEnabled = isPolarisUnifiedEnabled();
-  return remoteTemplates.filter((template) => availableSpecifications.includes(template.identifier) || availableSpecifications.includes(template.type)).map((template) => template.type === "ui_extension" ? {
-    ...template,
-    supportedFlavors: template.supportedFlavors.filter((flavor) => polarisUnifiedEnabled ? flavor.value === "preact" : flavor.value !== "preact")
-  } : template).filter((template) => template.supportedFlavors.length > 0);
+  let { templates: remoteTemplates, groupOrder } = await developerPlatformClient.templateSpecifications(app), polarisUnifiedEnabled = isPolarisUnifiedEnabled();
+  return {
+    templates: remoteTemplates.filter((template) => availableSpecifications.includes(template.identifier) || availableSpecifications.includes(template.type)).map((template) => template.type === "ui_extension" ? {
+      ...template,
+      supportedFlavors: template.supportedFlavors.filter((flavor) => polarisUnifiedEnabled ? flavor.value === "preact" : flavor.value !== "preact")
+    } : template).filter((template) => template.supportedFlavors.length > 0),
+    groupOrder
+  };
 }
 
 // ../app/dist/cli/prompts/generate/extension.js
@@ -224989,7 +225083,8 @@ var generateExtensionPrompts = async (options) => {
       throw new AbortError("You have reached the limit for the number of extensions you can create.");
     templateType = await renderAutocompletePrompt({
       message: "Type of extension?",
-      choices: buildChoices(extensionTemplates, options.unavailableExtensions)
+      choices: buildChoices(extensionTemplates, options.unavailableExtensions),
+      groupOrder: options.groupOrder
     });
   }
   let extensionTemplate = extensionTemplates.find((template) => template.identifier === templateType), name = options.name || await promptName(options.directory, extensionTemplate.defaultName), flavor = options.extensionFlavor ?? await promptFlavor(extensionTemplate);
@@ -225199,12 +225294,12 @@ async function downloadOrFindTemplateDirectory(url, extensionFlavor, tmpDir, onG
 
 // ../app/dist/cli/services/generate.js
 async function generate(options) {
-  let { app, developerPlatformClient, remoteApp, specifications, template } = options, availableSpecifications = specifications.map((spec2) => spec2.identifier), extensionTemplates = await fetchExtensionTemplates(developerPlatformClient, remoteApp, availableSpecifications), promptOptions = await buildPromptOptions(extensionTemplates, specifications, app, options), promptAnswers = await extension_default(promptOptions);
+  let { app, developerPlatformClient, remoteApp, specifications, template } = options, availableSpecifications = specifications.map((spec2) => spec2.identifier), { templates: extensionTemplates, groupOrder } = await fetchExtensionTemplates(developerPlatformClient, remoteApp, availableSpecifications), promptOptions = await buildPromptOptions(extensionTemplates, groupOrder, specifications, app, options), promptAnswers = await extension_default(promptOptions);
   await saveAnalyticsMetadata(promptAnswers, template);
   let generateExtensionOptions = buildGenerateOptions(promptAnswers, app, options, developerPlatformClient), generatedExtension = await generateExtensionTemplate(generateExtensionOptions);
   renderSuccessMessage2(generatedExtension, app.packageManager);
 }
-async function buildPromptOptions(extensionTemplates, specifications, app, options) {
+async function buildPromptOptions(extensionTemplates, groupOrder, specifications, app, options) {
   let extensionTemplate = await handleTypeParameter(options.template, app, extensionTemplates, specifications);
   validateExtensionFlavor(extensionTemplate, options.flavor);
   let { validTemplates, templatesOverlimit } = checkLimits(extensionTemplates, specifications, app);
@@ -225216,7 +225311,8 @@ async function buildPromptOptions(extensionTemplates, specifications, app, optio
     app,
     extensionTemplates: validTemplates ?? [],
     unavailableExtensions: templatesOverlimit ?? [],
-    reset: options.reset
+    reset: options.reset,
+    groupOrder
   };
 }
 function checkLimits(extensionTemplates, specifications, app) {
@@ -225285,7 +225381,7 @@ var generate_default = generate;
 
 // ../app/dist/cli/commands/app/generate/extension.js
 var import_core40 = __toESM(require_lib(), 1);
-var _a31, AppGenerateExtension = class extends AppCommand {
+var _a31, AppGenerateExtension = class extends AppLinkedCommand {
   static analyticsNameOverride() {
     return "app scaffold extension";
   }
@@ -225754,7 +225850,7 @@ var getMigrationChoices = () => [
     extensionTypes: ["app_link", "bulk_action"],
     buildTomlObject: buildTomlObject3
   }
-], ImportExtensions = class _ImportExtensions extends AppCommand {
+], ImportExtensions = class _ImportExtensions extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_ImportExtensions), appContext = await linkedAppContext({
       directory: flags.path,
@@ -225952,7 +226048,7 @@ Directory components`.toUpperCase(),
 
 // ../app/dist/cli/commands/app/info.js
 var import_core42 = __toESM(require_lib(), 1);
-var _a33, AppInfo2 = class extends AppCommand {
+var _a33, AppInfo2 = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a33), { app, remoteApp, organization, developerPlatformClient } = await linkedAppContext({
       directory: flags.path,
@@ -226302,7 +226398,7 @@ function validateFlavorValue(template, flavor) {
 
 // ../app/dist/cli/commands/app/init.js
 var import_core43 = __toESM(require_lib(), 1);
-var _a34, Init3 = class extends AppCommand {
+var _a34, Init3 = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a34);
     validateTemplateValue(flags.template), validateFlavorValue(flags.template, flags.flavor);
@@ -226466,7 +226562,7 @@ ${versionDetails.message}` : ""
 
 // ../app/dist/cli/commands/app/release.js
 var import_core44 = __toESM(require_lib(), 1);
-var _a35, Release = class extends AppCommand {
+var _a35, Release = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a35);
     flags["api-key"] && await showApiKeyDeprecationWarning();
@@ -226585,7 +226681,7 @@ async function versionList(options) {
 }
 
 // ../app/dist/cli/commands/app/versions/list.js
-var import_core45 = __toESM(require_lib(), 1), _a36, VersionsList = class extends AppCommand {
+var import_core45 = __toESM(require_lib(), 1), _a36, VersionsList = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a36);
     flags["api-key"] && await showApiKeyDeprecationWarning();
@@ -226757,7 +226853,7 @@ function formatErrors(errors) {
 
 // ../app/dist/cli/commands/app/webhook/trigger.js
 var import_core46 = __toESM(require_lib(), 1);
-var _a37, WebhookTrigger = class extends AppCommand {
+var _a37, WebhookTrigger = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a37);
     flags["shared-secret"] && renderWarning({
@@ -226916,7 +227012,7 @@ async function devClean(options) {
 
 // ../app/dist/cli/commands/app/dev/clean.js
 var import_core47 = __toESM(require_lib(), 1);
-var _a38, DevClean = class extends AppCommand {
+var _a38, DevClean = class extends AppLinkedCommand {
   async run() {
     let { flags } = await this.parse(_a38), appContextResult = await linkedAppContext({
       directory: flags.path,