diff --git a/Cargo.lock b/Cargo.lock index 3ae8ae0..83d4e41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,15 +508,6 @@ dependencies = [ "embedded-io", ] -[[package]] -name = "capnp" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71338171543626713e427635f7de390328d9e85828a816a0c88d959032b34a2f" -dependencies = [ - "embedded-io", -] - [[package]] name = "capnpc" version = "0.26.0" diff --git a/guix.scm b/guix.scm index e7e561a..b07a93d 100644 --- a/guix.scm +++ b/guix.scm @@ -20,7 +20,7 @@ (define-public echidna (package (name "echidna") - (version "1.5.0") + (version "2.3.0") (source (local-file "." "echidna-checkout" #:recursive? #t #:select? (git-predicate "."))) diff --git a/src/interfaces/rest/main.rs b/src/interfaces/rest/main.rs index f7ea3ce..f4cd532 100644 --- a/src/interfaces/rest/main.rs +++ b/src/interfaces/rest/main.rs @@ -98,21 +98,21 @@ async fn main() { .route("/health", get(health_check)) // Prover endpoints .route("/api/v1/provers", get(handlers::list_provers)) - .route("/api/v1/provers/:kind", get(handlers::get_prover)) + .route("/api/v1/provers/{kind}", get(handlers::get_prover)) // Proof endpoints .route("/api/v1/proofs", post(handlers::submit_proof)) .route("/api/v1/proofs", get(handlers::list_proofs)) - .route("/api/v1/proofs/:id", get(handlers::get_proof)) - .route("/api/v1/proofs/:id", delete(handlers::cancel_proof)) + .route("/api/v1/proofs/{id}", get(handlers::get_proof)) + .route("/api/v1/proofs/{id}", delete(handlers::cancel_proof)) // Tactic endpoints - .route("/api/v1/proofs/:id/tactics", post(handlers::apply_tactic)) + .route("/api/v1/proofs/{id}/tactics", post(handlers::apply_tactic)) .route( - "/api/v1/proofs/:id/tactics/suggest", + "/api/v1/proofs/{id}/tactics/suggest", get(handlers::suggest_tactics), ) // Cross-prover exchange endpoints (OpenTheory / Dedukti). // Export is session-scoped; import is stateless. - .route("/api/v1/proofs/:id/export", get(handlers::export_proof)) + .route("/api/v1/proofs/{id}/export", get(handlers::export_proof)) .route("/api/v1/exchange/import", post(handlers::import_proof)) // Consultant-mode Q&A — free-form question + optional context → // LLM-shaped markdown answer via BoJ's cartridge router. diff --git a/src/rust/server.rs b/src/rust/server.rs index a2def8c..b982084 100644 --- a/src/rust/server.rs +++ b/src/rust/server.rs @@ -180,9 +180,9 @@ pub async fn start_server(port: u16, host: String, enable_cors: bool) -> Result< .route("/api/suggest", post(suggest_handler)) .route("/api/search", get(search_handler)) .route("/api/session/create", post(create_session)) - .route("/api/session/:id/state", get(get_session_state)) - .route("/api/session/:id/apply", post(apply_tactic_handler)) - .route("/api/session/:id/tree", get(get_proof_tree)) + .route("/api/session/{id}/state", get(get_session_state)) + .route("/api/session/{id}/apply", post(apply_tactic_handler)) + .route("/api/session/{id}/tree", get(get_proof_tree)) // Additional UI-specific endpoints .route("/api/agent/plan", post(agent_plan_handler)) .route("/api/aspect-tags", get(get_aspect_tags)) @@ -229,8 +229,8 @@ pub async fn start_server(port: u16, host: String, enable_cors: bool) -> Result< println!(" POST /api/suggest - Get tactic suggestions"); println!(" GET /api/search?q= - Search theorems"); println!(" POST /api/session/create - Create proof session"); - println!(" GET /api/session/:id/state - Get session state"); - println!(" POST /api/session/:id/apply - Apply tactic to session"); + println!(" GET /api/session/{{id}}/state - Get session state"); + println!(" POST /api/session/{{id}}/apply - Apply tactic to session"); println!(" WS /ws/interactive - WebSocket live proof session"); println!(); println!("Press Ctrl+C to stop the server");