@shopify/cli 3.71.3 → 3.71.5

package/dist/index.js

@@ -123,7 +123,7 @@ import {
   supressNodeExperimentalWarnings,
   unsetStorefront,
   waitForJob
-} from "./chunk-5BBDQN6X.js";
+} from "./chunk-E73I4F5U.js";
 import {
   require_lib as require_lib4
 } from "./chunk-NUP5TATA.js";
@@ -138,39 +138,39 @@ import {
 } from "./chunk-NCKQIOV4.js";
 import {
   List
-} from "./chunk-Y6F5Q2PS.js";
+} from "./chunk-KTJYQJIW.js";
 import {
   Search
-} from "./chunk-677QAEGX.js";
+} from "./chunk-I4WHTNMG.js";
 import {
   Upgrade
-} from "./chunk-UCMFB56N.js";
+} from "./chunk-IHWTXBTO.js";
 import {
   getOutputUpdateCLIReminder
-} from "./chunk-SUYFVEJL.js";
+} from "./chunk-NYEWMOXL.js";
 import {
   Version
-} from "./chunk-EP6JHLLT.js";
-import "./chunk-2VSA7XB7.js";
-import "./chunk-EIHV2YKG.js";
+} from "./chunk-RYFQGFLW.js";
+import "./chunk-E3WEPNA5.js";
+import "./chunk-FPK3PLLJ.js";
 import {
   KitchenSinkAll
-} from "./chunk-5FHC66QV.js";
+} from "./chunk-DVCWXBVL.js";
 import {
   KitchenSinkPrompts
-} from "./chunk-6F3EVXQI.js";
-import "./chunk-KDHZNA2I.js";
+} from "./chunk-L34JBA2U.js";
+import "./chunk-K3IAR2V7.js";
 import {
   KitchenSinkStatic
-} from "./chunk-SA2FUS7F.js";
-import "./chunk-KP5XPKYC.js";
+} from "./chunk-BVMNPVVX.js";
+import "./chunk-5ZJJ2KQE.js";
 import {
   Generate
-} from "./chunk-ZYO4OZ7J.js";
-import "./chunk-ANNC2DRD.js";
+} from "./chunk-T2BAUKFV.js";
+import "./chunk-MD3VGRL6.js";
 import {
   Logout
-} from "./chunk-KLEYN7DR.js";
+} from "./chunk-DPYZXFHN.js";
 import {
   ensureAuthenticatedAdmin,
   ensureAuthenticatedAppManagement,
@@ -178,31 +178,31 @@ import {
   ensureAuthenticatedPartners,
   ensureAuthenticatedStorefront,
   ensureAuthenticatedThemes
-} from "./chunk-XMTTGOZD.js";
+} from "./chunk-TXM2NA7M.js";
 import {
   ClearCache,
   globalFlags,
   jsonFlag,
   runCLI
-} from "./chunk-3L3YMNIS.js";
+} from "./chunk-3FPTOHRM.js";
 import {
   CommandFlags
-} from "./chunk-XUENOXCR.js";
+} from "./chunk-ACMYNTHV.js";
 import {
   DocsGenerate
-} from "./chunk-C6335IDE.js";
+} from "./chunk-64ODKZA6.js";
 import {
   HelpCommand
-} from "./chunk-IXMASQPW.js";
+} from "./chunk-FNPKGJG5.js";
 import {
   KitchenSinkAsync
-} from "./chunk-HOV5ASVY.js";
-import "./chunk-44X35BNB.js";
+} from "./chunk-O2XD3S27.js";
+import "./chunk-MQBDFLI4.js";
 import {
   base_command_default,
   decodeToml,
   encodeToml
-} from "./chunk-2C3DNFVI.js";
+} from "./chunk-BSGG25LC.js";
 import {
   require_byline,
   require_end_of_stream,
@@ -210,7 +210,7 @@ import {
   require_iserror,
   require_pump,
   require_stack_generator
-} from "./chunk-DBJLGOY2.js";
+} from "./chunk-EP2QFBL2.js";
 import {
   require_once
 } from "./chunk-O5K4AU7Q.js";
