shopify-cli 2.7.0 → 2.7.4

data/lib/project_types/script/messages/messages.rb

@@ -47,14 +47,20 @@ module Script
           invalid_language_cause: "Invalid language %s.",
           invalid_language_help: "Allowed values: %s.",
 
+          missing_script_config_yml_field_cause: "The script.config.yml file is missing the required %s field.",
+          missing_script_config_yml_field_help: "Add the field and try again.",
+
           missing_script_json_field_cause: "The script.json file is missing the required %s field.",
           missing_script_json_field_help: "Add the field and try again.",
 
           invalid_script_json_definition_cause: "The script.json file contains invalid JSON.",
           invalid_script_json_definition_help: "Fix the errors and try again.",
 
-          no_script_json_file_cause: "The script.json file is missing.",
-          no_script_json_file_help: "Create this file and try again.",
+          invalid_script_config_yml_definition_cause: "The script.config.yml file contains invalid YAML.",
+          invalid_script_config_yml_definition_help: "Fix the errors and try again.",
+
+          no_script_config_yml_file_cause: "The script.config.yml file is missing.",
+          no_script_config_yml_file_help: "Create this file and try again.",
 
           configuration_syntax_error_cause: "The script.json is not formatted properly.",
           configuration_syntax_error_help: "Fix the errors and try again.",
@@ -115,8 +121,6 @@ module Script
           script_repush_cause: "A version of this script already exists on the app.",
           script_repush_help: "Use {{cyan:--force}} to replace the existing script.",
 
-          invalid_build_script: "The root package.json contains an invalid build command that " \
-                                "is needed to compile your script to WebAssembly.",
           build_script_not_found: "The root package.json is missing the build command that " \
                                   "is needed to compile your script to WebAssembly.",
           # rubocop:disable Layout/LineLength
@@ -140,6 +144,7 @@ module Script
 
           language_library_for_api_not_found_cause: "Script can’t be pushed because the %{language} library for API %{api} is missing.",
           language_library_for_api_not_found_help: "Make sure extension_point.yml contains the correct API library.",
+          no_scripts_found_in_app: "The selected apps have no scripts. Please, create them first on the partners' dashboard.",
         },
 
         create: {
@@ -175,6 +180,29 @@ module Script
 
           script_pushed: "{{v}} Script pushed to app (API key: %{api_key}).",
         },
+        connect: {
+          connected: "Connected! Your project is now connected to {{green:%s}}",
+          missing_script: "No script has been selected.",
+          help: <<~HELP,
+            {{command:%s script connect}}: Connects an existing script to an app.
+              Usage: {{command:%s script connect}}
+          HELP
+          error: {
+            operation_failed: "Couldn't connect script to app.",
+          },
+        },
+        javy: {
+          help: <<~HELP,
+            Compile the JavaScript code into WebAssembly.
+              Usage: {{command:%s script javy}}
+              Options:
+                {{command:--in}} The name of the JavaScript file that will be compiled.
+                {{command:--out}} The name of the file that the WebAssembly should be written to.
+          HELP
+          errors: {
+            invalid_arguments: "Javy was run with invalid arguments. Run {{command: %s script javy --help}} for more information.",
+          },
+        },
 
         project_deps: {
           none_required: "{{v}} None required",

data/lib/project_types/script/ui/error_handler.rb

@@ -74,7 +74,7 @@ module Script
           }
         when Layers::Infrastructure::Errors::DeprecatedEPError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.deprecated_ep", e.ep),
+            cause_of_error: ShopifyCLI::Context.message("script.error.deprecated_ep", e.extension_point),
             help_suggestion: ShopifyCLI::Context.message("script.error.deprecated_ep_cause"),
           }
         when Layers::Domain::Errors::InvalidExtensionPointError
@@ -103,32 +103,47 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.metadata_not_found_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.metadata_not_found_help"),
           }
-        when Layers::Domain::Errors::MissingScriptJsonFieldError
+        when Layers::Infrastructure::Errors::BuildError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_json_field_cause", e.field),
-            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_json_field_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.build_error_help"),
           }
-        when Layers::Domain::Errors::InvalidScriptJsonDefinitionError
+        when Layers::Infrastructure::Errors::InvalidScriptConfigYmlDefinitionError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_script_config_yml_definition_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_script_config_yml_definition_help"),
+          }
+        when Layers::Infrastructure::Errors::InvalidScriptJsonDefinitionError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.invalid_script_json_definition_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.invalid_script_json_definition_help"),
           }
