shopify-cli 2.8.0 → 2.10.2

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -19,7 +19,8 @@ module Script
           metadata:,
           script_config:,
           module_upload_url:,
-          library:
+          library:,
+          input_query: nil
         )
           query_name = "app_script_set"
           variables = {
@@ -34,11 +35,14 @@ module Script
             configurationUi: script_config.configuration_ui,
             configurationDefinition: script_config.configuration&.to_json,
             moduleUploadUrl: module_upload_url,
-            library: {
-              language: library[:language],
-              version: library[:version],
-            },
+            inputQuery: input_query,
           }
+
+          variables[:library] = {
+            language: library[:language],
+            version: library[:version],
+          }  if library
+
           resp_hash = make_request(query_name: query_name, variables: variables)
           user_errors = resp_hash["data"]["appScriptSet"]["userErrors"]
 
@@ -46,20 +50,37 @@ module Script
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
+          elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_error" })
+            raise Errors::ScriptConfigurationDefinitionError.new(
+              message: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.any? { |err| err["tag"] == "configuration_definition_syntax_error" })
-            raise Errors::ScriptConfigSyntaxError
+            raise Errors::ScriptConfigSyntaxError, script_config.filename
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_missing_keys_error" })
-            raise Errors::ScriptConfigMissingKeysError, e["message"]
+            raise Errors::ScriptConfigMissingKeysError.new(
+              missing_keys: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_invalid_value_error" })
-            raise Errors::ScriptConfigInvalidValueError, e["message"]
+            raise Errors::ScriptConfigInvalidValueError.new(
+              valid_input_modes: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.find do |err|
                    err["tag"] == "configuration_definition_schema_field_missing_keys_error"
                  end)
-            raise Errors::ScriptConfigFieldsMissingKeysError, e["message"]
+            raise Errors::ScriptConfigFieldsMissingKeysError.new(
+              missing_keys: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.find do |err|
                    err["tag"] == "configuration_definition_schema_field_invalid_value_error"
                  end)
-            raise Errors::ScriptConfigFieldsInvalidValueError, e["message"]
+            raise Errors::ScriptConfigFieldsInvalidValueError.new(
+              valid_types: e["message"],
+              filename: script_config.filename,
+            )
           elsif user_errors.find { |err| %w(not_use_msgpack_error schema_version_argument_error).include?(err["tag"]) }
             raise Domain::Errors::MetadataValidationError
           else
@@ -74,14 +95,16 @@ module Script
           response["data"]["appScripts"]
         end
 
-        def generate_module_upload_url
+        def generate_module_upload_details
           query_name = "module_upload_url_generate"
           variables = {}
           response = make_request(query_name: query_name, variables: variables)
           user_errors = response["data"]["moduleUploadUrlGenerate"]["userErrors"]
 
           raise Errors::GraphqlError, user_errors if user_errors.any?
-          response["data"]["moduleUploadUrlGenerate"]["url"]
+
+          data = response["data"]["moduleUploadUrlGenerate"]["details"]
+          { url: data["url"], headers: data["headers"], max_size: data["humanizedMaxSize"] }
         end
 
         private

data/lib/project_types/script/layers/infrastructure/script_uploader.rb

@@ -7,19 +7,32 @@ module Script
         end
 
         def upload(script_content)
-          @script_service.generate_module_upload_url.tap do |url|
-            url = URI(url)
+          upload_details = @script_service.generate_module_upload_details
+          url = URI(upload_details[:url])
 
-            https = Net::HTTP.new(url.host, url.port)
-            https.use_ssl = true
+          https = Net::HTTP.new(url.host, url.port)
+          https.use_ssl = true
 
-            request = Net::HTTP::Put.new(url)
-            request["Content-Type"] = "application/wasm"
-            request.body = script_content
+          request = Net::HTTP::Put.new(url)
+          request["Content-Type"] = "application/wasm"
 
-            response = https.request(request)
-            raise Errors::ScriptUploadError unless response.code == "200"
+          upload_details[:headers].each do |header, value|
+            request[header] = value
           end
+
+          request.body = script_content
+
+          response = https.request(request)
+          raise Errors::ScriptTooLargeError, upload_details[:max_size] if script_too_large?(response)
+          raise Errors::ScriptUploadError unless response.code == "200"
+
+          upload_details[:url]
+        end
+
+        private
+
+        def script_too_large?(response)
+          response.code == "400" && response.body.include?("EntityTooLarge")
         end
       end
     end

data/lib/project_types/script/loaders/project.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Script
+  module Loaders
+    module Project
+      def self.load(directory:, api_key:, uuid:, api_secret:, context: ShopifyCLI::Context.new)
+        env_overrides = {
+          "SHOPIFY_API_KEY" => api_key,
+          "SHOPIFY_API_SECRET" => api_secret,
+          "UUID" => uuid,
+        }.compact
+        env_file_present = env_file_exists?(directory)
+        env = if env_file_present
+          ShopifyCLI::Resources::EnvFile.read(directory, overrides: env_overrides)
+        else
+          ShopifyCLI::Resources::EnvFile.from_hash(env_overrides)
+        end
+
+        project = ShopifyCLI::Project.at(directory)
+        project.env = env
+        project
+      rescue SmartProperties::InitializationError, SmartProperties::InvalidValueError => error
+        handle_error(error, context: context, env_file_present: env_file_present)
+      end
+
+      def self.handle_error(error, context:, env_file_present:)
+        if env_file_present
+          properties_hash = { api_key: "SHOPIFY_API_KEY", secret: "SHOPIFY_API_SECRET" }
+          missing_env_variables = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
+          raise ShopifyCLI::Abort,
+            context.message("script.error.missing_env_file_variables", missing_env_variables, ShopifyCLI::TOOL_NAME)
+        else
+          properties_hash = { api_key: "--api-key", secret: "--api-secret" }
+          missing_options = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
+          raise ShopifyCLI::Abort, context.message("script.error.missing_push_options", missing_options)
+        end
+      end
+
+      def self.env_file_exists?(directory)
+        File.exist?(ShopifyCLI::Resources::EnvFile.path(directory))
+      end
+    end
+  end
+end

data/lib/project_types/script/loaders/specification_handler.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Script
+  module Loaders
+    module SpecificationHandler
+      def self.load(project:, context:)
+        identifier = project.specification_identifier
+        Models::LazySpecificationHandler.new(identifier) do
+          specifications = Models::Specifications.new(
+            fetch_specifications: Tasks::FetchSpecifications.new(api_key: project.app.api_key, context: context)
+          )
+
+          unless specifications.valid?(identifier)
+            context.abort(context.message("errors.unknown_type", project.specification_identifier))
+          end
+
+          specifications[identifier]
+        end
+      end
+    end
+  end
+end

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

@@ -47,38 +47,39 @@ 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_config_field_cause: "The %{filename} file is missing the required %{field} field.",
+          missing_script_config_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.",
+          script_config_parse_error_cause: "The %{filename} file contains invalid %{serialization_format}.",
+          script_config_parse_error_help: "Fix the errors 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_config_file_cause: "The %{filename} file is missing.",
+          no_script_config_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.",
+          app_not_connected_cause: "Script is not connected to an app.",
+          app_not_connected_help: "Run shopify connect or enter fields for api-key and api-secret.",
 
-          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_definition_error_cause: "In the %{filename} file, there was a problem with the "\
+                                                "configuration. %{message}",
+          configuration_definition_error_help: "Fix the error and try again.",
 
-          configuration_syntax_error_cause: "The script.json is not formatted properly.",
+          configuration_syntax_error_cause: "The %{filename} is not formatted properly.",
           configuration_syntax_error_help: "Fix the errors and try again.",
 
-          configuration_missing_keys_error_cause: "The script.json file is missing required keys: "\
+          configuration_missing_keys_error_cause: "The %{filename} file is missing required keys: "\
                                               "%{missing_keys}.",
           configuration_missing_keys_error_help: "Add the keys and try again.",
 
-          configuration_invalid_value_error_cause: "The script.json configuration only accepts "\
+          configuration_invalid_value_error_cause: "The %{filename} configuration only accepts "\
                                                    "one of the following types(s): %{valid_input_modes}.",
           configuration_invalid_value_error_help: "Change the type and try again.",
 
-          configuration_schema_field_missing_keys_error_cause: "A configuration entry in the script.json file "\
+          configuration_schema_field_missing_keys_error_cause: "A configuration entry in the %{filename} file "\
                                                      "is missing required keys: %{missing_keys}.",
           configuration_definition_schema_field_missing_keys_error_help: "Add the keys and try again.",
 
           configuration_schema_field_invalid_value_error_cause: "The configuration entries in the "\
-                                                     "script.json file only accept one of the following "\
+                                                     "%{filename} file only accept one of the following "\
                                                      "type(s): %{valid_types}.",
           configuration_schema_field_invalid_value_error_help: "Change the types and try again.",
 
@@ -128,8 +129,8 @@ module Script
             "\nbuild: npx shopify-scripts-toolchain-as build --src src/shopify_main.ts --binary build/<script_name>.wasm --metadata build/metadata.json -- --lib node_modules --optimize --use Date=",
 
           web_assembly_binary_not_found: "WebAssembly binary not found.",
-          web_assembly_binary_not_found_suggestion: "No WebAssembly binary found." \
-            "Check that your build npm script outputs the generated binary to the root of the directory." \
+          web_assembly_binary_not_found_suggestion: "No WebAssembly binary found. " \
+            "Check that your build script outputs the generated binary to the root of the directory. " \
             "Generated binary should match the script name: <script_name>.wasm",
 
           project_config_not_found: "Internal error - Script can't be created because the project's config file is missing from the repository.",
@@ -139,12 +140,20 @@ module Script
           script_upload_cause: "Fail to upload script.",
           script_upload_help: "Try again.",
 
+          script_too_large_cause: "The size of your Wasm binary file is too large.",
+          script_too_large_help: "It must be less than %{max_size}.",
+
           api_library_not_found_cause: "Script can't be created because API library %{library_name} is missing from the dependencies",
           api_library_not_found_help: "This error can occur because the API library was removed from your system or there is a problem with dependencies in the repository.",
 
           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.",
+          missing_env_file_variables: "The following variables are missing in the .env file: %s."\
+            " It might happen when the script hasn't been previously connected to an app."\
+            " To connect the script to an app, run {{command:%s script connect}}",
+          missing_push_options: "The following options are required: %s."\
+            " You can obtain them from the .env file generated after connecting the script to an app.",
         },
 
         create: {
@@ -154,6 +163,7 @@ module Script
               Options:
                 {{command:--name=NAME}} Script project name. Use any string.
                 {{command:--api=TYPE}} Script API name. Allowed values: %2$s.
+                {{command:--language=LANGUAGE}} Programming language. Allowed values: %3$s.
           HELP
 
           error: {
@@ -163,6 +173,9 @@ module Script
           change_directory_notice: "{{*}} Change directories to {{green:%s}} to run script commands",
           creating: "Creating script",
           created: "Created script",
+          preparing_project: "Preparing script project structure",
+          creating_wasm: "Creating configuration files",
+          created_wasm: "Configuration files created",
         },
 
         push: {
@@ -171,9 +184,13 @@ module Script
               Usage: {{command:%s script push}}
               Options:
                 {{command:[--force]}} Replaces the existing script on the app with this version.
+                {{command:[--api-key=API_KEY]}} The API key used to register an app with the script. This can be found on the app page on Partners Dashboard. Overrides the value in the .env file, if present.
+                {{command:[--api-secret=API_SECRET]}} The API secret of the app the script is registered with. Overrides the value in the .env file, if present.
+                {{command:[--uuid=UUID]}} The uuid of the script. Overrides the value in the .env file, if present.
           HELP
 
           error: {
+            operation_failed_no_uuid: "UUID is required to push in a CI environment.",
             operation_failed_with_api_key: "Couldn't push script to app (API key: %{api_key}).",
             operation_failed_no_api_key: "Couldn't push script to app.",
           },
@@ -182,13 +199,14 @@ module Script
         },
         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.",
+            missing_env_file_variables: "The following variables are missing in the .env file: %s."\
+            " To connect the script to an app, either enter the value into the .env file or delete the .env file, then run {{command:%s script connect}}",
           },
         },
         javy: {
@@ -206,7 +224,7 @@ module Script
 
         project_deps: {
           none_required: "{{v}} None required",
-          checking_with_npm: "Checking dependencies with npm",
+          checking: "Checking dependencies",
           installing: "Dependencies installing",
           installed: "Missing dependencies installed",
         },
@@ -224,6 +242,7 @@ module Script
           building_script: "Building script",
           built: "Built",
           pushing: "Pushing",
+          pushing_script: "Pushing script",
           pushed: "Pushed",
           ensure_env: {
             organization: "Partner organization {{green:%s (%s)}}.",

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

@@ -100,54 +100,68 @@ module Script
           }
         when Layers::Domain::Errors::MetadataNotFoundError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.metadata_not_found_cause"),
+            cause_of_error: ShopifyCLI::Context.message("script.error.metadata_not_found_cause", e.filename),
             help_suggestion: ShopifyCLI::Context.message("script.error.metadata_not_found_help"),
           }
