feat(kernel): complete tree-first graph tasks 074-080
This commit is contained in:
lix-2026
@@ -0,0 +1,35 @@
|
||||
use crate::app::AppState;
|
||||
use crate::context::RequestContext;
|
||||
use axum::extract::{Extension, State};
|
||||
use axum::Json;
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct CompatBoundaryResponse {
|
||||
pub ok: bool,
|
||||
pub boundary: &'static str,
|
||||
pub compatibility: &'static str,
|
||||
pub request_id: String,
|
||||
pub trace_id: String,
|
||||
pub target: String,
|
||||
pub notes: Vec<&'static str>,
|
||||
}
|
||||
|
||||
pub async fn next_ai_agent_run(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
) -> Json<CompatBoundaryResponse> {
|
||||
Json(CompatBoundaryResponse {
|
||||
ok: true,
|
||||
boundary: "next_route_compat",
|
||||
compatibility: "placeholder",
|
||||
request_id: context.trace.request_id,
|
||||
trace_id: context.trace.trace_id,
|
||||
target: format!("{}/bridge", state.config().hermes_base_path),
|
||||
notes: vec![
|
||||
"当前保留 Next route 兼容边界，后续用于把 /api/ai-agent/run 收口到 Rust Web 层。",
|
||||
"此占位实现不复制业务裁决，只声明桥接目标与迁移方向。",
|
||||
],
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
use crate::app::AppState;
|
||||
use crate::context::RequestContext;
|
||||
use axum::extract::{Extension, State};
|
||||
use axum::Json;
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct HealthResponse {
|
||||
pub ok: bool,
|
||||
pub service: String,
|
||||
pub version: String,
|
||||
pub request_id: String,
|
||||
pub trace_id: String,
|
||||
pub runtime: &'static str,
|
||||
}
|
||||
|
||||
pub async fn health(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
) -> Json<HealthResponse> {
|
||||
Json(HealthResponse {
|
||||
ok: true,
|
||||
service: state.config().service_name.clone(),
|
||||
version: state.config().service_version.clone(),
|
||||
request_id: context.trace.request_id,
|
||||
trace_id: context.trace.trace_id,
|
||||
runtime: "axum",
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
use crate::app::AppState;
|
||||
use crate::context::RequestContext;
|
||||
use crate::error::WebError;
|
||||
use axum::extract::{Extension, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum::Json;
|
||||
use bridge_runtime::{
|
||||
build_failure_response, build_success_response, execute_runtime_input, execute_runtime_query,
|
||||
runtime_input_requests_result, RuntimeInput,
|
||||
};
|
||||
use serde::Serialize;
|
||||
use serde_json::{json, Value};
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct HermesHealthResponse {
|
||||
pub ok: bool,
|
||||
pub service: String,
|
||||
pub bridge: &'static str,
|
||||
pub request_id: String,
|
||||
pub trace_id: String,
|
||||
}
|
||||
|
||||
pub async fn health(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
) -> Json<HermesHealthResponse> {
|
||||
Json(HermesHealthResponse {
|
||||
ok: true,
|
||||
service: state.config().service_name.clone(),
|
||||
bridge: "hermes",
|
||||
request_id: context.trace.request_id,
|
||||
trace_id: context.trace.trace_id,
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn bridge_runtime(
|
||||
Extension(context): Extension<RequestContext>,
|
||||
Json(runtime_input): Json<RuntimeInput>,
|
||||
) -> Result<(StatusCode, Json<Value>), WebError> {
|
||||
let payload = if runtime_input_requests_result(&runtime_input) {
|
||||
match execute_runtime_query(runtime_input) {
|
||||
Ok(result) => json!({
|
||||
"ok": true,
|
||||
"bridge": "hermes_runtime_result",
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"result": result,
|
||||
}),
|
||||
Err(error) => {
|
||||
let failure = build_failure_response(error);
|
||||
return Ok((
|
||||
StatusCode::BAD_REQUEST,
|
||||
Json(serde_json::to_value(failure).expect("runtime failure 应可序列化")),
|
||||
));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
match execute_runtime_input(runtime_input) {
|
||||
Ok(plan) => {
|
||||
let success = build_success_response(plan);
|
||||
json!({
|
||||
"ok": success.ok,
|
||||
"bridge": "hermes_runtime_plan",
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"plan": success.plan,
|
||||
})
|
||||
}
|
||||
Err(error) => {
|
||||
let failure = build_failure_response(error);
|
||||
return Ok((
|
||||
StatusCode::BAD_REQUEST,
|
||||
Json(serde_json::to_value(failure).expect("runtime failure 应可序列化")),
|
||||
));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Ok((StatusCode::OK, Json(payload)))
|
||||
}
|
||||
@@ -0,0 +1,282 @@
|
||||
use crate::app::{AppConfig, AppState};
|
||||
use crate::context::RequestContext;
|
||||
use crate::error::WebError;
|
||||
use crate::transport::convex::execute_sidebar_dataset_query;
|
||||
use axum::extract::{Extension, Query, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum::Json;
|
||||
use bridge_runtime::{
|
||||
execute_runtime_input, execute_runtime_query, RuntimeActorWire, RuntimeBridgeContextWire,
|
||||
RuntimeExecutionPlan, RuntimeInput, RuntimeQueryEnvelopeWire, RuntimeSourceWire,
|
||||
};
|
||||
use core_protocol::{KernelGraphDirection, KernelNodeType, KernelProjectionKind};
|
||||
use serde::Deserialize;
|
||||
use serde_json::{json, Value};
|
||||
use std::env;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelProjectionQuery {
|
||||
pub workspace_id: Option<String>,
|
||||
pub root_node_id: Option<String>,
|
||||
pub depth: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelSubtreeQuery {
|
||||
pub workspace_id: Option<String>,
|
||||
pub root_node_id: String,
|
||||
pub depth: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelEdgesQuery {
|
||||
pub workspace_id: Option<String>,
|
||||
pub node_id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelGraphQuery {
|
||||
pub workspace_id: Option<String>,
|
||||
pub start_node_id: String,
|
||||
pub max_depth: Option<u32>,
|
||||
}
|
||||
|
||||
fn runtime_context(context: &RequestContext) -> RuntimeBridgeContextWire {
|
||||
RuntimeBridgeContextWire {
|
||||
deployment_id: context.workspace.deployment_id.clone(),
|
||||
project_id: context.workspace.project_id.clone(),
|
||||
workspace_id: context.workspace.workspace_id.clone(),
|
||||
request_id: context.trace.request_id.clone(),
|
||||
trace_id: context.trace.trace_id.clone(),
|
||||
actor: RuntimeActorWire {
|
||||
actor_type: context.auth.actor_type.clone(),
|
||||
actor_id: context.auth.actor_id.clone(),
|
||||
session_id: context.auth.session_id.clone(),
|
||||
},
|
||||
source: RuntimeSourceWire {
|
||||
channel: context.source.channel.clone(),
|
||||
client: context.source.client.clone(),
|
||||
},
|
||||
tenant_id: context.workspace.tenant_id.clone(),
|
||||
auth_token: context.auth.authorization.clone(),
|
||||
idempotency_key: context.source.idempotency_key.clone(),
|
||||
validate_only: false,
|
||||
dry_run: false,
|
||||
}
|
||||
}
|
||||
|
||||
fn build_sidebar_dataset_plan(
|
||||
config: &AppConfig,
|
||||
context: &RequestContext,
|
||||
workspace_id: &str,
|
||||
) -> Result<Value, WebError> {
|
||||
let runtime_input = RuntimeInput::Query {
|
||||
context: runtime_context(context),
|
||||
query: RuntimeQueryEnvelopeWire {
|
||||
name: "sidebar.dataset.list".into(),
|
||||
payload: json!({
|
||||
"workspaceId": workspace_id,
|
||||
}),
|
||||
},
|
||||
data: None,
|
||||
};
|
||||
let RuntimeExecutionPlan::Query(plan) = execute_runtime_input(runtime_input)
|
||||
.map_err(|error| WebError::bad_request(error.message).with_context(context))?
|
||||
else {
|
||||
return Err(WebError::internal("sidebar.dataset.list 未返回 query plan").with_context(context));
|
||||
};
|
||||
|
||||
let dataset = execute_sidebar_dataset_query(config, &plan)?;
|
||||
Ok(dataset)
|
||||
}
|
||||
|
||||
fn load_sidebar_dataset(
|
||||
config: &AppConfig,
|
||||
context: &RequestContext,
|
||||
workspace_id: Option<&str>,
|
||||
) -> Result<Value, WebError> {
|
||||
if let Ok(raw) = env::var("MNOTE_WEB_KERNEL_SIDEBAR_FIXTURE_JSON") {
|
||||
let trimmed = raw.trim();
|
||||
if !trimmed.is_empty() {
|
||||
return serde_json::from_str(trimmed).map_err(|error| {
|
||||
WebError::internal(format!("kernel fixture JSON 非法: {error}")).with_context(context)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
let workspace_id = workspace_id
|
||||
.or(context.workspace.workspace_id.as_deref())
|
||||
.unwrap_or("ws_demo");
|
||||
build_sidebar_dataset_plan(config, context, workspace_id)
|
||||
}
|
||||
|
||||
fn execute_kernel_query(
|
||||
context: &RequestContext,
|
||||
query: RuntimeQueryEnvelopeWire,
|
||||
dataset: Value,
|
||||
) -> Result<Value, WebError> {
|
||||
execute_runtime_query(RuntimeInput::Query {
|
||||
context: runtime_context(context),
|
||||
query,
|
||||
data: Some(dataset),
|
||||
})
|
||||
.map_err(|error| WebError::bad_request(error.message).with_context(context))
|
||||
}
|
||||
|
||||
pub async fn project_sidebar(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
Query(query): Query<KernelProjectionQuery>,
|
||||
) -> Result<(StatusCode, Json<Value>), WebError> {
|
||||
let dataset = load_sidebar_dataset(state.config(), &context, query.workspace_id.as_deref())?;
|
||||
let result = execute_kernel_query(
|
||||
&context,
|
||||
RuntimeQueryEnvelopeWire {
|
||||
name: "kernel.project_view".into(),
|
||||
payload: json!({
|
||||
"projection": KernelProjectionKind::SidebarTree,
|
||||
"workspaceId": query.workspace_id,
|
||||
"rootNodeId": query.root_node_id,
|
||||
"depth": query.depth,
|
||||
"includeEdges": true,
|
||||
"includeContent": false,
|
||||
"nodeTypes": [KernelNodeType::Page],
|
||||
}),
|
||||
},
|
||||
dataset,
|
||||
)?;
|
||||
|
||||
Ok((StatusCode::OK, Json(json!({
|
||||
"ok": true,
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"result": result,
|
||||
}))))
|
||||
}
|
||||
|
||||
pub async fn subtree(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
Query(query): Query<KernelSubtreeQuery>,
|
||||
) -> Result<(StatusCode, Json<Value>), WebError> {
|
||||
let dataset = load_sidebar_dataset(state.config(), &context, query.workspace_id.as_deref())?;
|
||||
let result = execute_kernel_query(
|
||||
&context,
|
||||
RuntimeQueryEnvelopeWire {
|
||||
name: "kernel.subtree.get".into(),
|
||||
payload: json!({
|
||||
"workspaceId": query.workspace_id,
|
||||
"rootNodeId": query.root_node_id,
|
||||
"depth": query.depth,
|
||||
"includeEdges": true,
|
||||
"nodeTypes": [KernelNodeType::Page],
|
||||
}),
|
||||
},
|
||||
dataset,
|
||||
)?;
|
||||
Ok((StatusCode::OK, Json(json!({
|
||||
"ok": true,
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"result": result,
|
||||
}))))
|
||||
}
|
||||
|
||||
pub async fn edges(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
Query(query): Query<KernelEdgesQuery>,
|
||||
) -> Result<(StatusCode, Json<Value>), WebError> {
|
||||
let dataset = load_sidebar_dataset(state.config(), &context, query.workspace_id.as_deref())?;
|
||||
let result = execute_kernel_query(
|
||||
&context,
|
||||
RuntimeQueryEnvelopeWire {
|
||||
name: "kernel.edges.list".into(),
|
||||
payload: json!({
|
||||
"workspaceId": query.workspace_id,
|
||||
"nodeId": query.node_id,
|
||||
"direction": KernelGraphDirection::Both,
|
||||
}),
|
||||
},
|
||||
dataset,
|
||||
)?;
|
||||
Ok((StatusCode::OK, Json(json!({
|
||||
"ok": true,
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"result": result,
|
||||
}))))
|
||||
}
|
||||
|
||||
pub async fn graph(
|
||||
State(state): State<AppState>,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
Query(query): Query<KernelGraphQuery>,
|
||||
) -> Result<(StatusCode, Json<Value>), WebError> {
|
||||
let dataset = load_sidebar_dataset(state.config(), &context, query.workspace_id.as_deref())?;
|
||||
let result = execute_kernel_query(
|
||||
&context,
|
||||
RuntimeQueryEnvelopeWire {
|
||||
name: "kernel.graph.traverse".into(),
|
||||
payload: json!({
|
||||
"workspaceId": query.workspace_id,
|
||||
"startNodeId": query.start_node_id,
|
||||
"maxDepth": query.max_depth.unwrap_or(2),
|
||||
"edgeTypes": [],
|
||||
}),
|
||||
},
|
||||
dataset,
|
||||
)?;
|
||||
Ok((StatusCode::OK, Json(json!({
|
||||
"ok": true,
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"result": result,
|
||||
}))))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::app::{build_app, AppConfig, AppState};
|
||||
use axum::body::Body;
|
||||
use axum::http::{Request, StatusCode};
|
||||
use tower::util::ServiceExt;
|
||||
|
||||
fn app() -> axum::Router {
|
||||
std::env::set_var(
|
||||
"MNOTE_WEB_KERNEL_SIDEBAR_FIXTURE_JSON",
|
||||
r#"{"documents":[{"id":"page_root","workspace_id":"ws_demo","title":"工作区首页","parent_id":null,"sort_order":0,"is_starred":true,"is_template":false,"created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"page_child","workspace_id":"ws_demo","title":"子页面","parent_id":"page_root","sort_order":1,"is_starred":false,"is_template":false,"created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}]}"#,
|
||||
);
|
||||
build_app(AppState::new(AppConfig {
|
||||
service_name: "mnote-web".into(),
|
||||
service_version: "0.1.0".into(),
|
||||
bind_addr: "127.0.0.1:0".into(),
|
||||
hermes_base_path: "/api/hermes".into(),
|
||||
compat_next_base_path: "/api/compat/next".into(),
|
||||
convex_url: None,
|
||||
convex_admin_key: None,
|
||||
dev_user_id: "dev-user".into(),
|
||||
dev_user_name: "开发用户".into(),
|
||||
dev_user_email: "dev@mnote.local".into(),
|
||||
}))
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn kernel_projection_route_returns_sidebar_projection() {
|
||||
let response = app()
|
||||
.oneshot(
|
||||
Request::builder()
|
||||
.uri("/api/kernel/projections/sidebar?rootNodeId=page_root")
|
||||
.body(Body::empty())
|
||||
.expect("request"),
|
||||
)
|
||||
.await
|
||||
.expect("response");
|
||||
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
mod compat;
|
||||
mod health;
|
||||
mod hermes;
|
||||
mod kernel;
|
||||
mod sse;
|
||||
mod ws;
|
||||
|
||||
use crate::app::AppState;
|
||||
use axum::routing::{get, post};
|
||||
use axum::Router;
|
||||
|
||||
pub fn build_router(state: AppState) -> Router {
|
||||
let hermes_base_path = state.config().hermes_base_path.clone();
|
||||
let compat_next_base_path = state.config().compat_next_base_path.clone();
|
||||
|
||||
Router::new()
|
||||
.route("/health", get(health::health))
|
||||
.route("/api/kernel/projections/sidebar", get(kernel::project_sidebar))
|
||||
.route("/api/kernel/subtree", get(kernel::subtree))
|
||||
.route("/api/kernel/edges", get(kernel::edges))
|
||||
.route("/api/kernel/graph", get(kernel::graph))
|
||||
.route("/api/stream/events", get(sse::events))
|
||||
.route("/api/realtime/ws", get(ws::socket))
|
||||
.nest(
|
||||
&hermes_base_path,
|
||||
Router::new()
|
||||
.route("/health", get(hermes::health))
|
||||
.route("/bridge", post(hermes::bridge_runtime)),
|
||||
)
|
||||
.nest(
|
||||
&compat_next_base_path,
|
||||
Router::new().route("/ai-agent/run", post(compat::next_ai_agent_run)),
|
||||
)
|
||||
.with_state(state)
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
use crate::context::RequestContext;
|
||||
use axum::extract::Extension;
|
||||
use axum::response::sse::{Event, KeepAlive, Sse};
|
||||
use futures_util::stream;
|
||||
use serde_json::json;
|
||||
use std::convert::Infallible;
|
||||
use std::time::Duration;
|
||||
|
||||
pub async fn events(
|
||||
Extension(context): Extension<RequestContext>,
|
||||
) -> Sse<impl futures_util::Stream<Item = Result<Event, Infallible>>> {
|
||||
let payload = json!({
|
||||
"kind": "sse_placeholder",
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"workspaceId": context.workspace.workspace_id,
|
||||
"notes": [
|
||||
"当前为 task-062 最小骨架，后续在此对齐统一流式输出协议。",
|
||||
"此路由预留给 Hermes token/tool/client event 回流。"
|
||||
]
|
||||
});
|
||||
|
||||
let event = Event::default()
|
||||
.event("ready")
|
||||
.json_data(payload)
|
||||
.expect("SSE 占位事件必须可序列化");
|
||||
|
||||
Sse::new(stream::iter(vec![Ok(event)])).keep_alive(
|
||||
KeepAlive::new()
|
||||
.interval(Duration::from_secs(15))
|
||||
.text("keepalive"),
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
use crate::context::RequestContext;
|
||||
use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade};
|
||||
use axum::extract::Extension;
|
||||
use axum::response::Response;
|
||||
use futures_util::StreamExt;
|
||||
use serde_json::json;
|
||||
|
||||
pub async fn socket(
|
||||
ws: WebSocketUpgrade,
|
||||
Extension(context): Extension<RequestContext>,
|
||||
) -> Response {
|
||||
ws.on_upgrade(move |socket| handle_socket(socket, context))
|
||||
}
|
||||
|
||||
async fn handle_socket(mut socket: WebSocket, context: RequestContext) {
|
||||
let payload = json!({
|
||||
"kind": "ws_placeholder",
|
||||
"requestId": context.trace.request_id,
|
||||
"traceId": context.trace.trace_id,
|
||||
"workspaceId": context.workspace.workspace_id,
|
||||
"notes": [
|
||||
"当前为 task-062 最小骨架，后续可承接协作推送和运行态事件。"
|
||||
]
|
||||
});
|
||||
|
||||
let _ = socket
|
||||
.send(Message::Text(payload.to_string().into()))
|
||||
.await;
|
||||
|
||||
while let Some(message) = socket.next().await {
|
||||
let Ok(message) = message else {
|
||||
break;
|
||||
};
|
||||
|
||||
match message {
|
||||
Message::Text(text) => {
|
||||
let echo = json!({
|
||||
"kind": "ws_echo",
|
||||
"traceId": context.trace.trace_id,
|
||||
"text": text.to_string(),
|
||||
});
|
||||
if socket
|
||||
.send(Message::Text(echo.to_string().into()))
|
||||
.await
|
||||
.is_err()
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
Message::Close(_) => break,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user