fix: reconcile upstream feature surfaces

Author: senamakel

src/memory/persona/mod.rs

@@ -3,13 +3,18 @@
 //! memory layer** — personality, communication style, coding style, and
 //! tool/stack preferences compiled into a small, prompt-ready context pack.
 //!
-//! The surface is organised around the canonical evidence model in [`types`]:
-//! readers ([`readers`]) emit redacted [`PersonaEvidence`], the map step
-//! ([`distill`]) turns batches of evidence into [`SessionDigest`]s via a
+//! The surface is organised around the canonical evidence model in
+//! [`types`](crate::memory::persona::types): readers
+//! ([`readers`](crate::memory::persona::readers)) emit redacted
+//! [`PersonaEvidence`](crate::memory::persona::types::PersonaEvidence), the map
+//! step ([`distill`](crate::memory::persona::distill)) turns batches of evidence
+//! into [`SessionDigest`](crate::memory::persona::types::SessionDigest)s via a
 //! [`ChatProvider`](crate::memory::score::extract::ChatProvider), the reduce
-//! step folds digests into seven facet flavoured trees, and the [`compile`]
-//! step assembles `persona/PERSONA.md`. [`state`] makes runs incremental and
-//! resumable; [`pipeline`] wires it all together for the CLI harness.
+//! step folds digests into seven facet flavoured trees, and the
+//! [`compile`](crate::memory::persona::compile) step assembles
+//! `persona/PERSONA.md`. [`state`](crate::memory::persona::state) makes runs
+//! incremental and resumable; [`pipeline`](crate::memory::persona::pipeline)
+//! wires it all together for the CLI harness.
 //!
 //! Everything is local-first and depends only on the crate's `ChatProvider` /
 //! `Summariser` / `EmbeddingBackend` trait seams — nothing here names a

src/memory/persona/types.rs

@@ -10,7 +10,7 @@
 //!
 //! [`PersonaEvidence`] can only be constructed through [`PersonaEvidence::new`],
 //! which runs the raw excerpt through
-//! [`sanitize_text`](crate::memory::store::safety::sanitize_text) *before* the
+//! [`sanitize_text`] *before* the
 //! value is stored on the struct. `sanitize_text` is the composite redactor: it
 //! scrubs secrets/tokens/keys (OpenAI `sk-…`, GitHub `gh*_…`, OAuth/bearer
 //! credentials) *and* runs the formatted-PII pass

src/memory/providers/openrouter.rs

@@ -4,13 +4,17 @@
 //! not a hard dependency. [`OpenRouterProvider`] implements all three provider
 //! seams against OpenRouter's OpenAI-compatible endpoints:
 //!
-//! - [`ChatProvider`] — `POST /chat/completions` in JSON mode (persona digests).
-//! - [`Summariser`] — the same endpoint in plain-text mode (flavoured-tree folds).
-//! - [`EmbeddingBackend`] — `POST /embeddings` (vector retrieval).
+//! - [`ChatProvider`](crate::memory::score::extract::ChatProvider) —
+//!   `POST /chat/completions` in JSON mode (persona digests).
+//! - [`Summariser`](crate::memory::tree::Summariser) — the same endpoint in
+//!   plain-text mode (flavoured-tree folds).
+//! - [`EmbeddingBackend`](crate::memory::store::vectors::EmbeddingBackend) —
+//!   `POST /embeddings` (vector retrieval).
 //!
 //! Nothing under `memory::persona` names this type: the pipeline depends only on
 //! the traits, and OpenHuman injects its own routes. Secrets are held as
-//! [`SecretString`]; token usage is accumulated per-run and the provider aborts
+//! [`SecretString`](crate::memory::config::SecretString); token usage is
+//! accumulated per-run and the provider aborts
 //! cleanly (returns a non-retryable error) once a configured cost/call budget is
 //! hit, mirroring the [`DailyBudget`](crate::memory::sync::state::DailyBudget)
 //! pattern. Transport and `429`/`5xx` failures retry with backoff; `4xx` client

src/memory/providers/openrouter_tests.rs

@@ -183,6 +183,8 @@ async fn summariser_folds_via_chat_and_reports_usage() {
         tree_kind: TreeKind::Flavoured,
         target_level: 1,
         token_budget: 200,
+        input_token_budget: 4_096,
+        overhead_reserve_tokens: 256,
         ask: Some("Distill workflow habits."),
     };
     let call = Summariser::summarise_with_usage(&provider, &inputs, &ctx)

src/memory/sources/types.rs

@@ -257,13 +257,13 @@ impl MemorySourcePatch {
         if self.query.is_some() && kind != SourceKind::TwitterQuery {
             return reject("query");
         }
-        if self.since_days.is_some() && kind != SourceKind::TwitterQuery {
+        if matches!(self.since_days, Some(Some(_))) && kind != SourceKind::TwitterQuery {
             return reject("since_days");
         }
         if self.selector.is_some() && kind != SourceKind::WebPage {
             return reject("selector");
         }
-        if self.max_items.is_some() && kind != SourceKind::RssFeed {
+        if matches!(self.max_items, Some(Some(_))) && kind != SourceKind::RssFeed {
             return reject("max_items");
         }
         if self.url.is_some()

src/memory/store/entity_index/transaction.rs

@@ -11,7 +11,7 @@ use super::types::CanonicalEntity;
 ///
 /// New rows are inserted with `is_user = false` because [`NoSelfIdentity`]
 /// performs no identity classification. On conflict,
-/// [`UPSERT_PRESERVE_USER_SQL`] deliberately preserves the existing `is_user`
+/// `UPSERT_PRESERVE_USER_SQL` deliberately preserves the existing `is_user`
 /// value rather than resetting a prior identity match.
 pub fn index_entities_tx(
     tx: &Transaction<'_>,

src/memory/store/vectors/store.rs

@@ -426,6 +426,7 @@ pub fn vec_to_bytes(v: &[f32]) -> Vec<u8> {
 ///
 /// Returns an error when the blob length is not divisible by four rather than
 /// silently truncating corrupt trailing bytes.
+#[allow(clippy::manual_is_multiple_of)] // Keep compatibility below Rust 1.87.
 pub fn bytes_to_vec(bytes: &[u8]) -> anyhow::Result<Vec<f32>> {
     anyhow::ensure!(
         bytes.len() % 4 == 0,

src/memory/types_tests.rs

@@ -54,7 +54,10 @@ fn memory_category_serde_uses_snake_case() {
             category
         );
     }
-    assert!("project_notes".parse::<MemoryCategory>().is_err());
+    assert_eq!(
+        "project_notes".parse::<MemoryCategory>().unwrap(),
+        MemoryCategory::Custom("project_notes".into())
+    );
 }
 
 #[test]