fix: dry-run correctness, verbose output gating, and CLI flag polish (v0.4.2)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "star-setup"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2021"
 repository = "https://github.com/star-setup/core"
 description = "Lightweight CLI to clone, configure, and wire single or multi-repo ecosystems"

src/cli/args.rs

@@ -21,21 +21,22 @@ pub enum Command {
 #[derive(Parser)]
 #[command(
   name = "star-setup",
+  version,
   about = "Lightweight CLI to clone, configure, and wire single or multi-repo ecosystems",
   long_about = None,
 )]
 pub struct Args {
   /// Repository name (username/repo) or full GitHub URL
   pub repo: Option<String>,
 
-  /// Skip confirmation prompts (non-interactive mode)
-  #[arg(short = 'y', long)]
-  pub yes: bool,
-
   /// Select a named configuration to use
   #[arg(long = "config")]
   pub config_name: Option<String>,
 
+  /// Skip confirmation prompts (non-interactive mode)
+  #[arg(short = 'y', long)]
+  pub yes: bool,
+
   #[command(subcommand)]
   pub command: Option<Command>,
 

src/cli/build/detect.rs

@@ -28,15 +28,24 @@ fn pick_build_system(
 /// # Errors
 /// Returns an error on EOF during prompt, or if no supported build system is found.
 pub fn detect_build_system(dir: &Path, ctx: &mut RunCtx<'_, '_>) -> Result<BuildSystem, String> {
-  crate::time!(ctx.flags.timing, ctx.io.output, "Detect", {
+  crate::time!(ctx.flags.timing, ctx.io.output, "Scanned directory", {
     let mut detected = Vec::new();
     if dir.join("CMakeLists.txt").exists() {
+      if ctx.flags.verbose {
+        writeln!(ctx.io.output, "  Found CMakeLists.txt").ok();
+      }
       detected.push(BuildSystem::Cmake);
     }
     if dir.join("meson.build").exists() {
+      if ctx.flags.verbose {
+        writeln!(ctx.io.output, "  Found meson.build").ok();
+      }
       detected.push(BuildSystem::Meson);
     }
     if dir.join("package.json").exists() {
+      if ctx.flags.verbose {
+        writeln!(ctx.io.output, "  Found package.json").ok();
+      }
       detected.push(BuildSystem::Npm);
     }
     pick_build_system(&detected, "No supported build system found", ctx)
@@ -50,16 +59,24 @@ pub fn detect_mono_build_system(
   dirs: &[PathBuf],
   ctx: &mut RunCtx<'_, '_>,
 ) -> Result<BuildSystem, String> {
-  writeln!(ctx.io.output, "Detecting build system\n").ok();
-  crate::time!(ctx.flags.timing, ctx.io.output, "Detect", {
+  crate::time!(ctx.flags.timing, ctx.io.output, "Scanned directories", {
     let mut detected = Vec::new();
     if dirs.iter().all(|d| d.join("CMakeLists.txt").exists()) {
+      if ctx.flags.verbose {
+        writeln!(ctx.io.output, "  Found CMakeLists.txt").ok();
+      }
       detected.push(BuildSystem::Cmake);
     }
     if dirs.iter().all(|d| d.join("meson.build").exists()) {
+      if ctx.flags.verbose {
+        writeln!(ctx.io.output, "  Found meson.build").ok();
+      }
       detected.push(BuildSystem::Meson);
     }
     if dirs.iter().all(|d| d.join("package.json").exists()) {
+      if ctx.flags.verbose {
+        writeln!(ctx.io.output, "  Found package.json").ok();
+      }
       detected.push(BuildSystem::Npm);
     }
     pick_build_system(

src/cli/commands.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use crate::cli::{BuildFlags, ConnectionFlags, DiagnosticFlags, MonoRepoFlags};
-use clap::{Parser, Subcommand};
+use clap::{Args as ClapArgs, Parser, Subcommand};
 
 /// Config subcommand.
 #[derive(Parser)]
@@ -70,38 +70,35 @@ pub struct WorkspaceCommand {
   pub action: WorkspaceAction,
 }
 
-/// Workspace subcommand actions.
+#[derive(ClapArgs)]
+pub struct WorkspaceTarget {
+  /// Workspace root directory (default: current directory).
+  #[arg(long)]
+  pub path: Option<PathBuf>,
+  /// Mono-repo workspace directory name (default: build-mono).
+  #[arg(long)]
+  pub mono_dir: Option<String>,
+  #[arg(long)]
+  pub build_dir: Option<String>,
+}
+
 #[derive(Subcommand)]
 pub enum WorkspaceAction {
   /// Pull latest changes for all repos in the workspace.
   Update {
-    /// Workspace root directory (default: current directory).
-    #[arg(long)]
-    path: Option<PathBuf>,
-    /// Mono-repo workspace directory name (default: build-mono).
-    #[arg(long)]
-    mono_dir: Option<String>,
-    #[arg(long)]
-    build_dir: Option<String>,
+    #[command(flatten)]
+    target: WorkspaceTarget,
   },
   /// Show status of all repos in the workspace.
   Status {
-    #[arg(long)]
-    path: Option<PathBuf>,
-    #[arg(long)]
-    mono_dir: Option<String>,
-    #[arg(long)]
-    build_dir: Option<String>,
+    #[command(flatten)]
+    target: WorkspaceTarget,
     #[arg(long)]
     fetch: bool,
   },
   /// Remove the build directory from the workspace.
   Clean {
-    #[arg(long)]
-    path: Option<PathBuf>,
-    #[arg(long)]
-    mono_dir: Option<String>,
-    #[arg(long)]
-    build_dir: Option<String>,
+    #[command(flatten)]
+    target: WorkspaceTarget,
   },
 }

src/cli/flags.rs

@@ -3,6 +3,7 @@ use clap::Args as ClapArgs;
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(ClapArgs)]
+#[command(next_help_heading = "Connection")]
 pub struct ConnectionFlags {
   /// Use SSH instead of HTTPS for cloning
   #[arg(long, conflicts_with = "https")]
@@ -14,9 +15,10 @@ pub struct ConnectionFlags {
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(ClapArgs)]
+#[command(next_help_heading = "Build")]
 pub struct BuildFlags {
   /// Build type
-  #[arg(short = 'b', long)]
+  #[arg(long)]
   pub build_type: Option<String>,
 
   /// Build directory name
@@ -27,8 +29,8 @@ pub struct BuildFlags {
   #[arg(long, value_name = "BUILD_SYSTEM")]
   pub build_system: Option<BuildSystem>,
 
-  // Build after configuring (overrides config)
-  #[arg(long, conflicts_with = "no_build")]
+  /// Build after configuring (overrides config)
+  #[arg(short = 'b', long, conflicts_with = "no_build")]
   pub build: bool,
   /// Skip building, only configure
   #[arg(short = 'n', long, conflicts_with = "build")]
@@ -58,6 +60,7 @@ pub struct BuildFlags {
 }
 
 #[derive(ClapArgs)]
+#[command(next_help_heading = "Mono-repo")]
 pub struct MonoRepoFlags {
   /// Mono-repo mode
   #[arg(long)]
@@ -72,12 +75,13 @@ pub struct MonoRepoFlags {
   pub repos: Option<Vec<String>>,
 
   /// Use saved profile for library repositories
-  #[arg(long, conflicts_with = "repos")]
+  #[arg(short = 'p', long, conflicts_with = "repos")]
   pub profile: Option<String>,
 }
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(ClapArgs)]
+#[command(next_help_heading = "Diagnostics")]
 pub struct DiagnosticFlags {
   /// Show detailed command output
   #[arg(short = 'v', long, conflicts_with = "no_verbose")]
@@ -97,6 +101,6 @@ pub struct DiagnosticFlags {
   #[arg(long)]
   pub dry_run: bool,
   /// Do not use dry-run mode (overrides config)
-  #[arg(long, conflicts_with = "no_dry_run")]
+  #[arg(long, conflicts_with = "dry_run")]
   pub no_dry_run: bool,
 }

src/commands/build.rs

@@ -30,7 +30,7 @@ pub fn cmake_build(
   });
 
   if !args.build.no_build {
-    writeln!(ctx.io.output, "Building project\n").ok();
+    writeln!(ctx.io.output, "Building project").ok();
     crate::time!(ctx.flags.timing, ctx.io.output, "CMake build", {
       ctx.runner.run(
         &[
@@ -75,7 +75,7 @@ pub fn meson_build(
     ctx.runner.run(&meson_cmd, None, ctx.flags, ctx.io.output)?;
   });
   if !args.build.no_build {
-    writeln!(ctx.io.output, "Building project\n").ok();
+    writeln!(ctx.io.output, "Building project").ok();
     crate::time!(ctx.flags.timing, ctx.io.output, "Meson compile", {
       ctx.runner.run(
         &["meson", "compile", "-C", to_str(build_path)?],
@@ -97,6 +97,7 @@ pub fn npm_build(
   is_mono: bool,
   ctx: &mut RunCtx<'_, '_>,
 ) -> Result<(), String> {
+  writeln!(ctx.io.output, "Installing dependencies").ok();
   crate::time!(ctx.flags.timing, ctx.io.output, "npm install", {
     ctx.runner.run(
       &["npm", "install"],
@@ -106,7 +107,7 @@ pub fn npm_build(
     )?;
   });
   if !args.build.no_build && !is_mono {
-    writeln!(ctx.io.output, "Building project\n").ok();
+    writeln!(ctx.io.output, "Building project").ok();
     crate::time!(ctx.flags.timing, ctx.io.output, "npm build", {
       ctx.runner.run(
         &["npm", "run", "build"],
@@ -130,9 +131,11 @@ pub fn build_project(
   mono: bool,
   ctx: &mut RunCtx<'_, '_>,
 ) -> Result<(), String> {
-  match build_system {
+  let result = match build_system {
     BuildSystem::Cmake => cmake_build(args, build_path, mono, ctx),
     BuildSystem::Meson => meson_build(args, build_path, source_path, ctx),
     BuildSystem::Npm => npm_build(args, source_path, mono, ctx),
-  }
+  };
+  writeln!(ctx.io.output).ok();
+  result
 }

src/commands/handlers.rs

@@ -63,36 +63,32 @@ pub fn handle_profile_cmd(
 /// # Errors
 /// Returns an error if resolving, updating, cleaning, or fetching status for the workspace fails.
 pub fn handle_workspace_cmd(
-  action: WorkspaceAction,
-  io: IoCtx,
+  action: &WorkspaceAction,
+  mut io: IoCtx,
   flags: RunFlags,
 ) -> Result<(), Box<dyn Error>> {
+  let target = match &action {
+    WorkspaceAction::Update { target }
+    | WorkspaceAction::Clean { target }
+    | WorkspaceAction::Status { target, .. } => target,
+  };
+  let ws = resolve_workspace(
+    target.path.as_deref(),
+    target.mono_dir.as_deref(),
+    target.build_dir.as_deref(),
+    &mut io,
+    flags.verbose,
+  )?;
+
   match action {
-    WorkspaceAction::Update {
-      path,
-      mono_dir,
-      build_dir,
-    } => {
-      let ws = resolve_workspace(path.as_deref(), mono_dir.as_deref(), build_dir.as_deref())?;
-      with_runner(io, flags, |ctx| ws.update(ctx).map_err(Into::into))?;
+    WorkspaceAction::Update { .. } => {
+      with_runner(io, flags, |ctx| ws.update(ctx).map_err(Into::into))
     }
-    WorkspaceAction::Status {
-      path,
-      mono_dir,
-      build_dir,
-      fetch,
-    } => {
-      let ws = resolve_workspace(path.as_deref(), mono_dir.as_deref(), build_dir.as_deref())?;
-      with_runner(io, flags, |ctx| ws.status(fetch, ctx).map_err(Into::into))?;
+    WorkspaceAction::Status { fetch, .. } => {
+      with_runner(io, flags, |ctx| ws.status(*fetch, ctx).map_err(Into::into))
     }
-    WorkspaceAction::Clean {
-      path,
-      mono_dir,
-      build_dir,
-    } => {
-      let ws = resolve_workspace(path.as_deref(), mono_dir.as_deref(), build_dir.as_deref())?;
-      with_runner(io, flags, |ctx| ws.clean(ctx).map_err(Into::into))?;
+    WorkspaceAction::Clean { .. } => {
+      with_runner(io, flags, |ctx| ws.clean(ctx).map_err(Into::into))
     }
   }
-  Ok(())
 }

src/commands/header.rs

@@ -11,6 +11,7 @@ pub struct ModeHeader<'a> {
   pub mono_dir: Option<&'a str>,
   pub profile: Option<&'a str>,
   pub lib_count: Option<usize>,
+  pub repo_count: Option<usize>,
 }
 
 /// Prints a formatted header summarizing the current mode and configuration.
@@ -36,5 +37,8 @@ pub fn print_mode_header(header: &ModeHeader<'_>, io: &mut IoCtx<'_>) {
   if let Some(c) = header.lib_count {
     writeln!(io.output, "  Libraries: {c}").ok();
   }
+  if let Some(c) = header.repo_count {
+    writeln!(io.output, "  Total repositories: {c}").ok();
+  }
   writeln!(io.output).ok();
 }

src/commands/mod.rs

@@ -12,6 +12,6 @@ pub use mono::{
 pub mod single;
 pub use single::single_repo_mode;
 pub mod setup;
-pub use setup::{configure_and_build, extract_repo_input, prepare_build_dir};
+pub use setup::{extract_repo_input, prepare_build_dir};
 pub mod handlers;
 pub use handlers::{handle_config_cmd, handle_profile_cmd, handle_workspace_cmd};

src/commands/mono/clone.rs

@@ -12,15 +12,26 @@ pub fn clone_mono_repos(
   writeln!(ctx.io.output, "Cloning repositories").ok();
   crate::time!(ctx.flags.timing, ctx.io.output, "Clone", {
     for repo in repos {
-      clone_repository(repo, repos_path, ssh, ctx)?;
+      if ctx.flags.verbose {
+        writeln!(
+          ctx.io.output,
+          "  Cloning {}",
+          crate::repository::repo_dir_name(repo)
+        )
+        .ok();
+      }
+      clone_repository(repo, repos_path, ssh, true, false, ctx)?;
+    }
+    if ctx.flags.verbose {
+      writeln!(
+        ctx.io.output,
+        "  Finished cloning ({} repositories)",
+        repos.len()
+      )
+      .ok();
     }
     Ok::<(), String>(())
   })?;
-  writeln!(
-    ctx.io.output,
-    "\n  Finished cloning ({} repositories)\n",
-    repos.len()
-  )
-  .ok();
+  writeln!(ctx.io.output).ok();
   Ok(())
 }