-        when Layers::Domain::Errors::NoScriptJsonFile
+        when Layers::Infrastructure::Errors::MissingScriptConfigYmlFieldError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.no_script_json_file_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.no_script_json_file_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_help"),
           }
-        when Layers::Infrastructure::Errors::BuildError
+        when Layers::Infrastructure::Errors::MissingScriptConfigYmlFieldError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.build_error_help"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_config_yml_field_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonSyntaxError
+        when Layers::Infrastructure::Errors::MissingScriptJsonFieldError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.missing_script_json_field_cause", e.field),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_json_field_help"),
+          }
+        when Layers::Infrastructure::Errors::NoScriptConfigYmlFileError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.no_script_config_yml_file_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.no_script_config_yml_file_help"),
+          }
+        when Layers::Infrastructure::Errors::ScriptConfigSyntaxError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.configuration_syntax_error_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_syntax_error_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonMissingKeysError
+        when Layers::Infrastructure::Errors::ScriptConfigMissingKeysError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_missing_keys_error_cause",
@@ -136,7 +151,7 @@ module Script
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_missing_keys_error_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonInvalidValueError
+        when Layers::Infrastructure::Errors::ScriptConfigInvalidValueError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_invalid_value_error_cause",
@@ -144,7 +159,7 @@ module Script
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_invalid_value_error_help"),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonFieldsMissingKeysError
+        when Layers::Infrastructure::Errors::ScriptConfigFieldsMissingKeysError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_missing_keys_error_cause",
@@ -154,7 +169,7 @@ module Script
               "script.error.configuration_definition_schema_field_missing_keys_error_help"
             ),
           }
-        when Layers::Infrastructure::Errors::ScriptJsonFieldsInvalidValueError
+        when Layers::Infrastructure::Errors::ScriptConfigFieldsInvalidValueError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_invalid_value_error_cause",
@@ -201,11 +216,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.build_script_not_found"),
             help_suggestion: ShopifyCLI::Context.message("script.error.build_script_suggestion"),
           }
-        when Layers::Infrastructure::Errors::InvalidBuildScriptError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_build_script"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.build_script_suggestion"),
-          }
         when Layers::Infrastructure::Errors::WebAssemblyBinaryNotFoundError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.web_assembly_binary_not_found"),

data/lib/project_types/theme/commands/pull.rb

@@ -9,6 +9,7 @@ module Theme
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+        parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-x", "--ignore=PATTERN") do |pattern|
           flags[:ignores] ||= []
           flags[:ignores] << pattern
@@ -21,6 +22,8 @@ module Theme
 
         theme = if (theme_id = options.flags[:theme_id])
           ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        elsif options.flags[:live]
