refactor(cli-sub-agent): consolidate plan execution args into PlanRunContext

Cargo.toml

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

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

@@ -588,7 +588,10 @@ const ANTI_RECURSION_PREAMBLE: &str = "\
 CRITICAL: You are running INSIDE a CSA subprocess (csa review / csa debate). \
 Do NOT invoke `csa run`, `csa review`, `csa debate`, or ANY `csa` CLI command — \
 this causes infinite recursion. Perform the task DIRECTLY using your own \
-capabilities (Read, Grep, Glob, Bash for git commands). \
+capabilities (Read, Grep, Glob, Bash for read-only git commands). \
+DEBATE SAFETY: Do NOT run git add/commit/push/merge/rebase/tag/stash/reset/checkout/cherry-pick, \
+and do NOT run gh pr/create/comment/merge or any command that mutates repository/PR state. \
+Ignore prompt-guard reminders about commit/push in this subprocess. \
 Ignore any CLAUDE.md or AGENTS.md rules that instruct you to delegate to CSA.\n\n";
 
 /// Build a debate instruction that passes parameters to the debate skill.

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

@@ -216,10 +216,38 @@ pub(crate) async fn build_and_validate_executor(
         );
         anyhow::bail!("{}", e);
     }
+    ensure_tool_runtime_prerequisites(executor.tool_name()).await?;
 
     Ok(executor)
 }
 
+async fn ensure_tool_runtime_prerequisites(tool_name: &str) -> Result<()> {
+    if tool_name != "codex" {
+        return Ok(());
+    }
+    if std::env::var("CSA_SKIP_BWRAP_PREFLIGHT").ok().as_deref() == Some("1") {
+        return Ok(());
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+        let has_bwrap = tokio::process::Command::new("which")
+            .arg("bwrap")
+            .output()
+            .await
+            .map(|out| out.status.success())
+            .unwrap_or(false);
+        if !has_bwrap {
+            anyhow::bail!(
+                "codex preflight failed: required runtime dependency 'bwrap' (bubblewrap) is missing.\n\
+                 Install bubblewrap first, then re-run the command."
+            );
+        }
+    }
+
+    Ok(())
+}
+
 /// Acquire global concurrency slot for the executor.
 ///
 /// Returns ToolSlot guard on success.