+        when Layers::Domain::Errors::MissingScriptConfigFieldError
+          {
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.missing_script_config_field_cause",
+              field: e.field,
+              filename: e.filename,
+            ),
+            help_suggestion: ShopifyCLI::Context.message("script.error.missing_script_config_field_help"),
+          }
         when Layers::Infrastructure::Errors::BuildError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.build_error_help"),
           }
-        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
+        when Layers::Infrastructure::Errors::ScriptConfigParseError
           {
-            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::Infrastructure::Errors::MissingScriptConfigYmlFieldError
-          {
-            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::MissingScriptConfigYmlFieldError
-          {
-            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"),
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.script_config_parse_error_cause",
+              filename: e.filename,
+              serialization_format: e.serialization_format,
+            ),
+            help_suggestion: ShopifyCLI::Context.message("script.error.script_config_parse_error_help"),
           }
-        when Layers::Infrastructure::Errors::MissingScriptJsonFieldError
+        when Layers::Infrastructure::Errors::NoScriptConfigFileError
           {
-            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.no_script_config_file_cause",
+              filename: e.filename,
+            ),
+            help_suggestion: ShopifyCLI::Context.message("script.error.no_script_config_file_help"),
           }
-        when Layers::Infrastructure::Errors::NoScriptConfigYmlFileError
+        when Layers::Infrastructure::Errors::ScriptConfigurationDefinitionError
           {
-            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"),
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.configuration_definition_error_cause",
+              message: e.message,
+              filename: e.filename,
+            ),
+            help_suggestion: ShopifyCLI::Context.message("script.error.configuration_definition_error_help"),
           }
         when Layers::Infrastructure::Errors::ScriptConfigSyntaxError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.configuration_syntax_error_cause"),
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.configuration_syntax_error_cause",
+              filename: e.filename,
+            ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_syntax_error_help"),
           }