@@ -218,7 +218,7 @@ import {
   fanoutHooks,
   getListOfTunnelPlugins,
   reportAnalyticsEvent
-} from "./chunk-HACHBHSU.js";
+} from "./chunk-SM6WFLIN.js";
 import {
   appManagementFqdn,
   developerDashboardFqdn,
@@ -236,14 +236,14 @@ import {
   restRequestHeaders,
   restRequestUrl,
   setNextDeprecationDate
-} from "./chunk-SIP3D6LF.js";
+} from "./chunk-YDGS44FV.js";
 import {
   platformAndArch,
   username
-} from "./chunk-P5TTDXTY.js";
+} from "./chunk-Z7ZXBCGB.js";
 import {
   showNotificationsIfNeeded
-} from "./chunk-JYJHRYOY.js";
+} from "./chunk-M4EYUWRX.js";
 import {
   ClientError,
   FetchError,
@@ -261,11 +261,11 @@ import {
   require_lib as require_lib2,
   require_mime_types,
   z
-} from "./chunk-YMBTAXI4.js";
+} from "./chunk-Q6SH2YN6.js";
 import "./chunk-VSLR7ET4.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-LP2745DV.js";
+} from "./chunk-SCUUFAJG.js";
 import {
   LocalStorage,
   UnknownPackageManagerError,
@@ -287,7 +287,7 @@ import {
   usesWorkspaces,
   versionSatisfies,
   writePackageJSON
-} from "./chunk-ZGU6M4YD.js";
+} from "./chunk-U2PHK2QU.js";
 import {
   require_semver
 } from "./chunk-BYPQXSAL.js";
