Skip to content

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

refactor(running_subagents): resolve subagent tasks from records only

Steven Enamakel529246fb1652
diff --git a/crates/openhuman-core/src/agent/orchestration/running_subagents/resolve.rs b/crates/openhuman-core/src/agent/orchestration/running_subagents/resolve.rs
index 38cefc6782..5786f2d99b 100644
--- a/crates/openhuman-core/src/agent/orchestration/running_subagents/resolve.rs
+++ b/crates/openhuman-core/src/agent/orchestration/running_subagents/resolve.rs
@@ -6,12 +6,11 @@
use std::path::Path;
use tinyagents_orchestration::subagent::{
- resolve_detached_or_durable_with_owners, resume_ref_for_task as live_resume_ref_for_task,
- task_id_for_session as live_task_id_for_session, DetachedSubagentOwners, SubagentResumeRef,
- WaitError,
+ resume_ref_from_record, subagent_record_for_task, task_id_for_session_in_records,
+ SubagentResumeRef, WaitError,
};
-use super::registry::{admit_workspace, owner_key, registry};
+use super::registry::admit_workspace;
use super::task_ledger::task_store_for_workspace;
/// Resolve a durable `subagent_session_id` to the currently-running transient
@@ -21,13 +20,8 @@ pub(crate) fn task_id_for_session(
subagent_session_id: &str,
parent_session: &str,
) -> Result<String, WaitError> {
- let owner = owner_key(ctx, parent_session)?;
- let Some(context) = ctx.resolved() else {
- return live_task_id_for_session(registry(), subagent_session_id, &owner);
- };
- let Ok(workspace) = context.workspace_dir() else {
- return live_task_id_for_session(registry(), subagent_session_id, &owner);
- };
+ let context = ctx.resolved().ok_or(WaitError::NotOwned)?;
+ let workspace = context.workspace_dir().map_err(|_| WaitError::NotOwned)?;
task_id_for_session_in_workspace(ctx, subagent_session_id, parent_session, &workspace)
}
@@ -38,16 +32,12 @@ pub(crate) fn task_id_for_session_in_workspace(
workspace_dir: &Path,
) -> Result<String, WaitError> {
admit_workspace(ctx, workspace_dir)?;
- let owner = owner_key(ctx, parent_session)?;
let store = scoped_task_store(ctx, workspace_dir)?;
- let owners = DetachedSubagentOwners::new(&owner, parent_session);
- let resolved = resolve_detached_or_durable_with_owners(
- registry(),
- store.as_ref(),
+ let task_id = task_id_for_session_in_records(
+ tinyagents_orchestration::subagent::list_subagent_records(store.as_ref()),
subagent_session_id,
- owners,
+ parent_session,
)?;
- let task_id = resolved.task_id;
log::debug!(
"[running_subagents] resolved session from task store subagent_session_id={} task_id={} workspace_dir={}",
subagent_session_id,
@@ -62,13 +52,8 @@ pub(crate) fn resume_ref_for_task(
task_id: &str,
parent_session: &str,
) -> Result<SubagentResumeRef, WaitError> {
- let owner = owner_key(ctx, parent_session)?;
- let Some(context) = ctx.resolved() else {
- return live_resume_ref_for_task(registry(), task_id, &owner);
- };
- let Ok(workspace) = context.workspace_dir() else {
- return live_resume_ref_for_task(registry(), task_id, &owner);
- };
+ let context = ctx.resolved().ok_or(WaitError::NotOwned)?;
+ let workspace = context.workspace_dir().map_err(|_| WaitError::NotOwned)?;
resume_ref_for_task_in_workspace(ctx, task_id, parent_session, &workspace)
}
@@ -79,11 +64,9 @@ pub(crate) fn resume_ref_for_task_in_workspace(
workspace_dir: &Path,
) -> Result<SubagentResumeRef, WaitError> {
admit_workspace(ctx, workspace_dir)?;
- let owner = owner_key(ctx, parent_session)?;
let store = scoped_task_store(ctx, workspace_dir)?;
- let owners = DetachedSubagentOwners::new(&owner, parent_session);
- let reference =
- resolve_detached_or_durable_with_owners(registry(), store.as_ref(), task_id, owners)?;
+ let record = subagent_record_for_task(store.as_ref(), task_id, parent_session)?;
+ let reference = resume_ref_from_record(task_id, &record);
log::debug!(
"[running_subagents] resolved resume ref from task store task_id={} workspace_dir={}",
task_id,