+        when Layers::Infrastructure::Errors::ScriptEnvAppNotConnectedError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.app_not_connected_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.app_not_connected_help"),
+          }
         when Layers::Infrastructure::Errors::ScriptConfigMissingKeysError
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_missing_keys_error_cause",
-              missing_keys: e.missing_keys
+              missing_keys: e.missing_keys,
+              filename: e.filename,
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_missing_keys_error_help"),
           }
@@ -155,7 +169,8 @@ module Script
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_invalid_value_error_cause",
-              valid_input_modes: e.valid_input_modes
+              valid_input_modes: e.valid_input_modes,
+              filename: e.filename,
             ),
             help_suggestion: ShopifyCLI::Context.message("script.error.configuration_invalid_value_error_help"),
           }
@@ -163,7 +178,8 @@ module Script
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_missing_keys_error_cause",
-              missing_keys: e.missing_keys
+              missing_keys: e.missing_keys,
+              filename: e.filename,
             ),
             help_suggestion: ShopifyCLI::Context.message(
               "script.error.configuration_definition_schema_field_missing_keys_error_help"
@@ -173,7 +189,8 @@ module Script
           {
             cause_of_error: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_invalid_value_error_cause",
-              valid_types: e.valid_types
+              valid_types: e.valid_types,
+              filename: e.filename,
             ),
             help_suggestion: ShopifyCLI::Context.message(
               "script.error.configuration_schema_field_invalid_value_error_help"
@@ -234,6 +251,11 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.script_upload_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.script_upload_help"),
           }
+        when Layers::Infrastructure::Errors::ScriptTooLargeError
+          {
+            cause_of_error: ShopifyCLI::Context.message("script.error.script_too_large_cause"),
+            help_suggestion: ShopifyCLI::Context.message("script.error.script_too_large_help", max_size: e.max_size),
+          }
         when Layers::Infrastructure::Errors::APILibraryNotFoundError
           {
             cause_of_error: ShopifyCLI::Context

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "shopify_cli/theme/theme"
 require "shopify_cli/theme/ignore_filter"
+require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
 
 module Theme
@@ -9,7 +10,10 @@ 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("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
         parser.on("-l", "--live") { flags[:live] = true }
+        parser.on("-d", "--development") { flags[:development] = true }
+        parser.on("-o", "--only=PATTERN") { |pattern| flags[:includes] = pattern }
         parser.on("-x", "--ignore=PATTERN") do |pattern|
           flags[:ignores] ||= []
           flags[:ignores] << pattern
@@ -19,26 +23,16 @@ module Theme
       def call(args, _name)
         root = args.first || "."
         delete = !options.flags[:nodelete]
+        theme = find_theme(root, **options.flags)
+        return if theme.nil?
 
-        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,
-            [],
-            title: @ctx.message("theme.pull.select"),
-            root: root,
-          )
-          return unless form
-          form.theme
-        end
-
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 
-        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
+        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme,
+                                               include_filter: include_filter,
+                                               ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           CLI::UI::Frame.open(@ctx.message("theme.pull.pulling", theme.name, theme.id, theme.shop)) do
@@ -46,7 +40,7 @@ module Theme
           end
           @ctx.done(@ctx.message("theme.pull.done"))
         rescue ShopifyCLI::API::APIRequestNotFoundError
-          @ctx.abort(@ctx.message("theme.pull.theme_not_found", theme.id))
+          @ctx.abort(@ctx.message("theme.pull.theme_not_found", "##{theme.id}"))
         ensure
           syncer.shutdown
         end
@@ -55,6 +49,40 @@ module Theme
       def self.help
         ShopifyCLI::Context.message("theme.pull.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
       end
+
+      private
+
+      def find_theme(root, theme_id: nil, theme: nil, live: nil, development: nil, **_args)
+        if theme_id
+          @ctx.warn(@ctx.message("theme.pull.deprecated_themeid"))
+          return ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        end
+
+        if theme
+          selected_theme = ShopifyCLI::Theme::Theme.find_by_identifier(@ctx, root: root, identifier: theme)
+          return selected_theme || @ctx.abort(@ctx.message("theme.pull.theme_not_found", theme))
+        end
+
+        if live
+          return ShopifyCLI::Theme::Theme.live(@ctx, root: root)
+        end
+
+        if development
+          return ShopifyCLI::Theme::Theme.development(@ctx, root: root)
+        end
+
+        select_theme(root)
+      end
+
+      def select_theme(root)
+        form = Forms::Select.ask(
+          @ctx,
+          [],
+          title: @ctx.message("theme.pull.select"),
+          root: root,
+        )
+        form&.theme
+      end
     end
   end
 end