diff --git a/epiphany-core/src/current_work.rs b/epiphany-core/src/current_work.rs index 341e75fb..ee4f9c46 100644 --- a/epiphany-core/src/current_work.rs +++ b/epiphany-core/src/current_work.rs @@ -3744,7 +3744,6 @@ mod tests { created_at: "2026-08-17T00:00:02.100Z".into(), }, &failed_native, - "2026-08-17T00:00:02.100Z", )?; let failed_process = crate::ProcessInstanceIdentity { process_id: u32::MAX, @@ -4761,7 +4760,6 @@ mod tests { created_at: "2026-08-17T00:00:14.750Z".into(), }, &verification_native, - "2026-08-17T00:00:14.750Z", )?; let verification_context = crate::EpiphanyDecisionContext::new( &verification_basis, @@ -5443,7 +5441,6 @@ mod tests { created_at: "2026-08-17T00:00:21.750Z".into(), }, &planning_native, - "2026-08-17T00:00:21.750Z", )?; let planning_context = crate::EpiphanyDecisionContext::new(&planning_basis, planning_native, Vec::new())?; @@ -5581,7 +5578,6 @@ mod tests { created_at: "2026-08-17T00:00:22.250Z".into(), }, &mind_native, - "2026-08-17T00:00:22.250Z", )?; let mind_context = crate::EpiphanyDecisionContext::new(&mind_basis, mind_native, Vec::new())?; diff --git a/epiphany-core/src/reasoning_context.rs b/epiphany-core/src/reasoning_context.rs index 5e5fa002..4078bbfe 100644 --- a/epiphany-core/src/reasoning_context.rs +++ b/epiphany-core/src/reasoning_context.rs @@ -1373,9 +1373,7 @@ fn validate_context_store_ownership( } let model_binding = crate::runtime_spine::validate_runtime_model_execution_binding(cache, &native.request_id)?; - if model_binding.reasoning_basis_id.as_deref() != Some(context.basis_id.as_str()) - || model_binding.source_worker_job_id != native.source_worker_job_id - { + if native.reasoning_basis_id.as_deref() != Some(context.basis_id.as_str()) { return Err(anyhow!( "decision context terminal request has foreign runtime ownership" )); @@ -1409,12 +1407,14 @@ fn validate_context_store_ownership( )); } if let Some(request_id) = intent.model_request_id.as_deref() { - let continuation = cache - .get::(request_id)? - .ok_or_else(|| anyhow!("decision tool continuation request is absent"))?; + let continuation = + crate::runtime_spine::validate_runtime_model_execution_binding(cache, request_id)?; + let continuation_request = cache + .get::(request_id)? + .ok_or_else(|| anyhow!("decision tool continuation native request is absent"))?; if continuation.session_id != model_binding.session_id - || continuation.source_worker_job_id != model_binding.source_worker_job_id - || continuation.reasoning_basis_id != model_binding.reasoning_basis_id + || continuation_request.source_worker_job_id != native.source_worker_job_id + || continuation_request.reasoning_basis_id != native.reasoning_basis_id || tool_binding.session_id != continuation.session_id || tool_binding.job_id != continuation.job_id { @@ -2256,7 +2256,6 @@ mod tests { created_at: "2026-08-17T00:00:01Z".into(), }, &initial_native, - "2026-08-17T00:00:01Z", )?; let intent = EpiphanyToolInvocationIntent::new( "intent-1", @@ -2269,13 +2268,7 @@ mod tests { "2026-08-17T00:00:02Z", ) .with_model_call("call-1", &initial_native.request_id); - crate::put_runtime_tool_execution_intent( - &store, - "session-1", - "model-job-1", - &intent, - "2026-08-17T00:00:02Z", - )?; + crate::put_runtime_tool_execution_intent(&store, "session-1", "model-job-1", &intent)?; let mut receipt = EpiphanyToolInvocationReceipt::new( "receipt-1", &intent.intent_id, @@ -2316,7 +2309,6 @@ mod tests { created_at: "2026-08-17T00:00:04Z".into(), }, &terminal_native, - "2026-08-17T00:00:04Z", )?; let context = seal_model_decision_context(&store, &terminal_native.request_id)?; @@ -2347,7 +2339,7 @@ mod tests { let mut hostile_binding = cache .get::(&intent.intent_id)? .expect("tool binding"); - hostile_binding.bound_at = "not-a-time".into(); + hostile_binding.session_id = "foreign-session".into(); cache.put(&intent.intent_id, &hostile_binding)?; let before = SingleFileMessagePackBackingStore::new(&store).pull_all()?; assert!(seal_model_decision_context(&store, &terminal_native.request_id).is_err()); @@ -2391,7 +2383,6 @@ mod tests { created_at: "2026-08-18T00:00:01Z".into(), }, &native, - "2026-08-18T00:00:01Z", )?; let context = seal_model_decision_context(&store, &native.request_id)?; let options = crate::ModelPassFailureTerminalOptions { @@ -2627,7 +2618,6 @@ mod tests { created_at: "2026-08-14T00:00:01Z".into(), }, &native, - "2026-08-14T00:00:01Z", )?; let context = put_decision_context( &store, diff --git a/epiphany-core/src/reorientation_work.rs b/epiphany-core/src/reorientation_work.rs index 73790667..09fa74e2 100644 --- a/epiphany-core/src/reorientation_work.rs +++ b/epiphany-core/src/reorientation_work.rs @@ -999,7 +999,6 @@ mod tests { created_at: "2026-08-18T10:00:03Z".into(), }, &native, - "2026-08-18T10:00:03Z", )?; let context = crate::EpiphanyDecisionContext::new(&basis, native, Vec::new())?; crate::put_decision_context(&store, &context)?; @@ -1130,7 +1129,6 @@ mod tests { created_at: "2026-08-18T10:00:10Z".into(), }, &failed_native, - "2026-08-18T10:00:10Z", )?; let failed_context = crate::EpiphanyDecisionContext::new(&failed_basis, failed_native, Vec::new())?; diff --git a/epiphany-core/src/runtime_spine.rs b/epiphany-core/src/runtime_spine.rs index d5becd9c..34737881 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.v36"; +pub const RUNTIME_SPINE_SCHEMA_VERSION: &str = "epiphany.runtime_spine.v37"; pub const EPIPHANY_RUNTIME_ROOT_SESSION_ID: &str = "epiphany-main"; #[derive(Clone, Debug, PartialEq, DatabaseEntry)] #[cultcache(type = "epiphany.runtime.identity", schema = "EpiphanyRuntimeIdentity")] @@ -135,21 +135,11 @@ pub struct EpiphanyRuntimeJob { )] pub struct EpiphanyRuntimeModelExecutionBinding { #[cultcache(key = 1)] - pub binding_id: String, - #[cultcache(key = 2)] pub request_id: String, - #[cultcache(key = 3)] + #[cultcache(key = 2)] pub session_id: String, - #[cultcache(key = 4)] + #[cultcache(key = 3)] pub job_id: String, - #[cultcache(key = 5)] - pub provider: String, - #[cultcache(key = 6)] - pub bound_at: String, - #[cultcache(key = 7, default)] - pub source_worker_job_id: Option, - #[cultcache(key = 8, default)] - pub reasoning_basis_id: Option, } #[derive(Clone, Debug, PartialEq, Eq, DatabaseEntry)] @@ -159,17 +149,11 @@ pub struct EpiphanyRuntimeModelExecutionBinding { )] pub struct EpiphanyRuntimeToolExecutionBinding { #[cultcache(key = 1)] - pub binding_id: String, - #[cultcache(key = 2)] pub intent_id: String, - #[cultcache(key = 3)] + #[cultcache(key = 2)] pub session_id: String, - #[cultcache(key = 4)] + #[cultcache(key = 3)] pub job_id: String, - #[cultcache(key = 5, default)] - pub model_request_id: Option, - #[cultcache(key = 6)] - pub bound_at: String, } #[derive(Clone, Debug, PartialEq, Eq, DatabaseEntry)] @@ -1217,7 +1201,6 @@ pub fn open_runtime_model_execution( session_options: RuntimeSpineSessionOptions, job_options: RuntimeSpineJobOptions, model_request: &EpiphanyModelRequest, - bound_at: &str, ) -> Result { validate_non_empty(&session_options.session_id, "model execution session id")?; validate_non_empty(&session_options.objective, "model execution objective")?; @@ -1235,9 +1218,6 @@ pub fn open_runtime_model_execution( } validate_non_empty(&model_request.request_id, "model execution request id")?; validate_non_empty(&model_request.provider, "model execution provider")?; - validate_non_empty(bound_at, "model execution binding time")?; - chrono::DateTime::parse_from_rfc3339(bound_at) - .map_err(|error| anyhow!("model execution binding time is invalid: {error}"))?; let provider_request = epiphany_openai_adapter::request_from_native(model_request); let store_path = store_path.as_ref(); @@ -1357,14 +1337,9 @@ pub fn open_runtime_model_execution( )); } let binding = EpiphanyRuntimeModelExecutionBinding { - binding_id: binding_id.clone(), request_id: model_request.request_id.clone(), session_id: session.session_id.clone(), job_id: job.job_id.clone(), - provider: model_request.provider.clone(), - bound_at: bound_at.to_string(), - source_worker_job_id: model_request.source_worker_job_id.clone(), - reasoning_basis_id: model_request.reasoning_basis_id.clone(), }; let identity_envelope = cache .get_envelope::(RUNTIME_IDENTITY_KEY)? @@ -1410,7 +1385,6 @@ pub fn put_runtime_tool_execution_intent( session_id: &str, job_id: &str, intent: &EpiphanyToolInvocationIntent, - bound_at: &str, ) -> Result { validate_non_empty(session_id, "tool execution session id")?; validate_non_empty(job_id, "tool execution job id")?; @@ -1418,9 +1392,6 @@ pub fn put_runtime_tool_execution_intent( validate_non_empty(&intent.adapter, "tool execution adapter")?; validate_non_empty(&intent.server, "tool execution server")?; validate_non_empty(&intent.tool_name, "tool execution tool name")?; - chrono::DateTime::parse_from_rfc3339(bound_at) - .map_err(|error| anyhow!("tool execution binding time is invalid: {error}"))?; - let store_path = store_path.as_ref(); let mut cache = runtime_spine_cache(store_path)?; cache.pull_all_backing_stores()?; @@ -1500,24 +1471,12 @@ pub fn put_runtime_tool_execution_intent( intent.intent_id ) })?; - if model_binding.request_id != model_request_id - || model_binding.session_id != session_id - || model_binding.job_id != job_id - { + if model_binding.session_id != session_id || model_binding.job_id != job_id { return Err(anyhow!( "model-derived tool intent {:?} has foreign execution ownership", intent.intent_id )); } - let persisted_model_request = cache - .get::(model_request_id)? - .ok_or_else(|| anyhow!("model-derived tool intent lost its model request"))?; - if persisted_model_request.source_worker_job_id != model_binding.source_worker_job_id { - return Err(anyhow!( - "model-derived tool intent {:?} has substituted worker provenance", - intent.intent_id - )); - } for envelope in [ cache.get_envelope::(model_request_id)?, cache.get_envelope::(model_request_id)?, @@ -1534,14 +1493,11 @@ pub fn put_runtime_tool_execution_intent( } } let binding = EpiphanyRuntimeToolExecutionBinding { - binding_id: intent.intent_id.clone(), intent_id: intent.intent_id.clone(), session_id: session_id.to_string(), job_id: job_id.to_string(), - model_request_id: intent.model_request_id.clone(), - bound_at: bound_at.to_string(), }; - replacements.push(cache.prepare_entry(&binding.binding_id, &binding)?.0); + replacements.push(cache.prepare_entry(&binding.intent_id, &binding)?.0); replacements.push( cache .prepare_entry(&tool_invocation_intent_key(&intent.intent_id), intent)? @@ -1577,12 +1533,7 @@ pub(crate) fn validate_runtime_model_execution_binding( let job = cache .get::(&binding.job_id)? .ok_or_else(|| anyhow!("model execution binding {request_id:?} lost its job"))?; - if binding.binding_id != request_id - || binding.request_id != request_id - || binding.provider != native.provider - || binding.source_worker_job_id != native.source_worker_job_id - || binding.reasoning_basis_id != native.reasoning_basis_id - || chrono::DateTime::parse_from_rfc3339(&binding.bound_at).is_err() + if binding.request_id != request_id || provider != epiphany_openai_adapter::request_from_native(&native) || session.status == EpiphanyRuntimeSessionStatus::Archived || job.session_id != binding.session_id @@ -1591,8 +1542,8 @@ pub(crate) fn validate_runtime_model_execution_binding( "model execution binding {request_id:?} is not one exact request family" )); } - if let Some(worker_job_id) = binding.source_worker_job_id.as_deref() { - let basis_id = binding + if let Some(worker_job_id) = native.source_worker_job_id.as_deref() { + let basis_id = native .reasoning_basis_id .as_deref() .ok_or_else(|| anyhow!("decision-bearing model execution lost its reasoning basis"))?; @@ -1636,10 +1587,7 @@ pub(crate) fn validate_runtime_tool_execution_binding( let binding = cache .get::(intent_id)? .ok_or_else(|| anyhow!("tool execution intent {intent_id:?} is unbound"))?; - if binding.binding_id != intent_id - || binding.intent_id != intent_id - || chrono::DateTime::parse_from_rfc3339(&binding.bound_at).is_err() - { + if binding.intent_id != intent_id { return Err(anyhow!( "tool execution intent {intent_id:?} has an invalid binding" )); @@ -1647,7 +1595,7 @@ pub(crate) fn validate_runtime_tool_execution_binding( let intent = cache .get::(&tool_invocation_intent_key(intent_id))? .ok_or_else(|| anyhow!("tool execution binding {intent_id:?} lost its intent"))?; - if intent.intent_id != intent_id || intent.model_request_id != binding.model_request_id { + if intent.intent_id != intent_id { return Err(anyhow!( "tool execution binding {intent_id:?} disagrees with its intent" )); @@ -1666,13 +1614,9 @@ pub(crate) fn validate_runtime_tool_execution_binding( )); } let _ = validate_governed_source_tool_intent(&cache, &binding.job_id, &intent)?; - if let Some(model_request_id) = binding.model_request_id.as_deref() { - let model_binding = cache - .get::(model_request_id)? - .ok_or_else(|| anyhow!("tool execution binding lost its model execution"))?; - if model_binding.session_id != binding.session_id - || model_binding.job_id != binding.job_id - || model_binding.request_id != model_request_id + if let Some(model_request_id) = intent.model_request_id.as_deref() { + let model_binding = validate_runtime_model_execution_binding(cache, model_request_id)?; + if model_binding.session_id != binding.session_id || model_binding.job_id != binding.job_id { return Err(anyhow!( "tool execution binding {intent_id:?} has foreign model ownership" @@ -1712,7 +1656,7 @@ pub fn put_runtime_tool_execution_receipt( )); } let binding_envelope = cache - .get_envelope::(&binding.binding_id)? + .get_envelope::(&binding.intent_id)? .ok_or_else(|| anyhow!("tool execution receipt lost its binding envelope"))?; let intent_envelope = cache .get_envelope::(&tool_invocation_intent_key( @@ -1739,9 +1683,7 @@ pub(crate) fn validate_terminal_tool_execution_family( intent: &EpiphanyToolInvocationIntent, receipt: &EpiphanyToolInvocationReceipt, ) -> Result<()> { - if binding.binding_id != intent.intent_id - || binding.intent_id != intent.intent_id - || binding.model_request_id != intent.model_request_id + if binding.intent_id != intent.intent_id || intent.schema_id != TOOL_ADAPTER_INVOCATION_INTENT_SCHEMA_ID || receipt.schema_id != TOOL_ADAPTER_INVOCATION_RECEIPT_SCHEMA_ID || receipt.receipt_id.is_empty() @@ -1918,9 +1860,17 @@ fn archive_completed_model_session( .iter() .map(|binding| binding.request_id.clone()) .collect::>(); - let reasoning_basis_ids = model_bindings + let native_requests = model_request_ids .iter() - .filter_map(|binding| binding.reasoning_basis_id.clone()) + .map(|request_id| { + cache + .get::(request_id)? + .ok_or_else(|| anyhow!("archived model execution lost native request")) + }) + .collect::>>()?; + let reasoning_basis_ids = native_requests + .iter() + .filter_map(|request| request.reasoning_basis_id.clone()) .collect::>(); for basis_id in &reasoning_basis_ids { cache @@ -1939,25 +1889,22 @@ fn archive_completed_model_session( decision_context_ids.insert(context.context_id); } } - if model_bindings + if native_requests .iter() - .any(|binding| binding.source_worker_job_id.is_some()) + .any(|request| request.source_worker_job_id.is_some()) && decision_context_ids.is_empty() { return Err(anyhow!( "decision-bearing model session archive requires its terminal context" )); } - for request_id in &model_request_ids { - let native_request = cache - .get::(request_id)? - .ok_or_else(|| anyhow!("archived model execution lost native request"))?; + for native_request in &native_requests { + let request_id = &native_request.request_id; let provider_request = cache .get::(request_id)? .ok_or_else(|| anyhow!("archived model execution lost provider request"))?; - if native_request.request_id != *request_id - || provider_request.request_id != *request_id - || provider_request != epiphany_openai_adapter::request_from_native(&native_request) + if provider_request.request_id != *request_id + || provider_request != epiphany_openai_adapter::request_from_native(native_request) { return Err(anyhow!( "archived model execution request family is inconsistent" @@ -2012,13 +1959,10 @@ fn archive_completed_model_session( .filter(|binding| binding.session_id == session_id) .collect::>(); tool_bindings.sort_by(|left, right| left.intent_id.cmp(&right.intent_id)); - if tool_bindings.iter().any(|binding| { - !job_ids.contains(&binding.job_id) - || binding - .model_request_id - .as_ref() - .is_some_and(|request_id| !model_request_ids.contains(request_id)) - }) { + if tool_bindings + .iter() + .any(|binding| !job_ids.contains(&binding.job_id)) + { return Err(anyhow!( "runtime session archive found foreign tool execution ownership" )); @@ -2043,6 +1987,18 @@ fn archive_completed_model_session( )); } for binding in &tool_bindings { + let intent = cache + .get::(&tool_invocation_intent_key(&binding.intent_id))? + .ok_or_else(|| anyhow!("runtime session archive lost a tool intent"))?; + if intent + .model_request_id + .as_ref() + .is_some_and(|request_id| !model_request_ids.contains(request_id)) + { + return Err(anyhow!( + "runtime session archive found foreign tool execution ownership" + )); + } require_runtime_tool_execution_binding(store_path, &binding.intent_id)?; let receipt = cache .get::(&tool_invocation_receipt_key(&binding.intent_id))? @@ -2074,7 +2030,7 @@ fn archive_completed_model_session( for binding in &model_bindings { retired_identities.insert(( EpiphanyRuntimeModelExecutionBinding::TYPE.to_string(), - binding.binding_id.clone(), + binding.request_id.clone(), )); retired_identities.insert(( EpiphanyModelRequest::TYPE.to_string(), @@ -2107,7 +2063,7 @@ fn archive_completed_model_session( for binding in &tool_bindings { retired_identities.insert(( EpiphanyRuntimeToolExecutionBinding::TYPE.to_string(), - binding.binding_id.clone(), + binding.intent_id.clone(), )); retired_identities.insert(( EpiphanyToolInvocationIntent::TYPE.to_string(), @@ -2782,7 +2738,6 @@ pub fn put_runtime_requested_public_source_intents( || existing_binding.intent_id != intent_id || existing_binding.job_id != worker_job_id || existing_binding.session_id != job.session_id - || existing_binding.model_request_id.is_some() { return Err(anyhow!( "requested public source intent {intent_id:?} collides with foreign authority" @@ -2800,13 +2755,7 @@ pub fn put_runtime_requested_public_source_intents( )); } drop(cache); - put_runtime_tool_execution_intent( - store_path, - &job.session_id, - worker_job_id, - &intent, - created_at, - )?; + put_runtime_tool_execution_intent(store_path, &job.session_id, worker_job_id, &intent)?; intents.push(intent); } Ok(intents) @@ -2942,24 +2891,24 @@ fn authenticated_public_source_lookup_receipts_for_worker( return Err(anyhow!("public source evidence is Eyes-owned")); } let model_request_ids = cache - .get_all::()? + .get_all::()? .into_iter() - .filter(|binding| binding.source_worker_job_id.as_deref() == Some(worker_job_id)) - .map(|binding| binding.request_id) + .filter(|request| request.source_worker_job_id.as_deref() == Some(worker_job_id)) + .map(|request| request.request_id) .collect::>(); let mut lookups = Vec::new(); for binding in cache.get_all::()? { - let model_owned = binding - .model_request_id - .as_deref() - .is_some_and(|model_request_id| model_request_ids.contains(model_request_id)); - let request_owned = binding.model_request_id.is_none() && binding.job_id == worker_job_id; - if !model_owned && !request_owned { - continue; - } let intent = cache .get::(&tool_invocation_intent_key(&binding.intent_id))? .ok_or_else(|| anyhow!("public source tool binding lost its intent"))?; + let model_owned = intent + .model_request_id + .as_deref() + .is_some_and(|model_request_id| model_request_ids.contains(model_request_id)); + let request_owned = intent.model_request_id.is_none() && binding.job_id == worker_job_id; + if !model_owned && !request_owned { + continue; + } if intent.server != "epiphany_public" || intent.tool_name != "github_file" { continue; } @@ -3093,15 +3042,15 @@ fn governed_source_tool_authority( crate::substrate_gate_operation_for_governed_tool(&intent.server, &intent.tool_name); let source_worker_job_id = match intent.model_request_id.as_deref() { Some(model_request_id) => { - let model_binding = cache - .get::(model_request_id)? + let model_request = cache + .get::(model_request_id)? .ok_or_else(|| { anyhow!( - "model-derived tool intent {:?} has no execution binding", + "model-derived tool intent {:?} has no native request", intent.intent_id ) })?; - match model_binding.source_worker_job_id { + match model_request.source_worker_job_id { Some(worker_job_id) => Some(worker_job_id), None if required_operation.is_some() => { return Err(anyhow!( @@ -3437,7 +3386,6 @@ fn terminal_worker_request_id(cache: &CultCache, worker_job_id: &str) -> Result< let bindings = cache .get_all::()? .into_iter() - .filter(|binding| binding.source_worker_job_id.as_deref() == Some(worker_job_id)) .map(|binding| { let validated = validate_runtime_model_execution_binding(cache, &binding.request_id)?; let job = cache @@ -3446,9 +3394,15 @@ fn terminal_worker_request_id(cache: &CultCache, worker_job_id: &str) -> Result< let request = cache .get::(&validated.request_id)? .ok_or_else(|| anyhow!("worker model execution lost its native request"))?; - Ok((validated, job, request)) + Ok( + (request.source_worker_job_id.as_deref() == Some(worker_job_id)) + .then_some((validated, job, request)), + ) }) - .collect::>>()?; + .collect::>>()? + .into_iter() + .flatten() + .collect::>(); if bindings.is_empty() { return Ok(None); } @@ -3683,9 +3637,9 @@ fn commit_runtime_worker_process_death( expected.extend([context_envelope.clone(), failure_envelope.clone()]); unchanged_strong_reads.extend([context_envelope, failure_envelope]); } else if cache - .get_all::()? + .get_all::()? .iter() - .any(|binding| binding.source_worker_job_id.as_deref() == Some(job_id)) + .any(|request| request.source_worker_job_id.as_deref() == Some(job_id)) { return Err(anyhow!( "model-backed worker death cannot terminalize without its exact context" diff --git a/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs b/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs index b42a6faf..1a63c7c1 100644 --- a/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs +++ b/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs @@ -957,7 +957,6 @@ mod tests { created_at: chrono::Utc::now().to_rfc3339(), }, &model_request, - &chrono::Utc::now().to_rfc3339(), )?; let mut receipt = EpiphanyOpenAiModelReceipt::new(request_id, "gpt-test"); receipt.response_id = Some(format!("response-{request_id}")); @@ -1216,7 +1215,6 @@ mod tests { created_at: now(), }, &request, - &now(), )?; let pass_progress = WorkerPassProgress::default(); pass_progress.note_model_request(&request.request_id); diff --git a/epiphany-openai-runtime/src/lib.rs b/epiphany-openai-runtime/src/lib.rs index ebef4818..3c17d023 100644 --- a/epiphany-openai-runtime/src/lib.rs +++ b/epiphany-openai-runtime/src/lib.rs @@ -161,7 +161,6 @@ async fn run_openai_model_turn_bound( created_at: now(), }, &model_request, - &now(), )?; let events = match profile { EpiphanyProviderProfile::OpenAiCodex => { @@ -350,7 +349,6 @@ fn record_openai_events( &options.session_id, &options.job_id, intent, - &now(), )?; } let mut receipt = None; @@ -1003,7 +1001,7 @@ pub fn append_requested_public_source_receipts( } let binding = epiphany_core::require_runtime_tool_execution_binding(store_path, &intent.intent_id)?; - if binding.job_id != source_worker_job_id || binding.model_request_id.is_some() { + if binding.job_id != source_worker_job_id { return Err(anyhow!( "requested public source intent {:?} is not owned by worker {:?}", intent.intent_id, @@ -3386,7 +3384,6 @@ mod tests { created_at: now(), }, &native_request, - &now(), )?; let mut receipt = EpiphanyOpenAiModelReceipt::new("req-1", "gpt-5.4"); receipt.response_id = Some("resp-1".to_string()); @@ -3489,7 +3486,6 @@ mod tests { created_at: "2026-08-14T00:00:00Z".into(), }, &model_request, - "2026-08-14T00:00:00Z", )?; assert_eq!( model_request.output_contract_id.as_deref(), @@ -3870,7 +3866,6 @@ mod tests { created_at: now(), }, &native_request, - &now(), )?; let mut receipt = EpiphanyOpenAiModelReceipt::new("req-tools", "gpt-5.4"); receipt.response_id = Some("resp-tools".to_string()); @@ -3904,7 +3899,12 @@ mod tests { epiphany_core::require_runtime_tool_execution_binding(&store, &intent_id)?; assert_eq!(tool_binding.session_id, options.session_id); assert_eq!(tool_binding.job_id, options.job_id); - assert_eq!(tool_binding.model_request_id.as_deref(), Some("req-tools")); + let tool_intent = cache + .get::( + &epiphany_tool_adapter::tool_invocation_intent_key(&intent_id), + )? + .expect("tool intent"); + assert_eq!(tool_intent.model_request_id.as_deref(), Some("req-tools")); let mut tool_receipt = EpiphanyToolInvocationReceipt::new( "receipt-tool", intent_id.clone(), diff --git a/epiphany-openai-runtime/src/persona_executor.rs b/epiphany-openai-runtime/src/persona_executor.rs index ef2c13e1..3ed47d94 100644 --- a/epiphany-openai-runtime/src/persona_executor.rs +++ b/epiphany-openai-runtime/src/persona_executor.rs @@ -705,7 +705,6 @@ mod tests { created_at: "2026-08-14T00:00:00Z".into(), }, &request, - "2026-08-14T00:00:00Z", )?; let output = match stage { "projector" => "Epiphany feels the direct call as a live obligation, while remaining tired and sharply curious about her own machinery.".to_string(), diff --git a/epiphany-tool-mcp-runtime/src/main.rs b/epiphany-tool-mcp-runtime/src/main.rs index 729f377d..18688293 100644 --- a/epiphany-tool-mcp-runtime/src/main.rs +++ b/epiphany-tool-mcp-runtime/src/main.rs @@ -304,7 +304,6 @@ mod tests { "native-tool-session", "native-tool-job", &intent, - "2026-08-10T01:00:03Z", )?; let summary = run(RunOptions { @@ -372,7 +371,6 @@ mod tests { "state-tool-session", "state-tool-job", &intent, - "2026-08-11T00:00:02Z", )?; let unbound = execute_to_receipt(