diff --git a/epiphany-core/src/bin/epiphany-mvp-status.rs b/epiphany-core/src/bin/epiphany-mvp-status.rs index 89ddb08c..bb392b4a 100644 --- a/epiphany-core/src/bin/epiphany-mvp-status.rs +++ b/epiphany-core/src/bin/epiphany-mvp-status.rs @@ -38,9 +38,7 @@ use epiphany_core::derive_scene; use epiphany_core::read_accepted_coordinator_state; use epiphany_core::recommend_crrc_action; use epiphany_core::recommend_reorientation; -use epiphany_core::runtime_has_actionable_hands_frontier; use epiphany_core::runtime_job_snapshot; -use epiphany_core::runtime_repo_frontier_research_lifecycle; use epiphany_self_policy::crrc_scene_action_to_coordinator_scene_action; use epiphany_self_policy::derive_coordinator_finding_signals; use epiphany_self_policy::derive_coordinator_status; @@ -296,6 +294,8 @@ fn run_native_status(args: &Args, include_auxiliary_status: bool) -> Result Result false, }; - let hands_frontier_ready = runtime_has_actionable_hands_frontier(&runtime_store_path) - .context("failed to derive actionable Hands frontier from runtime-spine state")?; - let research_lifecycle = runtime_repo_frontier_research_lifecycle(&runtime_store_path) - .context("failed to derive exact Eyes frontier lifecycle from runtime-spine state")?; - let research_continuation_action = research_lifecycle.continuation_action(); + let hands_frontier_ready = current_work.hands_frontier_ready; + let research_continuation_action = current_work.research_continuation_action; let frontier_planning_eligibility = epiphany_core::runtime_repo_frontier_planning_eligibility( &runtime_store_path, ) @@ -498,6 +495,9 @@ fn run_native_status(args: &Args, include_auxiliary_status: bool) -> Result Result Result Result, + pub research_continuation_action: Option, + pub frontier_planning_stage: RepoFrontierPlanningLifecycleStage, + pub proposal_modeling_request: Option, + pub hands_frontier_ready: bool, +} + #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct EpiphanyBodyModelingWorkProjection { pub work_id: String, @@ -208,6 +222,47 @@ pub fn unresolved_body_modeling_work( resolve_body_modeling_work(work, decision) } +pub fn project_current_work( + store_path: impl AsRef, +) -> Result { + let store_path = store_path.as_ref(); + let mind = crate::assemble_mind_view(store_path)?; + let body_modeling = match ( + mind.repository_body_observation.clone(), + mind.repo_model.as_ref(), + ) { + (Some(body), Some(repo_model)) => { + let work = EpiphanyBodyModelingWorkProjection::derive( + mind.runtime_id.clone(), + body, + repo_model.reasoning_basis(), + )?; + let mut cache = crate::runtime_spine_cache(store_path)?; + cache.pull_all_backing_stores()?; + resolve_body_modeling_work( + work.clone(), + cache.get::(&work.work_id)?, + )? + } + (None, None) | (Some(_), None) => None, + (None, Some(_)) => { + return Err(anyhow!( + "current work has a RepoModel but no admitted repository Body observation" + )); + } + }; + Ok(EpiphanyCurrentWorkProjection { + mind_projection_digest: mind.projection_digest, + body_modeling, + research_continuation_action: crate::runtime_repo_frontier_research_lifecycle(store_path)? + .continuation_action(), + frontier_planning_stage: crate::runtime_repo_frontier_planning_lifecycle(store_path)?.stage, + proposal_modeling_request: + crate::runtime_pending_repo_frontier_proposal_modeling_request(store_path)?, + hands_frontier_ready: crate::runtime_has_actionable_hands_frontier(store_path)?, + }) +} + fn resolve_body_modeling_work( work: EpiphanyBodyModelingWorkProjection, receipt: Option, @@ -390,6 +445,13 @@ mod tests { let projected_work = current_body_modeling_work(&store)?; assert_eq!(projected_work.body_basis, body); assert_eq!(crate::repository_body_read_counters(), (0, 0)); + let current_work = project_current_work(&store)?; + assert_eq!(current_work.body_modeling, Some(projected_work.clone())); + assert_eq!( + current_work.mind_projection_digest, + crate::assemble_mind_view(&store)?.projection_digest + ); + assert_eq!(crate::repository_body_read_counters(), (0, 0)); let document = crate::EpiphanyWorkerLaunchDocument::Role(crate::EpiphanyRoleWorkerLaunchDocument { thread_id: "creation-thread".into(), @@ -514,6 +576,10 @@ mod tests { receipt.repo_model_projection_digest, crate::assemble_repo_model_view(&store)?.projection_digest ); + let mut cache = crate::runtime_spine_cache(&store)?; + cache.put(&receipt.work_id, &receipt)?; + assert!(project_current_work(&store)?.body_modeling.is_none()); + assert_eq!(crate::repository_body_read_counters(), (0, 0)); Ok(()) } } diff --git a/epiphany-core/src/runtime_spine.rs b/epiphany-core/src/runtime_spine.rs index bbcb81a2..0879f838 100644 --- a/epiphany-core/src/runtime_spine.rs +++ b/epiphany-core/src/runtime_spine.rs @@ -7840,7 +7840,8 @@ pub enum RepoFrontierResearchLifecycleStage { ResultReady, } -#[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] pub enum RepoFrontierResearchContinuationAction { LaunchResearch, ReviewResearchResult,