+          ShopifyCLI::Theme::Theme.live(@ctx, root: root)
         else
           form = Forms::Select.ask(
             @ctx,

data/lib/project_types/theme/commands/push.rb

@@ -10,6 +10,7 @@ module Theme
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+        parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-u", "--unpublished") { flags[:unpublished] = true }
         parser.on("-j", "--json") { flags[:json] = true }
@@ -27,6 +28,8 @@ module Theme
 
         theme = if (theme_id = options.flags[:theme_id])
           ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        elsif options.flags[:live]
+          ShopifyCLI::Theme::Theme.live(@ctx, root: root)
         elsif options.flags[:development]
           theme = ShopifyCLI::Theme::DevelopmentTheme.new(@ctx, root: root)
           theme.ensure_exists!
@@ -48,7 +51,9 @@ module Theme
         end
 
         if theme.live? && !options.flags[:allow_live]
-          return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
+          question = @ctx.message("theme.push.live")
+          question += @ctx.message("theme.push.theme", theme.name, theme.id) if options.flags[:live]
+          return unless CLI::UI::Prompt.confirm(question)
         end
 
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
@@ -72,6 +77,7 @@ module Theme
               @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
             end
           end
+          raise ShopifyCLI::AbortSilent if syncer.has_any_error?
         rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.push.theme_not_found", theme.id))
         ensure

data/lib/project_types/theme/commands/serve.rb

@@ -15,7 +15,7 @@ module Theme
       def call(*)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
-        ShopifyCLI::Theme::DevServer.start(@ctx, ".", http_bind: host, **flags) do |syncer|
+        ShopifyCLI::Theme::DevServer.start(@ctx, ".", host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       rescue ShopifyCLI::Theme::DevServer::AddressBindingError

data/lib/project_types/theme/messages/messages.rb

@@ -58,6 +58,7 @@ module Theme
 
               Options:
                 {{command:-i, --themeid=THEMEID}} Theme ID. Must be an existing theme on your store.
+                {{command:-l, --live}}            Push to your remote live theme, and update your live store.
                 {{command:-d, --development}}     Push to your remote development theme, and create it if needed.
                 {{command:-u, --unpublished}}     Create a new unpublished theme and push to it.
                 {{command:-n, --nodelete}}        Runs the push command without deleting remote files from Shopify.
@@ -73,6 +74,7 @@ module Theme
           push: "Pushing theme files to Shopify",
           select: "Select theme to push to",
           live: "Are you sure you want to push to your live theme?",
+          theme: "\n  Theme: {{blue:%s #%s}} {{green:[live]}}",
           theme_not_found: "Theme #%s doesn't exist",
           done: <<~DONE,
             {{green:Your theme was pushed successfully}}
@@ -96,12 +98,43 @@ module Theme
               {{command:--poll}}      Force polling to detect file changes
               {{command:--host=HOST}} Set which network interface the web server listens on. The default value is 127.0.0.1.
           HELP
-          serve: "Viewing theme…",
+          viewing_theme: "Viewing theme…",
+          syncing_theme: "Syncing theme #%s on %s",
           open_fail: "Couldn't open the theme",
+          operation: {
+            status: {
+              error: "ERROR",
+              synced: "Synced",
+              fixed: "Fixed",
+            },
+          },
           error: {
             address_binding_error: "Couldn't bind to localhost."\
               " To serve your theme, set a different address with {{command:%s theme serve --host=<address>}}",
           },
+          serving: <<~SERVING,
+
+            Serving %s
+
+          SERVING
+          customize_or_preview: <<~CUSTOMIZE_OR_PREVIEW,
+
+            Customize this theme in the Online Store Editor:
+            {{green:%s}}
+
+            Share this theme preview:
+            {{green:%s}}
+
+            (Use Ctrl-C to stop)
+          CUSTOMIZE_OR_PREVIEW
+          ensure_user: <<~ENSURE_USER,
+            You are not authorized to edit themes on %s.
+            Make sure you are a user of that store, and allowed to edit themes.
+          ENSURE_USER
+          already_in_use_error: "Error",
+          address_already_in_use: "The address \"%s\" is already in use.",
+          try_this: "Try this",
+          try_port_option: "Use the --port=PORT option to serve the theme in a different port.",
         },
         check: {
           help: <<~HELP,
@@ -157,6 +190,7 @@ module Theme
 
             Options:
               {{command:-i, --themeid=THEMEID}} The Theme ID. Must be an existing theme on your store.
+              {{command:-l, --live}}            Pull theme files from your remote live theme.
               {{command:-n, --nodelete}}        Runs the pull command without deleting local files.
 
             Run without options to select theme from a list.

data/lib/project_types/theme/ui/sync_progress_bar.rb

@@ -6,14 +6,14 @@ module Theme
       end
 
       def progress(method, **args)
-        @syncer.delay_errors!
+        @syncer.lock_io!
         CLI::UI::Progress.progress do |bar|
           @syncer.public_send(method, **args) do |left, total|
             bar.tick(set_percent: 1 - left.to_f / total)
           end
           bar.tick(set_percent: 1)
         end
-        @syncer.report_errors!
+        @syncer.unlock_io!
       end
     end
   end

data/lib/shopify_cli/command/project_command.rb

@@ -5,13 +5,26 @@ module ShopifyCLI
         @ctx.puts(self.class.help)
       end
 
-      def self.help
-        project_type = name.split("::")[0].downcase
-        ShopifyCLI::Context.message(
-          "#{project_type}.help",
-          ShopifyCLI::TOOL_NAME,
-          subcommand_registry.command_names.join(" | ")
-        )
+      class << self
+        def help
+          project_type = name.split("::")[0].downcase
+          ShopifyCLI::Context.message(
+            "#{project_type}.help",
+            ShopifyCLI::TOOL_NAME,
+            available_subcommands
+          )
+        end
+
+        private
+
+        def available_subcommands
+          subcommand_registry
+            .resolved_commands
+            .reject { |_name, command| command.hidden? }
+            .keys
+            .sort
+            .join(" | ")
+        end
       end
     end
   end

data/lib/shopify_cli/command.rb

@@ -29,6 +29,12 @@ module ShopifyCLI
           run_prerequisites
           cmd.call(args, command_name)
         end
+      rescue OptionParser::InvalidOption => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.invalid_option", arg)
+      rescue OptionParser::MissingArgument => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.missing_argument", arg)
       end
 
       def options(&block)

data/lib/shopify_cli/commands/app/create/node.rb

@@ -3,9 +3,7 @@ module ShopifyCLI
     class App
       class Create
         class Node < ShopifyCLI::Command::AppSubCommand
-          unless ShopifyCLI::Environment.acceptance_test?
-            prerequisite_task :ensure_authenticated
-          end
+          prerequisite_task :ensure_authenticated
 
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -3,9 +3,7 @@ module ShopifyCLI
     class App
       class Create
         class Rails < ShopifyCLI::Command::AppSubCommand
-          unless ShopifyCLI::Environment.acceptance_test?
-            prerequisite_task :ensure_authenticated
-          end
+          prerequisite_task :ensure_authenticated
 
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }

data/lib/shopify_cli/constants.rb

@@ -46,6 +46,9 @@ module ShopifyCLI
       ACCEPTANCE_TEST = "SHOPIFY_CLI_ACCEPTANCE_TEST"
       DEVELOPMENT = "SHOPIFY_CLI_DEVELOPMENT"
 
+      # Authentication
+      AUTH_TOKEN = "SHOPIFY_CLI_AUTH_TOKEN"
+
       # Monorail
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
     end
@@ -58,5 +61,9 @@ module ShopifyCLI
     module Links
       NEW_ISSUE = "https://github.com/Shopify/shopify-cli/issues/new"
     end
+
+    module Extension
+      DEFAULT_PORT = 39351
+    end
   end
 end

data/lib/shopify_cli/context.rb

@@ -61,6 +61,7 @@ module ShopifyCLI
     # will return which operating system that the cli is running on [:mac, :linux]
     def os
       host = uname
+      return :mac_m1 if /arm64-apple-darwin/i.match(host)
       return :mac if /darwin/i.match(host)
       return :windows if /mswin|mingw|cygwin/i.match(host)
       return :linux if /linux|bsd/i.match(host)
@@ -89,7 +90,7 @@ module ShopifyCLI
 
     # will return true if being launched from a tty
     def tty?
-      $stdin.tty? && !testing?
+      !testing? && $stdin.tty?
     end
 
     # will return true if the cli is being run from an installation, and not a
@@ -357,6 +358,15 @@ module ShopifyCLI
       Kernel.puts(CLI::UI.fmt(*args))
     end
 
+    # a wrapper around $stderr.puts to allow for easy formatting
+    #
+    # #### Parameters
+    # * `text` - a string message to output
+    #
+    def error(text)
+      $stderr.puts(CLI::UI.fmt(text))
+    end
+
     # a wrapper around Kernel.warn to allow for easy formatting
     #
     # #### Parameters

data/lib/shopify_cli/environment.rb

@@ -86,6 +86,10 @@ module ShopifyCLI
       )
     end
 
