split up bundling and deployment logic for retries

Author: jtcorbett

src/mcp_agent/cli/cloud/commands/deploy/main.py

@@ -34,7 +34,6 @@
     print_error,
     print_info,
     print_success,
-    print_warning,
 )
 
 from .wrangler_wrapper import wrangler_deploy
@@ -291,31 +290,30 @@ async def _deploy_with_retry(
         api_key: API key for authentication
         project_dir: Directory containing the project files
         mcp_app_client: MCP App client for API calls
-        retry_count: Number of retry attempts
+        retry_count: Number of retry attempts for deployment
 
     Returns:
         Deployed app information
     """
+    # Step 1: Bundle once (no retry - if this fails, fail immediately)
+    try:
+        wrangler_deploy(
+            app_id=app_id,
+            api_key=api_key,
+            project_dir=project_dir,
+        )
+    except Exception as e:
+        raise CLIError(f"Bundling failed: {str(e)}") from e
+
+    # Step 2: Deployment API call with retries if needed
     attempt = 0
 
-    async def _perform_deployment():
+    async def _perform_api_deployment():
         nonlocal attempt
         attempt += 1
 
         attempt_suffix = f" (attempt {attempt}/{retry_count})" if attempt > 1 else ""
 
-        try:
-            wrangler_deploy(
-                app_id=app_id,
-                api_key=api_key,
-                project_dir=project_dir,
-            )
-        except Exception as e:
-            if attempt < retry_count:
-                print_warning(f"Bundling failed on attempt {attempt}/{retry_count}: {str(e)}")
-            raise
-
-        # Deploy app
         with Progress(
             SpinnerColumn(spinner_name="arrow3"),
             TextColumn("[progress.description]{task.description}"),
@@ -325,18 +323,16 @@ async def _perform_deployment():
                 app = await mcp_app_client.deploy_app(app_id=app_id)
                 progress.update(deploy_task, description=f"✅ MCP App deployed successfully{attempt_suffix}!")
                 return app
-            except Exception as e:
+            except Exception:
                 progress.update(deploy_task, description=f"❌ Deployment failed{attempt_suffix}")
-                if attempt < retry_count:
-                    print_warning(f"Deployment failed on attempt {attempt}/{retry_count}: {str(e)}")
                 raise
 
     if retry_count > 1:
-        print_info(f"Deployment configured with up to {retry_count} attempts")
+        print_info(f"Deployment API configured with up to {retry_count} attempts")
 
     try:
         return await retry_async_with_exponential_backoff(
-            _perform_deployment,
+            _perform_api_deployment,
             max_attempts=retry_count,
             initial_delay=1.0,
             backoff_multiplier=2.0,