Skip to content

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

refactor(agent): extract reusable driver session lookup into its own module

Steven Enamakelbbe59f2e9cb8
diff --git a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_driver_lookup.rs b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_driver_lookup.rs
new file mode 100644
index 0000000000..2b4bd52dcc
--- /dev/null
+++ b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_driver_lookup.rs
@@ -0,0 +1,37 @@
+async fn find_reusable_driver_session(
+ driver: &std::sync::Arc<dyn tinyagents_orchestration::subagent::SubagentSessionStore>,
+ legacy: &SubagentSessionStore,
+ selector: &SubagentSessionSelector,
+) -> Result<Option<DurableSubagentSession>, String> {
+ let driver_selector = tinyagents_orchestration::subagent::SubagentSessionSelector {
+ parent_session: selector.parent_session.clone(),
+ parent_thread_id: selector.parent_thread_id.clone(),
+ agent_id: selector.agent_id.clone(),
+ model: selector.model.clone(),
+ sandbox_mode: selector.sandbox_mode.clone(),
+ action_root: selector.action_root.clone(),
+ task_key: selector.task_key.clone(),
+ };
+ let sessions = driver
+ .list_for_parent(
+ &selector.parent_session,
+ selector.parent_thread_id.as_deref(),
+ )
+ .await
+ .map_err(|error| error.to_string())?;
+ let Some(selected) = tinyagents_orchestration::subagent::find_reusable_session(
+ sessions,
+ &driver_selector,
+ ) else {
+ return Ok(None);
+ };
+
+ legacy
+ .load()
+ .map(|sessions| {
+ sessions.into_iter().find(|session| {
+ session.subagent_session_id == selected.subagent_session_id
+ && session.matches_selector(selector)
+ })
+ })
+}
diff --git a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_host_impl.rs b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_host_impl.rs
index 415d415836..17a36bfaed 100644
--- a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_host_impl.rs
+++ b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_host_impl.rs
@@ -1,41 +1,3 @@
-async fn find_reusable_driver_session(
- driver: &std::sync::Arc<dyn tinyagents_orchestration::subagent::SubagentSessionStore>,
- legacy: &SubagentSessionStore,
- selector: &SubagentSessionSelector,
-) -> Result<Option<DurableSubagentSession>, String> {
- let driver_selector = tinyagents_orchestration::subagent::SubagentSessionSelector {
- parent_session: selector.parent_session.clone(),
- parent_thread_id: selector.parent_thread_id.clone(),
- agent_id: selector.agent_id.clone(),
- model: selector.model.clone(),
- sandbox_mode: selector.sandbox_mode.clone(),
- action_root: selector.action_root.clone(),
- task_key: selector.task_key.clone(),
- };
- let sessions = driver
- .list_for_parent(
- &selector.parent_session,
- selector.parent_thread_id.as_deref(),
- )
- .await
- .map_err(|error| error.to_string())?;
- let Some(selected) = tinyagents_orchestration::subagent::find_reusable_session(
- sessions,
- &driver_selector,
- ) else {
- return Ok(None);
- };
-
- legacy
- .load()
- .map(|sessions| {
- sessions.into_iter().find(|session| {
- session.subagent_session_id == selected.subagent_session_id
- && session.matches_selector(selector)
- })
- })
-}
-
impl SpawnSubagentTool {
async fn execute_with_context_inner(
&self,
diff --git a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_surface.rs b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_surface.rs
index 654df12648..0e6451ba47 100644
--- a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_surface.rs
+++ b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_surface.rs
@@ -368,6 +368,7 @@ impl SpawnSubagentTool {
#[path = "spawn_subagent_completion.rs"]
mod completion;
+include!("spawn_subagent_driver_lookup.rs");
include!("spawn_subagent_host_impl.rs");
include!("spawn_subagent_request.rs");
include!("spawn_subagent_projection.rs");