From d1fdfb140cc440664f77a24886172f9976a05a31 Mon Sep 17 00:00:00 2001
From: soryu <soryu@soryu.co>
Date: Tue, 28 Apr 2026 19:12:52 +0100
Subject: feat: revert broken directive PRs, re-implement Lexical document
 orchestrator (#98)

* feat: soryu-co/soryu - makima: Revert broken directive PRs and verify clean build

* feat: soryu-co/soryu - makima: Re-implement frontend: Lexical document editor with feature flag and base components

* WIP: heartbeat checkpoint

* feat: soryu-co/soryu - makima: Add contract blocks, expandable log rows, and interaction controls

* WIP: heartbeat checkpoint

* feat: soryu-co/soryu - makima: End-to-end build verification and integration polish
---
 makima/src/server/mod.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'makima/src/server/mod.rs')

diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index 025ec85..99dc1f3 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, daemon_download, directives, file_ws, files, history, listen, mesh, mesh_chat, mesh_daemon, mesh_merge, mesh_supervisor, mesh_ws, orders, repository_history, settings, speak, templates, transcript_analysis, users, versions};
+use crate::server::handlers::{api_keys, chat, contract_chat, contract_daemon, contract_discuss, contracts, daemon_download, directives, file_ws, files, history, listen, mesh, mesh_chat, mesh_daemon, mesh_merge, mesh_supervisor, mesh_ws, orders, repository_history, speak, templates, transcript_analysis, users, versions};
 use crate::server::openapi::ApiDoc;
 use crate::server::state::SharedState;
 
@@ -281,16 +281,7 @@ pub fn make_router(state: SharedState) -> Router {
         .route("/timeline", get(history::get_timeline))
         // Contract type templates (built-in only)
         .route("/contract-types", get(templates::list_contract_types))
-        // User settings (feature flags) endpoints
-        .route(
-            "/user-settings",
-            get(settings::list_settings).put(settings::upsert_setting),
-        )
-        .route(
-            "/user-settings/{key}",
-            get(settings::get_setting).delete(settings::delete_setting),
-        )
-        // Settings endpoints
+        // Settings endpoints (static routes first to avoid conflict with /settings/{key})
         .route(
             "/settings/repository-history",
             get(repository_history::list_repository_history),
@@ -303,6 +294,15 @@ pub fn make_router(state: SharedState) -> Router {
             "/settings/repository-history/{id}",
             axum::routing::delete(repository_history::delete_repository_history),
         )
+        // User settings (feature flags / preferences)
+        .route(
+            "/settings",
+            get(settings::list_settings).put(settings::upsert_setting),
+        )
+        .route(
+            "/settings/{key}",
+            get(settings::get_setting).delete(settings::delete_setting),
+        )
         .with_state(state);
 
     let swagger = SwaggerUi::new("/swagger-ui")
-- 
cgit v1.2.3