cargo-rail: updating/streamlining CLI; fixing the panic for unwrap/errors.

Author: loadingalias

src/cargo/metadata.rs

@@ -119,7 +119,7 @@ impl WorkspaceMetadata {
   /// - Feature dependency analysis: Understand feature activation chains
   /// - Feature optimization: Identify minimal feature sets for build times
   ///
-  /// TODO: Use this for `cargo rail audit` or `cargo rail graph` to inspect specific packages.
+  /// TODO: Use this for `cargo rail audit` or `cargo rail inspect` to inspect specific packages.
   /// For global analysis (like unification), use `cargo_metadata` directly to avoid O(N) lookups.
   ///
   /// # Example
@@ -210,7 +210,7 @@ impl WorkspaceMetadata {
   /// - License compliance: Check all dependency licenses
   /// - Duplicate detection: Find dependencies listed multiple times
   ///
-  /// TODO: Use this for `cargo rail graph` or `cargo rail audit` to inspect dependencies of a specific crate.
+  /// TODO: Use this for `cargo rail inspect` or `cargo rail audit` to inspect dependencies of a specific crate.
   /// For global analysis, iterate `metadata.packages` directly.
   ///
   /// # Example

src/commands/watch.rs

@@ -110,7 +110,7 @@ fn run_with_bacon(_ctx: &WorkspaceContext, _config: TestConfig) -> RailResult<()
   println!("   Running: bacon test\n");
 
   // Note: In the future, we could generate a custom bacon.toml that runs
-  // `cargo rail graph test` instead of `cargo test` to get smart change detection
+  // `cargo rail test` instead of `cargo test` to get smart change detection
   // while still benefiting from bacon's UI. For now, users get standard bacon behavior.
 
   let status = Command::new("bacon")
@@ -133,8 +133,8 @@ fn run_with_cargo_watch(ctx: &WorkspaceContext, config: TestConfig) -> RailResul
   let mut cmd = Command::new("cargo-watch");
   cmd.current_dir(ctx.workspace_root());
 
-  // cargo-watch -x "rail graph test --since HEAD~1"
-  let mut rail_cmd = String::from("rail graph test");
+  // cargo-watch -x "rail test --since HEAD~1"
+  let mut rail_cmd = String::from("rail test");
 
   if let Some(ref since) = config.since {
     rail_cmd.push_str(&format!(" --since {}", since));

src/graph/core.rs

@@ -64,7 +64,7 @@ pub struct WorkspaceGraph {
   /// - Feature analysis: Cross-reference cargo metadata with dependency graph
   /// - External dependency queries: Look up non-workspace packages efficiently
   ///
-  /// TODO: Expose this via a public method when implementing `cargo rail graph --resolve` or similar advanced analysis.
+  /// TODO: Expose this via a public method when implementing `cargo rail resolve` or similar advanced analysis.
   #[allow(dead_code)]
   id_to_node: HashMap<PackageId, NodeIndex>,
 
@@ -162,7 +162,7 @@ impl WorkspaceGraph {
   /// - Dependency analysis: Find immediate dependencies for auditing
   /// - Visualization: Generate dependency tree for a specific crate
   ///
-  /// TODO: Use this for `cargo rail graph` CLI command.
+  /// TODO: Use this for `cargo rail inspect` CLI command.
   #[allow(dead_code)]
   pub fn direct_dependencies(&self, crate_name: &str) -> RailResult<Vec<String>> {
     let node_idx = self.find_node(crate_name)?;
@@ -186,7 +186,7 @@ impl WorkspaceGraph {
   /// - Impact analysis: See what breaks when modifying this crate
   /// - Reverse dependency tree: Understand crate usage across workspace
   ///
-  /// TODO: Use this for `cargo rail graph` or `cargo rail affected` CLI commands.
+  /// TODO: Use this for `cargo rail inspect` or `cargo rail affected` CLI commands.
   #[allow(dead_code)]
   pub fn direct_dependents(&self, crate_name: &str) -> RailResult<Vec<String>> {
     let node_idx = self.find_node(crate_name)?;
@@ -381,7 +381,7 @@ impl WorkspaceGraph {
   /// - Audit dependency chains: Trace the path from app to vulnerable dependency
   /// - Refactoring decisions: Identify dependency paths to break or preserve
   ///
-  /// TODO: Implement `cargo rail graph --why` command using this method.
+  /// TODO: Implement `cargo rail why` command using this method.
   ///
   /// # Example
   /// ```ignore
@@ -443,7 +443,7 @@ impl WorkspaceGraph {
   /// - Visual debugging: See complex dependency relationships at a glance
   /// - Architecture analysis: Understand workspace structure visually
   ///
-  /// TODO: Implement `cargo rail graph --dot` command using this method.
+  /// TODO: Implement `cargo rail graph` command (as a top-level visualization command) using this method.
   ///
   /// # Example
   /// ```bash

src/main.rs

@@ -27,9 +27,46 @@ enum Commands {
   // ============================================================================
   // Graph-Aware CI Optimization
   // ============================================================================
-  /// Graph-aware workspace operations
-  #[command(subcommand)]
-  Graph(GraphCommands),
+  /// Show which crates are affected by changes
+  Affected {
+    /// Git ref to compare against (default: origin/main)
+    #[arg(long, default_value = "origin/main")]
+    since: String,
+    /// Start ref (for SHA pair mode)
+    #[arg(long, conflicts_with = "since")]
+    from: Option<String>,
+    /// End ref (for SHA pair mode)
+    #[arg(long, requires = "from")]
+    to: Option<String>,
+    /// Output format: text, json, names-only
+    #[arg(long, default_value = "text")]
+    format: String,
+  },
+
+  /// Run tests only for affected crates (smart test runner)
+  Test {
+    /// Git ref to compare against (auto-detects origin/main, origin/master, or HEAD~1)
+    #[arg(long)]
+    since: Option<String>,
+    /// Use cargo-nextest if available
+    #[arg(long)]
+    nextest: bool,
+    /// Show what would be tested without running tests
+    #[arg(long)]
+    dry_run: bool,
+    /// Explain why tests are being run
+    #[arg(long)]
+    explain: bool,
+    /// Watch for file changes and re-run tests automatically
+    #[arg(long)]
+    watch: bool,
+    /// Watch mode backend: bacon, cargo-watch, auto (default: auto)
+    #[arg(long, default_value = "auto")]
+    watch_mode: String,
+    /// Pass additional arguments to the test runner
+    #[arg(last = true)]
+    test_args: Vec<String>,
+  },
 
   // ============================================================================
   // Dependency Unification
@@ -107,50 +144,6 @@ enum Commands {
   },
 }
 
-#[derive(Subcommand)]
-enum GraphCommands {
-  /// Show which crates are affected by changes
-  Affected {
-    /// Git ref to compare against (default: origin/main)
-    #[arg(long, default_value = "origin/main")]
-    since: String,
-    /// Start ref (for SHA pair mode)
-    #[arg(long, conflicts_with = "since")]
-    from: Option<String>,
-    /// End ref (for SHA pair mode)
-    #[arg(long, requires = "from")]
-    to: Option<String>,
-    /// Output format: text, json, names-only
-    #[arg(long, default_value = "text")]
-    format: String,
-  },
-
-  /// Run tests only for affected crates (smart test runner)
-  Test {
-    /// Git ref to compare against (auto-detects origin/main, origin/master, or HEAD~1)
-    #[arg(long)]
-    since: Option<String>,
-    /// Use cargo-nextest if available
-    #[arg(long)]
-    nextest: bool,
-    /// Show what would be tested without running tests
-    #[arg(long)]
-    dry_run: bool,
-    /// Explain why tests are being run
-    #[arg(long)]
-    explain: bool,
-    /// Watch for file changes and re-run tests automatically
-    #[arg(long)]
-    watch: bool,
-    /// Watch mode backend: bacon, cargo-watch, auto (default: auto)
-    #[arg(long, default_value = "auto")]
-    watch_mode: String,
-    /// Pass additional arguments to the test runner
-    #[arg(last = true)]
-    test_args: Vec<String>,
-  },
-}
-
 #[derive(Subcommand)]
 enum UnifyCommands {
   /// Analyze dependencies and show unification plan (dry-run)
@@ -237,44 +230,42 @@ fn main() {
 
   let result = match cli.command {
     // Graph Commands
-    Commands::Graph(graph_cmd) => match graph_cmd {
-      GraphCommands::Affected {
-        since,
-        from,
-        to,
-        format,
-      } => commands::run_affected(&ctx, since, from, to, format, false),
-      GraphCommands::Test {
+    Commands::Affected {
+      since,
+      from,
+      to,
+      format,
+    } => commands::run_affected(&ctx, since, from, to, format, false),
+    Commands::Test {
+      since,
+      nextest,
+      dry_run,
+      explain,
+      watch,
+      watch_mode,
+      test_args,
+    } => {
+      let config = commands::test::TestConfig {
         since,
-        nextest,
         dry_run,
         explain,
-        watch,
-        watch_mode,
+        prefer_nextest: nextest,
         test_args,
-      } => {
-        let config = commands::test::TestConfig {
-          since,
-          dry_run,
-          explain,
-          prefer_nextest: nextest,
-          test_args,
-        };
+      };
 
-        if watch {
-          // Parse watch mode
-          let mode = match watch_mode.as_str() {
-            "bacon" => commands::watch::WatchMode::Bacon,
-            "cargo-watch" => commands::watch::WatchMode::CargoWatch,
-            "auto" => commands::watch::WatchMode::Auto,
-            _ => commands::watch::WatchMode::Auto,
-          };
-          commands::run_test_watch(&ctx, config, mode)
-        } else {
-          commands::run_test(&ctx, config)
-        }
+      if watch {
+        // Parse watch mode
+        let mode = match watch_mode.as_str() {
+          "bacon" => commands::watch::WatchMode::Bacon,
+          "cargo-watch" => commands::watch::WatchMode::CargoWatch,
+          "auto" => commands::watch::WatchMode::Auto,
+          _ => commands::watch::WatchMode::Auto,
+        };
+        commands::run_test_watch(&ctx, config, mode)
+      } else {
+        commands::run_test(&ctx, config)
       }
-    },
+    }
 
     // Dependency Unification
     Commands::Unify(unify_cmd) => match unify_cmd {

tests/integration/test_affected.rs

@@ -1,4 +1,4 @@
-//! Integration tests for `cargo rail graph affected` command
+//! Integration tests for `cargo rail affected` command
 
 use crate::helpers::{TestWorkspace, git, run_cargo_rail};
 use anyhow::Result;
@@ -19,7 +19,7 @@ fn test_affected_basic() -> Result<()> {
   ws.commit("Modify lib-a")?;
 
   // Run affected command
-  let output = run_cargo_rail(&ws.path, &["rail", "graph", "affected", "--since", "origin/main"])?;
+  let output = run_cargo_rail(&ws.path, &["rail", "affected", "--since", "origin/main"])?;
   let stdout = String::from_utf8_lossy(&output.stdout);
 
   // Should show lib-a as directly affected and lib-b as dependent
@@ -40,7 +40,7 @@ fn test_affected_no_changes() -> Result<()> {
   git(&ws.path, &["branch", "origin/main"])?;
 
   // Run affected with no changes
-  let output = run_cargo_rail(&ws.path, &["rail", "graph", "affected", "--since", "origin/main"])?;
+  let output = run_cargo_rail(&ws.path, &["rail", "affected", "--since", "origin/main"])?;
   let stdout = String::from_utf8_lossy(&output.stdout);
 
   // Should indicate no changes
@@ -69,15 +69,7 @@ fn test_affected_json_output() -> Result<()> {
   // Run with --format json
   let output = run_cargo_rail(
     &ws.path,
-    &[
-      "rail",
-      "graph",
-      "affected",
-      "--since",
-      "origin/main",
-      "--format",
-      "json",
-    ],
+    &["rail", "affected", "--since", "origin/main", "--format", "json"],
   )?;
   let stdout = String::from_utf8_lossy(&output.stdout);
 
@@ -105,15 +97,7 @@ fn test_affected_names_only() -> Result<()> {
   // Run with --format names
   let output = run_cargo_rail(
     &ws.path,
-    &[
-      "rail",
-      "graph",
-      "affected",
-      "--since",
-      "origin/main",
-      "--format",
-      "names",
-    ],
+    &["rail", "affected", "--since", "origin/main", "--format", "names"],
   )?;
   let stdout = String::from_utf8_lossy(&output.stdout);
 
@@ -137,7 +121,7 @@ fn test_affected_sha_pair_mode() -> Result<()> {
   let sha2 = ws.commit("Update lib-a")?;
 
   // Run with --from/--to
-  let output = run_cargo_rail(&ws.path, &["rail", "graph", "affected", "--from", &sha1, "--to", &sha2])?;
+  let output = run_cargo_rail(&ws.path, &["rail", "affected", "--from", &sha1, "--to", &sha2])?;
   let stdout = String::from_utf8_lossy(&output.stdout);
 
   assert!(stdout.contains("lib-a"), "lib-a should be affected");