cli: move product entrypoint to insomnia

crates/client/Cargo.toml

@@ -7,7 +7,6 @@ license.workspace = true
 [dependencies]
 protocol = { workspace = true }
 manifest = { workspace = true }
-insomnia = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["rt", "macros", "net", "io-util", "sync", "time", "process", "fs"] }
 uuid = { workspace = true }

crates/client/src/lib.rs

@@ -9,7 +9,10 @@
 //! TUI / GUI / E2E ハーネスはこの crate に依存して protocol を喋る。
 
 mod pod_client;
+pub mod runtime_command;
 pub mod spawn;
 
+pub use runtime_command::PodRuntimeCommand;
+
 pub use pod_client::PodClient;
 pub use spawn::{SpawnConfig, SpawnError, SpawnReady, spawn_pod};

crates/client/src/runtime_command.rs

@@ -0,0 +1,101 @@
+use std::ffi::OsString;
+use std::fmt;
+use std::io;
+use std::path::{Path, PathBuf};
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PodRuntimeCommand {
+    pub program: PathBuf,
+    pub prefix_args: Vec<OsString>,
+}
+
+impl PodRuntimeCommand {
+    pub fn new(program: impl Into<PathBuf>, prefix_args: Vec<OsString>) -> Self {
+        Self {
+            program: program.into(),
+            prefix_args,
+        }
+    }
+
+    pub fn for_current_exe() -> io::Result<Self> {
+        Ok(Self::for_executable(std::env::current_exe()?))
+    }
+
+    pub fn for_executable(program: impl Into<PathBuf>) -> Self {
+        Self::new(program, vec![OsString::from("pod")])
+    }
+
+    /// Resolve the Pod runtime command used for subprocess launches.
+    ///
+    /// The default launch path is always the current `insomnia` executable plus
+    /// the unified `pod` prefix argument.
+    pub fn resolve() -> io::Result<Self> {
+        Self::for_current_exe()
+    }
+
+    pub fn program(&self) -> &Path {
+        &self.program
+    }
+
+    pub fn prefix_args(&self) -> &[OsString] {
+        &self.prefix_args
+    }
+
+    pub fn argv_with<I, S>(&self, args: I) -> Vec<OsString>
+    where
+        I: IntoIterator<Item = S>,
+        S: Into<OsString>,
+    {
+        let mut argv = self.prefix_args.clone();
+        argv.extend(args.into_iter().map(Into::into));
+        argv
+    }
+}
+
+impl fmt::Display for PodRuntimeCommand {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.program.display())?;
+        for arg in &self.prefix_args {
+            write!(f, " {}", arg.to_string_lossy())?;
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn insomnia_binary_defaults_to_pod_prefix() {
+        let command = PodRuntimeCommand::for_executable("/opt/insomnia/bin/insomnia");
+
+        assert_eq!(command.program(), Path::new("/opt/insomnia/bin/insomnia"));
+        assert_eq!(command.prefix_args(), [OsString::from("pod")]);
+        assert_eq!(
+            command.argv_with(["--pod", "agent"]),
+            vec!["pod", "--pod", "agent"]
+                .into_iter()
+                .map(OsString::from)
+                .collect::<Vec<_>>()
+        );
+    }
+
+    #[test]
+    fn any_runtime_executable_gets_pod_prefix() {
+        let command = PodRuntimeCommand::for_executable("/opt/insomnia/bin/custom-runtime");
+
+        assert_eq!(
+            command.program(),
+            Path::new("/opt/insomnia/bin/custom-runtime")
+        );
+        assert_eq!(command.prefix_args(), [OsString::from("pod")]);
+        assert_eq!(
+            command.argv_with(["--pod", "agent"]),
+            vec!["pod", "--pod", "agent"]
+                .into_iter()
+                .map(OsString::from)
+                .collect::<Vec<_>>()
+        );
+    }
+}

crates/client/src/spawn.rs

@@ -15,7 +15,7 @@ use std::path::{Path, PathBuf};
 use std::process::Stdio;
 use std::time::Duration;
 
-use insomnia::PodRuntimeCommand;
+use crate::PodRuntimeCommand;
 use tokio::process::Command;
 use uuid::Uuid;
 
@@ -24,6 +24,7 @@ const READY_TIMEOUT: Duration = Duration::from_secs(20);
 
 /// `spawn_pod` の入力。
 pub struct SpawnConfig {
+    pub runtime_command: PodRuntimeCommand,
     /// `pod.name` として使う識別子。runtime ディレクトリ
     /// (`manifest::paths::pod_runtime_dir`) の解決と、ready 行に乗る
     /// 名前との突き合わせに使う。
@@ -100,17 +101,15 @@ pub async fn spawn_pod<F>(config: SpawnConfig, mut progress: F) -> Result<SpawnR
 where
     F: FnMut(&str),
 {
-    let runtime_command = PodRuntimeCommand::resolve().map_err(SpawnError::Io)?;
-
     let pod_runtime_dir = manifest::paths::pod_runtime_dir(&config.pod_name)
         .ok_or(SpawnError::RuntimeDirUnavailable)?;
     std::fs::create_dir_all(&pod_runtime_dir).map_err(SpawnError::Io)?;
     let stderr_path = pod_runtime_dir.join("stderr.log");
     let stderr_file = std::fs::File::create(&stderr_path).map_err(SpawnError::Io)?;
 
-    let mut command = Command::new(runtime_command.program());
+    let mut command = Command::new(config.runtime_command.program());
     command
-        .args(runtime_command.prefix_args())
+        .args(config.runtime_command.prefix_args())
         .current_dir(&config.cwd)
         .stdin(Stdio::null())
         .stdout(Stdio::null())