fix: Resolve merge conflict in server/mod.rsmakima/discuss-contract-feature

Combine imports from both branches - include both chains and contract_discuss handlers.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

1 files changed, 52 insertions, 0 deletions

diff --git a/makima/src/daemon/api/chain.rs b/makima/src/daemon/api/chain.rs
new file mode 100644
index 0000000..7f7826f
--- /dev/null
+++ b/makima/src/daemon/api/chain.rs
@@ -0,0 +1,52 @@
+//! Chain API methods.
+
+use uuid::Uuid;
+
+use super::client::{ApiClient, ApiError};
+use super::supervisor::JsonValue;
+use crate::db::models::CreateChainRequest;
+
+impl ApiClient {
+    /// Create a new chain with contracts.
+    pub async fn create_chain(&self, req: CreateChainRequest) -> Result<JsonValue, ApiError> {
+        self.post("/api/v1/chains", &req).await
+    }
+
+    /// List all chains for the authenticated user.
+    pub async fn list_chains(
+        &self,
+        status: Option<&str>,
+        limit: i32,
+    ) -> Result<JsonValue, ApiError> {
+        let mut params = Vec::new();
+        if let Some(s) = status {
+            params.push(format!("status={}", s));
+        }
+        params.push(format!("limit={}", limit));
+        let query_string = format!("?{}", params.join("&"));
+        self.get(&format!("/api/v1/chains{}", query_string)).await
+    }
+
+    /// Get a chain by ID.
+    pub async fn get_chain(&self, chain_id: Uuid) -> Result<JsonValue, ApiError> {
+        self.get(&format!("/api/v1/chains/{}", chain_id)).await
+    }
+
+    /// Get contracts in a chain.
+    pub async fn get_chain_contracts(&self, chain_id: Uuid) -> Result<JsonValue, ApiError> {
+        self.get(&format!("/api/v1/chains/{}/contracts", chain_id))
+            .await
+    }
+
+    /// Get chain DAG structure for visualization.
+    pub async fn get_chain_graph(&self, chain_id: Uuid) -> Result<JsonValue, ApiError> {
+        self.get(&format!("/api/v1/chains/{}/graph", chain_id))
+            .await
+    }
+
+    /// Archive a chain.
+    pub async fn archive_chain(&self, chain_id: Uuid) -> Result<JsonValue, ApiError> {
+        self.delete_with_response(&format!("/api/v1/chains/{}", chain_id))
+            .await
+    }
+}