+    def self.auth_token(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::AUTH_TOKEN]
+    end
+
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end

data/lib/shopify_cli/form.rb

@@ -15,6 +15,8 @@ module ShopifyCLI
         rescue ShopifyCLI::Abort => err
           ctx.puts(err.message)
           nil
+        rescue ShopifyCLI::AbortSilent
+          nil
         end
       end
 

data/lib/shopify_cli/git.rb

@@ -8,6 +8,8 @@ module ShopifyCLI
       def available?(ctx)
         _output, status = ctx.capture2e("git", "status")
         status.success?
+      rescue Errno::ENOENT # git is not installed
+        false
       end
 
       ##

data/lib/shopify_cli/identity_auth.rb

@@ -68,6 +68,24 @@ module ShopifyCLI
       request_exchange_tokens
     end
 
+    def self.fetch_or_auth_partners_token(ctx:)
+      env_var_auth_token = Environment.auth_token
+      return env_var_auth_token if env_var_auth_token
+
+      ShopifyCLI::DB.get(:partners_exchange_token) do
+        IdentityAuth.new(ctx: ctx).authenticate
+        ShopifyCLI::DB.get(:partners_exchange_token)
+      end
+    end
+
+    def self.environment_auth_token?
+      !!Environment.auth_token
+    end
+
+    def self.authenticated?
+      environment_auth_token? || IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCLI::DB.exists?(key) }
+    end
+
     def reauthenticate
       return if refresh_exchange_tokens || refresh_access_tokens
       ctx.abort(ctx.message("core.identity_auth.error.reauthenticate", ShopifyCLI::TOOL_NAME))

