From b3e9b229e31c7378c80fa365522d69266692bfa2 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 24 Aug 2026 12:05:34 +0200 Subject: [PATCH] Fold Persona delivery into social terminal --- epiphany-core/src/persona_conversation.rs | 100 +++--------------- epiphany-core/src/persona_social_state.rs | 49 +++++---- epiphany-core/src/runtime_spine.rs | 3 +- .../src/bin/epiphany-persona-service.rs | 2 +- 4 files changed, 44 insertions(+), 110 deletions(-) diff --git a/epiphany-core/src/persona_conversation.rs b/epiphany-core/src/persona_conversation.rs index 08a93780..105b2873 100644 --- a/epiphany-core/src/persona_conversation.rs +++ b/epiphany-core/src/persona_conversation.rs @@ -21,10 +21,8 @@ use crate::{ verify_persona_discord_delivery_receipt, }; -pub const PERSONA_DISCORD_DELIVERY_EVIDENCE_SCHEMA_VERSION: &str = - "epiphany.persona_discord_delivery_evidence.v0"; pub const PERSONA_CONVERSATION_EXECUTION_RECEIPT_SCHEMA_VERSION: &str = - "epiphany.persona_conversation_execution_receipt.v1"; + "epiphany.persona_conversation_execution_receipt.v2"; pub const PERSONA_EFFECT_EXECUTION_INTENT_SCHEMA_VERSION: &str = "epiphany.persona_effect_execution_intent.v0"; pub const PERSONA_CONVERSATION_STORE_RETIREMENT_RECEIPT_SCHEMA_VERSION: &str = @@ -150,37 +148,7 @@ pub struct PersonaEffectExecutionIntent { #[derive(Clone, Debug, PartialEq, DatabaseEntry)] #[cultcache( - type = "epiphany.persona_discord_delivery_evidence.v0", - schema = "PersonaDiscordDeliveryEvidence" -)] -pub struct PersonaDiscordDeliveryEvidence { - #[cultcache(key = 0)] - pub schema_version: String, - #[cultcache(key = 1)] - pub evidence_id: String, - #[cultcache(key = 2)] - pub effect_document_id: String, - #[cultcache(key = 3)] - pub channel_id: String, - #[cultcache(key = 4, default)] - pub reply_to_message_id: Option, - #[cultcache(key = 5)] - pub message_id: String, - #[cultcache(key = 6)] - pub transport: String, - #[cultcache(key = 7)] - pub crossing_receipt_id: String, - #[cultcache(key = 8)] - pub receipt_url: String, - #[cultcache(key = 9)] - pub bridge_receipt_sha256: String, - #[cultcache(key = 10)] - pub private_state_exposed: bool, -} - -#[derive(Clone, Debug, PartialEq, DatabaseEntry)] -#[cultcache( - type = "epiphany.persona_conversation_execution_receipt.v1", + type = "epiphany.persona_conversation_execution_receipt.v2", schema = "PersonaConversationExecutionReceipt" )] pub struct PersonaConversationExecutionReceipt { @@ -198,8 +166,6 @@ pub struct PersonaConversationExecutionReceipt { pub state_effect_status: String, #[cultcache(key = 6, default)] pub state_effect_reasons: Vec, - #[cultcache(key = 7, default)] - pub delivery_evidence_ids: Vec, #[cultcache(key = 8)] pub social_terminal_receipt_id: Option, #[cultcache(key = 9)] @@ -289,7 +255,7 @@ pub fn poll_persona_discord_crossing( PersonaTurnTerminalOptions { request_id: request_id.into(), outcome: outcome.into(), - delivery_evidence: None, + delivery_receipt: None, blocked_evidence: None, }, )?; @@ -301,7 +267,6 @@ pub fn poll_persona_discord_crossing( outcome: outcome.into(), state_effect_status: state_status, state_effect_reasons: reasons, - delivery_evidence_ids: vec![], social_terminal_receipt_id: Some(terminal.receipt_id), private_state_exposed: false, model_terminal_receipt_id: Some(model_terminal.receipt_id.clone()), @@ -379,32 +344,12 @@ pub fn poll_persona_discord_crossing( ), _ => unreachable!(), }; - let evidence = (outcome == "delivered").then(|| PersonaDiscordDeliveryEvidence { - schema_version: PERSONA_DISCORD_DELIVERY_EVIDENCE_SCHEMA_VERSION.into(), - evidence_id: format!( - "persona-delivery:{}:{}", - effects.document_id, delivery.message_id - ), - effect_document_id: effects.document_id.clone(), - channel_id: delivery.channel_id.clone(), - reply_to_message_id: (!delivery.reply_to_message_id.is_empty()) - .then(|| delivery.reply_to_message_id.clone()), - message_id: delivery.message_id.clone(), - transport: delivery.transport.clone(), - crossing_receipt_id: delivery.crossing_receipt_id.clone(), - receipt_url: delivery.receipt_url.clone(), - bridge_receipt_sha256: signed_receipt_sha256, - private_state_exposed: false, - }); - if let Some(value) = &evidence { - put_runtime_document(runtime_store, &value.evidence_id, value)?; - } let terminal = complete_persona_social_turn( social_store, PersonaTurnTerminalOptions { request_id: request_id.into(), outcome: outcome.into(), - delivery_evidence: evidence.clone(), + delivery_receipt: (outcome == "delivered").then(|| delivery.clone()), blocked_evidence, }, )?; @@ -422,10 +367,6 @@ pub fn poll_persona_discord_crossing( outcome: outcome.into(), state_effect_status: "admitted_before_delivery_request".into(), state_effect_reasons: vec![], - delivery_evidence_ids: evidence - .iter() - .map(|value| value.evidence_id.clone()) - .collect(), social_terminal_receipt_id: Some(terminal.receipt_id), private_state_exposed: false, model_terminal_receipt_id: Some(model_terminal.receipt_id.clone()), @@ -448,7 +389,7 @@ fn terminalize_local_effect_quarantine( PersonaTurnTerminalOptions { request_id: request.request_id.clone(), outcome: "blocked".into(), - delivery_evidence: None, + delivery_receipt: None, blocked_evidence: Some(crate::PersonaTurnBlockedEvidence { evidence_source: "local_effect".into(), crossing_status: "unknown".into(), @@ -466,7 +407,6 @@ fn terminalize_local_effect_quarantine( outcome: "blocked".into(), state_effect_status: "quarantined_ambiguous_local_effect".into(), state_effect_reasons: vec![error.to_string()], - delivery_evidence_ids: vec![], social_terminal_receipt_id: Some(terminal.receipt_id), private_state_exposed: false, model_terminal_receipt_id: Some(model_terminal.receipt_id), @@ -519,7 +459,6 @@ pub fn reconcile_terminal_persona_conversation( outcome: terminal.outcome.clone(), state_effect_status: "reconciled_from_social_terminal".into(), state_effect_reasons: vec![], - delivery_evidence_ids: terminal.delivery_evidence_id.clone().into_iter().collect(), social_terminal_receipt_id: Some(terminal.receipt_id.clone()), private_state_exposed: false, model_terminal_receipt_id: Some(model_terminal.receipt_id), @@ -756,22 +695,6 @@ fn build_persona_retention_member( } runtime_ids.push((::TYPE, id)); } - if let Some(evidence_id) = &terminal.delivery_evidence_id { - let Some(evidence) = - runtime_document::(runtime_store, evidence_id)? - else { - return Ok(None); - }; - if conversation.delivery_evidence_ids != [evidence_id.clone()] - || evidence.private_state_exposed - { - return Err(anyhow!("Persona retained delivery evidence is invalid")); - } - } else if terminal.outcome == "delivered" || !conversation.delivery_evidence_ids.is_empty() { - return Err(anyhow!( - "delivered Persona retention candidate lacks evidence" - )); - } let mut runtime_cache = runtime_spine_cache(runtime_store)?; runtime_cache.pull_all_backing_stores()?; let runtime_snapshot = runtime_cache.snapshot_envelopes(); @@ -801,7 +724,16 @@ fn build_persona_retention_member( &crossing_request, receipt_anchor, )?; - if crossing_receipt.status != "completed" { + let receipt_sha256 = format!( + "sha256:{:x}", + Sha256::digest(rmp_serde::to_vec(&crossing_receipt)?) + ); + if crossing_receipt.status != "completed" + || terminal.delivery_message_id.as_deref() != Some(crossing_receipt.message_id.as_str()) + || terminal.crossing_receipt_id.as_deref() + != Some(crossing_receipt.crossing_receipt_id.as_str()) + || terminal.bridge_receipt_sha256.as_deref() != Some(receipt_sha256.as_str()) + { return Ok(None); } // The signed request and consequence receipt remain durable audit @@ -1528,7 +1460,6 @@ mod tests { outcome: "dropped".into(), state_effect_status: "none".into(), state_effect_reasons: vec![], - delivery_evidence_ids: vec![], social_terminal_receipt_id: Some(terminal.receipt_id), private_state_exposed: false, model_terminal_receipt_id: Some(format!("persona-terminal:{request_id}")), @@ -1896,7 +1827,6 @@ mod tests { outcome: "dropped".into(), state_effect_status: "none".into(), state_effect_reasons: vec![], - delivery_evidence_ids: vec![], social_terminal_receipt_id: Some("retry:terminal".into()), private_state_exposed: false, model_terminal_receipt_id: Some("persona-terminal:retry".into()), diff --git a/epiphany-core/src/persona_social_state.rs b/epiphany-core/src/persona_social_state.rs index b74106aa..29758733 100644 --- a/epiphany-core/src/persona_social_state.rs +++ b/epiphany-core/src/persona_social_state.rs @@ -10,7 +10,7 @@ use std::path::Path; pub const PERSONA_TURN_REQUEST_SCHEMA_VERSION: &str = "epiphany.persona_turn_request.v1"; pub const PERSONA_TURN_TERMINAL_RECEIPT_SCHEMA_VERSION: &str = - "epiphany.persona_turn_terminal_receipt.v1"; + "epiphany.persona_turn_terminal_receipt.v2"; pub const PERSONA_CONVERSATION_RETENTION_HEAD_SCHEMA_VERSION: &str = "epiphany.persona_conversation_retention_head.v1"; pub const PERSONA_CONVERSATION_RETENTION_PLAN_SCHEMA_VERSION: &str = @@ -72,7 +72,7 @@ pub struct PersonaTurnTerminalReceipt { pub mention_ids: Vec, pub mention_cargo_sha256: String, #[serde(default)] - pub delivery_evidence_id: Option, + pub delivery_message_id: Option, #[serde(default)] pub crossing_receipt_id: Option, #[serde(default)] @@ -89,7 +89,7 @@ pub struct PersonaTurnTerminalReceipt { pub struct PersonaTurnTerminalOptions { pub request_id: String, pub outcome: String, - pub delivery_evidence: Option, + pub delivery_receipt: Option, pub blocked_evidence: Option, } @@ -147,7 +147,7 @@ pub struct PersonaTurnBlockedEvidence { pub const PERSONA_SOCIAL_MENTION_TYPE: &str = "epiphany.persona.social_mention.v2"; pub const PERSONA_SOCIAL_TURN_REQUEST_TYPE: &str = "epiphany.persona.turn_request.v1"; -pub const PERSONA_SOCIAL_TURN_TERMINAL_TYPE: &str = "epiphany.persona.turn_terminal.v1"; +pub const PERSONA_SOCIAL_TURN_TERMINAL_TYPE: &str = "epiphany.persona.turn_terminal.v2"; pub const PERSONA_SOCIAL_RETENTION_HEAD_TYPE: &str = "epiphany.persona.retention_head.v1"; pub const PERSONA_SOCIAL_RETENTION_PLAN_TYPE: &str = "epiphany.persona.retention_plan.v1"; pub const PERSONA_SOCIAL_RETENTION_HEAD_KEY: &str = "persona"; @@ -198,7 +198,7 @@ pub struct PersonaSocialTurnRequestDocument { #[derive(Clone, Debug, PartialEq, DatabaseEntry)] #[cultcache( - type = "epiphany.persona.turn_terminal.v1", + type = "epiphany.persona.turn_terminal.v2", schema = "PersonaSocialTurnTerminalDocument" )] pub struct PersonaSocialTurnTerminalDocument { @@ -494,30 +494,33 @@ pub fn complete_persona_social_turn( existing.outcome )); } - let delivery_evidence = options.delivery_evidence.as_ref(); + let delivery_receipt = options.delivery_receipt.as_ref(); let blocked_evidence = options.blocked_evidence.as_ref(); if options.outcome == "delivered" { - let evidence = delivery_evidence.ok_or_else(|| { - anyhow!("delivered Persona turn requires typed Discord delivery evidence") + let receipt = delivery_receipt.ok_or_else(|| { + anyhow!("delivered Persona turn requires a typed Discord delivery receipt") })?; - if evidence.schema_version != crate::PERSONA_DISCORD_DELIVERY_EVIDENCE_SCHEMA_VERSION - || evidence.private_state_exposed - || evidence.evidence_id.trim().is_empty() - || evidence.message_id.trim().is_empty() - || evidence.crossing_receipt_id.trim().is_empty() - || evidence.bridge_receipt_sha256.trim().is_empty() + if receipt.schema_version != crate::PERSONA_DISCORD_DELIVERY_RECEIPT_SCHEMA_VERSION + || receipt.status != "completed" + || receipt.private_state_exposed + || receipt.receipt_id != receipt.request_id + || !receipt + .request_id + .starts_with(&format!("persona-discord:{}:", request.request_id)) + || receipt.message_id.trim().is_empty() + || receipt.crossing_receipt_id.trim().is_empty() || !request .mentions .iter() - .any(|mention| mention.channel_id == evidence.channel_id) + .any(|mention| mention.channel_id == receipt.channel_id) { return Err(anyhow!( - "Discord delivery evidence is not bound to the Persona turn" + "Discord delivery receipt is not bound to the Persona turn" )); } - } else if delivery_evidence.is_some() { + } else if delivery_receipt.is_some() { return Err(anyhow!( - "non-delivered Persona terminal outcome must not carry delivery evidence" + "non-delivered Persona terminal outcome must not carry a delivery receipt" )); } if options.outcome == "blocked" { @@ -568,10 +571,12 @@ pub fn complete_persona_social_turn( "sha256-{:x}", sha2::Sha256::digest(rmp_serde::to_vec(&request.mentions)?) ), - delivery_evidence_id: delivery_evidence.map(|evidence| evidence.evidence_id.clone()), - crossing_receipt_id: delivery_evidence.map(|evidence| evidence.crossing_receipt_id.clone()), - bridge_receipt_sha256: delivery_evidence - .map(|evidence| evidence.bridge_receipt_sha256.clone()), + delivery_message_id: delivery_receipt.map(|receipt| receipt.message_id.clone()), + crossing_receipt_id: delivery_receipt.map(|receipt| receipt.crossing_receipt_id.clone()), + bridge_receipt_sha256: delivery_receipt + .map(rmp_serde::to_vec) + .transpose()? + .map(|bytes| format!("sha256:{:x}", sha2::Sha256::digest(bytes))), blocked_crossing_status: blocked_evidence.map(|evidence| evidence.crossing_status.clone()), blocked_reason: blocked_evidence.map(|evidence| evidence.reason.clone()), completed_at: now_iso(), diff --git a/epiphany-core/src/runtime_spine.rs b/epiphany-core/src/runtime_spine.rs index 29a238be..d5becd9c 100644 --- a/epiphany-core/src/runtime_spine.rs +++ b/epiphany-core/src/runtime_spine.rs @@ -55,7 +55,7 @@ pub const COORDINATOR_RUN_RECEIPT_TYPE: &str = "epiphany.coordinator_run_receipt pub const RUNTIME_IDENTITY_KEY: &str = "self"; pub const RUNTIME_SWARM_BINDING_KEY: &str = "runtime-swarm-binding"; pub const RUNTIME_SWARM_BINDING_SCHEMA_VERSION: &str = "epiphany.runtime.swarm_binding.v1"; -pub const RUNTIME_SPINE_SCHEMA_VERSION: &str = "epiphany.runtime_spine.v35"; +pub const RUNTIME_SPINE_SCHEMA_VERSION: &str = "epiphany.runtime_spine.v36"; pub const EPIPHANY_RUNTIME_ROOT_SESSION_ID: &str = "epiphany-main"; #[derive(Clone, Debug, PartialEq, DatabaseEntry)] #[cultcache(type = "epiphany.runtime.identity", schema = "EpiphanyRuntimeIdentity")] @@ -793,7 +793,6 @@ fn runtime_spine_schema_cache() -> Result { cache.register_entry_type::()?; cache.register_entry_type::()?; cache.register_entry_type::()?; - cache.register_entry_type::()?; cache.register_entry_type::()?; cache.register_entry_type::()?; cache.register_entry_type::()?; diff --git a/epiphany-openai-runtime/src/bin/epiphany-persona-service.rs b/epiphany-openai-runtime/src/bin/epiphany-persona-service.rs index 5250ee2a..86670866 100644 --- a/epiphany-openai-runtime/src/bin/epiphany-persona-service.rs +++ b/epiphany-openai-runtime/src/bin/epiphany-persona-service.rs @@ -113,7 +113,7 @@ async fn poll_once(options: &Options) -> Result { PersonaTurnTerminalOptions { request_id: request.request_id, outcome: "failed".into(), - delivery_evidence: None, + delivery_receipt: None, blocked_evidence: None, }, )?;