update deploy to retry if deployment failed

[jtcorbett]

TL;DR

Added retry functionality to the MCP Agent deployment process to improve reliability.

What changed?

• Added a new --retry-count option to the deploy command with a default of 3 retries
• Implemented exponential backoff retry logic for deployment operations
• Split the deployment process into bundling and deployment phases for better error handling
• Added progress indicators showing the current attempt number
• Enhanced error messages to indicate whether errors are retriable or not
• Added visual feedback during retry attempts with warning messages

How to test?

1. Deploy an MCP agent with the default retry settings:

   mcp-agent deploy config ./my-config
   

2. Test with a custom retry count:

   mcp-agent deploy config ./my-config --retry-count 5
   

3. Force a deployment failure to verify retry behavior (e.g., by temporarily disrupting network connectivity)

Summary by CodeRabbit

• New Features

  • Added deployment retry support via --retry-count (default 3, range 1–10).
  • Enhanced deployment progress feedback and final output (App ID, App URL, App Status).

• Bug Fixes

  • Improved error handling during deployment: non-retriable errors surfaced immediately and verbose traces preserved when enabled.
  • Properly handles cancellation during retries to avoid unintended reattempts.

• Tests

  • Updated tests to cover the new retry-count option.

[coderabbitai]

Caution

Review failed

The pull request is closed.

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Walkthrough

Adds retry-enabled deployment to the deploy CLI with a new --retry-count option and an internal async retry flow. Updates the retry utility to re-raise asyncio.CancelledError. Adjusts a test to pass retry_count. The deploy path now bundles, deploys via mcp_app_client, and retries with exponential backoff on failure.

Changes

Cohort / File(s)	Summary
Deploy CLI: retry-enabled flow src/mcp_agent/cli/cloud/commands/deploy/main.py	Introduces _deploy_with_retry using exponential backoff; integrates bundling (wrangler_deploy) then API deploy; surfaces per-attempt progress; adds --retry-count (1–10, default 3); marks certain CLI errors non-retriable; updates deploy_config signature to include retry_count.
Retry utility: cancellation propagation src/mcp_agent/cli/utils/retry.py	retry_async_with_exponential_backoff now re-raises asyncio.CancelledError immediately; non-cancelled exceptions follow existing retry/backoff logic; no API signature changes.
Tests: deploy invocation updated tests/cli/commands/test_deploy_command.py	Updates test_deploy_with_secrets_file to pass retry_count=3 to deploy_config; no other behavioral changes in tests.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  actor User
  participant CLI as Deploy CLI (deploy_config)
  participant Bundler as wrangler_deploy
  participant AppAPI as mcp_app_client.deploy_app
  participant Retry as retry_async_with_exponential_backoff

  User->>CLI: deploy --retry-count=N
  CLI->>Retry: attempt deploy (max N)
  rect rgb(240,248,255)
    note over CLI,Retry: Single attempt flow
    Retry->>Bundler: bundle artifacts
    Bundler-->>Retry: bundle result or error
    Retry->>AppAPI: deploy bundle
    AppAPI-->>Retry: app info or error
  end
  alt Success
    Retry-->>CLI: app info
    CLI-->>User: Print App ID/URL/Status
  else Non-retriable error
    Retry-->>CLI: raise CLIError(retriable=False)
    CLI-->>User: Error (no further retries)
  else Retriable error
    Retry-->>Retry: exponential backoff then retry
  end

  %% Cancellation path
  User--x CLI: cancel
  CLI->>Retry: cancel in-flight attempt
  Retry-->>CLI: re-raise asyncio.CancelledError
  CLI-->>User: Aborted

Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Possibly related PRs

• Fix: Port CLI UX updates #402: Also modifies the deploy flow in main.py, focusing on error propagation and progress updates along the same path.
• Create retry utility and mark certain errors as non-retriable #476: Introduces/uses CLIError.retriable and retry infrastructure leveraged by this PR’s retry behavior.
• Fix: Update wrangler wrapper to include remaining non-py files in deployment bundle #406: Adjusts wrangler_deploy bundling logic, which this PR now calls within the new retry-enabled deployment sequence.

Suggested reviewers

• rholinshead
• petersonbill64
• saqadri

Poem

I hop through logs, a vigilant sprite,
Retrying the clouds by day and night.
If storms arise, I wait—then leap!
Exponential dreams, not too deep.
Cancel the wind? I’ll swiftly bail—
Yet try, try again, with a twinkling tail. 🐇⚙️

✨ Finishing touches

• 📝 Generate Docstrings

🧪 Generate unit tests

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch 09-15-update_deploy_to_retry_if_deployment_failed

---

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between fe2567c and 4311918.

📒 Files selected for processing (3)

• src/mcp_agent/cli/cloud/commands/deploy/main.py (7 hunks)
• src/mcp_agent/cli/utils/retry.py (1 hunks)
• tests/cli/commands/test_deploy_command.py (1 hunks)

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[jtcorbett]

• update deploy to retry if deployment failed #477 👈 (View in Graphite)
• Create retry utility and mark certain errors as non-retriable #476
• Bump mcp-agent version #481
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[saqadri]

Looks good, that comment from graphite PR bot seems legit

[jtcorbett]

Merge activity

• Sep 15, 10:43 PM UTC: A user started a stack merge that includes this pull request via Graphite.
• Sep 15, 10:45 PM UTC: Graphite couldn't merge this PR because it failed for an unknown reason (Your push would publish a private email address. You can make your email public or disable this protection on GitHub).