data/lib/shopify_cli/messages/messages.rb

@@ -14,6 +14,12 @@ module ShopifyCLI
         },
       },
       core: {
+        errors: {
+          option_parser: {
+            invalid_option: "The option {{command:%s}} is not supported.",
+            missing_argument: "The required argument {{command:%s}} is missing.",
+          },
+        },
         app: {
           help: <<~HELP,
           Suite of commands for developing apps. See {{command:%1$s app <command> --help}} for usage of each command.
@@ -457,6 +463,7 @@ module ShopifyCLI
             not_authenticated: "Failed to authenticate",
           },
           login_prompt: "Please ensure you've logged in with {{command:%s login}} and try again",
+          token_authentication: "%s environment variable. We'll authenticate using its value as a token.",
         },
 
         options: {
@@ -718,7 +725,7 @@ module ShopifyCLI
           signup_suggestion: <<~MESSAGE,
             {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
             account at {{underline:https://ngrok.com/signup}}. After you signup, install your
-            personalized authorization token using {{command:%s [ node | rails ] tunnel auth <token>}}.
+            personalized authorization token using {{command:%s app tunnel auth <token>}}.
           MESSAGE
           start: "{{v}} ngrok tunnel running at {{underline:%s}}",
           start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
@@ -764,7 +771,7 @@ module ShopifyCLI
             Anonymized reports will be sent to Shopify.
           MESSAGE
           turned_off_message: <<~MESSAGE,
-            Turn on automatic reporting later wtih {{command:%s reporting on}}.
+            Turn on automatic reporting later with {{command:%s reporting on}}.
           MESSAGE
         },
         whoami: {

data/lib/shopify_cli/partners_api/app_extensions/job.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "shopify_cli/thread_pool/job"
+
+module ShopifyCLI
+  class PartnersAPI
+    class AppExtensions
+      class Job < ShopifyCLI::ThreadPool::Job
+        attr_reader :result
+
+        def initialize(ctx, app, type)
+          super()
+          @ctx = ctx
+          @app = app
+          @api_key = @app["apiKey"]
+          @type = type
+        end
+
+        def perform!
+          resp = PartnersAPI.query(@ctx, "get_extension_registrations", **params)
+          @result = resp&.dig("data", "app") || {}
+        end
+
+        def patch_app_with_extensions!
+          @app.merge!(result)
+        end
+
+        private
+
+        def params
+          { api_key: @api_key, type: @type }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/partners_api/app_extensions.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "shopify_cli/thread_pool"
+
+require_relative "app_extensions/job"
+
+module ShopifyCLI
+  class PartnersAPI
+    class AppExtensions
+      class << self
+        def fetch_apps_extensions(ctx, orgs, type)
+          jobs = apps(orgs).map { |app| AppExtensions::Job.new(ctx, app, type) }
+
+          consume_jobs!(jobs)
+          patch_apps_with_extensions!(jobs)
+
+          orgs
+        end
+
+        private
+
+        def apps(orgs)
+          orgs.flat_map { |org| org["apps"] }
+        end
+
+        def consume_jobs!(jobs)
+          thread_pool = ShopifyCLI::ThreadPool.new
+          jobs.each do |job|
+            thread_pool.schedule(job)
+          end
+          thread_pool.shutdown
+
+          raise_if_any_error(jobs)
+        end
+
+        def patch_apps_with_extensions!(jobs)
+          jobs.each(&:patch_app_with_extensions!)
+        end
+
+        def raise_if_any_error(jobs)
+          jobs.find(&:error?).tap { |job| raise job.error if job }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/partners_api/organizations.rb

@@ -28,11 +28,8 @@ module ShopifyCLI
         end
 
         def fetch_with_extensions(ctx, type)
-          resp = PartnersAPI.query(ctx, "all_orgs_with_extensions", type: type)
-          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
-            org["apps"] = (org.dig("apps", "nodes") || [])
-            org
-          end
+          orgs = fetch_with_app(ctx)
+          AppExtensions.fetch_apps_extensions(ctx, orgs, type)
         end
       end
     end