Delete Codex core Epiphany reexport husks
This commit is contained in:
parent
29029d22e4
commit
f72393d3b1
9 changed files with 29 additions and 46 deletions
|
|
@ -605,6 +605,12 @@ shadow `open_native_job` / `maybe_complete_native_job` compensator is deleted:
|
|||
there is one runtime job for the worker, owned by runtime-spine, and the worker
|
||||
runner completes that job.
|
||||
|
||||
The Codex-core re-export husks for `epiphany_distillation`, `epiphany_promotion`,
|
||||
`epiphany_proposal`, and `epiphany_retrieval` have also been deleted.
|
||||
`codex-core` now re-exports those native types/functions directly from
|
||||
`epiphany-core`, and `CodexThread` calls `epiphany_core::retrieve_workspace` /
|
||||
`index_workspace` / `retrieval_state_for_workspace` directly.
|
||||
|
||||
The runtime-spine job-opening mechanism for heartbeat/specialist launches has
|
||||
also been pulled into `epiphany-core` as `open_runtime_spine_heartbeat_job`.
|
||||
Vendored `codex_core::CodexThread::epiphany_launch_job` still validates,
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because one or more lines are too long
13
vendor/codex/codex-rs/core/src/codex_thread.rs
vendored
13
vendor/codex/codex-rs/core/src/codex_thread.rs
vendored
|
|
@ -1,8 +1,5 @@
|
|||
use crate::agent::AgentStatus;
|
||||
use crate::config::ConstraintResult;
|
||||
use crate::epiphany_retrieval;
|
||||
use crate::epiphany_retrieval::EpiphanyRetrieveQuery;
|
||||
use crate::epiphany_retrieval::EpiphanyRetrieveResponse;
|
||||
use crate::file_watcher::WatchRegistration;
|
||||
use crate::session::Codex;
|
||||
use crate::session::SessionSettingsUpdate;
|
||||
|
|
@ -56,6 +53,8 @@ use codex_protocol::protocol::TokenUsageInfo;
|
|||
use codex_protocol::protocol::W3cTraceContext;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use epiphany_core::EpiphanyRetrieveQuery;
|
||||
use epiphany_core::EpiphanyRetrieveResponse;
|
||||
use epiphany_core::EpiphanyStateUpdate;
|
||||
use epiphany_core::EpiphanyWorkerLaunchDocument;
|
||||
use epiphany_core::RuntimeSpineHeartbeatJobOptions;
|
||||
|
|
@ -596,11 +595,11 @@ impl CodexThread {
|
|||
let fallback_workspace_root = workspace_root.clone();
|
||||
let fallback_codex_home = codex_home.clone();
|
||||
tokio::task::spawn_blocking(move || {
|
||||
epiphany_retrieval::retrieval_state_for_workspace(&workspace_root, codex_home.as_path())
|
||||
epiphany_core::retrieval_state_for_workspace(&workspace_root, codex_home.as_path())
|
||||
})
|
||||
.await
|
||||
.unwrap_or_else(|_| {
|
||||
epiphany_retrieval::retrieval_state_for_workspace(
|
||||
epiphany_core::retrieval_state_for_workspace(
|
||||
&fallback_workspace_root,
|
||||
fallback_codex_home.as_path(),
|
||||
)
|
||||
|
|
@ -624,7 +623,7 @@ impl CodexThread {
|
|||
let workspace_root = config.cwd.to_path_buf();
|
||||
let codex_home = self.codex.session.codex_home().await;
|
||||
tokio::task::spawn_blocking(move || {
|
||||
epiphany_retrieval::index_workspace(
|
||||
epiphany_core::index_workspace(
|
||||
&workspace_root,
|
||||
codex_home.as_path(),
|
||||
force_full_rebuild,
|
||||
|
|
@ -642,7 +641,7 @@ impl CodexThread {
|
|||
let workspace_root = config.cwd.to_path_buf();
|
||||
let codex_home = self.codex.session.codex_home().await;
|
||||
tokio::task::spawn_blocking(move || {
|
||||
epiphany_retrieval::retrieve_workspace(&workspace_root, codex_home.as_path(), query)
|
||||
epiphany_core::retrieve_workspace(&workspace_root, codex_home.as_path(), query)
|
||||
})
|
||||
.await
|
||||
.map_err(|err| anyhow::anyhow!("epiphany retrieval worker failed: {err}"))?
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
pub use epiphany_core::EpiphanyDistillInput;
|
||||
pub use epiphany_core::EpiphanyDistillProposal;
|
||||
pub use epiphany_core::distill_observation;
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
pub use epiphany_core::EpiphanyPromotionDecision;
|
||||
pub use epiphany_core::EpiphanyPromotionInput;
|
||||
pub use epiphany_core::evaluate_promotion;
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
pub use epiphany_core::EpiphanyMapProposal;
|
||||
pub use epiphany_core::EpiphanyMapProposalInput;
|
||||
pub use epiphany_core::propose_map_update;
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
pub use epiphany_core::EPIPHANY_RETRIEVAL_DEFAULT_LIMIT;
|
||||
pub use epiphany_core::EPIPHANY_RETRIEVAL_MAX_LIMIT;
|
||||
pub use epiphany_core::EpiphanyRetrieveQuery;
|
||||
pub use epiphany_core::EpiphanyRetrieveResponse;
|
||||
pub use epiphany_core::EpiphanyRetrieveResult;
|
||||
pub use epiphany_core::EpiphanyRetrieveResultKind;
|
||||
pub use epiphany_core::index_workspace;
|
||||
pub use epiphany_core::retrieval_state_for_workspace;
|
||||
pub use epiphany_core::retrieve_workspace;
|
||||
36
vendor/codex/codex-rs/core/src/lib.rs
vendored
36
vendor/codex/codex-rs/core/src/lib.rs
vendored
|
|
@ -17,32 +17,28 @@ pub(crate) mod session;
|
|||
pub use session::SteerInputError;
|
||||
mod codex_thread;
|
||||
mod compact_remote;
|
||||
mod epiphany_distillation;
|
||||
mod epiphany_promotion;
|
||||
mod epiphany_proposal;
|
||||
mod epiphany_retrieval;
|
||||
mod epiphany_rollout;
|
||||
pub use codex_thread::CodexThread;
|
||||
pub use codex_thread::CodexThreadTurnContextOverrides;
|
||||
pub use codex_thread::EpiphanyJobInterruptRequest;
|
||||
pub use codex_thread::EpiphanyJobLaunchRequest;
|
||||
pub use epiphany_core::EpiphanyStateUpdate;
|
||||
pub use codex_thread::ThreadConfigSnapshot;
|
||||
pub use epiphany_distillation::EpiphanyDistillInput;
|
||||
pub use epiphany_distillation::EpiphanyDistillProposal;
|
||||
pub use epiphany_distillation::distill_observation;
|
||||
pub use epiphany_promotion::EpiphanyPromotionDecision;
|
||||
pub use epiphany_promotion::EpiphanyPromotionInput;
|
||||
pub use epiphany_promotion::evaluate_promotion;
|
||||
pub use epiphany_proposal::EpiphanyMapProposal;
|
||||
pub use epiphany_proposal::EpiphanyMapProposalInput;
|
||||
pub use epiphany_proposal::propose_map_update;
|
||||
pub use epiphany_retrieval::EPIPHANY_RETRIEVAL_DEFAULT_LIMIT;
|
||||
pub use epiphany_retrieval::EPIPHANY_RETRIEVAL_MAX_LIMIT;
|
||||
pub use epiphany_retrieval::EpiphanyRetrieveQuery;
|
||||
pub use epiphany_retrieval::EpiphanyRetrieveResponse;
|
||||
pub use epiphany_retrieval::EpiphanyRetrieveResult;
|
||||
pub use epiphany_retrieval::EpiphanyRetrieveResultKind;
|
||||
pub use epiphany_core::EPIPHANY_RETRIEVAL_DEFAULT_LIMIT;
|
||||
pub use epiphany_core::EPIPHANY_RETRIEVAL_MAX_LIMIT;
|
||||
pub use epiphany_core::EpiphanyDistillInput;
|
||||
pub use epiphany_core::EpiphanyDistillProposal;
|
||||
pub use epiphany_core::EpiphanyMapProposal;
|
||||
pub use epiphany_core::EpiphanyMapProposalInput;
|
||||
pub use epiphany_core::EpiphanyPromotionDecision;
|
||||
pub use epiphany_core::EpiphanyPromotionInput;
|
||||
pub use epiphany_core::EpiphanyRetrieveQuery;
|
||||
pub use epiphany_core::EpiphanyRetrieveResponse;
|
||||
pub use epiphany_core::EpiphanyRetrieveResult;
|
||||
pub use epiphany_core::EpiphanyRetrieveResultKind;
|
||||
pub use epiphany_core::EpiphanyStateUpdate;
|
||||
pub use epiphany_core::distill_observation;
|
||||
pub use epiphany_core::evaluate_promotion;
|
||||
pub use epiphany_core::propose_map_update;
|
||||
pub use epiphany_rollout::latest_epiphany_state_from_rollout_items;
|
||||
mod agent;
|
||||
mod codex_delegate;
|
||||
|
|
|
|||
Reference in a new issue