3 files changed, 35 insertions, 2 deletions
diff --git a/makima/src/daemon/cli/daemon.rs b/makima/src/daemon/cli/daemon.rs
index de4cff4..c779d64 100644
--- a/makima/src/daemon/cli/daemon.rs
+++ b/makima/src/daemon/cli/daemon.rs
@@ -33,4 +33,9 @@ pub struct DaemonArgs {
     /// Log level (trace, debug, info, warn, error)
     #[arg(short, long, default_value = "info")]
     pub log_level: String,
+
+    /// Enable bubblewrap sandbox for Claude processes.
+    /// Requires bwrap to be installed on the system.
+    #[arg(long, env = "MAKIMA_DAEMON_BUBBLEWRAP")]
+    pub bubblewrap: bool,
 }
diff --git a/makima/src/daemon/cli/mod.rs b/makima/src/daemon/cli/mod.rs
index 1a49399..da71b0d 100644
--- a/makima/src/daemon/cli/mod.rs
+++ b/makima/src/daemon/cli/mod.rs
@@ -82,6 +82,12 @@ pub enum SupervisorCommand {
 
     /// Ask a question and wait for user feedback
     Ask(supervisor::AskArgs),
+
+    /// Get individual task details
+    Task(supervisor::GetTaskArgs),
+
+    /// Get task output/claude log
+    Output(supervisor::GetTaskOutputArgs),
 }
 
 /// Contract subcommands for task-contract interaction.
diff --git a/makima/src/daemon/cli/supervisor.rs b/makima/src/daemon/cli/supervisor.rs
index dc534b5..2bc4c89 100644
--- a/makima/src/daemon/cli/supervisor.rs
+++ b/makima/src/daemon/cli/supervisor.rs
@@ -14,9 +14,9 @@ pub struct SupervisorArgs {
     #[arg(long, env = "MAKIMA_API_KEY")]
     pub api_key: String,
 
-    /// Current task ID (optional)
+    /// Current task ID (optional) - the supervisor's own task ID
     #[arg(long, env = "MAKIMA_TASK_ID")]
-    pub task_id: Option<Uuid>,
+    pub self_task_id: Option<Uuid>,
 
     /// Contract ID
     #[arg(long, env = "MAKIMA_CONTRACT_ID")]
@@ -199,3 +199,25 @@ pub struct AdvancePhaseArgs {
     #[arg(index = 1)]
     pub phase: String,
 }
+
+/// Arguments for task command (get individual task details).
+#[derive(Args, Debug)]
+pub struct GetTaskArgs {
+    #[command(flatten)]
+    pub common: SupervisorArgs,
+
+    /// Task ID to get details for
+    #[arg(index = 1, id = "target_task_id")]
+    pub target_task_id: Uuid,
+}
+
+/// Arguments for output command (get task output/claude log).
+#[derive(Args, Debug)]
+pub struct GetTaskOutputArgs {
+    #[command(flatten)]
+    pub common: SupervisorArgs,
+
+    /// Task ID to get output for
+    #[arg(index = 1, id = "target_task_id")]
+    pub target_task_id: Uuid,
+}