From c535ebb437d04330aa9cf7ff32f2a3445fe9d63a Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 10 Nov 2026 21:16:18 +0000 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20route=20CLI=20request=5Fpack=20?= =?UTF-8?q?through=20kimetsu=5Fsdk=20(ADR=200001=20=C2=A75)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Rodrigo --- crates/kimetsu-bus/tests/f2_exit.rs | 78 +++++++++++++++++++++++++++++ crates/kimetsu-cli/src/network.rs | 11 ++-- 2 files changed, 84 insertions(+), 5 deletions(-) diff --git a/crates/kimetsu-bus/tests/f2_exit.rs b/crates/kimetsu-bus/tests/f2_exit.rs index fb2c90d..1cc88da 100644 --- a/crates/kimetsu-bus/tests/f2_exit.rs +++ b/crates/kimetsu-bus/tests/f2_exit.rs @@ -327,6 +327,84 @@ async fn sdk_request_pack_reaches_the_bus() { let _ = std::fs::remove_dir_all(&brain); } +#[tokio::test] +async fn cli_request_pack_imports_through_the_sdk() { + let network = include_str!("../../kimetsu-cli/src/network.rs"); + let request_fn = network + .split_once("async fn request(") + .expect("CLI request") + .1 + .split_once("\nfn repo_only(") + .expect("end of CLI request") + .0; + assert!( + request_fn.contains("kimetsu_sdk::request_pack("), + "CLI request must reach the bus through kimetsu_sdk::request_pack" + ); + assert!( + !request_fn.contains(".request_pack("), + "CLI request must not call BusEndpoint::request_pack directly" + ); + + let built = members(&[MountLevel::Repo], true); + let (server, client) = bind_pair(&built, BusRelay::Disabled, false).await; + let lesson = "F2_CLI_SDK_LESSON verified repo import"; + let announcement = server + .publish_memories( + &manifest(), + &["repo".into()], + &[memory("repo", lesson)], + &built.signer, + ) + .unwrap(); + let direct_root = brain_root("cli-sdk-direct"); + let sdk_root = brain_root("cli-sdk"); + let mut trust = TrustStore::empty(); + trust + .allow(&built.signer.public_key_hex(), &[MountLevel::Repo]) + .unwrap(); + let addr = server.direct_addr().await.unwrap(); + let direct = client + .request_pack(request( + addr.clone(), + &announcement.digest, + MountLevel::Repo, + trust.clone(), + &direct_root, + &[MountLevel::Repo], + )) + .await + .unwrap(); + let via_sdk = kimetsu_sdk::request_pack( + &client, + request( + addr, + &announcement.digest, + MountLevel::Repo, + trust, + &sdk_root, + &[MountLevel::Repo], + ), + ) + .await + .unwrap(); + assert_eq!(direct.imported, 1, "{direct:?}"); + assert_eq!(direct.quarantined, 0); + assert_eq!(via_sdk.imported, direct.imported, "{via_sdk:?}"); + assert_eq!(via_sdk.deduped, direct.deduped); + assert_eq!(via_sdk.quarantined, direct.quarantined); + assert_eq!(via_sdk.superseded, direct.superseded); + assert_eq!(active_text(&direct_root, lesson), 1); + assert_eq!( + active_text(&sdk_root, lesson), + active_text(&direct_root, lesson) + ); + server.close().await; + client.close().await; + let _ = std::fs::remove_dir_all(&direct_root); + let _ = std::fs::remove_dir_all(&sdk_root); +} + #[tokio::test] async fn fetch_verified_refuses_a_stranger_before_any_pack() { let built = members(&[MountLevel::Repo], true); diff --git a/crates/kimetsu-cli/src/network.rs b/crates/kimetsu-cli/src/network.rs index c128c1c..76bfdf2 100644 --- a/crates/kimetsu-cli/src/network.rs +++ b/crates/kimetsu-cli/src/network.rs @@ -555,17 +555,18 @@ async fn request( continue; } for item in wanted { - let summary = online - .endpoint - .request_pack(PackRequest { + let summary = kimetsu_sdk::request_pack( + &online.endpoint, + PackRequest { peer: target.clone(), digest: item.digest.clone(), destination: MountLevel::Repo, grants: grants.clone(), trust: trust.clone(), brain: workspace.to_path_buf(), - }) - .await?; + }, + ) + .await?; imported += summary.imported; deduped += summary.deduped; quarantined += summary.quarantined; From 60e267d79108ad242963ad196e0e5b28597d7751 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 13 Nov 2026 16:30:03 +0000 Subject: [PATCH 2/2] test(cli): assert network request imports into the repo mount Drive kimetsu network request on loopback and check the imported row is on the repo mount, with nothing written to user or org. Remove the source-text check that never ran the CLI. Co-authored-by: Rodrigo --- crates/kimetsu-bus/tests/f2_exit.rs | 78 -------------------- crates/kimetsu-cli/tests/network_loopback.rs | 60 ++++++++++++++- 2 files changed, 58 insertions(+), 80 deletions(-) diff --git a/crates/kimetsu-bus/tests/f2_exit.rs b/crates/kimetsu-bus/tests/f2_exit.rs index 1cc88da..fb2c90d 100644 --- a/crates/kimetsu-bus/tests/f2_exit.rs +++ b/crates/kimetsu-bus/tests/f2_exit.rs @@ -327,84 +327,6 @@ async fn sdk_request_pack_reaches_the_bus() { let _ = std::fs::remove_dir_all(&brain); } -#[tokio::test] -async fn cli_request_pack_imports_through_the_sdk() { - let network = include_str!("../../kimetsu-cli/src/network.rs"); - let request_fn = network - .split_once("async fn request(") - .expect("CLI request") - .1 - .split_once("\nfn repo_only(") - .expect("end of CLI request") - .0; - assert!( - request_fn.contains("kimetsu_sdk::request_pack("), - "CLI request must reach the bus through kimetsu_sdk::request_pack" - ); - assert!( - !request_fn.contains(".request_pack("), - "CLI request must not call BusEndpoint::request_pack directly" - ); - - let built = members(&[MountLevel::Repo], true); - let (server, client) = bind_pair(&built, BusRelay::Disabled, false).await; - let lesson = "F2_CLI_SDK_LESSON verified repo import"; - let announcement = server - .publish_memories( - &manifest(), - &["repo".into()], - &[memory("repo", lesson)], - &built.signer, - ) - .unwrap(); - let direct_root = brain_root("cli-sdk-direct"); - let sdk_root = brain_root("cli-sdk"); - let mut trust = TrustStore::empty(); - trust - .allow(&built.signer.public_key_hex(), &[MountLevel::Repo]) - .unwrap(); - let addr = server.direct_addr().await.unwrap(); - let direct = client - .request_pack(request( - addr.clone(), - &announcement.digest, - MountLevel::Repo, - trust.clone(), - &direct_root, - &[MountLevel::Repo], - )) - .await - .unwrap(); - let via_sdk = kimetsu_sdk::request_pack( - &client, - request( - addr, - &announcement.digest, - MountLevel::Repo, - trust, - &sdk_root, - &[MountLevel::Repo], - ), - ) - .await - .unwrap(); - assert_eq!(direct.imported, 1, "{direct:?}"); - assert_eq!(direct.quarantined, 0); - assert_eq!(via_sdk.imported, direct.imported, "{via_sdk:?}"); - assert_eq!(via_sdk.deduped, direct.deduped); - assert_eq!(via_sdk.quarantined, direct.quarantined); - assert_eq!(via_sdk.superseded, direct.superseded); - assert_eq!(active_text(&direct_root, lesson), 1); - assert_eq!( - active_text(&sdk_root, lesson), - active_text(&direct_root, lesson) - ); - server.close().await; - client.close().await; - let _ = std::fs::remove_dir_all(&direct_root); - let _ = std::fs::remove_dir_all(&sdk_root); -} - #[tokio::test] async fn fetch_verified_refuses_a_stranger_before_any_pack() { let built = members(&[MountLevel::Repo], true); diff --git a/crates/kimetsu-cli/tests/network_loopback.rs b/crates/kimetsu-cli/tests/network_loopback.rs index 5a2c56e..a926ee7 100644 --- a/crates/kimetsu-cli/tests/network_loopback.rs +++ b/crates/kimetsu-cli/tests/network_loopback.rs @@ -1,5 +1,6 @@ //! Two processes on loopback: invite, join, share, request, check the -//! signature by importing, then leave. Built only with `--features network`. +//! signature by importing into the repo mount, then leave. Built only +//! with `--features network`. #![cfg(feature = "network")] @@ -11,7 +12,7 @@ use std::sync::{Arc, Mutex}; use std::time::{Duration, Instant}; use kimetsu_brain::project; -use kimetsu_core::memory::{MemoryKind, MountLevel}; +use kimetsu_core::memory::{MemoryKind, MountLevel, mount_stored_scopes}; fn bin() -> &'static str { env!("CARGO_BIN_EXE_kimetsu") @@ -61,6 +62,46 @@ fn active(root: &Path, text: &str) -> i64 { .unwrap() } +fn count_scope(root: &Path, sql: &str, scope: &str) -> i64 { + let (_, _, conn) = project::load_project_readonly(root).unwrap(); + conn.query_row(sql, [scope], |row| row.get(0)).unwrap() +} + +/// Active rows of `text` whose stored scope belongs to `level`. +fn active_on(root: &Path, text: &str, level: MountLevel) -> i64 { + let (_, _, conn) = project::load_project_readonly(root).unwrap(); + mount_stored_scopes(level) + .iter() + .map(|scope| { + conn.query_row( + "SELECT COUNT(*) FROM memories + WHERE text = ?1 AND scope = ?2 AND invalidated_at IS NULL", + (text, *scope), + |row| row.get::<_, i64>(0), + ) + .unwrap() + }) + .sum() +} + +/// Memories and proposals stored on `level`, including invalidated rows. +fn rows_on(root: &Path, level: MountLevel) -> i64 { + mount_stored_scopes(level) + .iter() + .map(|scope| { + count_scope( + root, + "SELECT COUNT(*) FROM memories WHERE scope = ?1", + scope, + ) + count_scope( + root, + "SELECT COUNT(*) FROM memory_proposals WHERE scope = ?1", + scope, + ) + }) + .sum() +} + fn run(args: &[&str]) -> std::process::Output { Command::new(bin()) .args(args) @@ -298,6 +339,21 @@ fn two_nodes_invite_join_share_request_then_leave() { "the imported pack is the one that was announced" ); assert_eq!(active(&bob_ws, lesson), 1); + assert_eq!( + active_on(&bob_ws, lesson, MountLevel::Repo), + 1, + "the requested entry must land on the repo mount" + ); + assert_eq!( + rows_on(&bob_ws, MountLevel::User), + 0, + "a repo request must not write the user mount" + ); + assert_eq!( + rows_on(&bob_ws, MountLevel::Org), + 0, + "a repo request must not write the org mount" + ); for state in [&alice_state, &bob_state] { let left = run(&["network", "leave", "--state-dir", state.to_str().unwrap()]);