4 files changed, 71 insertions, 0 deletions

diff --git a/makima/src/daemon/api/supervisor.rs b/makima/src/daemon/api/supervisor.rs
index 9614cfc..bd3aefd 100644
--- a/makima/src/daemon/api/supervisor.rs
+++ b/makima/src/daemon/api/supervisor.rs
@@ -249,6 +249,41 @@ impl ApiClient {
             .await
     }
 
+    /// Mark a contract as complete.
+    /// This will update contract status to 'completed', stop the supervisor, and clean up worktrees.
+    pub async fn supervisor_complete(&self, contract_id: Uuid) -> Result<JsonValue, ApiError> {
+        #[derive(Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct CompleteContractRequest {
+            status: String,
+        }
+        let req = CompleteContractRequest {
+            status: "completed".to_string(),
+        };
+        self.put(&format!("/api/v1/contracts/{}", contract_id), &req)
+            .await
+    }
+
+    /// Resume a completed contract (reactivate it).
+    ///
+    /// This updates the contract status from 'completed' back to 'active'
+    /// and optionally respawns the supervisor task.
+    pub async fn supervisor_resume_contract(
+        &self,
+        contract_id: Uuid,
+    ) -> Result<JsonValue, ApiError> {
+        #[derive(Serialize)]
+        #[serde(rename_all = "camelCase")]
+        struct ResumeContractRequest {
+            status: String,
+        }
+        let req = ResumeContractRequest {
+            status: "active".to_string(),
+        };
+        self.put(&format!("/api/v1/contracts/{}", contract_id), &req)
+            .await
+    }
+
     /// Delete a task.
     pub async fn delete_task(&self, task_id: Uuid) -> Result<(), ApiError> {
         self.delete(&format!("/api/v1/mesh/tasks/{}", task_id)).await
diff --git a/makima/src/daemon/cli/mod.rs b/makima/src/daemon/cli/mod.rs
index ba71c28..3394b35 100644
--- a/makima/src/daemon/cli/mod.rs
+++ b/makima/src/daemon/cli/mod.rs
@@ -122,6 +122,12 @@ pub enum SupervisorCommand {
 
     /// Rewind supervisor conversation
     RewindConversation(supervisor::ConversationRewindArgs),
+
+    /// Mark the contract as complete and stop the supervisor
+    Complete(supervisor::CompleteArgs),
+
+    /// Resume a completed contract (reactivate it)
+    ResumeContract(supervisor::ResumeContractArgs),
 }
 
 /// Contract subcommands for task-contract interaction.
diff --git a/makima/src/daemon/cli/supervisor.rs b/makima/src/daemon/cli/supervisor.rs
index ae1a126..798a55f 100644
--- a/makima/src/daemon/cli/supervisor.rs
+++ b/makima/src/daemon/cli/supervisor.rs
@@ -390,3 +390,30 @@ pub struct ConversationRewindArgs {
     #[arg(long)]
     pub rewind_code: bool,
 }
+
+/// Arguments for complete command (mark contract as complete).
+#[derive(Args, Debug)]
+pub struct CompleteArgs {
+    #[command(flatten)]
+    pub common: SupervisorArgs,
+}
+
+// ============================================================================
+// Resume Contract Command Args
+// ============================================================================
+
+/// Arguments for resume-contract command (reactivate a completed contract).
+#[derive(Args, Debug)]
+pub struct ResumeContractArgs {
+    /// API URL
+    #[arg(long, env = "MAKIMA_API_URL", default_value = "https://api.makima.jp")]
+    pub api_url: String,
+
+    /// API key for authentication
+    #[arg(long, env = "MAKIMA_API_KEY")]
+    pub api_key: String,
+
+    /// Contract ID to resume
+    #[arg(index = 1)]
+    pub contract_id: Uuid,
+}
diff --git a/makima/src/daemon/task/manager.rs b/makima/src/daemon/task/manager.rs
index 80b7039..555cd2a 100644
--- a/makima/src/daemon/task/manager.rs
+++ b/makima/src/daemon/task/manager.rs
@@ -980,6 +980,8 @@ pub struct TaskConfig {
     pub bubblewrap: Option<crate::daemon::config::BubblewrapConfig>,
     /// API URL for spawned tasks (HTTP endpoint for makima CLI).
     pub api_url: String,
+    /// API key for making authenticated API calls.
+    pub api_key: String,
     /// Interval in seconds between heartbeat commits (WIP checkpoints).
     /// Set to 0 to disable. Default: 300 (5 minutes).
     pub heartbeat_commit_interval_secs: u64,
@@ -998,6 +1000,7 @@ impl Default for TaskConfig {
             disable_verbose: false,
             bubblewrap: None,
             api_url: "https://api.makima.jp".to_string(),
+            api_key: String::new(),
             heartbeat_commit_interval_secs: 300, // 5 minutes
         }
     }