Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(subagent_sessions): move parent epoch helpers into their own module

Steven Enamakelf06ca280109e
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port.rs
index 843523d196..0eabeb56d4 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port.rs
@@ -12,97 +12,9 @@ use tinyagents_orchestration::subagent::{
SubagentSessionStore as TinySessionStore, SubagentSessionUpsert as TinyUpsert,
};
-use super::storage_schema::EPOCHS;
use super::types::{DurableSubagentSession, DurableSubagentStatus, SubagentSessionSelector};
use super::{SubagentSessionStore, SubagentSessionUpsert};
-
-#[derive(Deserialize, Serialize)]
-struct ParentEpochRecord {
- parent_epoch: Option<u64>,
-}
-
-fn import_parent_epoch(
- documents: Arc<dyn crate::storage::DocumentStore>,
- session_id: String,
- parent_epoch: Option<u64>,
-) -> Result<(), SubagentError> {
- crate::storage::block_on(async move {
- documents
- .ensure_collection(&tinystoragedrivers::CollectionSpec::new(EPOCHS))
- .await?;
- let repo = tinystoragedrivers::Repo::<ParentEpochRecord>::new(&documents, EPOCHS)?;
- repo.update(&session_id, move |_| {
- Ok(Some(ParentEpochRecord { parent_epoch }))
- })
- .await?;
- Ok(())
- })
- .map_err(|error| SubagentError::Persistence(format!("import parent epoch: {error}")))
-}
-
-pub(crate) fn parent_epoch_from_sidecar(
- documents: Arc<dyn crate::storage::DocumentStore>,
- session_id: String,
-) -> Result<Option<u64>, SubagentError> {
- crate::storage::block_on(async move {
- documents
- .ensure_collection(&tinystoragedrivers::CollectionSpec::new(EPOCHS))
- .await?;
- let repo = tinystoragedrivers::Repo::<ParentEpochRecord>::new(&documents, EPOCHS)?;
- Ok(repo
- .get(&session_id)
- .await?
- .and_then(|record| record.doc.parent_epoch))
- })
- .map_err(|error| SubagentError::Persistence(format!("read parent epoch: {error}")))
-}
-
-pub(crate) fn parent_epoch_for_context(
- ctx: &crate::core::runtime::DispatchCtx,
- workspace_dir: &std::path::Path,
- session_id: String,
-) -> Result<Option<u64>, SubagentError> {
- let open_documents = || {
- let opened =
- crate::storage::local::open("subagent_sessions", workspace_dir).map_err(|error| {
- SubagentError::Persistence(format!("open session store: {error:#}"))
- })?;
- let scoped = opened.scoped().map_err(|error| {
- SubagentError::Persistence(format!("scope session store: {error:#}"))
- })?;
- Ok::<_, SubagentError>(Arc::clone(scoped.documents()))
- };
- let context = ctx.resolved().ok_or_else(|| {
- SubagentError::Persistence("subagent session store has no resolved owner scope".into())
- })?;
- parent_epoch_from_sidecar(
- crate::core::runtime::CoreContext::sync_scope(context, open_documents)?,
- session_id,
- )
-}
-
-pub(crate) fn set_parent_epoch_for_context(
- ctx: &crate::core::runtime::DispatchCtx,
- workspace_dir: &std::path::Path,
- session_id: String,
- parent_epoch: Option<u64>,
-) -> Result<(), SubagentError> {
- const DOMAIN: &str = "subagent_sessions";
- let open_documents = || {
- let opened = crate::storage::local::open(DOMAIN, workspace_dir).map_err(|error| {
- SubagentError::Persistence(format!("open session store: {error:#}"))
- })?;
- let scoped = opened.scoped().map_err(|error| {
- SubagentError::Persistence(format!("scope session store: {error:#}"))
- })?;
- Ok::<_, SubagentError>(Arc::clone(scoped.documents()))
- };
- let context = ctx.resolved().ok_or_else(|| {
- SubagentError::Persistence("subagent session store has no resolved owner scope".into())
- })?;
- let documents = crate::core::runtime::CoreContext::sync_scope(context, open_documents)?;
- import_parent_epoch(documents, session_id, parent_epoch)
-}
+use super::tiny_port_epoch::{import_parent_epoch, parent_epoch_from_sidecar};
pub(crate) fn host_projection(
session: TinySession,