Skip to content

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

refactor(tinyagents): pass owned and shared handles through turn drive wiring

Steven Enamakel0934d2a06641
diff --git a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive.rs b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive.rs
index c47ec3dbcb..df81586349 100644
--- a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive.rs
@@ -231,14 +231,14 @@ pub(super) async fn drive_turn(
model,
provider_id.clone(),
max_iterations,
- subagent_scope.as_ref(),
+ subagent_scope.clone(),
&cursor,
&tool_names,
&failure_map,
&provider_usage_carry,
- bridge_tool_sets,
+ bridge_tool_sets.clone(),
&run_context,
- &mut ctx,
+ &ctx,
)
.await;
let events::EventWiring {
@@ -247,12 +247,13 @@ pub(super) async fn drive_turn(
turn_journal,
turn_completed_sink,
} = event_wiring;
+ ctx = ctx.with_events(sink.clone());
let controls = controls::build(
max_iterations,
pause_at_cap,
early_exit_tools,
- subagent_scope.as_ref(),
+ subagent_scope.clone(),
message_run_queue,
run_queue,
is_subagent,
diff --git a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/controls.rs b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/controls.rs
index 91db948f08..9c839e5abe 100644
--- a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/controls.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/controls.rs
@@ -5,7 +5,7 @@ pub(super) fn build(
max_iterations: usize,
pause_at_cap: bool,
early_exit_tools: &[&str],
- subagent_scope: Option<&SubagentScope>,
+ subagent_scope: Option<SubagentScope>,
message_run_queue: Option<tinyagents_harness::run_queue::RunQueueHandle>,
run_queue: Option<Arc<RunQueue<crate::agent::queued_turn::QueuedTurn>>>,
is_subagent: bool,
diff --git a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/events.rs b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/events.rs
index 01201b5946..e30f06bad7 100644
--- a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/events.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/events.rs
@@ -2,29 +2,30 @@ use super::*;
pub(super) struct EventWiring {
pub(super) sink: EventSink,
- pub(super) bridge: OpenhumanEventBridge,
- pub(super) turn_journal: Option<journal::TurnJournalHandle>,
- pub(super) turn_completed_sink: Option<tokio::sync::mpsc::Sender<AgentProgress>>,
+ pub(super) bridge: Arc<OpenhumanEventBridge>,
+ pub(super) turn_journal: Option<journal::TurnJournal>,
+ pub(super) turn_completed_sink:
+ Option<tokio::sync::mpsc::Sender<crate::progress::AgentProgress>>,
}
#[allow(clippy::too_many_arguments)]
pub(super) async fn attach(
- on_progress: Option<tokio::sync::mpsc::Sender<AgentProgress>>,
+ on_progress: Option<tokio::sync::mpsc::Sender<crate::progress::AgentProgress>>,
is_subagent: bool,
defer_turn_completed_to_caller: bool,
- journal_run_id: String,
+ journal_run_id: tinyagents_harness::ids::RunId,
native_subagent: Option<&NativeSubagentRunContext>,
model: &str,
provider_id: String,
max_iterations: usize,
- subagent_scope: Option<&SubagentScope>,
+ subagent_scope: Option<SubagentScope>,
cursor: &tinyagents_harness::events::IterationCursor,
tool_names: &crate::agent::tinyagents::observability::ToolNameMap,
failure_map: &crate::agent::tinyagents::observability::ToolFailureMap,
provider_usage_carry: &crate::agent::tinyagents::observability::ProviderUsageCarry,
bridge_tool_sets: Vec<Arc<Vec<Box<dyn tinytools::Tool>>>>,
run_context: &OpenHumanRunContext,
- ctx: &mut tinyagents_harness::context::RunContext<OpenHumanRunContext>,
+ ctx: &tinyagents_harness::context::RunContext<OpenHumanRunContext>,
) -> EventWiring {
let turn_completed_sink = (!is_subagent && !defer_turn_completed_to_caller)
.then(|| on_progress.clone())
@@ -38,7 +39,7 @@ pub(super) async fn attach(
// the restart-stable `{run_id}-evt-{offset}` a late-attach replay
// reconstructs the timeline from (05.1). The same id keys the journal + status.
let sink = EventSink::with_stream_id(journal_run_id.as_str());
- if let Some(native) = &native_subagent {
+ if let Some(native) = native_subagent {
*native
.child_events
.lock()
@@ -105,7 +106,7 @@ pub(super) async fn attach(
ctx.config.lineage.root_run_id.clone(),
)
.await;
- if let Some(native) = &native_subagent {
+ if let Some(native) = native_subagent {
*native
.child_journal
.lock()
@@ -124,7 +125,6 @@ pub(super) async fn attach(
);
}
}
- ctx = ctx.with_events(sink.clone());
// Per-turn controls for the driver. Best-effort thread label for the
// delivery/requeue observability events and the metadata on any requeued
diff --git a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/stores.rs b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/stores.rs
index e0b41f7327..16a7d27213 100644
--- a/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/stores.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/turn_exec/drive/stores.rs
@@ -2,7 +2,7 @@ use super::*;
pub(super) async fn attach(
run_context: &OpenHumanRunContext,
- tool_result_artifact_index: Option<ToolResultArtifactIndexStore>,
+ tool_result_artifact_index: Option<Arc<ToolResultArtifactIndexStore>>,
) -> Option<StoreRegistry> {
// Assemble the run's store registry: the tool-result artifact index (when
// present) and — behind the default-ON session dual-write flag — the
@@ -31,8 +31,5 @@ pub(super) async fn attach(
crate::storage::import::live::TINYAGENTS_SESSION_KV_STORE
);
}
- if let Some(stores) = stores {
- ctx = ctx.with_stores(stores);
- }
stores
}