From cf9fb4451397e410d3f3760e252154401fca70e9 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Tue, 25 Aug 2026 13:41:15 +0200 Subject: [PATCH] Preserve typed worker failure outcome --- .../src/bin/epiphany-openai-runtime.rs | 20 ++++++++++++-- epiphany-openai-runtime/src/lib.rs | 26 ++++++++++++------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs b/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs index 61f54d13..4b4f3fb4 100644 --- a/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs +++ b/epiphany-openai-runtime/src/bin/epiphany-openai-runtime.rs @@ -561,13 +561,29 @@ async fn run_worker_launch( let assistant_text = assistant_text_from_model_events(&options.store_path, ¤t_request_id)?; - complete_worker_job_from_assistant_text( + if let Some(failure) = complete_worker_job_from_assistant_text( &options.store_path, &launch_request, ¤t_request_id, &openai_summary, &assistant_text, - )?; + )? { + return Ok(json!({ + "store": options.store_path, + "jobId": launch_request.job_id, + "bindingId": launch_request.binding_id, + "role": launch_request.role, + "requestId": current_request_id, + "openaiVerdict": openai_summary.verdict, + "openaiSummary": openai_summary.summary, + "workerResultId": null, + "verdict": "failed", + "summary": failure.summary, + "nextSafeMove": "Inspect the typed model-pass failure before launching a fresh request identity.", + "requestedPublicSourceRuns": requested_public_source_runs, + "toolRounds": tool_rounds, + })); + } let (worker_result_id, verdict, summary, next_safe_move) = match launch_request.launch_document()? { epiphany_core::EpiphanyWorkerLaunchDocument::Role(_) => { diff --git a/epiphany-openai-runtime/src/lib.rs b/epiphany-openai-runtime/src/lib.rs index 2c5fc40e..6538cf2a 100644 --- a/epiphany-openai-runtime/src/lib.rs +++ b/epiphany-openai-runtime/src/lib.rs @@ -366,7 +366,7 @@ pub fn complete_worker_job_from_assistant_text( openai_request_id: &str, openai_summary: &EpiphanyOpenAiRuntimeRunSummary, assistant_text: &str, -) -> Result<()> { +) -> Result> { let decision_context = epiphany_core::seal_model_decision_context(store_path.as_ref(), openai_request_id)?; let launch_document = launch_request.launch_document()?; @@ -392,7 +392,7 @@ pub fn complete_worker_job_from_assistant_text( .unwrap_or("structured output was absent") ) }; - fail_model_backed_worker_job( + let failure = fail_model_backed_worker_job( store_path, &launch_request.job_id, openai_request_id, @@ -403,7 +403,7 @@ pub fn complete_worker_job_from_assistant_text( }, summary, )?; - return Ok(()); + return Ok(Some(failure)); } let mut evidence_refs = parsed .as_ref() @@ -457,7 +457,7 @@ pub fn complete_worker_job_from_assistant_text( } } } - Ok(()) + Ok(None) } pub fn fail_worker_job( @@ -2972,13 +2972,18 @@ mod tests { summary: "Provider refused the model pass.".to_string(), tool_intent_ids: Vec::new(), }; - complete_worker_job_from_assistant_text( + let provider_failure = complete_worker_job_from_assistant_text( &provider_failure_store, &launch_request, &model_request.request_id, &provider_failure_summary, "", - )?; + )? + .expect("provider failure outcome"); + assert_eq!( + provider_failure.failure_kind, + "provider_or_transport_failure" + ); assert_eq!( runtime_job(&provider_failure_store, &worker_job_id)? .expect("provider failure worker job") @@ -3005,13 +3010,15 @@ mod tests { verdict: "pass".to_string(), ..provider_failure_summary.clone() }; - complete_worker_job_from_assistant_text( + let contract_failure = complete_worker_job_from_assistant_text( &contract_failure_store, &launch_request, &model_request.request_id, &contract_failure_summary, "not the declared structured contract", - )?; + )? + .expect("contract failure outcome"); + assert_eq!(contract_failure.failure_kind, "output_contract_failure"); assert_eq!( runtime_job(&contract_failure_store, &worker_job_id)? .expect("contract failure worker job") @@ -3049,13 +3056,14 @@ mod tests { "repoModelOperations": [] }) .to_string(); - complete_worker_job_from_assistant_text( + let completed = complete_worker_job_from_assistant_text( &store, &launch_request, &model_request.request_id, &openai_summary, &assistant_text, )?; + assert!(completed.is_none()); let runtime_evidence_id = format!("openai-request:{}", model_request.request_id); let typed_result = epiphany_core::runtime_role_worker_result(&store, &worker_job_id)?