@@ -471,7 +471,7 @@ import {
   use_stdin_default,
   writeFile,
   writeFileSync
-} from "./chunk-CDEOMLBD.js";
+} from "./chunk-S62XWKOW.js";
 import "./chunk-2HGYYNE5.js";
 import {
   require_graceful_fs
@@ -149422,24 +149422,18 @@ async function bulkUploadThemeAssets(id, assets, session) {
   return results;
 }
 function prepareFilesForUpload(assets) {
-  return assets.map((asset) => {
-    if (asset.value)
-      return {
-        filename: asset.key,
-        body: {
-          type: "TEXT",
-          value: asset.value
-        }
-      };
-    if (asset.attachment)
-      return {
-        filename: asset.key,
-        body: {
-          type: "BASE64",
-          value: asset.attachment
-        }
-      };
-    unexpectedGraphQLError("Asset must have a value or attachment");
+  return assets.map((asset) => asset.attachment ? {
+    filename: asset.key,
+    body: {
+      type: "BASE64",
+      value: asset.attachment
+    }
+  } : {
+    filename: asset.key,
+    body: {
+      type: "TEXT",
+      value: asset.value ?? ""
+    }
   });
 }
 async function uploadFiles(themeId, files, session) {
@@ -151946,7 +151940,7 @@ var THEME_DIRECTORY_PATTERNS = [
   "templates/customers/**/*.{liquid,json}"
 ], THEME_PARTITION_REGEX = {
   sectionLiquidRegex: /^sections\/.+\.liquid$/,
-  liquidRegex: /\.liquid$/,
+  blockLiquidRegex: /^blocks\/.+\.liquid$/,
   configRegex: /^config\/(settings_schema|settings_data)\.json$/,
   sectionJsonRegex: /^sections\/.+\.json$/,
   templateJsonRegex: /^templates\/.+\.json$/,
@@ -152100,10 +152094,10 @@ async function removeThemeFile(root, path3) {
   await removeFile(absolutePath);
 }
 function partitionThemeFiles(files) {
-  let sectionLiquidFiles = [], otherLiquidFiles = [], sectionJsonFiles = [], templateJsonFiles = [], otherJsonFiles = [], contextualizedJsonFiles = [], configFiles = [], staticAssetFiles = [];
+  let sectionLiquidFiles = [], otherLiquidFiles = [], sectionJsonFiles = [], templateJsonFiles = [], otherJsonFiles = [], contextualizedJsonFiles = [], configFiles = [], staticAssetFiles = [], blockLiquidFiles = [];
   return files.forEach((file) => {
     let fileKey = file.key;
-    fileKey.endsWith(".liquid") ? THEME_PARTITION_REGEX.sectionLiquidRegex.test(fileKey) ? sectionLiquidFiles.push(file) : otherLiquidFiles.push(file) : THEME_PARTITION_REGEX.configRegex.test(fileKey) ? configFiles.push(file) : THEME_PARTITION_REGEX.jsonRegex.test(fileKey) ? THEME_PARTITION_REGEX.contextualizedJsonRegex.test(fileKey) ? contextualizedJsonFiles.push(file) : THEME_PARTITION_REGEX.sectionJsonRegex.test(fileKey) ? sectionJsonFiles.push(file) : THEME_PARTITION_REGEX.templateJsonRegex.test(fileKey) ? templateJsonFiles.push(file) : otherJsonFiles.push(file) : THEME_PARTITION_REGEX.staticAssetRegex.test(fileKey) && staticAssetFiles.push(file);
+    fileKey.endsWith(".liquid") ? THEME_PARTITION_REGEX.sectionLiquidRegex.test(fileKey) ? sectionLiquidFiles.push(file) : THEME_PARTITION_REGEX.blockLiquidRegex.test(fileKey) ? blockLiquidFiles.push(file) : otherLiquidFiles.push(file) : THEME_PARTITION_REGEX.configRegex.test(fileKey) ? configFiles.push(file) : THEME_PARTITION_REGEX.jsonRegex.test(fileKey) ? THEME_PARTITION_REGEX.contextualizedJsonRegex.test(fileKey) ? contextualizedJsonFiles.push(file) : THEME_PARTITION_REGEX.sectionJsonRegex.test(fileKey) ? sectionJsonFiles.push(file) : THEME_PARTITION_REGEX.templateJsonRegex.test(fileKey) ? templateJsonFiles.push(file) : otherJsonFiles.push(file) : THEME_PARTITION_REGEX.staticAssetRegex.test(fileKey) && staticAssetFiles.push(file);
   }), {
     sectionLiquidFiles,
     otherLiquidFiles,
@@ -152112,7 +152106,8 @@ function partitionThemeFiles(files) {
     contextualizedJsonFiles,
     otherJsonFiles,
     configFiles,
-    staticAssetFiles
+    staticAssetFiles,
+    blockLiquidFiles
   };
 }
 function isTextFile(path3) {
@@ -153081,6 +153076,7 @@ function orderFilesToBeDeleted(files) {
     ...fileSets.sectionJsonFiles,
     ...fileSets.otherJsonFiles,
     ...fileSets.sectionLiquidFiles,
+    ...fileSets.blockLiquidFiles,
     ...fileSets.otherLiquidFiles,
     ...fileSets.configFiles,
     ...fileSets.staticAssetFiles
@@ -153129,6 +153125,7 @@ function orderFilesToBeUploaded(files) {
     independentFiles: [fileSets.otherLiquidFiles, fileSets.otherJsonFiles, fileSets.staticAssetFiles],
     // Follow order of dependencies:
     dependentFiles: [
+      fileSets.blockLiquidFiles,
       fileSets.sectionLiquidFiles,
       fileSets.sectionJsonFiles,
       fileSets.templateJsonFiles,
@@ -158413,10 +158410,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-VC56S7TM.js");
+    let { startNodeServer } = await import("./node-W2RFI2AB.js");
     return startNodeServer(options);
   }
-  let { startWorkerdServer } = await import("./workerd-472F5I7T.js");
+  let { startWorkerdServer } = await import("./workerd-VGMCWUQJ.js");
   return startWorkerdServer(options);
 }
 
@@ -161202,7 +161199,7 @@ async function performActionWithRetryAfterRecovery(performAction, recoveryProced
 import stream from "node:stream/promises";
 import * as gzip from "node:zlib";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
-var FUNCTION_RUNNER_VERSION = "v6.3.0", JAVY_VERSION = "v4.0.0", JAVY_PLUGIN_VERSION = "v3.2.0", Executable = class {
+var FUNCTION_RUNNER_VERSION = "v6.4.0", JAVY_VERSION = "v4.0.0", JAVY_PLUGIN_VERSION = "v3.2.0", Executable = class {
   constructor(name, version, gitHubRepo) {
     this.name = name, this.version = version;
     let filename = process.platform === "win32" ? `${name}.exe` : name;
@@ -161456,8 +161453,8 @@ async function runJavy(fun, options, extra = []) {
 }
 async function installJavy(app) {
   if (app.allExtensions.some((ext) => ext.features.includes("function") && ext.isJavaScript)) {
-    let javy = javyBinary();
-    await downloadBinary(javy);
+    let javy = javyBinary(), plugin = javyPluginBinary();
+    await Promise.all([downloadBinary(javy), downloadBinary(plugin)]);
   }
 }
 var DefaultJavyBuilder = {
@@ -166345,11 +166342,19 @@ var PartnersClient = class {
   async currentAccountInfo() {
     return this.request(CurrentAccountInfoQuery);
   }
-  async targetSchemaDefinition(input) {
-    return (await this.request(TargetSchemaDefinitionQuery, input)).definition;
+  async targetSchemaDefinition(input, apiKey, _organizationId, _appId) {
+    let transformedInput = {
+      target: input.handle,
+      version: input.version,
+      apiKey
+    };
+    return (await this.request(TargetSchemaDefinitionQuery, transformedInput)).definition;
   }
-  async apiSchemaDefinition(input) {
-    return (await this.request(ApiSchemaDefinitionQuery, input)).definition;
+  async apiSchemaDefinition(input, apiKey, _organizationId, _appId) {
+    return (await this.request(ApiSchemaDefinitionQuery, {
+      ...input,
+      apiKey
+    })).definition;
   }
   async migrateToUiExtension(input) {
     return this.request(MigrateToUiExtensionQuery, input);
@@ -167964,6 +167969,146 @@ var PublicApiVersions2 = {
   ]
 };
 
+// ../app/dist/cli/api/graphql/functions/generated/schema-definition-by-target.js
+init_cjs_shims();
+var SchemaDefinitionByTarget = {
+  kind: "Document",
+  definitions: [
+    {
+      kind: "OperationDefinition",
+      operation: "query",
+      name: { kind: "Name", value: "SchemaDefinitionByTarget" },
+      variableDefinitions: [
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "handle" } },
+          type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }
+        },
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "version" } },
+          type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }
+        }
+      ],
+      selectionSet: {
+        kind: "SelectionSet",
+        selections: [
+          {
+            kind: "Field",
+            name: { kind: "Name", value: "target" },
+            arguments: [
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "handle" },
+                value: { kind: "Variable", name: { kind: "Name", value: "handle" } }
+              }
+            ],
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "api" },
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "schema" },
+                        arguments: [
+                          {
+                            kind: "Argument",
+                            name: { kind: "Name", value: "version" },
+                            value: { kind: "Variable", name: { kind: "Name", value: "version" } }
+                          }
+                        ],
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [
+                            { kind: "Field", name: { kind: "Name", value: "definition" } },
+                            { kind: "Field", name: { kind: "Name", value: "__typename" } }
+                          ]
+                        }
+                      },
+                      { kind: "Field", name: { kind: "Name", value: "__typename" } }
+                    ]
+                  }
+                },
+                { kind: "Field", name: { kind: "Name", value: "__typename" } }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ]
+};
+
+// ../app/dist/cli/api/graphql/functions/generated/schema-definition-by-api-type.js
+init_cjs_shims();
+var SchemaDefinitionByApiType = {
+  kind: "Document",
+  definitions: [
+    {
+      kind: "OperationDefinition",
+      operation: "query",
+      name: { kind: "Name", value: "SchemaDefinitionByApiType" },
+      variableDefinitions: [
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "type" } },
+          type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }
+        },
+        {
+          kind: "VariableDefinition",
+          variable: { kind: "Variable", name: { kind: "Name", value: "version" } },
+          type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }
+        }
+      ],
+      selectionSet: {
+        kind: "SelectionSet",
+        selections: [
+          {
+            kind: "Field",
+            name: { kind: "Name", value: "api" },
+            arguments: [
+              {
+                kind: "Argument",
+                name: { kind: "Name", value: "type" },
+                value: { kind: "Variable", name: { kind: "Name", value: "type" } }
+              }
+            ],
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "schema" },
+                  arguments: [
+                    {
+                      kind: "Argument",
+                      name: { kind: "Name", value: "version" },
+                      value: { kind: "Variable", name: { kind: "Name", value: "version" } }
+                    }
+                  ],
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      { kind: "Field", name: { kind: "Name", value: "definition" } },
+                      { kind: "Field", name: { kind: "Name", value: "__typename" } }
+                    ]
+                  }
+                },
+                { kind: "Field", name: { kind: "Name", value: "__typename" } }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ]
+};
+
 // ../cli-kit/dist/public/node/api/app-management.js
 init_cjs_shims();
 var import_bottleneck = __toESM(require_lib3()), limiter = new import_bottleneck.default({
@@ -168029,6 +168174,29 @@ async function webhooksRequest(organizationId, query, token, variables) {
   }));
 }
 
