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
@@ -1,8 +1,18 @@
 use crate::app::AppState;
 use crate::context::RequestContext;
+use crate::error::WebError;
+use crate::routes::query_support::{
+    execute_runtime_query_against_data, fetch_query_data_via_convex, resolve_effective_workspace_id,
+};
+use axum::extract::Query;
 use axum::extract::{Extension, State};
+use axum::http::StatusCode;
 use axum::Json;
+use bridge_runtime::RuntimeQueryEnvelopeWire;
+use core_protocol::{KernelNodeType, KernelProjectionKind};
+use serde::Deserialize;
 use serde::Serialize;
+use serde_json::{json, Value};

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -16,6 +26,12 @@ pub struct CompatBoundaryResponse {
    pub notes: Vec<&'static str>,
 }

+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CompatSidebarQuery {
+    pub workspace_id: Option<String>,
+}
+
 pub async fn next_ai_agent_run(
    State(state): State<AppState>,
    Extension(context): Extension<RequestContext>,
@@ -33,3 +49,103 @@ pub async fn next_ai_agent_run(
        ],
    })
 }
+
+pub async fn next_sidebar(
+    State(state): State<AppState>,
+    Extension(context): Extension<RequestContext>,
+    Query(query): Query<CompatSidebarQuery>,
+) -> Result<(StatusCode, Json<Value>), WebError> {
+    let effective_workspace_id =
+        resolve_effective_workspace_id(&context, query.workspace_id.as_deref(), true)?
+            .expect("workspace_required 已确保存在");
+
+    let dataset = fetch_query_data_via_convex(
+        state.config(),
+        &context,
+        Some(&effective_workspace_id),
+        RuntimeQueryEnvelopeWire {
+            name: "sidebar.dataset.list".into(),
+            payload: json!({
+                "workspaceId": effective_workspace_id,
+            }),
+        },
+    )?;
+    let projection = execute_runtime_query_against_data(
+        &context,
+        Some(&effective_workspace_id),
+        RuntimeQueryEnvelopeWire {
+            name: "kernel.project_view".into(),
+            payload: json!({
+                "projection": KernelProjectionKind::SidebarTree,
+                "workspaceId": effective_workspace_id,
+                "includeEdges": true,
+                "includeContent": false,
+                "nodeTypes": [KernelNodeType::Page],
+            }),
+        },
+        dataset.clone(),
+    )?;
+
+    let mut dataset_object = dataset.as_object().cloned().ok_or_else(|| {
+        WebError::bad_gateway_code("convex_bad_response", "sidebar.dataset.list 返回值不是对象")
+            .with_context(&context)
+            .with_header("x-error-phase", "compat_sidebar_shape")
+            .with_header("x-upstream-service", "convex")
+    })?;
+    dataset_object.insert("kernel_sidebar_projection".into(), projection);
+
+    Ok((
+        StatusCode::OK,
+        Json(json!({
+            "ok": true,
+            "boundary": "next_sidebar_compat",
+            "requestId": context.trace.request_id,
+            "traceId": context.trace.trace_id,
+            "workspaceId": effective_workspace_id,
+            "result": Value::Object(dataset_object),
+        })),
+    ))
+}
+
+#[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":{"active_workspace_id":"ws_demo","workspaces":[],"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"}],"trashed_documents":[],"media_assets":[],"trashed_media_assets":[],"mindmap_assets":[],"trashed_mindmap_assets":[],"table_assets":[],"trashed_table_assets":[],"mindmap_docs":[],"mindmap_asset_children":{}},"bridgeLogs:listWorkspaceOverview":{"workspace_id":"ws_demo","command_logs":[],"domain_events":[],"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 compat_sidebar_route_returns_dataset_and_projection() {
+        let response = app()
+            .oneshot(
+                Request::builder()
+                    .uri("/api/compat/next/sidebar?workspaceId=ws_demo")
+                    .body(Body::empty())
+                    .expect("request"),
+            )
+            .await
+            .expect("response");
+
+        assert_eq!(response.status(), StatusCode::OK);
+    }
+}