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, 16 insertions, 1 deletions

diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index 12651d9..553797f 100644
--- a/makima/src/server/mod.rs
+++ b/makima/src/server/mod.rs
@@ -18,7 +18,7 @@ use tower_http::trace::TraceLayer;
 use utoipa::OpenApi;
 use utoipa_swagger_ui::SwaggerUi;
 
-use crate::server::handlers::{api_keys, chat, contract_chat, contract_daemon, contract_discuss, contracts, file_ws, files, history, listen, mesh, mesh_chat, mesh_daemon, mesh_merge, mesh_supervisor, mesh_ws, repository_history, speak, templates, transcript_analysis, users, versions};
+use crate::server::handlers::{api_keys, chains, chat, contract_chat, contract_daemon, contract_discuss, contracts, file_ws, files, history, listen, mesh, mesh_chat, mesh_daemon, mesh_merge, mesh_supervisor, mesh_ws, repository_history, speak, templates, transcript_analysis, users, versions};
 use crate::server::openapi::ApiDoc;
 use crate::server::state::SharedState;
 
@@ -214,6 +214,21 @@ pub fn make_router(state: SharedState) -> Router {
         )
         // Timeline endpoint (unified history for user)
         .route("/timeline", get(history::get_timeline))
+        // Chain endpoints (multi-contract orchestration)
+        .route(
+            "/chains",
+            get(chains::list_chains).post(chains::create_chain),
+        )
+        .route(
+            "/chains/{id}",
+            get(chains::get_chain)
+                .put(chains::update_chain)
+                .delete(chains::delete_chain),
+        )
+        .route("/chains/{id}/contracts", get(chains::get_chain_contracts))
+        .route("/chains/{id}/graph", get(chains::get_chain_graph))
+        .route("/chains/{id}/events", get(chains::get_chain_events))
+        .route("/chains/{id}/editor", get(chains::get_chain_editor))
         // Contract type templates (built-in only)
         .route("/contract-types", get(templates::list_contract_types))
         // Settings endpoints