+// ../cli-kit/dist/public/node/api/functions.js
+init_cjs_shims();
+var import_bottleneck4 = __toESM(require_lib3()), limiter4 = new import_bottleneck4.default({
+  minTime: 150,
+  maxConcurrent: 10
+});
+async function setupRequest2(orgId, token, appId) {
+  let api = "Functions", url = `https://${await appManagementFqdn()}/functions/unstable/organizations/${orgId}/${appId}/graphql`;
+  return {
+    token,
+    api,
+    url,
+    responseOptions: { onResponse: handleDeprecations }
+  };
+}
+async function functionsRequestDoc(orgId, query, token, appId, variables) {
+  return await limiter4.schedule(async () => graphqlRequestDoc({
+    ...await setupRequest2(orgId, token, appId),
+    query,
+    variables
+  }));
+}
+
 // ../app/dist/cli/utilities/developer-platform-client/app-management-client.js
 var TEMPLATE_JSON_URL = "https://cdn.shopify.com/static/cli/extensions/templates.json", AppManagementClient = class {
   constructor(session) {
@@ -168435,11 +168603,24 @@ var TEMPLATE_JSON_URL = "https://cdn.shopify.com/static/cli/extensions/templates
   async currentAccountInfo() {
     throw new BugError("Not implemented: currentAccountInfo");
   }
-  async targetSchemaDefinition(_input) {
-    throw new BugError("Not implemented: targetSchemaDefinition");
+  async targetSchemaDefinition(input, _apiKey, organizationId, appId) {
+    try {
+      let appIdNumber = String(numberFromGid(appId)), token = await this.token();
+      return (await functionsRequestDoc(organizationId, SchemaDefinitionByTarget, token, appIdNumber, {
+        handle: input.handle,
+        version: input.version
+      }))?.target?.api?.schema?.definition ?? null;
+    } catch (error) {
+      throw new AbortError(`Failed to fetch schema definition: ${error}`);
+    }
   }
-  async apiSchemaDefinition(_input) {
-    throw new BugError("Not implemented: apiSchemaDefinition");
+  async apiSchemaDefinition(input, _apiKey, organizationId, appId) {
+    try {
+      let appIdNumber = String(numberFromGid(appId)), token = await this.token();
+      return (await functionsRequestDoc(organizationId, SchemaDefinitionByApiType, token, appIdNumber, input))?.api?.schema?.definition ?? null;
+    } catch (error) {
+      throw new AbortError(`Failed to fetch schema definition: ${error}`);
+    }
   }
   async migrateToUiExtension(_input) {
     throw new BugError("Not implemented: migrateToUiExtension");
@@ -175621,43 +175802,45 @@ init_cjs_shims();
 // ../app/dist/cli/services/generate-schema.js
 init_cjs_shims();
 async function generateSchemaService(options) {
-  let { extension, stdout, developerPlatformClient, app } = options, apiKey = app.configuration.client_id, { api_version: version, type, targeting } = extension.configuration, definition = await (!!targeting?.length ? generateSchemaFromTarget({
+  let { extension, stdout, developerPlatformClient, app, orgId } = options, apiKey = app.configuration.client_id, appId = app.configuration.app_id, { api_version: version, type, targeting } = extension.configuration, definition = await (!!targeting?.length ? generateSchemaFromTarget({
     localIdentifier: extension.localIdentifier,
     developerPlatformClient,
     apiKey,
+    appId,
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     target: targeting[0].target,
-    version
-  }) : generateSchemaFromType({
+    version,
+    orgId
+  }) : generateSchemaFromApiType({
     localIdentifier: extension.localIdentifier,
     developerPlatformClient,
     apiKey,
+    appId,
     type,
-    version
+    version,
+    orgId
   }));
   if (stdout)
     outputInfo(definition);
   else {
-    let outputPath = joinPath(options.path, "schema.graphql");
+    let outputPath = joinPath(extension.directory, "schema.graphql");
     await writeFile(outputPath, definition), outputInfo(`GraphQL Schema for ${extension.localIdentifier} written to ${outputPath}`);
   }
 }
-async function generateSchemaFromTarget({ localIdentifier, developerPlatformClient, apiKey, target, version }) {
+async function generateSchemaFromTarget({ localIdentifier, developerPlatformClient, appId, apiKey, target, version, orgId }) {
   let variables = {
-    apiKey,
-    target,
+    handle: target,
     version
-  }, definition = await developerPlatformClient.targetSchemaDefinition(variables);
+  }, definition = await developerPlatformClient.targetSchemaDefinition(variables, apiKey, orgId, appId);
   if (!definition)
     throw new AbortError(outputContent`A schema could not be generated for ${localIdentifier}`, outputContent`Check that the Function targets and version are valid.`);
   return definition;
 }
-async function generateSchemaFromType({ localIdentifier, developerPlatformClient, apiKey, version, type }) {
+async function generateSchemaFromApiType({ localIdentifier, developerPlatformClient, apiKey, appId, version, type, orgId }) {
   let variables = {
-    apiKey,
     version,
     type
-  }, definition = await developerPlatformClient.apiSchemaDefinition(variables);
+  }, definition = await developerPlatformClient.apiSchemaDefinition(variables, apiKey, orgId, appId);
   if (!definition)
     throw new AbortError(outputContent`A schema could not be generated for ${localIdentifier}`, outputContent`Check that the Function API type and version are valid.`);
   return definition;
@@ -175676,31 +175859,32 @@ var functionFlags = {
   })
 };
 async function inFunctionContext({ path: path3, userProvidedConfigName, apiKey, callback, reset }) {
-  let { app, developerPlatformClient } = await linkedAppContext({
+  let { app, developerPlatformClient, organization } = await linkedAppContext({
     directory: path3,
     clientId: apiKey,
     forceRelink: reset ?? !1,
     userProvidedConfigName
   }), allFunctions = app.allExtensions.filter((ext) => ext.isFunctionExtension), ourFunction = allFunctions.find((fun) => fun.directory === path3);
   if (ourFunction)
-    return callback(app, developerPlatformClient, ourFunction);
+    return callback(app, developerPlatformClient, ourFunction, organization.id);
   if (isTerminalInteractive()) {
     let selectedFunction = await renderAutocompletePrompt({
       message: "Which function?",
       choices: allFunctions.map((shopifyFunction) => ({ label: shopifyFunction.handle, value: shopifyFunction }))
     });
-    return callback(app, developerPlatformClient, selectedFunction);
+    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.");
 }
-async function getOrGenerateSchemaPath(extension, app, developerPlatformClient) {
+async function getOrGenerateSchemaPath(extension, app, developerPlatformClient, orgId) {
   let path3 = joinPath(extension.directory, "schema.graphql");
   return await fileExists(path3) ? path3 : (await generateSchemaService({
     app,
     developerPlatformClient,
     extension,
     stdout: !1,
-    path: extension.directory
+    path: extension.directory,
+    orgId
   }), await fileExists(path3) ? path3 : void 0);
 }
 
@@ -176151,7 +176335,7 @@ var _a25, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends AppCom
       userProvidedConfigName: flags.config,
       apiKey: flags["client-id"],
       reset: flags.reset,
-      callback: async (app2, developerPlatformClient, ourFunction) => {
+      callback: async (app2, developerPlatformClient, ourFunction, orgId) => {
         let functionExport = DEFAULT_FUNCTION_EXPORT;
         if (flags.export !== void 0)
           outputDebug(`Using export ${flags.export} from the --export flag.`), functionExport = flags.export;
@@ -176170,7 +176354,7 @@ var _a25, DEFAULT_FUNCTION_EXPORT = "_start", FunctionRun = class extends AppCom
             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, app2, developerPlatformClient);
+        let inputQueryPath = ourFunction?.configuration.targeting?.[0]?.input_query, queryPath = inputQueryPath && `${ourFunction?.directory}/${inputQueryPath}`, schemaPath = await getOrGenerateSchemaPath(ourFunction, app2, developerPlatformClient, orgId);
         return await runFunction({
           functionExtension: ourFunction,
           json: flags.json,
@@ -176220,12 +176404,13 @@ var _a26, FetchSchema = class extends AppCommand {
       apiKey,
       reset: flags.reset,
       userProvidedConfigName: flags.config,
-      callback: async (app2, developerPlatformClient, ourFunction) => (await generateSchemaService({
+      callback: async (app2, developerPlatformClient, ourFunction, orgId) => (await generateSchemaService({
         app: app2,
         extension: ourFunction,
         developerPlatformClient,
         stdout: flags.stdout,
-        path: flags.path
+        path: flags.path,
+        orgId
       }), app2)
     }) };
   }
@@ -176879,11 +177064,10 @@ function buildTomlObject3(extension, _2, appConfiguration) {
     extensions: [
       {
         type: "admin_link",
-        name: extension.title,
+        name: config2.text,
         handle: slugify(extension.title.substring(0, MAX_EXTENSION_HANDLE_LENGTH)),
         targeting: [
           {
-            text: config2.text,
             url: config2.url,
             target: contextToTarget(context)
           }
@@ -179408,20 +179592,6 @@ var DidYouMeanCommands = {
   await shouldRunCommand(result, userCommand) && await this.config.runCommand(result, opts.argv);
 };
 
-// ../cli-kit/dist/public/node/cli-launcher.js
-init_cjs_shims();
-import { fileURLToPath as fileURLToPath7 } from "node:url";
-async function launchCLI(options) {
-  let { errorHandler: errorHandler2 } = await import("./error-handler-FY3IUTH3.js"), { isDevelopment } = await import("./local-TRXHLDGT.js"), oclif = await import("./lib-XYCLX35G.js"), { ShopifyConfig } = await import("./custom-oclif-loader-4V6TU5BB.js");
-  isDevelopment() && (oclif.default.settings.debug = !0);
-  try {
-    let config2 = new ShopifyConfig({ root: fileURLToPath7(options.moduleURL) });
-    await config2.load(), await oclif.default.run(options.argv, config2), await oclif.default.flush();
-  } catch (error) {
-    return await errorHandler2(error), oclif.default.Errors.handle(error);
-  }
-}
-
 // src/index.ts
 import fs6 from "fs";
 
@@ -179444,7 +179614,7 @@ var TUNNEL_PROVIDER = "cloudflare", provider_default = defineProvider({ name: TU
 
 // ../plugin-cloudflare/dist/install-cloudflared.js
 init_cjs_shims();
-import { fileURLToPath as fileURLToPath8 } from "url";
+import { fileURLToPath as fileURLToPath7 } from "url";
 import util from "util";
 import { pipeline as pipeline2 } from "stream";
 import { execSync, execFileSync } from "child_process";
@@ -179474,7 +179644,7 @@ function getURL(platform2 = process.platform, arch = process.arch) {
   return CLOUDFLARE_REPO + fileName;
 }
 function getBinPathTarget(env = process.env, platform2 = process.platform) {
-  return env.SHOPIFY_CLI_CLOUDFLARED_PATH ? env.SHOPIFY_CLI_CLOUDFLARED_PATH : joinPath(dirname(fileURLToPath8(import.meta.url)), "..", "bin", platform2 === "win32" ? "cloudflared.exe" : "cloudflared");
+  return env.SHOPIFY_CLI_CLOUDFLARED_PATH ? env.SHOPIFY_CLI_CLOUDFLARED_PATH : joinPath(dirname(fileURLToPath7(import.meta.url)), "..", "bin", platform2 === "win32" ? "cloudflared.exe" : "cloudflared");
 }
 async function install(env = process.env, platform2 = process.platform, arch = process.arch) {
   if (env.SHOPIFY_CLI_IGNORE_CLOUDFLARED) {
@@ -179527,7 +179697,7 @@ async function downloadFile(url, to) {
 
 // ../plugin-cloudflare/dist/tunnel.js
 import { Writable as Writable2 } from "stream";
-import { fileURLToPath as fileURLToPath9 } from "url";
+import { fileURLToPath as fileURLToPath8 } from "url";
 var tunnel_default = startTunnel({ provider: TUNNEL_PROVIDER, action: hookStart }), TUNNEL_TIMEOUT = isUnitTest() ? 0.2 : 40, MAX_RETRIES = 5;
 async function hookStart(port) {
   try {
@@ -179639,7 +179809,7 @@ function findConnection(data) {
   return match2 && match2[0];
 }
 function getBinPathTarget2() {
-  return process.env.SHOPIFY_CLI_CLOUDFLARED_PATH ? process.env.SHOPIFY_CLI_CLOUDFLARED_PATH : joinPath(dirname(fileURLToPath9(import.meta.url)), "..", "bin", process.platform === "win32" ? "cloudflared.exe" : "cloudflared");
+  return process.env.SHOPIFY_CLI_CLOUDFLARED_PATH ? process.env.SHOPIFY_CLI_CLOUDFLARED_PATH : joinPath(dirname(fileURLToPath8(import.meta.url)), "..", "bin", process.platform === "win32" ? "cloudflared.exe" : "cloudflared");
 }
 function getTunnelDomain() {
   return process.env.SHOPIFY_CLI_CLOUDFLARED_DOMAIN ?? "trycloudflare.com";
@@ -179660,13 +179830,10 @@ signals.forEach((signal) => {
 var columns2 = Number(process.env.SHOPIFY_CLI_COLUMNS);
 isNaN(columns2) || (process.stdout.columns = columns2);
 async function runShopifyCLI({ development }) {
-  await runCLI(
-    {
-      moduleURL: import.meta.url,
-      development
-    },
-    launchCLI
-  );
+  await runCLI({
+    moduleURL: import.meta.url,
+    development
+  });
 }
 commands3.plugins.hidden = !0;
 commands3["plugins:install"].description = "";