feat(kernel): finish phase3 bridge cutover and phase4 tree projection

- add generic mnote-web query transport and bridge routes for workspace/request/trace - route sidebar compat traffic through mnote-web and tighten fixture fallback to dev/test - unify sidebar/page tree/file tree/picker consumers on page_tree projection - sync phase3/phase4 checklist, breakdown docs, and harness progress state
2026-04-17 00:25:28 +08:00
parent b1d5d97142
commit ddf285b82d
27 changed files with 2650 additions and 340 deletions
@@ -0,0 +1,191 @@
+use crate::app::{AppConfig, AppState};
+use crate::context::RequestContext;
+use crate::error::WebError;
+use crate::routes::query_support::{
+    execute_runtime_query_via_convex, resolve_effective_workspace_id,
+};
+use axum::extract::{Extension, Query, State};
+use axum::http::StatusCode;
+use axum::Json;
+use bridge_runtime::RuntimeQueryEnvelopeWire;
+use serde::Deserialize;
+use serde_json::{json, Value};
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BridgeWorkspaceQuery {
+    pub workspace_id: Option<String>,
+    pub limit: Option<u32>,
+    pub cursor: Option<String>,
+    pub command_status: Option<String>,
+    pub event_status: Option<String>,
+    pub target_page_id: Option<String>,
+    pub target_block_id: Option<String>,
+    pub aggregate_type: Option<String>,
+    pub aggregate_id: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BridgeRequestQuery {
+    pub workspace_id: Option<String>,
+    pub request_id: String,
+    pub command_id: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BridgeTraceQuery {
+    pub workspace_id: Option<String>,
+    pub trace_id: String,
+    pub command_id: Option<String>,
+}
+
+fn ok_response(context: &RequestContext, result: Value) -> (StatusCode, Json<Value>) {
+    (
+        StatusCode::OK,
+        Json(json!({
+            "ok": true,
+            "requestId": context.trace.request_id,
+            "traceId": context.trace.trace_id,
+            "result": result,
+        })),
+    )
+}
+
+fn workspace_query_payload(
+    workspace_id: &str,
+    query: &BridgeWorkspaceQuery,
+) -> RuntimeQueryEnvelopeWire {
+    RuntimeQueryEnvelopeWire {
+        name: "bridge.workspace.overview".into(),
+        payload: json!({
+            "workspaceId": workspace_id,
+            "limit": query.limit.unwrap_or(50),
+            "cursor": query.cursor,
+            "commandStatus": query.command_status,
+            "eventStatus": query.event_status,
+            "targetPageId": query.target_page_id,
+            "targetBlockId": query.target_block_id,
+            "aggregateType": query.aggregate_type,
+            "aggregateId": query.aggregate_id,
+        }),
+    }
+}
+
+fn execute_bridge_query(
+    config: &AppConfig,
+    context: &RequestContext,
+    workspace_id: &str,
+    query: RuntimeQueryEnvelopeWire,
+) -> Result<Value, WebError> {
+    execute_runtime_query_via_convex(config, context, Some(workspace_id), query)
+}
+
+pub async fn workspace(
+    State(state): State<AppState>,
+    Extension(context): Extension<RequestContext>,
+    Query(query): Query<BridgeWorkspaceQuery>,
+) -> Result<(StatusCode, Json<Value>), WebError> {
+    let effective_workspace_id =
+        resolve_effective_workspace_id(&context, query.workspace_id.as_deref(), true)?
+            .expect("workspace_required 已确保存在");
+    let result = execute_bridge_query(
+        state.config(),
+        &context,
+        &effective_workspace_id,
+        workspace_query_payload(&effective_workspace_id, &query),
+    )?;
+    Ok(ok_response(&context, result))
+}
+
+pub async fn request(
+    State(state): State<AppState>,
+    Extension(context): Extension<RequestContext>,
+    Query(query): Query<BridgeRequestQuery>,
+) -> Result<(StatusCode, Json<Value>), WebError> {
+    let effective_workspace_id =
+        resolve_effective_workspace_id(&context, query.workspace_id.as_deref(), true)?
+            .expect("workspace_required 已确保存在");
+    let result = execute_bridge_query(
+        state.config(),
+        &context,
+        &effective_workspace_id,
+        RuntimeQueryEnvelopeWire {
+            name: "bridge.request.get".into(),
+            payload: json!({
+                "workspaceId": effective_workspace_id,
+                "requestId": query.request_id,
+                "commandId": query.command_id,
+            }),
+        },
+    )?;
+    Ok(ok_response(&context, result))
+}
+
+pub async fn trace(
+    State(state): State<AppState>,
+    Extension(context): Extension<RequestContext>,
+    Query(query): Query<BridgeTraceQuery>,
+) -> Result<(StatusCode, Json<Value>), WebError> {
+    let effective_workspace_id =
+        resolve_effective_workspace_id(&context, query.workspace_id.as_deref(), true)?
+            .expect("workspace_required 已确保存在");
+    let result = execute_bridge_query(
+        state.config(),
+        &context,
+        &effective_workspace_id,
+        RuntimeQueryEnvelopeWire {
+            name: "bridge.trace.get".into(),
+            payload: json!({
+                "workspaceId": effective_workspace_id,
+                "traceId": query.trace_id,
+                "commandId": query.command_id,
+            }),
+        },
+    )?;
+    Ok(ok_response(&context, 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_QUERY_FIXTURES_JSON",
+            r#"{"sidebar:datasetList":{"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"}]},"bridgeLogs:listWorkspaceOverview":{"workspace_id":"ws_demo","command_logs":[{"command_id":"cmd_1","request_id":"req_1","status":"applied","created_at":"2026-04-16T00:00:00Z"}],"domain_events":[{"command_id":"cmd_1","status":"published","created_at":"2026-04-16T00:00:00Z"}],"next_cursor":null,"has_more":false,"filters":{"command_status":null,"event_status":null,"target_page_id":null,"target_block_id":null,"aggregate_type":null,"aggregate_id":null},"generated_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,
+            allow_dev_fixtures: true,
+            dev_user_id: "dev-user".into(),
+            dev_user_name: "开发用户".into(),
+            dev_user_email: "dev@mnote.local".into(),
+        }))
+    }
+
+    #[tokio::test]
+    async fn bridge_workspace_route_returns_runtime_result() {
+        let response = app()
+            .oneshot(
+                Request::builder()
+                    .uri("/api/bridge/workspace?workspaceId=ws_demo")
+                    .body(Body::empty())
+                    .expect("request"),
+            )
+            .await
+            .expect("response");
+
+        assert_eq!(response.status(), StatusCode::OK);
+    }
+}