GameCult/Epiphany
Archived
Watch
9
0
Fork
You've already forked Epiphany
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Centralize view enum projection

Browse source
This commit is contained in:
Meta Vens 2026-05-20 15:12:34 +01:00
commit 06145e33aa
5 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
epiphany-codex-bridge/src/protocol_edge.rs
View file

@ -48,6 +48,7 @@ use codex_app_server_protocol::ThreadEpiphanyRoleResultStatus;
use codex_app_server_protocol::ThreadEpiphanyRoleSelfPersistenceReview;
use codex_app_server_protocol::ThreadEpiphanyRoleSelfPersistenceStatus;
use codex_app_server_protocol::ThreadEpiphanyRoleWorkerLaunchDocument;
use codex_app_server_protocol::ThreadEpiphanyRolesSource;
use codex_app_server_protocol::ThreadEpiphanyStateUpdatedField;
use codex_app_server_protocol::ThreadEpiphanyStateUpdatedNotification;
use codex_app_server_protocol::ThreadEpiphanyStateUpdatedSource;
@ -91,6 +92,19 @@ pub fn protocol_view_lenses_to_core(lenses: Vec<ThreadEpiphanyViewLens>) -> Vec<
lenses.into_iter().map(protocol_view_lens_to_core).collect()
}
pub fn protocol_view_lens_from_core(lens: EpiphanyViewLens) -> ThreadEpiphanyViewLens {
match lens {
EpiphanyViewLens::Scene => ThreadEpiphanyViewLens::Scene,
EpiphanyViewLens::Jobs => ThreadEpiphanyViewLens::Jobs,
EpiphanyViewLens::Roles => ThreadEpiphanyViewLens::Roles,
EpiphanyViewLens::Planning => ThreadEpiphanyViewLens::Planning,
EpiphanyViewLens::Pressure => ThreadEpiphanyViewLens::Pressure,
EpiphanyViewLens::Reorient => ThreadEpiphanyViewLens::Reorient,
EpiphanyViewLens::Crrc => ThreadEpiphanyViewLens::Crrc,
EpiphanyViewLens::Coordinator => ThreadEpiphanyViewLens::Coordinator,
}
}
pub fn core_epiphany_view_needs_jobs(lenses: &[EpiphanyViewLens]) -> bool {
epiphany_view_needs_jobs(lenses)
}
@ -475,6 +489,13 @@ pub fn protocol_reorient_source(source: EpiphanySurfaceSource) -> ThreadEpiphany
}
}
pub fn protocol_roles_source(source: EpiphanySurfaceSource) -> ThreadEpiphanyRolesSource {
match source {
EpiphanySurfaceSource::Stored => ThreadEpiphanyRolesSource::Stored,
EpiphanySurfaceSource::Live => ThreadEpiphanyRolesSource::Live,
}
}
pub fn protocol_reorient_decision(
decision: EpiphanyReorientDecision,
) -> ThreadEpiphanyReorientDecision {

54
epiphany-codex-bridge/src/view.rs
View file

@ -42,10 +42,13 @@ use crate::protocol_edge::protocol_pressure_from_core;
use crate::protocol_edge::protocol_reorient_decision;
use crate::protocol_edge::protocol_reorient_finding;
use crate::protocol_edge::protocol_reorient_result_status;
use crate::protocol_edge::protocol_reorient_source;
use crate::protocol_edge::protocol_reorient_state_status;
use crate::protocol_edge::protocol_role_finding;
use crate::protocol_edge::protocol_role_id_from_core;
use crate::protocol_edge::protocol_role_result_status;
use crate::protocol_edge::protocol_roles_source;
use crate::protocol_edge::protocol_view_lens_from_core;
use crate::reorient::EpiphanyFreshnessWatcherSnapshot;
use crate::reorient::derive_epiphany_freshness_view;
use crate::reorient::derive_epiphany_reorient;
@ -55,19 +58,6 @@ use crate::scene::derive_epiphany_scene;
use crate::scene_protocol::protocol_scene;
use crate::scene_protocol::protocol_scene_action;
fn map_protocol_epiphany_view_lens(lens: EpiphanyViewLens) -> ThreadEpiphanyViewLens {
match lens {
EpiphanyViewLens::Scene => ThreadEpiphanyViewLens::Scene,
EpiphanyViewLens::Jobs => ThreadEpiphanyViewLens::Jobs,
EpiphanyViewLens::Roles => ThreadEpiphanyViewLens::Roles,
EpiphanyViewLens::Planning => ThreadEpiphanyViewLens::Planning,
EpiphanyViewLens::Pressure => ThreadEpiphanyViewLens::Pressure,
EpiphanyViewLens::Reorient => ThreadEpiphanyViewLens::Reorient,
EpiphanyViewLens::Crrc => ThreadEpiphanyViewLens::Crrc,
EpiphanyViewLens::Coordinator => ThreadEpiphanyViewLens::Coordinator,
}
}
pub struct EpiphanyFreshnessResponseInput<'a> {
pub thread_id: String,
pub loaded: bool,
@ -436,7 +426,7 @@ pub async fn map_epiphany_view_response(
coordinator: coordinator_response,
lenses: lenses
.into_iter()
.map(map_protocol_epiphany_view_lens)
.map(protocol_view_lens_from_core)
.collect(),
}
}
@ -462,13 +452,15 @@ pub async fn map_epiphany_role_result_response(
runtime_store_path,
} = input;
let protocol_role_id = protocol_role_id_from_core(role_id);
let protocol_source = map_protocol_roles_source(source);
let protocol_source = protocol_roles_source(source);
let Some(state) = state else {
return ThreadEpiphanyRoleResultResponse {
thread_id,
role_id: protocol_role_id,
source: protocol_source,
state_status: ThreadEpiphanyReorientStateStatus::Missing,
state_status: protocol_reorient_state_status(
epiphany_core::EpiphanyReorientStateStatus::Missing,
),
state_revision: None,
binding_id,
status: ThreadEpiphanyRoleResultStatus::MissingState,
@ -490,7 +482,9 @@ pub async fn map_epiphany_role_result_response(
thread_id,
role_id: protocol_role_id,
source: protocol_source,
state_status: ThreadEpiphanyReorientStateStatus::Ready,
state_status: protocol_reorient_state_status(
epiphany_core::EpiphanyReorientStateStatus::Ready,
),
state_revision: Some(state.revision),
binding_id,
status: protocol_role_result_status(result.status),
@ -520,12 +514,14 @@ pub async fn map_epiphany_reorient_result_response(
state,
runtime_store_path,
} = input;
let protocol_source = map_protocol_reorient_result_source(source);
let protocol_source = protocol_reorient_source(source);
let Some(state) = state else {
return ThreadEpiphanyReorientResultResponse {
thread_id,
source: protocol_source,
state_status: ThreadEpiphanyReorientStateStatus::Missing,
state_status: protocol_reorient_state_status(
epiphany_core::EpiphanyReorientStateStatus::Missing,
),
state_revision: None,
binding_id,
status: ThreadEpiphanyReorientResultStatus::MissingState,
@ -546,7 +542,9 @@ pub async fn map_epiphany_reorient_result_response(
ThreadEpiphanyReorientResultResponse {
thread_id,
source: protocol_source,
state_status: ThreadEpiphanyReorientStateStatus::Ready,
state_status: protocol_reorient_state_status(
epiphany_core::EpiphanyReorientStateStatus::Ready,
),
state_revision: Some(state.revision),
binding_id,
status: protocol_reorient_result_status(result.status),
@ -556,22 +554,6 @@ pub async fn map_epiphany_reorient_result_response(
}
}
fn map_protocol_roles_source(source: EpiphanySurfaceSource) -> ThreadEpiphanyRolesSource {
match source {
EpiphanySurfaceSource::Live => ThreadEpiphanyRolesSource::Live,
EpiphanySurfaceSource::Stored => ThreadEpiphanyRolesSource::Stored,
}
}
fn map_protocol_reorient_result_source(
source: EpiphanySurfaceSource,
) -> ThreadEpiphanyReorientSource {
match source {
EpiphanySurfaceSource::Live => ThreadEpiphanyReorientSource::Live,
EpiphanySurfaceSource::Stored => ThreadEpiphanyReorientSource::Stored,
}
}
pub fn map_epiphany_distill_response(
expected_revision: u64,
input: EpiphanyDistillInput,