refactor(cli): centralize internal re-exec via InternalCommands::get_command_builder

Each InternalCommands variant now owns how it's re-invoked: the
current_exe() resolution, CommandBuilder construction, and argv
layout all live in one place. The samply call site collapses from
hand-rolled CommandBuilder setup to a single chained expression.

Author: not-matthias

src/cli/mod.rs

@@ -2,7 +2,7 @@ mod auth;
 pub(crate) mod exec;
 pub(crate) mod experimental;
 pub(crate) mod run;
-mod samply;
+pub(crate) mod samply;
 mod setup;
 mod shared;
 mod show;
@@ -17,6 +17,7 @@ use std::path::PathBuf;
 use crate::{
     api_client::CodSpeedAPIClient,
     config::CodSpeedConfig,
+    executor::helpers::command::CommandBuilder,
     local_logger::{CODSPEED_U8_COLOR_CODE, IS_TTY, init_local_logger},
     prelude::*,
     project_config::DiscoveredProjectConfig,
@@ -125,12 +126,29 @@ enum Commands {
 
 /// Subcommands the CLI uses to re-invoke itself; not user-facing entry points.
 #[derive(Subcommand, Debug)]
-enum InternalCommands {
+pub(crate) enum InternalCommands {
     /// Run the bundled samply profiler. Args are forwarded to samply.
     #[command(disable_help_flag = true, disable_help_subcommand = true)]
     Samply(samply::SamplyArgs),
 }
 
+impl InternalCommands {
+    /// Build a [`CommandBuilder`] that re-execs the current binary into this
+    /// internal subcommand. Each variant owns its own arg layout.
+    pub fn get_command_builder(&self) -> Result<CommandBuilder> {
+        let current_exe = std::env::current_exe()
+            .context("failed to resolve current executable for internal subcommand")?;
+        let mut builder = CommandBuilder::new(current_exe);
+        match self {
+            InternalCommands::Samply(args) => {
+                builder.arg("samply");
+                builder.args(args.args.iter().cloned());
+            }
+        }
+        Ok(builder)
+    }
+}
+
 pub async fn run() -> Result<()> {
     let cli = Cli::parse();
     // Important: keep this after the Cli::parse() because the function can exit the process by itself, skipping the drop of the CursorGuard

src/cli/samply.rs

@@ -7,7 +7,7 @@ use crate::prelude::*;
 #[derive(Debug, clap::Args)]
 pub struct SamplyArgs {
     #[arg(trailing_var_arg = true, allow_hyphen_values = true)]
-    args: Vec<std::ffi::OsString>,
+    pub args: Vec<std::ffi::OsString>,
 }
 
 pub fn run(args: SamplyArgs) -> Result<()> {

src/executor/mod.rs

@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 pub mod config;
 mod execution_context;
-mod helpers;
+pub(crate) mod helpers;
 mod interfaces;
 mod memory;
 pub mod orchestrator;

src/executor/wall_time/profiler/samply/mod.rs

@@ -1,5 +1,7 @@
 //! Samply profiler integration.
 
+use crate::cli::InternalCommands;
+use crate::cli::samply::SamplyArgs;
 use crate::executor::ExecutorConfig;
 use crate::executor::helpers::command::CommandBuilder;
 use crate::executor::shared::fifo::FifoBenchmarkData;
@@ -53,21 +55,20 @@ impl Profiler for SamplyProfiler {
 
         // samply is bundled into this binary as the `samply` subcommand;
         // re-exec ourselves so we don't depend on a system install.
-        let current_exe = std::env::current_exe()
-            .context("failed to resolve current executable for bundled samply")?;
-        let mut samply_builder = CommandBuilder::new(current_exe);
-        samply_builder.args([
-            "samply",
-            "record",
-            "--presymbolicate",
-            "--no-open",
-            "--save-only",
-            "--rate",
-            &SAMPLING_RATE_HZ.to_string(),
-        ]);
-        samply_builder.arg("-o");
-        samply_builder.arg(&output_path);
-        samply_builder.arg("--");
+        let samply_builder = InternalCommands::Samply(SamplyArgs {
+            args: vec![
+                "record".into(),
+                "--presymbolicate".into(),
+                "--no-open".into(),
+                "--save-only".into(),
+                "--rate".into(),
+                SAMPLING_RATE_HZ.to_string().into(),
+                "-o".into(),
+                output_path.clone().into(),
+                "--".into(),
+            ],
+        })
+        .get_command_builder()?;
 
         cmd_builder.wrap_with(samply_builder);
         self.output_path = Some(output_path);