feat(kernel): complete tree-first graph tasks 074-080
This commit is contained in:
lix-2026
Generated
+274
@@ -79,6 +79,61 @@ version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
||||
|
||||
[[package]]
|
||||
name = "axum"
|
||||
version = "0.8.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
|
||||
dependencies = [
|
||||
"axum-core",
|
||||
"base64",
|
||||
"bytes",
|
||||
"form_urlencoded",
|
||||
"futures-util",
|
||||
"http",
|
||||
"http-body",
|
||||
"http-body-util",
|
||||
"hyper",
|
||||
"hyper-util",
|
||||
"itoa",
|
||||
"matchit",
|
||||
"memchr",
|
||||
"mime",
|
||||
"percent-encoding",
|
||||
"pin-project-lite",
|
||||
"serde_core",
|
||||
"serde_json",
|
||||
"serde_path_to_error",
|
||||
"serde_urlencoded",
|
||||
"sha1",
|
||||
"sync_wrapper",
|
||||
"tokio",
|
||||
"tokio-tungstenite",
|
||||
"tower",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "axum-core"
|
||||
version = "0.5.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-core",
|
||||
"http",
|
||||
"http-body",
|
||||
"http-body-util",
|
||||
"mime",
|
||||
"pin-project-lite",
|
||||
"sync_wrapper",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.22.1"
|
||||
@@ -228,6 +283,12 @@ dependencies = [
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "data-encoding"
|
||||
version = "2.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
|
||||
|
||||
[[package]]
|
||||
name = "digest"
|
||||
version = "0.10.7"
|
||||
@@ -250,6 +311,16 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-log"
|
||||
version = "0.1.0"
|
||||
@@ -294,6 +365,17 @@ version = "0.3.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.32"
|
||||
@@ -314,6 +396,7 @@ checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
"futures-macro",
|
||||
"futures-sink",
|
||||
"futures-task",
|
||||
"memchr",
|
||||
@@ -412,6 +495,12 @@ version = "1.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
||||
|
||||
[[package]]
|
||||
name = "httpdate"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.9.0"
|
||||
@@ -425,6 +514,7 @@ dependencies = [
|
||||
"http",
|
||||
"http-body",
|
||||
"httparse",
|
||||
"httpdate",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"smallvec",
|
||||
@@ -625,6 +715,12 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.185"
|
||||
@@ -649,12 +745,24 @@ version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
|
||||
|
||||
[[package]]
|
||||
name = "matchit"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "1.2.0"
|
||||
@@ -680,6 +788,34 @@ dependencies = [
|
||||
"storage-convex-bridge",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mnote-web"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"axum",
|
||||
"base64",
|
||||
"bridge-runtime",
|
||||
"core-protocol",
|
||||
"futures-util",
|
||||
"reqwest",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
"tower",
|
||||
"tower-http",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nu-ansi-term"
|
||||
version = "0.50.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
|
||||
dependencies = [
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.21.4"
|
||||
@@ -1009,6 +1145,17 @@ dependencies = [
|
||||
"zmij",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_path_to_error"
|
||||
version = "0.1.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"serde",
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_urlencoded"
|
||||
version = "0.7.1"
|
||||
@@ -1021,6 +1168,17 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha1"
|
||||
version = "0.10.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures",
|
||||
"digest",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha2"
|
||||
version = "0.10.9"
|
||||
@@ -1032,12 +1190,31 @@ dependencies = [
|
||||
"digest",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sharded-slab"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
|
||||
dependencies = [
|
||||
"errno",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "slab"
|
||||
version = "0.4.12"
|
||||
@@ -1138,6 +1315,15 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread_local"
|
||||
version = "1.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinystr"
|
||||
version = "0.8.3"
|
||||
@@ -1173,10 +1359,23 @@ dependencies = [
|
||||
"libc",
|
||||
"mio",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "2.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-rustls"
|
||||
version = "0.26.4"
|
||||
@@ -1187,6 +1386,18 @@ dependencies = [
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-tungstenite"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c"
|
||||
dependencies = [
|
||||
"futures-util",
|
||||
"log",
|
||||
"tokio",
|
||||
"tungstenite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tower"
|
||||
version = "0.5.3"
|
||||
@@ -1200,6 +1411,7 @@ dependencies = [
|
||||
"tokio",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1218,6 +1430,7 @@ dependencies = [
|
||||
"tower",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1238,10 +1451,23 @@ version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
|
||||
dependencies = [
|
||||
"log",
|
||||
"pin-project-lite",
|
||||
"tracing-attributes",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-attributes"
|
||||
version = "0.1.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-core"
|
||||
version = "0.1.36"
|
||||
@@ -1249,6 +1475,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"valuable",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-log"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
|
||||
dependencies = [
|
||||
"log",
|
||||
"once_cell",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-subscriber"
|
||||
version = "0.3.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
|
||||
dependencies = [
|
||||
"nu-ansi-term",
|
||||
"sharded-slab",
|
||||
"smallvec",
|
||||
"thread_local",
|
||||
"tracing-core",
|
||||
"tracing-log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1257,6 +1509,22 @@ version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||
|
||||
[[package]]
|
||||
name = "tungstenite"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"data-encoding",
|
||||
"http",
|
||||
"httparse",
|
||||
"log",
|
||||
"rand",
|
||||
"sha1",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.19.0"
|
||||
@@ -1305,6 +1573,12 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "valuable"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.5"
|
||||
|
||||
@@ -6,6 +6,7 @@ members = [
|
||||
"crates/core-protocol",
|
||||
"crates/event-log",
|
||||
"crates/mnote-cli",
|
||||
"crates/mnote-web",
|
||||
"crates/storage-convex-bridge",
|
||||
"crates/index-fts",
|
||||
]
|
||||
|
||||
@@ -8,10 +8,16 @@ use core_domain::Timestamp;
|
||||
use core_protocol::{
|
||||
default_tool_registry, invocation_kind_label, tool_effect_label, ActorPayload,
|
||||
CommandEnvelope, EmbedBlock, GetBlock, GetBridgeCommand, GetBridgeRequest, GetBridgeTrace,
|
||||
GetMindmap, InvocationKind, ListBridgeWorkspaceOverview, MindmapNodeData, MindmapNodeInput,
|
||||
MindmapNodeRef, MindmapOp, MindmapTreeNode, MoveBlock, PatchBlock, PutMindmap,
|
||||
QueryEnvelope, SearchDocuments, SearchRecent, SourcePayload, TargetRef, ToolExecutionMode,
|
||||
ToolInvocation,
|
||||
GetMindmap, InvocationKind, KernelAttachEdge, KernelAuditStamp, KernelContentPayload,
|
||||
KernelCreateNode, KernelDetachEdge, KernelEdge, KernelEdgeListResult, KernelEdgeType,
|
||||
KernelGetNode, KernelGetSubtree, KernelGraphDirection, KernelGraphTraversalResult,
|
||||
KernelGraphVisit, KernelListChildren, KernelListEdges, KernelMoveSubtree, KernelNode,
|
||||
KernelNodeMetadata, KernelNodeType, KernelProjectionFilter, KernelProjectionItem,
|
||||
KernelProjectionKind, KernelProjectionRequest, KernelProjectionResult, KernelRefsPayload,
|
||||
KernelSubtreeRef, KernelSubtreeResult, KernelTraverseGraph, KernelUpdateNode,
|
||||
ListBridgeWorkspaceOverview, MindmapNodeData, MindmapNodeInput, MindmapNodeRef, MindmapOp,
|
||||
MindmapTreeNode, MoveBlock, PatchBlock, PutMindmap, QueryEnvelope, SearchDocuments,
|
||||
SearchRecent, SourcePayload, TargetRef, ToolExecutionMode, ToolInvocation,
|
||||
};
|
||||
use event_log::DomainEventRecord;
|
||||
use index_fts::{
|
||||
@@ -346,6 +352,63 @@ struct SidebarDatasetQueryPayload {
|
||||
workspace_id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelGetNodeQueryPayload {
|
||||
node_id: String,
|
||||
workspace_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelGetSubtreeQueryPayload {
|
||||
root_node_id: String,
|
||||
workspace_id: Option<String>,
|
||||
depth: Option<u32>,
|
||||
include_edges: Option<bool>,
|
||||
node_types: Option<Vec<KernelNodeType>>,
|
||||
edge_types: Option<Vec<KernelEdgeType>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelListChildrenQueryPayload {
|
||||
parent_node_id: String,
|
||||
workspace_id: Option<String>,
|
||||
node_types: Option<Vec<KernelNodeType>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelListEdgesQueryPayload {
|
||||
node_id: String,
|
||||
workspace_id: Option<String>,
|
||||
edge_types: Option<Vec<KernelEdgeType>>,
|
||||
direction: Option<KernelGraphDirection>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelTraverseGraphQueryPayload {
|
||||
start_node_id: String,
|
||||
workspace_id: Option<String>,
|
||||
edge_types: Option<Vec<KernelEdgeType>>,
|
||||
max_depth: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelProjectViewQueryPayload {
|
||||
projection: KernelProjectionKind,
|
||||
workspace_id: Option<String>,
|
||||
root_node_id: Option<String>,
|
||||
depth: Option<u32>,
|
||||
include_content: Option<bool>,
|
||||
include_edges: Option<bool>,
|
||||
node_types: Option<Vec<KernelNodeType>>,
|
||||
edge_types: Option<Vec<KernelEdgeType>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct SearchDocumentsQueryPayload {
|
||||
@@ -425,6 +488,46 @@ struct DocumentSaveCommandPayload {
|
||||
conflict_detection_key: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelCreateNodeCommandPayload {
|
||||
node: KernelNode,
|
||||
position: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelUpdateNodeCommandPayload {
|
||||
node_id: String,
|
||||
metadata: Option<KernelNodeMetadata>,
|
||||
content: Option<KernelContentPayload>,
|
||||
refs: Option<KernelRefsPayload>,
|
||||
audit: Option<KernelAuditStamp>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelMoveSubtreeCommandPayload {
|
||||
subtree: KernelSubtreeRef,
|
||||
new_parent_node_id: Option<String>,
|
||||
sort_order: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelAttachEdgeCommandPayload {
|
||||
edge: KernelEdge,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct KernelDetachEdgeCommandPayload {
|
||||
edge_id: Option<String>,
|
||||
from_node_id: Option<String>,
|
||||
to_node_id: Option<String>,
|
||||
edge_type: Option<KernelEdgeType>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct MindmapPutCommandPayload {
|
||||
@@ -635,6 +738,193 @@ fn execute_query(
|
||||
) -> Result<RuntimeExecutionPlan, BridgeError> {
|
||||
let context = to_bridge_context(context_wire);
|
||||
match query_wire.name.as_str() {
|
||||
"kernel.node.get" => {
|
||||
let payload: KernelGetNodeQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
name: "kernel.node.get".into(),
|
||||
payload: KernelGetNode {
|
||||
node_id: payload.node_id.clone(),
|
||||
workspace_id: payload.workspace_id.clone(),
|
||||
},
|
||||
};
|
||||
let request = build_query_request(&context, &query)?;
|
||||
Ok(RuntimeExecutionPlan::Query(RuntimeQueryExecutionPlan {
|
||||
query_name: query.name,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
payload_json: request.payload_json,
|
||||
args_json: json!({
|
||||
"nodeId": payload.node_id,
|
||||
"workspaceId": payload.workspace_id,
|
||||
}),
|
||||
}))
|
||||
}
|
||||
"kernel.subtree.get" => {
|
||||
let payload: KernelGetSubtreeQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
name: "kernel.subtree.get".into(),
|
||||
payload: KernelGetSubtree {
|
||||
subtree: KernelSubtreeRef {
|
||||
root_node_id: payload.root_node_id.clone(),
|
||||
path: vec![payload.root_node_id.clone()],
|
||||
depth: payload.depth,
|
||||
},
|
||||
workspace_id: payload.workspace_id.clone(),
|
||||
include_edges: payload.include_edges.unwrap_or(true),
|
||||
filters: KernelProjectionFilter {
|
||||
node_types: payload.node_types.clone().unwrap_or_default(),
|
||||
edge_types: payload.edge_types.clone().unwrap_or_default(),
|
||||
include_deleted: false,
|
||||
},
|
||||
},
|
||||
};
|
||||
let request = build_query_request(&context, &query)?;
|
||||
Ok(RuntimeExecutionPlan::Query(RuntimeQueryExecutionPlan {
|
||||
query_name: query.name,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
payload_json: request.payload_json,
|
||||
args_json: json!({
|
||||
"rootNodeId": payload.root_node_id,
|
||||
"workspaceId": payload.workspace_id,
|
||||
"depth": payload.depth,
|
||||
"includeEdges": payload.include_edges.unwrap_or(true),
|
||||
"nodeTypes": payload.node_types.unwrap_or_default(),
|
||||
"edgeTypes": payload.edge_types.unwrap_or_default(),
|
||||
}),
|
||||
}))
|
||||
}
|
||||
"kernel.children.list" => {
|
||||
let payload: KernelListChildrenQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
name: "kernel.children.list".into(),
|
||||
payload: KernelListChildren {
|
||||
parent_node_id: payload.parent_node_id.clone(),
|
||||
workspace_id: payload.workspace_id.clone(),
|
||||
node_types: payload.node_types.clone().unwrap_or_default(),
|
||||
},
|
||||
};
|
||||
let request = build_query_request(&context, &query)?;
|
||||
Ok(RuntimeExecutionPlan::Query(RuntimeQueryExecutionPlan {
|
||||
query_name: query.name,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
payload_json: request.payload_json,
|
||||
args_json: json!({
|
||||
"parentNodeId": payload.parent_node_id,
|
||||
"workspaceId": payload.workspace_id,
|
||||
"nodeTypes": payload.node_types.unwrap_or_default(),
|
||||
}),
|
||||
}))
|
||||
}
|
||||
"kernel.edges.list" => {
|
||||
let payload: KernelListEdgesQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
name: "kernel.edges.list".into(),
|
||||
payload: KernelListEdges {
|
||||
node_id: payload.node_id.clone(),
|
||||
workspace_id: payload.workspace_id.clone(),
|
||||
edge_types: payload.edge_types.clone().unwrap_or_default(),
|
||||
direction: payload.direction.clone(),
|
||||
},
|
||||
};
|
||||
let request = build_query_request(&context, &query)?;
|
||||
Ok(RuntimeExecutionPlan::Query(RuntimeQueryExecutionPlan {
|
||||
query_name: query.name,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
payload_json: request.payload_json,
|
||||
args_json: json!({
|
||||
"nodeId": payload.node_id,
|
||||
"workspaceId": payload.workspace_id,
|
||||
"edgeTypes": payload.edge_types.unwrap_or_default(),
|
||||
"direction": payload.direction.unwrap_or(KernelGraphDirection::Both),
|
||||
}),
|
||||
}))
|
||||
}
|
||||
"kernel.graph.traverse" => {
|
||||
let payload: KernelTraverseGraphQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
name: "kernel.graph.traverse".into(),
|
||||
payload: KernelTraverseGraph {
|
||||
start_node_id: payload.start_node_id.clone(),
|
||||
workspace_id: payload.workspace_id.clone(),
|
||||
edge_types: payload.edge_types.clone().unwrap_or_default(),
|
||||
max_depth: payload.max_depth.unwrap_or(2),
|
||||
},
|
||||
};
|
||||
let request = build_query_request(&context, &query)?;
|
||||
Ok(RuntimeExecutionPlan::Query(RuntimeQueryExecutionPlan {
|
||||
query_name: query.name,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
payload_json: request.payload_json,
|
||||
args_json: json!({
|
||||
"startNodeId": payload.start_node_id,
|
||||
"workspaceId": payload.workspace_id,
|
||||
"edgeTypes": payload.edge_types.unwrap_or_default(),
|
||||
"maxDepth": payload.max_depth.unwrap_or(2),
|
||||
}),
|
||||
}))
|
||||
}
|
||||
"kernel.project_view" => {
|
||||
let payload: KernelProjectViewQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
name: "kernel.project_view".into(),
|
||||
payload: KernelProjectionRequest {
|
||||
projection: payload.projection.clone(),
|
||||
workspace_id: payload.workspace_id.clone(),
|
||||
root_node_id: payload.root_node_id.clone(),
|
||||
subtree: payload.root_node_id.as_ref().map(|root_node_id| KernelSubtreeRef {
|
||||
root_node_id: root_node_id.clone(),
|
||||
path: vec![root_node_id.clone()],
|
||||
depth: payload.depth,
|
||||
}),
|
||||
filters: KernelProjectionFilter {
|
||||
node_types: payload.node_types.clone().unwrap_or_default(),
|
||||
edge_types: payload.edge_types.clone().unwrap_or_default(),
|
||||
include_deleted: false,
|
||||
},
|
||||
include_content: payload.include_content.unwrap_or(false),
|
||||
include_edges: payload.include_edges.unwrap_or(true),
|
||||
},
|
||||
};
|
||||
let request = build_query_request(&context, &query)?;
|
||||
Ok(RuntimeExecutionPlan::Query(RuntimeQueryExecutionPlan {
|
||||
query_name: query.name,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
payload_json: request.payload_json,
|
||||
args_json: json!({
|
||||
"projection": payload.projection,
|
||||
"workspaceId": payload.workspace_id,
|
||||
"rootNodeId": payload.root_node_id,
|
||||
"depth": payload.depth,
|
||||
"includeContent": payload.include_content.unwrap_or(false),
|
||||
"includeEdges": payload.include_edges.unwrap_or(true),
|
||||
"nodeTypes": payload.node_types.unwrap_or_default(),
|
||||
"edgeTypes": payload.edge_types.unwrap_or_default(),
|
||||
}),
|
||||
}))
|
||||
}
|
||||
"documents.content.get" => {
|
||||
let payload: DocumentContentQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let query = QueryEnvelope {
|
||||
@@ -3021,6 +3311,292 @@ fn delete_mindmap_node_in_children(nodes: &mut Vec<MindmapTreeNode>, uid: &str)
|
||||
false
|
||||
}
|
||||
|
||||
fn record_field<'a>(value: &'a Value, key: &str) -> Option<&'a Value> {
|
||||
value.as_object().and_then(|map| map.get(key))
|
||||
}
|
||||
|
||||
fn string_field(value: &Value, key: &str) -> Option<String> {
|
||||
record_field(value, key)
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.filter(|value| !value.is_empty())
|
||||
.map(ToOwned::to_owned)
|
||||
}
|
||||
|
||||
fn bool_field(value: &Value, key: &str) -> Option<bool> {
|
||||
record_field(value, key).and_then(Value::as_bool)
|
||||
}
|
||||
|
||||
fn normalize_kernel_node_from_record(
|
||||
value: &Value,
|
||||
workspace_id: Option<&str>,
|
||||
) -> Result<KernelNode, BridgeError> {
|
||||
let id = string_field(value, "id")
|
||||
.or_else(|| string_field(value, "documentId"))
|
||||
.ok_or_else(|| BridgeError::validation("kernel node 缺少 id"))?;
|
||||
let title = string_field(value, "title").or_else(|| string_field(value, "text"));
|
||||
let parent_id = string_field(value, "parent_id")
|
||||
.or_else(|| string_field(value, "parentId"))
|
||||
.or_else(|| string_field(value, "document_id"));
|
||||
let updated_at = string_field(value, "updated_at").or_else(|| string_field(value, "updatedAt"));
|
||||
let created_at = string_field(value, "created_at").or_else(|| string_field(value, "createdAt"));
|
||||
let access_scope = string_field(value, "access_scope").or_else(|| string_field(value, "accessScope"));
|
||||
let is_mindmap = string_field(value, "asset_type")
|
||||
.map(|asset_type| asset_type == "mindmap")
|
||||
.unwrap_or(false);
|
||||
|
||||
let node_type = if is_mindmap {
|
||||
KernelNodeType::Mindmap
|
||||
} else if bool_field(value, "is_template").unwrap_or(false) {
|
||||
KernelNodeType::Page
|
||||
} else if value.get("content").is_some() || value.get("rawText").is_some() {
|
||||
KernelNodeType::ContentNode
|
||||
} else {
|
||||
KernelNodeType::Page
|
||||
};
|
||||
|
||||
let mut extra = BTreeMap::new();
|
||||
if let Some(access_scope) = access_scope {
|
||||
extra.insert("accessScope".into(), json!(access_scope));
|
||||
}
|
||||
if let Some(is_starred) = bool_field(value, "is_starred").or_else(|| bool_field(value, "isStarred")) {
|
||||
extra.insert("isStarred".into(), json!(is_starred));
|
||||
}
|
||||
|
||||
let content = value
|
||||
.get("content")
|
||||
.cloned()
|
||||
.or_else(|| value.get("rawText").cloned())
|
||||
.map(|body| KernelContentPayload {
|
||||
format: if body.is_string() { "text".into() } else { "json".into() },
|
||||
body,
|
||||
});
|
||||
|
||||
Ok(KernelNode {
|
||||
id: id.clone(),
|
||||
node_type,
|
||||
workspace_id: workspace_id.map(ToOwned::to_owned).or_else(|| string_field(value, "workspace_id")).or_else(|| string_field(value, "workspaceId")),
|
||||
parent_id,
|
||||
subtree: Some(KernelSubtreeRef {
|
||||
root_node_id: id.clone(),
|
||||
path: vec![id.clone()],
|
||||
depth: Some(0),
|
||||
}),
|
||||
metadata: KernelNodeMetadata {
|
||||
title,
|
||||
icon: None,
|
||||
tags: Vec::new(),
|
||||
created_at,
|
||||
updated_at,
|
||||
extra,
|
||||
},
|
||||
content,
|
||||
refs: None,
|
||||
audit: KernelAuditStamp::default(),
|
||||
})
|
||||
}
|
||||
|
||||
fn build_sidebar_kernel_nodes(
|
||||
data: &Value,
|
||||
workspace_id: Option<&str>,
|
||||
) -> Result<Vec<KernelNode>, BridgeError> {
|
||||
let documents = data
|
||||
.get("documents")
|
||||
.and_then(Value::as_array)
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
documents
|
||||
.iter()
|
||||
.map(|item| normalize_kernel_node_from_record(item, workspace_id))
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
}
|
||||
|
||||
fn build_sidebar_kernel_edges(nodes: &[KernelNode]) -> Vec<KernelEdge> {
|
||||
nodes.iter()
|
||||
.filter_map(|node| {
|
||||
node.parent_id.as_ref().map(|parent_id| KernelEdge {
|
||||
id: format!("edge_parent_of_{}_{}", parent_id, node.id),
|
||||
edge_type: KernelEdgeType::ParentOf,
|
||||
workspace_id: node.workspace_id.clone(),
|
||||
from_node_id: parent_id.clone(),
|
||||
to_node_id: node.id.clone(),
|
||||
metadata: BTreeMap::new(),
|
||||
audit: KernelAuditStamp::default(),
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn build_kernel_subtree_result(
|
||||
data: &Value,
|
||||
root_node_id: &str,
|
||||
workspace_id: Option<&str>,
|
||||
depth: Option<u32>,
|
||||
) -> Result<KernelSubtreeResult, BridgeError> {
|
||||
let mut all_nodes = build_sidebar_kernel_nodes(data, workspace_id)?;
|
||||
let max_depth = depth.unwrap_or(u32::MAX);
|
||||
let mut by_parent = BTreeMap::<Option<String>, Vec<String>>::new();
|
||||
for node in &all_nodes {
|
||||
by_parent
|
||||
.entry(node.parent_id.clone())
|
||||
.or_default()
|
||||
.push(node.id.clone());
|
||||
}
|
||||
let mut queue = VecDeque::from([(root_node_id.to_string(), 0u32)]);
|
||||
let mut visited = BTreeMap::<String, u32>::new();
|
||||
while let Some((node_id, current_depth)) = queue.pop_front() {
|
||||
if visited.contains_key(&node_id) || current_depth > max_depth {
|
||||
continue;
|
||||
}
|
||||
visited.insert(node_id.clone(), current_depth);
|
||||
if let Some(children) = by_parent.get(&Some(node_id.clone())) {
|
||||
for child in children {
|
||||
queue.push_back((child.clone(), current_depth + 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
let nodes = all_nodes
|
||||
.iter_mut()
|
||||
.filter_map(|node| {
|
||||
visited.get(&node.id).copied().map(|node_depth| {
|
||||
node.subtree = Some(KernelSubtreeRef {
|
||||
root_node_id: root_node_id.to_string(),
|
||||
path: vec![root_node_id.to_string(), node.id.clone()],
|
||||
depth: Some(node_depth),
|
||||
});
|
||||
node.clone()
|
||||
})
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
let edges = build_sidebar_kernel_edges(&nodes);
|
||||
Ok(KernelSubtreeResult {
|
||||
root_node_id: root_node_id.to_string(),
|
||||
nodes,
|
||||
edges,
|
||||
})
|
||||
}
|
||||
|
||||
fn build_kernel_edge_list_result(
|
||||
data: &Value,
|
||||
node_id: &str,
|
||||
workspace_id: Option<&str>,
|
||||
) -> Result<KernelEdgeListResult, BridgeError> {
|
||||
let nodes = build_sidebar_kernel_nodes(data, workspace_id)?;
|
||||
let edges = build_sidebar_kernel_edges(&nodes)
|
||||
.into_iter()
|
||||
.filter(|edge| edge.from_node_id == node_id || edge.to_node_id == node_id)
|
||||
.collect::<Vec<_>>();
|
||||
Ok(KernelEdgeListResult {
|
||||
node_id: node_id.to_string(),
|
||||
edges,
|
||||
})
|
||||
}
|
||||
|
||||
fn build_kernel_graph_traversal_result(
|
||||
data: &Value,
|
||||
start_node_id: &str,
|
||||
workspace_id: Option<&str>,
|
||||
max_depth: u32,
|
||||
) -> Result<KernelGraphTraversalResult, BridgeError> {
|
||||
let subtree = build_kernel_subtree_result(data, start_node_id, workspace_id, Some(max_depth))?;
|
||||
let mut visits = Vec::new();
|
||||
let mut queue = VecDeque::from([(start_node_id.to_string(), 0u32)]);
|
||||
let parent_map = subtree
|
||||
.nodes
|
||||
.iter()
|
||||
.map(|node| (node.id.clone(), node.parent_id.clone()))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
let mut seen = BTreeMap::<String, bool>::new();
|
||||
while let Some((node_id, depth)) = queue.pop_front() {
|
||||
if seen.insert(node_id.clone(), true).is_some() || depth > max_depth {
|
||||
continue;
|
||||
}
|
||||
visits.push(KernelGraphVisit { node_id: node_id.clone(), depth });
|
||||
for (candidate_id, parent_id) in &parent_map {
|
||||
if parent_id.as_deref() == Some(node_id.as_str()) {
|
||||
queue.push_back((candidate_id.clone(), depth + 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(KernelGraphTraversalResult {
|
||||
start_node_id: start_node_id.to_string(),
|
||||
visited: visits,
|
||||
edges: subtree.edges,
|
||||
})
|
||||
}
|
||||
|
||||
fn build_kernel_projection_result(
|
||||
data: &Value,
|
||||
projection: KernelProjectionKind,
|
||||
root_node_id: Option<&str>,
|
||||
workspace_id: Option<&str>,
|
||||
depth: Option<u32>,
|
||||
) -> Result<KernelProjectionResult, BridgeError> {
|
||||
let subtree = if let Some(root_node_id) = root_node_id {
|
||||
build_kernel_subtree_result(data, root_node_id, workspace_id, depth)?
|
||||
} else {
|
||||
let mut nodes = build_sidebar_kernel_nodes(data, workspace_id)?;
|
||||
for node in &mut nodes {
|
||||
node.subtree = Some(KernelSubtreeRef {
|
||||
root_node_id: node.id.clone(),
|
||||
path: vec![node.id.clone()],
|
||||
depth: Some(0),
|
||||
});
|
||||
}
|
||||
let edges = build_sidebar_kernel_edges(&nodes);
|
||||
KernelSubtreeResult {
|
||||
root_node_id: "workspace_root".into(),
|
||||
nodes,
|
||||
edges,
|
||||
}
|
||||
};
|
||||
let items = subtree
|
||||
.nodes
|
||||
.iter()
|
||||
.map(|node| KernelProjectionItem {
|
||||
node_id: node.id.clone(),
|
||||
parent_node_id: node.parent_id.clone(),
|
||||
node_type: node.node_type.clone(),
|
||||
title: node.metadata.title.clone(),
|
||||
depth: node
|
||||
.subtree
|
||||
.as_ref()
|
||||
.and_then(|subtree| subtree.depth)
|
||||
.unwrap_or(0),
|
||||
position: node
|
||||
.metadata
|
||||
.extra
|
||||
.get("sortOrder")
|
||||
.and_then(Value::as_i64),
|
||||
child_count: subtree
|
||||
.edges
|
||||
.iter()
|
||||
.filter(|edge| edge.from_node_id == node.id && edge.edge_type == KernelEdgeType::ParentOf)
|
||||
.count() as u32,
|
||||
expanded_by_default: true,
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
Ok(KernelProjectionResult {
|
||||
projection_id: format!(
|
||||
"kernel_projection:{}:{}",
|
||||
match projection {
|
||||
KernelProjectionKind::SidebarTree => "sidebar_tree",
|
||||
KernelProjectionKind::PageTree => "page_tree",
|
||||
KernelProjectionKind::FileTree => "file_tree",
|
||||
KernelProjectionKind::Mindmap => "mindmap",
|
||||
KernelProjectionKind::ReadView => "read_view",
|
||||
KernelProjectionKind::SearchResults => "search_results",
|
||||
KernelProjectionKind::RagIndex => "rag_index",
|
||||
},
|
||||
root_node_id.unwrap_or("root")
|
||||
),
|
||||
projection,
|
||||
root_node_id: root_node_id.map(ToOwned::to_owned),
|
||||
items,
|
||||
edges: subtree.edges,
|
||||
})
|
||||
}
|
||||
|
||||
fn find_mindmap_node_mut<'a>(
|
||||
node: &'a mut MindmapTreeNode,
|
||||
uid: &str,
|
||||
@@ -3042,6 +3618,78 @@ fn execute_query_result(
|
||||
data: Value,
|
||||
) -> Result<Value, BridgeError> {
|
||||
match query_wire.name.as_str() {
|
||||
"kernel.node.get" => {
|
||||
let payload: KernelGetNodeQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let node = normalize_kernel_node_from_record(&data, payload.workspace_id.as_deref())?;
|
||||
serde_json::to_value(node).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.node.get result 序列化失败: {error}"))
|
||||
})
|
||||
}
|
||||
"kernel.subtree.get" => {
|
||||
let payload: KernelGetSubtreeQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let result = build_kernel_subtree_result(
|
||||
&data,
|
||||
&payload.root_node_id,
|
||||
payload.workspace_id.as_deref(),
|
||||
payload.depth,
|
||||
)?;
|
||||
serde_json::to_value(result).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.subtree.get result 序列化失败: {error}"))
|
||||
})
|
||||
}
|
||||
"kernel.children.list" => {
|
||||
let payload: KernelListChildrenQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let subtree = build_kernel_subtree_result(
|
||||
&data,
|
||||
&payload.parent_node_id,
|
||||
payload.workspace_id.as_deref(),
|
||||
Some(1),
|
||||
)?;
|
||||
let nodes = subtree
|
||||
.nodes
|
||||
.into_iter()
|
||||
.filter(|node| node.parent_id.as_deref() == Some(payload.parent_node_id.as_str()))
|
||||
.collect::<Vec<KernelNode>>();
|
||||
serde_json::to_value(nodes).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.children.list result 序列化失败: {error}"))
|
||||
})
|
||||
}
|
||||
"kernel.edges.list" => {
|
||||
let payload: KernelListEdgesQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let result = build_kernel_edge_list_result(
|
||||
&data,
|
||||
&payload.node_id,
|
||||
payload.workspace_id.as_deref(),
|
||||
)?;
|
||||
serde_json::to_value(result).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.edges.list result 序列化失败: {error}"))
|
||||
})
|
||||
}
|
||||
"kernel.graph.traverse" => {
|
||||
let payload: KernelTraverseGraphQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let result = build_kernel_graph_traversal_result(
|
||||
&data,
|
||||
&payload.start_node_id,
|
||||
payload.workspace_id.as_deref(),
|
||||
payload.max_depth.unwrap_or(2),
|
||||
)?;
|
||||
serde_json::to_value(result).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.graph.traverse result 序列化失败: {error}"))
|
||||
})
|
||||
}
|
||||
"kernel.project_view" => {
|
||||
let payload: KernelProjectViewQueryPayload = parse_payload(query_wire.payload)?;
|
||||
let result = build_kernel_projection_result(
|
||||
&data,
|
||||
payload.projection,
|
||||
payload.root_node_id.as_deref(),
|
||||
payload.workspace_id.as_deref(),
|
||||
payload.depth,
|
||||
)?;
|
||||
serde_json::to_value(result).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.project_view result 序列化失败: {error}"))
|
||||
})
|
||||
}
|
||||
"mindmaps.get" => {
|
||||
let tree = normalize_mindmap_from_value(&data)?;
|
||||
serde_json::to_value(tree).map_err(|error| {
|
||||
@@ -3118,6 +3766,181 @@ fn execute_command(
|
||||
) -> Result<RuntimeExecutionPlan, BridgeError> {
|
||||
let context = to_bridge_context(context_wire);
|
||||
match command_wire.name.as_str() {
|
||||
"kernel.node.create" => {
|
||||
let payload: KernelCreateNodeCommandPayload = parse_payload(command_wire.payload.clone())?;
|
||||
let command = CommandEnvelope {
|
||||
name: "kernel.node.create".into(),
|
||||
command_id: command_wire.command_id.clone(),
|
||||
idempotency_key: command_wire.idempotency_key.clone(),
|
||||
actor: to_actor_payload(&command_wire.actor),
|
||||
source: to_source_payload(&command_wire.source),
|
||||
target: to_target_ref(command_wire.target.as_ref()),
|
||||
payload: KernelCreateNode {
|
||||
node: payload.node.clone(),
|
||||
position: payload.position,
|
||||
},
|
||||
reason: command_wire.reason,
|
||||
refs: command_wire.refs,
|
||||
dry_run: command_wire.dry_run,
|
||||
validate_only: command_wire.validate_only,
|
||||
};
|
||||
let request = build_write_request(&context, &command)?;
|
||||
Ok(RuntimeExecutionPlan::Command(RuntimeCommandExecutionPlan {
|
||||
command_name: command.name,
|
||||
command_id: command.command_id,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
idempotency_key: request.idempotency_key,
|
||||
payload_json: request.payload_json,
|
||||
args_json: serde_json::to_value(&payload).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.node.create 参数序列化失败: {error}"))
|
||||
})?,
|
||||
}))
|
||||
}
|
||||
"kernel.node.update" => {
|
||||
let payload: KernelUpdateNodeCommandPayload = parse_payload(command_wire.payload.clone())?;
|
||||
let command = CommandEnvelope {
|
||||
name: "kernel.node.update".into(),
|
||||
command_id: command_wire.command_id.clone(),
|
||||
idempotency_key: command_wire.idempotency_key.clone(),
|
||||
actor: to_actor_payload(&command_wire.actor),
|
||||
source: to_source_payload(&command_wire.source),
|
||||
target: to_target_ref(command_wire.target.as_ref()),
|
||||
payload: KernelUpdateNode {
|
||||
node_id: payload.node_id.clone(),
|
||||
metadata: payload.metadata.clone(),
|
||||
content: payload.content.clone(),
|
||||
refs: payload.refs.clone(),
|
||||
audit: payload.audit.clone(),
|
||||
},
|
||||
reason: command_wire.reason,
|
||||
refs: command_wire.refs,
|
||||
dry_run: command_wire.dry_run,
|
||||
validate_only: command_wire.validate_only,
|
||||
};
|
||||
let request = build_write_request(&context, &command)?;
|
||||
Ok(RuntimeExecutionPlan::Command(RuntimeCommandExecutionPlan {
|
||||
command_name: command.name,
|
||||
command_id: command.command_id,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
idempotency_key: request.idempotency_key,
|
||||
payload_json: request.payload_json,
|
||||
args_json: serde_json::to_value(&payload).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.node.update 参数序列化失败: {error}"))
|
||||
})?,
|
||||
}))
|
||||
}
|
||||
"kernel.subtree.move" => {
|
||||
let payload: KernelMoveSubtreeCommandPayload = parse_payload(command_wire.payload.clone())?;
|
||||
let command = CommandEnvelope {
|
||||
name: "kernel.subtree.move".into(),
|
||||
command_id: command_wire.command_id.clone(),
|
||||
idempotency_key: command_wire.idempotency_key.clone(),
|
||||
actor: to_actor_payload(&command_wire.actor),
|
||||
source: to_source_payload(&command_wire.source),
|
||||
target: to_target_ref(command_wire.target.as_ref()),
|
||||
payload: KernelMoveSubtree {
|
||||
subtree: payload.subtree.clone(),
|
||||
new_parent_node_id: payload.new_parent_node_id.clone(),
|
||||
sort_order: payload.sort_order,
|
||||
},
|
||||
reason: command_wire.reason,
|
||||
refs: command_wire.refs,
|
||||
dry_run: command_wire.dry_run,
|
||||
validate_only: command_wire.validate_only,
|
||||
};
|
||||
let request = build_write_request(&context, &command)?;
|
||||
Ok(RuntimeExecutionPlan::Command(RuntimeCommandExecutionPlan {
|
||||
command_name: command.name,
|
||||
command_id: command.command_id,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
idempotency_key: request.idempotency_key,
|
||||
payload_json: request.payload_json,
|
||||
args_json: serde_json::to_value(&payload).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.subtree.move 参数序列化失败: {error}"))
|
||||
})?,
|
||||
}))
|
||||
}
|
||||
"kernel.edge.attach" => {
|
||||
let payload: KernelAttachEdgeCommandPayload = parse_payload(command_wire.payload.clone())?;
|
||||
let command = CommandEnvelope {
|
||||
name: "kernel.edge.attach".into(),
|
||||
command_id: command_wire.command_id.clone(),
|
||||
idempotency_key: command_wire.idempotency_key.clone(),
|
||||
actor: to_actor_payload(&command_wire.actor),
|
||||
source: to_source_payload(&command_wire.source),
|
||||
target: to_target_ref(command_wire.target.as_ref()),
|
||||
payload: KernelAttachEdge {
|
||||
edge: payload.edge.clone(),
|
||||
},
|
||||
reason: command_wire.reason,
|
||||
refs: command_wire.refs,
|
||||
dry_run: command_wire.dry_run,
|
||||
validate_only: command_wire.validate_only,
|
||||
};
|
||||
let request = build_write_request(&context, &command)?;
|
||||
Ok(RuntimeExecutionPlan::Command(RuntimeCommandExecutionPlan {
|
||||
command_name: command.name,
|
||||
command_id: command.command_id,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
idempotency_key: request.idempotency_key,
|
||||
payload_json: request.payload_json,
|
||||
args_json: serde_json::to_value(&payload).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.edge.attach 参数序列化失败: {error}"))
|
||||
})?,
|
||||
}))
|
||||
}
|
||||
"kernel.edge.detach" => {
|
||||
let payload: KernelDetachEdgeCommandPayload = parse_payload(command_wire.payload.clone())?;
|
||||
let command = CommandEnvelope {
|
||||
name: "kernel.edge.detach".into(),
|
||||
command_id: command_wire.command_id.clone(),
|
||||
idempotency_key: command_wire.idempotency_key.clone(),
|
||||
actor: to_actor_payload(&command_wire.actor),
|
||||
source: to_source_payload(&command_wire.source),
|
||||
target: to_target_ref(command_wire.target.as_ref()),
|
||||
payload: KernelDetachEdge {
|
||||
edge_id: payload.edge_id.clone(),
|
||||
from_node_id: payload.from_node_id.clone(),
|
||||
to_node_id: payload.to_node_id.clone(),
|
||||
edge_type: payload.edge_type.clone(),
|
||||
},
|
||||
reason: command_wire.reason,
|
||||
refs: command_wire.refs,
|
||||
dry_run: command_wire.dry_run,
|
||||
validate_only: command_wire.validate_only,
|
||||
};
|
||||
let request = build_write_request(&context, &command)?;
|
||||
Ok(RuntimeExecutionPlan::Command(RuntimeCommandExecutionPlan {
|
||||
command_name: command.name,
|
||||
command_id: command.command_id,
|
||||
function_name: request.function_name,
|
||||
workspace_id: request.workspace_id,
|
||||
request_id: request.request_id,
|
||||
trace_id: request.trace_id,
|
||||
actor_id: request.actor_id,
|
||||
idempotency_key: request.idempotency_key,
|
||||
payload_json: request.payload_json,
|
||||
args_json: serde_json::to_value(&payload).map_err(|error| {
|
||||
BridgeError::transport(format!("kernel.edge.detach 参数序列化失败: {error}"))
|
||||
})?,
|
||||
}))
|
||||
}
|
||||
"blocks.patch" => {
|
||||
let payload: BlockPatchCommandPayload = parse_payload(command_wire.payload.clone())?;
|
||||
let command = CommandEnvelope {
|
||||
@@ -4842,6 +5665,104 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn kernel_project_view_query_executes_into_sidebar_projection() {
|
||||
let result = execute_runtime_query(RuntimeInput::Query {
|
||||
context: demo_context(),
|
||||
query: RuntimeQueryEnvelopeWire {
|
||||
name: "kernel.project_view".into(),
|
||||
payload: json!({
|
||||
"projection": "sidebar_tree",
|
||||
"workspaceId": "ws_1",
|
||||
"rootNodeId": "page_root",
|
||||
"depth": 2,
|
||||
"includeEdges": true,
|
||||
"nodeTypes": ["page"],
|
||||
}),
|
||||
},
|
||||
data: Some(json!({
|
||||
"documents": [
|
||||
{
|
||||
"id": "page_root",
|
||||
"workspace_id": "ws_1",
|
||||
"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_1",
|
||||
"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"
|
||||
}
|
||||
]
|
||||
})),
|
||||
})
|
||||
.expect("kernel projection result should build");
|
||||
|
||||
assert_eq!(result["projection"], json!("sidebar_tree"));
|
||||
assert_eq!(result["rootNodeId"], json!("page_root"));
|
||||
assert_eq!(result["items"][0]["nodeId"], json!("page_root"));
|
||||
assert_eq!(result["items"][1]["parentNodeId"], json!("page_root"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn kernel_subtree_query_executes_into_unified_subtree() {
|
||||
let result = execute_runtime_query(RuntimeInput::Query {
|
||||
context: demo_context(),
|
||||
query: RuntimeQueryEnvelopeWire {
|
||||
name: "kernel.subtree.get".into(),
|
||||
payload: json!({
|
||||
"workspaceId": "ws_1",
|
||||
"rootNodeId": "page_root",
|
||||
"depth": 2,
|
||||
"includeEdges": true,
|
||||
"nodeTypes": ["page"],
|
||||
}),
|
||||
},
|
||||
data: Some(json!({
|
||||
"documents": [
|
||||
{
|
||||
"id": "page_root",
|
||||
"workspace_id": "ws_1",
|
||||
"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_1",
|
||||
"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"
|
||||
}
|
||||
]
|
||||
})),
|
||||
})
|
||||
.expect("kernel subtree result should build");
|
||||
|
||||
assert_eq!(result["rootNodeId"], json!("page_root"));
|
||||
assert_eq!(result["nodes"].as_array().map(Vec::len), Some(2));
|
||||
assert_eq!(result["edges"].as_array().map(Vec::len), Some(1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn index_rebuild_tool_executes_in_rust_runtime() {
|
||||
let result = execute_runtime_query(RuntimeInput::Tool {
|
||||
|
||||
@@ -0,0 +1,397 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum KernelNodeType {
|
||||
Workspace,
|
||||
Folder,
|
||||
Page,
|
||||
Section,
|
||||
Asset,
|
||||
Book,
|
||||
Pdf,
|
||||
Mindmap,
|
||||
MindmapNode,
|
||||
Summary,
|
||||
AiNote,
|
||||
ReferenceAnchor,
|
||||
ContentNode,
|
||||
IndexNode,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum KernelEdgeType {
|
||||
ParentOf,
|
||||
ChildOf,
|
||||
Contains,
|
||||
References,
|
||||
BacklinksTo,
|
||||
SourceOf,
|
||||
DerivedFrom,
|
||||
Summarizes,
|
||||
Indexes,
|
||||
PointsTo,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum KernelProjectionKind {
|
||||
SidebarTree,
|
||||
PageTree,
|
||||
FileTree,
|
||||
Mindmap,
|
||||
ReadView,
|
||||
SearchResults,
|
||||
RagIndex,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum KernelGraphDirection {
|
||||
Outgoing,
|
||||
Incoming,
|
||||
Both,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelSubtreeRef {
|
||||
pub root_node_id: String,
|
||||
#[serde(default)]
|
||||
pub path: Vec<String>,
|
||||
pub depth: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelNodeMetadata {
|
||||
pub title: Option<String>,
|
||||
pub icon: Option<String>,
|
||||
#[serde(default)]
|
||||
pub tags: Vec<String>,
|
||||
pub created_at: Option<String>,
|
||||
pub updated_at: Option<String>,
|
||||
#[serde(default)]
|
||||
pub extra: BTreeMap<String, Value>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelContentPayload {
|
||||
pub format: String,
|
||||
pub body: Value,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelRefsPayload {
|
||||
#[serde(default)]
|
||||
pub reference_node_ids: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub evidence_node_ids: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub source_node_ids: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub extra: BTreeMap<String, Value>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelAuditStamp {
|
||||
pub version: u64,
|
||||
pub revision: Option<u64>,
|
||||
pub request_id: Option<String>,
|
||||
pub trace_id: Option<String>,
|
||||
pub actor_id: Option<String>,
|
||||
}
|
||||
|
||||
impl Default for KernelAuditStamp {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
version: 1,
|
||||
revision: None,
|
||||
request_id: None,
|
||||
trace_id: None,
|
||||
actor_id: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelNode {
|
||||
pub id: String,
|
||||
pub node_type: KernelNodeType,
|
||||
pub workspace_id: Option<String>,
|
||||
pub parent_id: Option<String>,
|
||||
pub subtree: Option<KernelSubtreeRef>,
|
||||
pub metadata: KernelNodeMetadata,
|
||||
pub content: Option<KernelContentPayload>,
|
||||
pub refs: Option<KernelRefsPayload>,
|
||||
#[serde(default)]
|
||||
pub audit: KernelAuditStamp,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelEdge {
|
||||
pub id: String,
|
||||
pub edge_type: KernelEdgeType,
|
||||
pub workspace_id: Option<String>,
|
||||
pub from_node_id: String,
|
||||
pub to_node_id: String,
|
||||
#[serde(default)]
|
||||
pub metadata: BTreeMap<String, Value>,
|
||||
#[serde(default)]
|
||||
pub audit: KernelAuditStamp,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelProjectionFilter {
|
||||
#[serde(default)]
|
||||
pub node_types: Vec<KernelNodeType>,
|
||||
#[serde(default)]
|
||||
pub edge_types: Vec<KernelEdgeType>,
|
||||
#[serde(default)]
|
||||
pub include_deleted: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelGetNode {
|
||||
pub node_id: String,
|
||||
pub workspace_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelGetSubtree {
|
||||
pub subtree: KernelSubtreeRef,
|
||||
pub workspace_id: Option<String>,
|
||||
#[serde(default)]
|
||||
pub include_edges: bool,
|
||||
#[serde(default)]
|
||||
pub filters: KernelProjectionFilter,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelListChildren {
|
||||
pub parent_node_id: String,
|
||||
pub workspace_id: Option<String>,
|
||||
#[serde(default)]
|
||||
pub node_types: Vec<KernelNodeType>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelListEdges {
|
||||
pub node_id: String,
|
||||
pub workspace_id: Option<String>,
|
||||
#[serde(default)]
|
||||
pub edge_types: Vec<KernelEdgeType>,
|
||||
pub direction: Option<KernelGraphDirection>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelTraverseGraph {
|
||||
pub start_node_id: String,
|
||||
pub workspace_id: Option<String>,
|
||||
#[serde(default)]
|
||||
pub edge_types: Vec<KernelEdgeType>,
|
||||
pub max_depth: u32,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelProjectionRequest {
|
||||
pub projection: KernelProjectionKind,
|
||||
pub workspace_id: Option<String>,
|
||||
pub root_node_id: Option<String>,
|
||||
pub subtree: Option<KernelSubtreeRef>,
|
||||
#[serde(default)]
|
||||
pub filters: KernelProjectionFilter,
|
||||
#[serde(default)]
|
||||
pub include_content: bool,
|
||||
#[serde(default)]
|
||||
pub include_edges: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelSubtreeResult {
|
||||
pub root_node_id: String,
|
||||
pub nodes: Vec<KernelNode>,
|
||||
pub edges: Vec<KernelEdge>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelEdgeListResult {
|
||||
pub node_id: String,
|
||||
pub edges: Vec<KernelEdge>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelGraphVisit {
|
||||
pub node_id: String,
|
||||
pub depth: u32,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelGraphTraversalResult {
|
||||
pub start_node_id: String,
|
||||
pub visited: Vec<KernelGraphVisit>,
|
||||
pub edges: Vec<KernelEdge>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelProjectionItem {
|
||||
pub node_id: String,
|
||||
pub parent_node_id: Option<String>,
|
||||
pub node_type: KernelNodeType,
|
||||
pub title: Option<String>,
|
||||
pub depth: u32,
|
||||
pub position: Option<i64>,
|
||||
pub child_count: u32,
|
||||
pub expanded_by_default: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelProjectionResult {
|
||||
pub projection_id: String,
|
||||
pub projection: KernelProjectionKind,
|
||||
pub root_node_id: Option<String>,
|
||||
pub items: Vec<KernelProjectionItem>,
|
||||
pub edges: Vec<KernelEdge>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelCreateNode {
|
||||
pub node: KernelNode,
|
||||
pub position: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelUpdateNode {
|
||||
pub node_id: String,
|
||||
pub metadata: Option<KernelNodeMetadata>,
|
||||
pub content: Option<KernelContentPayload>,
|
||||
pub refs: Option<KernelRefsPayload>,
|
||||
pub audit: Option<KernelAuditStamp>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelMoveSubtree {
|
||||
pub subtree: KernelSubtreeRef,
|
||||
pub new_parent_node_id: Option<String>,
|
||||
pub sort_order: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelAttachEdge {
|
||||
pub edge: KernelEdge,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct KernelDetachEdge {
|
||||
pub edge_id: Option<String>,
|
||||
pub from_node_id: Option<String>,
|
||||
pub to_node_id: Option<String>,
|
||||
pub edge_type: Option<KernelEdgeType>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
|
||||
#[test]
|
||||
fn kernel_projection_request_roundtrip_keeps_subtree_and_filters() {
|
||||
let request = KernelProjectionRequest {
|
||||
projection: KernelProjectionKind::SidebarTree,
|
||||
workspace_id: Some("ws_1".into()),
|
||||
root_node_id: Some("page_root".into()),
|
||||
subtree: Some(KernelSubtreeRef {
|
||||
root_node_id: "page_root".into(),
|
||||
path: vec!["page_root".into(), "page_child".into()],
|
||||
depth: Some(2),
|
||||
}),
|
||||
filters: KernelProjectionFilter {
|
||||
node_types: vec![KernelNodeType::Page, KernelNodeType::Folder],
|
||||
edge_types: vec![KernelEdgeType::ParentOf],
|
||||
include_deleted: false,
|
||||
},
|
||||
include_content: false,
|
||||
include_edges: true,
|
||||
};
|
||||
|
||||
let value = serde_json::to_value(&request).expect("request 应可序列化");
|
||||
assert_eq!(value["projection"], json!("sidebar_tree"));
|
||||
assert_eq!(value["subtree"]["rootNodeId"], json!("page_root"));
|
||||
|
||||
let decoded: KernelProjectionRequest =
|
||||
serde_json::from_value(value).expect("request 应可反序列化");
|
||||
assert_eq!(decoded, request);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn kernel_node_serializes_content_refs_and_audit_boundaries() {
|
||||
let node = KernelNode {
|
||||
id: "node_1".into(),
|
||||
node_type: KernelNodeType::Summary,
|
||||
workspace_id: Some("ws_1".into()),
|
||||
parent_id: Some("page_1".into()),
|
||||
subtree: Some(KernelSubtreeRef {
|
||||
root_node_id: "page_1".into(),
|
||||
path: vec!["page_1".into(), "node_1".into()],
|
||||
depth: Some(1),
|
||||
}),
|
||||
metadata: KernelNodeMetadata {
|
||||
title: Some("摘要节点".into()),
|
||||
icon: None,
|
||||
tags: vec!["summary".into()],
|
||||
created_at: Some("2026-04-16T00:00:00Z".into()),
|
||||
updated_at: Some("2026-04-16T00:00:00Z".into()),
|
||||
extra: BTreeMap::new(),
|
||||
},
|
||||
content: Some(KernelContentPayload {
|
||||
format: "markdown".into(),
|
||||
body: json!({"text": "摘要正文"}),
|
||||
}),
|
||||
refs: Some(KernelRefsPayload {
|
||||
reference_node_ids: vec!["page_1".into()],
|
||||
evidence_node_ids: vec!["asset_1".into()],
|
||||
source_node_ids: vec!["pdf_1".into()],
|
||||
extra: BTreeMap::new(),
|
||||
}),
|
||||
audit: KernelAuditStamp {
|
||||
version: 3,
|
||||
revision: Some(9),
|
||||
request_id: Some("req_1".into()),
|
||||
trace_id: Some("trace_1".into()),
|
||||
actor_id: Some("user_1".into()),
|
||||
},
|
||||
};
|
||||
|
||||
let value = serde_json::to_value(&node).expect("node 应可序列化");
|
||||
assert_eq!(value["nodeType"], json!("summary"));
|
||||
assert_eq!(value["content"]["format"], json!("markdown"));
|
||||
assert_eq!(value["refs"]["referenceNodeIds"], json!(["page_1"]));
|
||||
assert_eq!(value["audit"]["traceId"], json!("trace_1"));
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
pub mod command;
|
||||
pub mod common;
|
||||
pub mod governance;
|
||||
pub mod kernel;
|
||||
pub mod mindmap;
|
||||
pub mod query;
|
||||
pub mod tool;
|
||||
@@ -16,6 +17,15 @@ pub use common::{
|
||||
ActorPayload, AffectedObject, ErrorDetail, ErrorPayload, OkPayload, RequestMeta, ResponseMeta,
|
||||
SourcePayload, TargetRef,
|
||||
};
|
||||
pub use kernel::{
|
||||
KernelAttachEdge, KernelAuditStamp, KernelContentPayload, KernelCreateNode,
|
||||
KernelDetachEdge, KernelEdge, KernelEdgeListResult, KernelEdgeType, KernelGetNode,
|
||||
KernelGetSubtree, KernelGraphDirection, KernelGraphTraversalResult, KernelGraphVisit,
|
||||
KernelListChildren, KernelListEdges, KernelMoveSubtree, KernelNode, KernelNodeMetadata,
|
||||
KernelNodeType, KernelProjectionFilter, KernelProjectionItem, KernelProjectionKind,
|
||||
KernelProjectionRequest, KernelProjectionResult, KernelRefsPayload, KernelSubtreeRef,
|
||||
KernelSubtreeResult, KernelTraverseGraph, KernelUpdateNode,
|
||||
};
|
||||
pub use mindmap::{
|
||||
MindmapNodeData, MindmapNodeInput, MindmapNodeRef, MindmapOp, MindmapTreeNode,
|
||||
};
|
||||
|
||||
@@ -142,6 +142,14 @@ pub enum SearchMatchField {
|
||||
Recent,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct SearchEvidenceRecord {
|
||||
pub kind: String,
|
||||
pub node_id: Option<String>,
|
||||
pub snippet: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct RankedSearchDocument {
|
||||
@@ -154,6 +162,9 @@ pub struct RankedSearchDocument {
|
||||
pub has_ocr: bool,
|
||||
pub public_path: String,
|
||||
pub score: f64,
|
||||
pub node_id: Option<String>,
|
||||
pub subtree_root_id: Option<String>,
|
||||
pub evidence: Vec<SearchEvidenceRecord>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
@@ -554,16 +565,33 @@ pub fn evaluate_search_documents(
|
||||
.into_iter()
|
||||
.filter_map(|(document_id, matched)| {
|
||||
let document = doc_map.get(document_id.as_str())?;
|
||||
let snippet = matched.snippet.clone();
|
||||
let evidence_kind = if matched.has_ocr {
|
||||
"ocr".to_string()
|
||||
} else {
|
||||
match matched.match_field {
|
||||
SearchMatchField::Title => "title".to_string(),
|
||||
SearchMatchField::Content => "content".to_string(),
|
||||
SearchMatchField::Recent => "recent".to_string(),
|
||||
}
|
||||
};
|
||||
Some(RankedSearchDocument {
|
||||
id: document.id.clone(),
|
||||
title: normalize_title(document.title.as_deref()),
|
||||
snippet: matched.snippet,
|
||||
snippet: snippet.clone(),
|
||||
updated_at: document.updated_at.clone(),
|
||||
created_at: document.created_at.clone(),
|
||||
match_field: matched.match_field,
|
||||
has_ocr: matched.has_ocr,
|
||||
public_path: format!("/documents/{}", document.id),
|
||||
score: matched.score,
|
||||
node_id: Some(document.id.clone()),
|
||||
subtree_root_id: Some(document.id.clone()),
|
||||
evidence: vec![SearchEvidenceRecord {
|
||||
kind: evidence_kind,
|
||||
node_id: Some(document.id.clone()),
|
||||
snippet,
|
||||
}],
|
||||
})
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
@@ -1063,6 +1091,9 @@ mod tests {
|
||||
assert_eq!(result.results.len(), 1);
|
||||
assert_eq!(result.results[0].id, "page_1");
|
||||
assert!(result.results[0].snippet.contains("<mark>Rust</mark>") || result.results[0].snippet.contains("<mark>rust</mark>"));
|
||||
assert_eq!(result.results[0].node_id.as_deref(), Some("page_1"));
|
||||
assert_eq!(result.results[0].subtree_root_id.as_deref(), Some("page_1"));
|
||||
assert_eq!(result.results[0].evidence.len(), 1);
|
||||
assert_eq!(result.enqueue_asset_ids, vec!["asset_1".to_string()]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
[package]
|
||||
name = "mnote-web"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
authors.workspace = true
|
||||
|
||||
[dependencies]
|
||||
axum = { version = "0.8", features = ["ws"] }
|
||||
bridge-runtime = { path = "../bridge-runtime" }
|
||||
core-protocol = { path = "../core-protocol" }
|
||||
futures-util = "0.3"
|
||||
reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "rustls-tls"] }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
tokio = { version = "1", features = ["macros", "rt-multi-thread", "net", "signal", "sync", "time"] }
|
||||
tower-http = { version = "0.6", features = ["trace"] }
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = { version = "0.3", features = ["fmt"] }
|
||||
tower = "0.5"
|
||||
base64 = "0.22"
|
||||
@@ -0,0 +1,72 @@
|
||||
use crate::middleware::request_context::inject_request_context;
|
||||
use crate::routes::build_router;
|
||||
use axum::Router;
|
||||
use std::env;
|
||||
use std::sync::Arc;
|
||||
use tower_http::trace::TraceLayer;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct AppConfig {
|
||||
pub service_name: String,
|
||||
pub service_version: String,
|
||||
pub bind_addr: String,
|
||||
pub hermes_base_path: String,
|
||||
pub compat_next_base_path: String,
|
||||
pub convex_url: Option<String>,
|
||||
pub convex_admin_key: Option<String>,
|
||||
pub dev_user_id: String,
|
||||
pub dev_user_name: String,
|
||||
pub dev_user_email: String,
|
||||
}
|
||||
|
||||
impl AppConfig {
|
||||
pub fn from_env() -> Self {
|
||||
Self {
|
||||
service_name: env::var("MNOTE_WEB_SERVICE_NAME")
|
||||
.unwrap_or_else(|_| "mnote-web".into()),
|
||||
service_version: env::var("MNOTE_WEB_SERVICE_VERSION")
|
||||
.unwrap_or_else(|_| env!("CARGO_PKG_VERSION").into()),
|
||||
bind_addr: env::var("MNOTE_WEB_BIND")
|
||||
.unwrap_or_else(|_| "127.0.0.1:3104".into()),
|
||||
hermes_base_path: env::var("MNOTE_WEB_HERMES_BASE_PATH")
|
||||
.unwrap_or_else(|_| "/api/hermes".into()),
|
||||
compat_next_base_path: env::var("MNOTE_WEB_COMPAT_NEXT_BASE_PATH")
|
||||
.unwrap_or_else(|_| "/api/compat/next".into()),
|
||||
convex_url: env::var("CONVEX_SELF_HOSTED_URL")
|
||||
.ok()
|
||||
.or_else(|| env::var("NEXT_PUBLIC_CONVEX_URL").ok())
|
||||
.map(|value| value.trim().trim_end_matches('/').to_string())
|
||||
.filter(|value| !value.is_empty()),
|
||||
convex_admin_key: env::var("CONVEX_SELF_HOSTED_ADMIN_KEY")
|
||||
.ok()
|
||||
.map(|value| value.trim().to_string())
|
||||
.filter(|value| !value.is_empty()),
|
||||
dev_user_id: env::var("DEV_USER_ID").unwrap_or_else(|_| "dev-user".into()),
|
||||
dev_user_name: env::var("DEV_USER_NAME").unwrap_or_else(|_| "开发用户".into()),
|
||||
dev_user_email: env::var("DEV_USER_EMAIL").unwrap_or_else(|_| "dev@mnote.local".into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct AppState {
|
||||
config: Arc<AppConfig>,
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
pub fn new(config: AppConfig) -> Self {
|
||||
Self {
|
||||
config: Arc::new(config),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn config(&self) -> &AppConfig {
|
||||
self.config.as_ref()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build_app(state: AppState) -> Router {
|
||||
build_router(state)
|
||||
.layer(TraceLayer::new_for_http())
|
||||
.layer(axum::middleware::from_fn(inject_request_context))
|
||||
}
|
||||
@@ -0,0 +1,165 @@
|
||||
use axum::http::{HeaderMap, HeaderName, HeaderValue, Method, Uri};
|
||||
use serde::Serialize;
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
static REQUEST_COUNTER: AtomicU64 = AtomicU64::new(1);
|
||||
|
||||
const HEADER_REQUEST_ID: &str = "x-request-id";
|
||||
const HEADER_TRACE_ID: &str = "x-trace-id";
|
||||
const HEADER_TENANT_ID: &str = "x-mnote-tenant-id";
|
||||
const HEADER_WORKSPACE_ID: &str = "x-mnote-workspace-id";
|
||||
const HEADER_DEPLOYMENT_ID: &str = "x-mnote-deployment-id";
|
||||
const HEADER_PROJECT_ID: &str = "x-mnote-project-id";
|
||||
const HEADER_ACTOR_ID: &str = "x-mnote-actor-id";
|
||||
const HEADER_ACTOR_TYPE: &str = "x-mnote-actor-type";
|
||||
const HEADER_SESSION_ID: &str = "x-mnote-session-id";
|
||||
const HEADER_SOURCE_CHANNEL: &str = "x-mnote-source-channel";
|
||||
const HEADER_SOURCE_CLIENT: &str = "x-mnote-source-client";
|
||||
const HEADER_IDEMPOTENCY_KEY: &str = "x-idempotency-key";
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct TraceContext {
|
||||
pub request_id: String,
|
||||
pub trace_id: String,
|
||||
pub method: String,
|
||||
pub path: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct AuthContext {
|
||||
pub authorization: Option<String>,
|
||||
pub actor_id: String,
|
||||
pub actor_type: String,
|
||||
pub session_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct WorkspaceContext {
|
||||
pub workspace_id: Option<String>,
|
||||
pub tenant_id: Option<String>,
|
||||
pub deployment_id: Option<String>,
|
||||
pub project_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct SourceContext {
|
||||
pub channel: String,
|
||||
pub client: String,
|
||||
pub idempotency_key: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct RequestContext {
|
||||
pub trace: TraceContext,
|
||||
pub auth: AuthContext,
|
||||
pub workspace: WorkspaceContext,
|
||||
pub source: SourceContext,
|
||||
}
|
||||
|
||||
impl RequestContext {
|
||||
pub fn from_http_parts(method: &Method, uri: &Uri, headers: &HeaderMap) -> Self {
|
||||
let request_id = header_or_generated(headers, HEADER_REQUEST_ID, "req");
|
||||
let trace_id = header_or_generated(headers, HEADER_TRACE_ID, "trace");
|
||||
|
||||
Self {
|
||||
trace: TraceContext {
|
||||
request_id,
|
||||
trace_id,
|
||||
method: method.as_str().to_string(),
|
||||
path: uri.path().to_string(),
|
||||
},
|
||||
auth: AuthContext {
|
||||
authorization: header_value(headers, axum::http::header::AUTHORIZATION.as_str()),
|
||||
actor_id: header_value(headers, HEADER_ACTOR_ID)
|
||||
.unwrap_or_else(|| "anonymous".into()),
|
||||
actor_type: header_value(headers, HEADER_ACTOR_TYPE)
|
||||
.unwrap_or_else(|| "anonymous".into()),
|
||||
session_id: header_value(headers, HEADER_SESSION_ID),
|
||||
},
|
||||
workspace: WorkspaceContext {
|
||||
workspace_id: header_value(headers, HEADER_WORKSPACE_ID),
|
||||
tenant_id: header_value(headers, HEADER_TENANT_ID),
|
||||
deployment_id: header_value(headers, HEADER_DEPLOYMENT_ID),
|
||||
project_id: header_value(headers, HEADER_PROJECT_ID),
|
||||
},
|
||||
source: SourceContext {
|
||||
channel: header_value(headers, HEADER_SOURCE_CHANNEL)
|
||||
.unwrap_or_else(|| "http".into()),
|
||||
client: header_value(headers, HEADER_SOURCE_CLIENT)
|
||||
.unwrap_or_else(|| "mnote-web".into()),
|
||||
idempotency_key: header_value(headers, HEADER_IDEMPOTENCY_KEY),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn apply_response_headers(&self, headers: &mut HeaderMap) {
|
||||
insert_header(headers, HEADER_REQUEST_ID, &self.trace.request_id);
|
||||
insert_header(headers, HEADER_TRACE_ID, &self.trace.trace_id);
|
||||
if let Some(workspace_id) = &self.workspace.workspace_id {
|
||||
insert_header(headers, HEADER_WORKSPACE_ID, workspace_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn header_or_generated(headers: &HeaderMap, key: &str, prefix: &str) -> String {
|
||||
header_value(headers, key).unwrap_or_else(|| generate_id(prefix))
|
||||
}
|
||||
|
||||
fn header_value(headers: &HeaderMap, key: &str) -> Option<String> {
|
||||
headers
|
||||
.get(key)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.map(str::trim)
|
||||
.filter(|value| !value.is_empty())
|
||||
.map(ToOwned::to_owned)
|
||||
}
|
||||
|
||||
fn generate_id(prefix: &str) -> String {
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_millis();
|
||||
let counter = REQUEST_COUNTER.fetch_add(1, Ordering::Relaxed);
|
||||
format!("{prefix}_{now}_{counter}")
|
||||
}
|
||||
|
||||
fn insert_header(headers: &mut HeaderMap, key: &str, value: &str) {
|
||||
let Ok(name) = HeaderName::from_lowercase(key.as_bytes()) else {
|
||||
return;
|
||||
};
|
||||
let Ok(value) = HeaderValue::from_str(value) else {
|
||||
return;
|
||||
};
|
||||
headers.insert(name, value);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn request_context_uses_headers_when_present() {
|
||||
let mut headers = HeaderMap::new();
|
||||
headers.insert(HEADER_REQUEST_ID, HeaderValue::from_static("req_demo"));
|
||||
headers.insert(HEADER_TRACE_ID, HeaderValue::from_static("trace_demo"));
|
||||
headers.insert(HEADER_WORKSPACE_ID, HeaderValue::from_static("ws_demo"));
|
||||
headers.insert(HEADER_ACTOR_ID, HeaderValue::from_static("user_demo"));
|
||||
|
||||
let context = RequestContext::from_http_parts(
|
||||
&Method::POST,
|
||||
&"/api/hermes/bridge".parse::<Uri>().expect("uri"),
|
||||
&headers,
|
||||
);
|
||||
|
||||
assert_eq!(context.trace.request_id, "req_demo");
|
||||
assert_eq!(context.trace.trace_id, "trace_demo");
|
||||
assert_eq!(context.workspace.workspace_id.as_deref(), Some("ws_demo"));
|
||||
assert_eq!(context.auth.actor_id, "user_demo");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
use crate::context::RequestContext;
|
||||
use axum::http::StatusCode;
|
||||
use axum::response::{IntoResponse, Response};
|
||||
use axum::Json;
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ErrorBody {
|
||||
pub ok: bool,
|
||||
pub code: &'static str,
|
||||
pub message: String,
|
||||
pub request_id: Option<String>,
|
||||
pub trace_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct WebError {
|
||||
status: StatusCode,
|
||||
code: &'static str,
|
||||
message: String,
|
||||
request_context: Option<RequestContext>,
|
||||
}
|
||||
|
||||
impl WebError {
|
||||
pub fn new(status: StatusCode, code: &'static str, message: impl Into<String>) -> Self {
|
||||
Self {
|
||||
status,
|
||||
code,
|
||||
message: message.into(),
|
||||
request_context: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn bad_request(message: impl Into<String>) -> Self {
|
||||
Self::new(StatusCode::BAD_REQUEST, "bad_request", message)
|
||||
}
|
||||
|
||||
pub fn internal(message: impl Into<String>) -> Self {
|
||||
Self::new(StatusCode::INTERNAL_SERVER_ERROR, "internal_error", message)
|
||||
}
|
||||
|
||||
pub fn with_context(mut self, request_context: &RequestContext) -> Self {
|
||||
self.request_context = Some(request_context.clone());
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoResponse for WebError {
|
||||
fn into_response(self) -> Response {
|
||||
let body = ErrorBody {
|
||||
ok: false,
|
||||
code: self.code,
|
||||
message: self.message,
|
||||
request_id: self
|
||||
.request_context
|
||||
.as_ref()
|
||||
.map(|context| context.trace.request_id.clone()),
|
||||
trace_id: self
|
||||
.request_context
|
||||
.as_ref()
|
||||
.map(|context| context.trace.trace_id.clone()),
|
||||
};
|
||||
(self.status, Json(body)).into_response()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
pub mod app;
|
||||
pub mod context;
|
||||
pub mod error;
|
||||
pub mod middleware;
|
||||
pub mod routes;
|
||||
pub mod transport;
|
||||
|
||||
pub use app::{build_app, AppConfig, AppState};
|
||||
@@ -0,0 +1,25 @@
|
||||
use mnote_web::{build_app, AppConfig, AppState};
|
||||
use tokio::net::TcpListener;
|
||||
use tracing::info;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
init_tracing();
|
||||
|
||||
let config = AppConfig::from_env();
|
||||
let bind_addr = config.bind_addr.clone();
|
||||
let app = build_app(AppState::new(config));
|
||||
let listener = TcpListener::bind(&bind_addr).await?;
|
||||
|
||||
info!(bind_addr = %bind_addr, "mnote-web 最小骨架已启动");
|
||||
axum::serve(listener, app).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn init_tracing() {
|
||||
tracing_subscriber::fmt()
|
||||
.with_target(false)
|
||||
.compact()
|
||||
.try_init()
|
||||
.ok();
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
pub mod request_context;
|
||||
@@ -0,0 +1,17 @@
|
||||
use crate::context::RequestContext;
|
||||
use axum::extract::Request;
|
||||
use axum::middleware::Next;
|
||||
use axum::response::Response;
|
||||
|
||||
pub async fn inject_request_context(mut request: Request, next: Next) -> Response {
|
||||
let context = RequestContext::from_http_parts(
|
||||
request.method(),
|
||||
request.uri(),
|
||||
request.headers(),
|
||||
);
|
||||
request.extensions_mut().insert(context.clone());
|
||||
|
||||
let mut response = next.run(request).await;
|
||||
context.apply_response_headers(response.headers_mut());
|
||||
response
|
||||
}
|
||||
@@ -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,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
pub mod convex;
|
||||
@@ -0,0 +1,127 @@
|
||||
use crate::app::AppConfig;
|
||||
use crate::error::WebError;
|
||||
use base64::engine::general_purpose::STANDARD;
|
||||
use base64::Engine;
|
||||
use bridge_runtime::RuntimeQueryExecutionPlan;
|
||||
use serde_json::{json, Value};
|
||||
use std::fs;
|
||||
use std::time::Duration;
|
||||
|
||||
fn read_env_or_dotenv(key: &str) -> Option<String> {
|
||||
if let Ok(value) = std::env::var(key) {
|
||||
let trimmed = value.trim().trim_matches('"').to_string();
|
||||
if !trimmed.is_empty() {
|
||||
return Some(trimmed);
|
||||
}
|
||||
}
|
||||
|
||||
let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
|
||||
.join("../../..")
|
||||
.join(".env.all");
|
||||
let content = fs::read_to_string(root).ok()?;
|
||||
for line in content.lines() {
|
||||
let line = line.trim_end_matches('\r');
|
||||
if line.starts_with('#') || line.trim().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let Some((k, v)) = line.split_once('=') else {
|
||||
continue;
|
||||
};
|
||||
if k.trim() != key {
|
||||
continue;
|
||||
}
|
||||
let trimmed = v.trim().trim_matches('"').to_string();
|
||||
if !trimmed.is_empty() {
|
||||
return Some(trimmed);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn build_authorization(config: &AppConfig) -> Result<String, WebError> {
|
||||
let admin_key = config
|
||||
.convex_admin_key
|
||||
.clone()
|
||||
.or_else(|| read_env_or_dotenv("CONVEX_SELF_HOSTED_ADMIN_KEY"))
|
||||
.ok_or_else(|| WebError::internal("缺少 CONVEX_SELF_HOSTED_ADMIN_KEY"))?;
|
||||
|
||||
let identity = json!({
|
||||
"subject": config.dev_user_id,
|
||||
"issuer": "https://mnote.local/dev-auth",
|
||||
"tokenIdentifier": format!("dev-user|{}", config.dev_user_id),
|
||||
"name": config.dev_user_name,
|
||||
"email": config.dev_user_email,
|
||||
});
|
||||
let encoded = STANDARD.encode(
|
||||
serde_json::to_string(&identity)
|
||||
.map_err(|error| WebError::internal(format!("开发用户身份序列化失败: {error}")))?,
|
||||
);
|
||||
|
||||
Ok(format!("Convex {admin_key}:{encoded}"))
|
||||
}
|
||||
|
||||
fn convex_url(config: &AppConfig) -> Result<String, WebError> {
|
||||
config
|
||||
.convex_url
|
||||
.clone()
|
||||
.or_else(|| read_env_or_dotenv("CONVEX_SELF_HOSTED_URL"))
|
||||
.or_else(|| read_env_or_dotenv("NEXT_PUBLIC_CONVEX_URL"))
|
||||
.map(|value| value.trim().trim_end_matches('/').to_string())
|
||||
.filter(|value| !value.is_empty())
|
||||
.ok_or_else(|| WebError::internal("缺少 CONVEX_SELF_HOSTED_URL / NEXT_PUBLIC_CONVEX_URL"))
|
||||
}
|
||||
|
||||
pub fn execute_sidebar_dataset_query(
|
||||
config: &AppConfig,
|
||||
plan: &RuntimeQueryExecutionPlan,
|
||||
) -> Result<Value, WebError> {
|
||||
if plan.function_name != "sidebar:datasetList" {
|
||||
return Err(WebError::bad_request(format!(
|
||||
"mnote-web transport 暂不支持 query: {}",
|
||||
plan.function_name
|
||||
)));
|
||||
}
|
||||
|
||||
let payload = json!({
|
||||
"path": plan.function_name,
|
||||
"format": "convex_encoded_json",
|
||||
"args": plan.args_json,
|
||||
});
|
||||
|
||||
let client = reqwest::blocking::Client::builder()
|
||||
.timeout(Duration::from_secs(20))
|
||||
.build()
|
||||
.map_err(|error| WebError::internal(format!("Convex HTTP 客户端创建失败: {error}")))?;
|
||||
|
||||
let response = client
|
||||
.post(format!("{}/api/query", convex_url(config)?))
|
||||
.header("Authorization", build_authorization(config)?)
|
||||
.header("Content-Type", "application/json")
|
||||
.header("Convex-Client", "mnote-web")
|
||||
.json(&payload)
|
||||
.send()
|
||||
.map_err(|error| WebError::internal(format!("Convex query 请求失败: {error}")))?;
|
||||
|
||||
let status = response.status();
|
||||
let body: Value = response
|
||||
.json()
|
||||
.map_err(|error| WebError::internal(format!("Convex 响应解析失败: {error}")))?;
|
||||
if !status.is_success() {
|
||||
let message = body
|
||||
.get("errorMessage")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("Convex query 失败");
|
||||
return Err(WebError::internal(message.to_string()));
|
||||
}
|
||||
|
||||
match body.get("status").and_then(Value::as_str) {
|
||||
Some("success") => Ok(body.get("value").cloned().unwrap_or(Value::Null)),
|
||||
Some("error") => Err(WebError::internal(
|
||||
body.get("errorMessage")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("Convex 返回 error")
|
||||
.to_string(),
|
||||
)),
|
||||
_ => Err(WebError::internal(format!("未知 Convex 响应: {body}"))),
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,11 @@ pub fn map_command_name_to_convex(command_name: &str) -> &'static str {
|
||||
match command_name {
|
||||
"create_workspace" => "workspaces:create",
|
||||
"create_page" => "pages:create",
|
||||
"kernel.node.create" => "kernel:createNode",
|
||||
"kernel.node.update" => "kernel:updateNode",
|
||||
"kernel.subtree.move" => "kernel:moveSubtree",
|
||||
"kernel.edge.attach" => "kernel:attachEdge",
|
||||
"kernel.edge.detach" => "kernel:detachEdge",
|
||||
"documents.create" => "documents:createWithParentReference",
|
||||
"documents.move" => "documents:move",
|
||||
"documents.delete" => "documents:softDelete",
|
||||
@@ -61,6 +66,12 @@ pub fn map_command_name_to_convex(command_name: &str) -> &'static str {
|
||||
|
||||
pub fn map_query_name_to_convex(query_name: &str) -> &'static str {
|
||||
match query_name {
|
||||
"kernel.node.get" => "kernel:getNode",
|
||||
"kernel.subtree.get" => "kernel:getSubtree",
|
||||
"kernel.children.list" => "kernel:listChildren",
|
||||
"kernel.edges.list" => "kernel:listEdges",
|
||||
"kernel.graph.traverse" => "kernel:traverseGraph",
|
||||
"kernel.project_view" => "kernel:projectView",
|
||||
"bridge.request.get" => "bridgeLogs:listByRequest",
|
||||
"bridge.trace.get" => "bridgeLogs:listByTrace",
|
||||
"bridge.command.get" => "bridgeLogs:listByCommand",
|
||||
|
||||
Reference in New Issue
Block a user