refactor: move cli into private module

refactor: move `exe` into library target
assisted-by: Zed (Claude Sonnet 4.6)

Author: jdc-pub

plumbing/git-filter-tree/src/cli.rs

@@ -1,35 +1,10 @@
-use clap::{Args, Parser};
-
-/// Arguments for filtering a Git tree by gitattributes-style patterns.
-/// Defined here so it can be re-used as a subcommand in the porcelain `git-rewrite` CLI.
-#[derive(Args, Clone)]
-pub struct FilterTreeArgs {
-    /// Tree-ish reference (commit, branch, tag, or tree SHA)
-    pub treeish: String,
-
-    /// Gitattributes-style patterns to filter tree entries
-    #[arg(required = true)]
-    pub patterns: Vec<String>,
-
-    /// Output format
-    #[arg(short, long, value_enum, default_value = "tree-sha")]
-    pub format: OutputFormat,
-}
+use clap::Parser;
+use git_filter_tree::exe::FilterTreeArgs;
 
 #[derive(Parser)]
 #[command(name = "git filter-tree", bin_name = "git filter-tree")]
-#[command(author, version, about = "Filter Git tree entries by gitattributes-style patterns", long_about = None)]
+#[command(author, version, about = "Filter Git tree entries by glob patterns")]
 pub struct Cli {
     #[command(flatten)]
     pub args: FilterTreeArgs,
 }
-
-#[derive(Clone, Copy, clap::ValueEnum)]
-pub enum OutputFormat {
-    /// Output only the tree SHA
-    TreeSha,
-    /// Output tree entries (name and type)
-    Entries,
-    /// Output detailed tree information
-    Detailed,
-}

plumbing/git-filter-tree/src/exe.rs

@@ -1,7 +1,36 @@
 use crate::FilterTree;
-use crate::cli::{FilterTreeArgs, OutputFormat};
 use git2 as git;
 
+/// Arguments for filtering a Git tree by glob patterns.
+///
+/// Defined here so that the library exposes a self-contained type that
+/// downstream code can construct directly without going through the CLI.
+#[derive(clap::Args, Clone)]
+pub struct FilterTreeArgs {
+    /// Tree-ish reference (commit, branch, tag, or tree SHA).
+    pub treeish: String,
+
+    /// Glob patterns for entries to keep in the tree.
+    #[arg(required = true)]
+    pub patterns: Vec<String>,
+
+    /// Output format.
+    #[arg(short, long, value_enum, default_value = "tree-sha")]
+    pub format: OutputFormat,
+}
+
+/// Output format for [`print_tree`].
+#[derive(Clone, Copy, Default, clap::ValueEnum)]
+pub enum OutputFormat {
+    /// Print only the tree SHA (default).
+    #[default]
+    TreeSha,
+    /// Print each entry's type and name.
+    Entries,
+    /// Print mode, type, OID, and name for every entry.
+    Detailed,
+}
+
 /// Core filter-tree operation: resolve the treeish, filter by patterns, and
 /// return the OID of the resulting tree.  This is the reusable building-block
 /// that both the plumbing binary and the porcelain CLI can call.

plumbing/git-filter-tree/src/main.rs

@@ -1,5 +1,7 @@
+mod cli;
+
 use clap::{CommandFactory, Parser};
-use git_filter_tree::cli::Cli;
+use cli::Cli;
 use std::path::PathBuf;
 use std::process;
 

src/cli.rs

@@ -1,8 +1,13 @@
 use clap::Parser;
+use git_rewrite::exe::TreeArgs;
 
 #[derive(Parser)]
 #[command(name = "git rewrite", bin_name = "git rewrite")]
-#[command(author, version, about = "Rewrite Git repository history, trees, and blobs", long_about = None)]
+#[command(
+    author,
+    version,
+    about = "Rewrite Git repository history, trees, and blobs"
+)]
 pub struct Cli {
     #[command(subcommand)]
     pub command: Command,
@@ -13,18 +18,3 @@ pub enum Command {
     /// Rewrite a Git tree, keeping only matching entries
     Tree(TreeArgs),
 }
-
-#[derive(clap::Args)]
-pub struct TreeArgs {
-    /// Tree-ish reference (commit, branch, tag, or tree SHA) [default: HEAD]
-    #[arg(default_value = "HEAD")]
-    pub treeish: String,
-
-    /// Glob patterns for entries to keep in the tree (may be repeated)
-    #[arg(long = "only", required = true)]
-    pub patterns: Vec<String>,
-
-    /// Allow running with uncommitted changes in the working tree
-    #[arg(long)]
-    pub allow_dirty: bool,
-}

src/exe.rs

@@ -1,6 +1,24 @@
-use crate::cli::TreeArgs;
 use git2 as git;
 
+/// Arguments for the `tree` subcommand.
+///
+/// Defined here so that the library exposes a self-contained type that
+/// downstream code can construct directly without going through the CLI.
+#[derive(clap::Args, Clone)]
+pub struct TreeArgs {
+    /// Tree-ish reference (commit, branch, tag, or tree SHA).
+    #[arg(default_value = "HEAD")]
+    pub treeish: String,
+
+    /// Glob patterns for entries to keep in the tree (may be repeated).
+    #[arg(long = "only", required = true)]
+    pub patterns: Vec<String>,
+
+    /// Allow running with uncommitted changes in the working tree.
+    #[arg(long)]
+    pub allow_dirty: bool,
+}
+
 pub fn tree(args: &TreeArgs) -> Result<(), Box<dyn std::error::Error>> {
     let repo = git::Repository::open_from_env()?;
 

src/lib.rs

@@ -44,4 +44,6 @@
 //! # Ok::<(), Box<dyn std::error::Error>>(())
 //! ```
 
-pub mod cli;
+pub mod exe;
+
+pub use exe::TreeArgs;

src/main.rs

@@ -1,8 +1,8 @@
 mod cli;
-mod exe;
 
 use clap::{CommandFactory, Parser};
 use cli::{Cli, Command};
+use git_rewrite::exe;
 use std::path::PathBuf;
 use std::process;