feat(daemon): default daemon mode, hardcoded wait timeout, session kill

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.197"
+version = "0.1.198"
 edition = "2024"
 rust-version = "1.88"
 license = "Apache-2.0"

crates/cli-sub-agent/src/cli.rs

@@ -228,11 +228,14 @@ pub enum Commands {
         #[arg(long, value_delimiter = ',', value_name = "PATH")]
         extra_writable: Vec<PathBuf>,
 
-        /// Detach as a background daemon; prints session ID and exits immediately.
-        /// Use `csa session wait/attach/result` to interact with the daemon.
-        #[arg(long)]
+        /// [DEPRECATED] Daemon mode is now the default. This flag is a no-op.
+        #[arg(long, hide = true)]
         daemon: bool,
 
+        /// Run in foreground blocking mode instead of the default daemon mode.
+        #[arg(long)]
+        no_daemon: bool,
+
         /// Internal flag: this process IS the daemon child. Skip re-spawning.
         #[arg(long, hide = true)]
         daemon_child: bool,

crates/cli-sub-agent/src/cli_session.rs

@@ -191,15 +191,23 @@ pub enum SessionCommands {
         cd: Option<String>,
     },
 
-    /// Wait for a daemon session to complete (poll until result.toml exists)
+    /// Wait for a daemon session to complete (poll until result.toml exists).
+    /// Hardcoded timeout: 250 seconds.
     Wait {
         /// Session ID to wait for
         #[arg(long)]
         session: String,
 
-        /// Timeout in seconds (0 = wait forever)
-        #[arg(long, default_value = "0")]
-        timeout: u64,
+        /// Working directory
+        #[arg(long)]
+        cd: Option<String>,
+    },
+
+    /// Kill a running daemon session (SIGTERM, then SIGKILL after grace period)
+    Kill {
+        /// Session ID to kill
+        #[arg(long)]
+        session: String,
 
         /// Working directory
         #[arg(long)]

crates/cli-sub-agent/src/main.rs

@@ -407,12 +407,13 @@ async fn run() -> Result<()> {
             force_ignore_tier_setting,
             no_fs_sandbox,
             extra_writable,
-            daemon,
+            daemon: _daemon,
+            no_daemon,
             daemon_child,
             session_id,
         } => {
-            // Daemon spawn: when --daemon is set and not already the child, fork and exit.
-            if daemon && !daemon_child {
+            // Daemon spawn: daemon mode is the default; --no-daemon opts out.
+            if !no_daemon && !daemon_child {
                 if let Some(ref _id) = session_id {
                     anyhow::bail!("--session-id is an internal flag and must not be used directly");
                 }

crates/cli-sub-agent/src/run_cmd_daemon.rs

@@ -1,4 +1,4 @@
-//! Daemon spawn logic for `csa run --daemon`.
+//! Daemon spawn logic for `csa run` (daemon mode is the default).
 //!
 //! Extracted from main.rs to keep the dispatch function under the
 //! monolith file limit.
@@ -26,7 +26,12 @@ pub(crate) fn spawn_and_exit(cd: Option<&str>) -> Result<()> {
     // that may appear before the subcommand (e.g. `csa --format json run ...`).
     let all_args: Vec<String> = std::env::args().collect();
     let run_pos = all_args.iter().position(|a| a == "run").unwrap_or(1);
-    let forwarded_args: Vec<String> = all_args.iter().skip(run_pos + 1).cloned().collect();
+    let forwarded_args: Vec<String> = all_args
+        .iter()
+        .skip(run_pos + 1)
+        .filter(|a| *a != "--daemon") // daemon is now default; strip no-op flag
+        .cloned()
+        .collect();
 
     let csa_binary = std::env::current_exe().unwrap_or_else(|_| std::path::PathBuf::from("csa"));
 

crates/cli-sub-agent/src/session_cmds.rs

@@ -759,8 +759,10 @@ pub(crate) fn handle_session_checkpoints(cd: Option<String>) -> Result<()> {
     Ok(())
 }
 
-// Daemon-specific commands (wait, attach) are in session_cmds_daemon.rs.
-pub(crate) use crate::session_cmds_daemon::{handle_session_attach, handle_session_wait};
+// Daemon-specific commands (wait, attach, kill) are in session_cmds_daemon.rs.
+pub(crate) use crate::session_cmds_daemon::{
+    handle_session_attach, handle_session_kill, handle_session_wait,
+};
 
 #[cfg(test)]
 #[path = "session_cmds_tests.rs"]