refactor(bitbucket): extract shared helpers to pr parent module

Move duplicated set_spinner_msg and format_state from list.rs, read.rs,
and create.rs into pr/mod.rs as pub(crate) functions. Unify field-level
attributes from #[clap(..)] to #[arg(..)] and remove dead Serialize
derives and unused variables in the bitbucket PR files.

Author: cloudbridgeuy

crates/mcptools/src/atlassian/bitbucket/pr/list.rs

@@ -5,18 +5,18 @@ use indicatif::{ProgressBar, ProgressStyle};
 use mcptools_core::atlassian::bitbucket::{
     transform_pr_list_response, BitbucketPRListResponse, PRListOutput,
 };
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 /// Options for listing Bitbucket PRs
-#[derive(Debug, clap::Args, Serialize, Deserialize, Clone)]
+#[derive(Debug, clap::Args, Deserialize, Clone)]
 pub struct ListOptions {
     /// Repository in workspace/repo_slug format (e.g., "myworkspace/myrepo")
-    #[clap(long, short = 'r')]
+    #[arg(long, short = 'r')]
     pub repo: String,
 
     /// Filter by PR state (can be repeated: --state OPEN --state MERGED)
     /// Valid values: OPEN, MERGED, DECLINED, SUPERSEDED
-    #[clap(long, value_name = "STATE")]
+    #[arg(long, value_name = "STATE")]
     pub state: Option<Vec<String>>,
 
     /// Maximum number of results to return per page
@@ -28,7 +28,7 @@ pub struct ListOptions {
     pub next_page: Option<String>,
 
     /// Bitbucket API base URL (overrides BITBUCKET_BASE_URL env var)
-    #[clap(long)]
+    #[arg(long)]
     pub base_url: Option<String>,
 
     /// Output as JSON
@@ -53,13 +53,6 @@ pub struct ListPRParams {
     pub app_password_override: Option<String>,
 }
 
-/// Helper to set spinner message if spinner is present
-fn set_spinner_msg(spinner: Option<&ProgressBar>, msg: impl Into<String>) {
-    if let Some(s) = spinner {
-        s.set_message(msg.into());
-    }
-}
-
 /// Fetch PR list from Bitbucket API
 ///
 /// This function fetches a paginated list of pull requests from the specified repository.
@@ -102,7 +95,7 @@ pub async fn list_pr_data(
         }
     };
 
-    set_spinner_msg(spinner, format!("Fetching PRs from {}...", repo));
+    super::set_spinner_msg(spinner, format!("Fetching PRs from {}...", repo));
     let response = client
         .get(&url)
         .send()
@@ -187,13 +180,11 @@ pub async fn handler(options: ListOptions, global: crate::Global) -> Result<()>
     ]);
 
     for pr in &data.pull_requests {
-        let branch_info = format!("{} → {}", pr.source_branch, pr.destination_branch);
-
         table.add_row(prettytable::row![
             pr.id.to_string().bright_yellow(),
             pr.title.bright_white(),
             pr.author.bright_magenta(),
-            format_state(&pr.state),
+            super::format_state(&pr.state),
             format!(
                 "{} → {}",
                 pr.source_branch.bright_green(),
@@ -219,14 +210,3 @@ pub async fn handler(options: ListOptions, global: crate::Global) -> Result<()>
 
     Ok(())
 }
-
-/// Format PR state with appropriate color
-fn format_state(state: &str) -> String {
-    match state.to_uppercase().as_str() {
-        "OPEN" => state.bright_green().to_string(),
-        "MERGED" => state.bright_magenta().to_string(),
-        "DECLINED" => state.bright_red().to_string(),
-        "SUPERSEDED" => state.bright_yellow().to_string(),
-        _ => state.to_string(),
-    }
-}

crates/mcptools/src/atlassian/bitbucket/pr/mod.rs

@@ -1,7 +1,10 @@
+pub mod create;
 pub mod list;
 pub mod read;
 
 use crate::prelude::{println, *};
+use color_eyre::owo_colors::OwoColorize;
+use indicatif::ProgressBar;
 
 /// Pull request commands
 #[derive(Debug, clap::Subcommand)]
@@ -13,6 +16,10 @@ pub enum Commands {
     /// Read pull request details, comments, and diff link
     #[clap(name = "read")]
     Read(read::ReadOptions),
+
+    /// Create a new pull request
+    #[clap(name = "create")]
+    Create(create::CreateOptions),
 }
 
 /// Run PR commands
@@ -24,5 +31,24 @@ pub async fn run(cmd: Commands, global: crate::Global) -> Result<()> {
     match cmd {
         Commands::List(options) => list::handler(options, global).await,
         Commands::Read(options) => read::handler(options, global).await,
+        Commands::Create(options) => create::handler(options, global).await,
+    }
+}
+
+/// Helper to set spinner message if spinner is present
+pub(crate) fn set_spinner_msg(spinner: Option<&ProgressBar>, msg: impl Into<String>) {
+    if let Some(s) = spinner {
+        s.set_message(msg.into());
+    }
+}
+
+/// Format PR state with appropriate color
+pub(crate) fn format_state(state: &str) -> String {
+    match state.to_uppercase().as_str() {
+        "OPEN" => state.bright_green().to_string(),
+        "MERGED" => state.bright_magenta().to_string(),
+        "DECLINED" => state.bright_red().to_string(),
+        "SUPERSEDED" => state.bright_yellow().to_string(),
+        _ => state.to_string(),
     }
 }

crates/mcptools/src/atlassian/bitbucket/pr/read.rs

@@ -6,21 +6,21 @@ use mcptools_core::atlassian::bitbucket::{
     transform_pr_response, BitbucketComment, BitbucketCommentsResponse, BitbucketDiffstat,
     BitbucketDiffstatResponse, BitbucketPRResponse, PROutput,
 };
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 /// Options for reading a Bitbucket PR
-#[derive(Debug, clap::Args, Serialize, Deserialize, Clone)]
+#[derive(Debug, clap::Args, Deserialize, Clone)]
 pub struct ReadOptions {
     /// Repository in workspace/repo_slug format (e.g., "myworkspace/myrepo")
-    #[clap(long, short = 'r')]
+    #[arg(long, short = 'r')]
     pub repo: String,
 
     /// Pull request number
-    #[clap(value_name = "PR_NUMBER")]
+    #[arg(value_name = "PR_NUMBER")]
     pub pr_number: u64,
 
     /// Bitbucket API base URL (overrides BITBUCKET_BASE_URL env var)
-    #[clap(long)]
+    #[arg(long)]
     pub base_url: Option<String>,
 
     /// Maximum number of comments per page (default: 100)
@@ -75,13 +75,6 @@ pub struct ReadPRParams {
     pub no_diff: bool,
 }
 
-/// Helper to set spinner message if spinner is present
-fn set_spinner_msg(spinner: Option<&ProgressBar>, msg: impl Into<String>) {
-    if let Some(s) = spinner {
-        s.set_message(msg.into());
-    }
-}
-
 /// Fetch PR data from Bitbucket API
 ///
 /// This function fetches PR details, comments, diffstats, and optionally diff content.
@@ -104,7 +97,7 @@ pub async fn read_pr_data(params: ReadPRParams, spinner: Option<&ProgressBar>) -
     let base_url = config.base_url.trim_end_matches('/');
 
     // Fetch PR details
-    set_spinner_msg(
+    super::set_spinner_msg(
         spinner,
         format!("Fetching PR #{} from {}...", pr_number, repo),
     );
@@ -145,7 +138,7 @@ pub async fn read_pr_data(params: ReadPRParams, spinner: Option<&ProgressBar>) -
         .ok_or_else(|| eyre!("PR response missing destination commit hash"))?;
 
     // Fetch diffstats (auto-paginate by default)
-    set_spinner_msg(spinner, "Fetching diffstats...");
+    super::set_spinner_msg(spinner, "Fetching diffstats...");
     let diffstats = fetch_all_diffstats(
         &client,
         base_url,
@@ -162,12 +155,12 @@ pub async fn read_pr_data(params: ReadPRParams, spinner: Option<&ProgressBar>) -
     let diff_content = if no_diff {
         None
     } else {
-        set_spinner_msg(spinner, "Fetching diff content...");
+        super::set_spinner_msg(spinner, "Fetching diff content...");
         Some(fetch_diff_content(&client, base_url, &repo, pr_number).await?)
     };
 
     // Fetch ALL comments (auto-paginate by default)
-    set_spinner_msg(spinner, "Fetching comments...");
+    super::set_spinner_msg(spinner, "Fetching comments...");
     let comments = fetch_all_comments(
         &client,
         base_url,
@@ -245,7 +238,7 @@ async fn fetch_all_diffstats(
     let mut page = 1;
     while let Some(url) = next_url {
         if page > 1 {
-            set_spinner_msg(spinner, format!("Fetching diffstats (page {})...", page));
+            super::set_spinner_msg(spinner, format!("Fetching diffstats (page {})...", page));
         }
         let response = client
             .get(&url)
@@ -299,7 +292,7 @@ async fn fetch_all_comments(
     let mut page = 1;
     while let Some(url) = next_url {
         if page > 1 {
-            set_spinner_msg(
+            super::set_spinner_msg(
                 spinner,
                 format!(
                     "Fetching comments (page {}, {} found)...",
@@ -389,7 +382,7 @@ pub async fn handler(options: ReadOptions, global: crate::Global) -> Result<()>
     let mut table = crate::prelude::new_table();
     table.add_row(prettytable::row![
         "State".bold().cyan(),
-        format_state(&pr.state)
+        super::format_state(&pr.state)
     ]);
     table.add_row(prettytable::row![
         "Author".bold().cyan(),
@@ -601,13 +594,3 @@ fn render_change_bar(additions: u32, deletions: u32) -> String {
 
     format!("{}{}", add_bar, del_bar)
 }
-
-fn format_state(state: &str) -> String {
-    match state.to_uppercase().as_str() {
-        "OPEN" => state.bright_green().to_string(),
-        "MERGED" => state.bright_magenta().to_string(),
-        "DECLINED" => state.bright_red().to_string(),
-        "SUPERSEDED" => state.bright_yellow().to_string(),
-        _ => state.to_string(),
-    }
-}