The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
refactor(orchestration): tidy subagent cancellation formatting
Steven Enamakel4b4ce8d16ebb
diff --git a/crates/openhuman-core/src/agent/orchestration/completion_owners.rs b/crates/openhuman-core/src/agent/orchestration/completion_owners.rsindex 8de5ca31d3..01583bc884 100644--- a/crates/openhuman-core/src/agent/orchestration/completion_owners.rs+++ b/crates/openhuman-core/src/agent/orchestration/completion_owners.rs@@ -101,7 +101,10 @@ pub(crate) fn driver_task_owner(ctx: &crate::core::runtime::DispatchCtx,task_id: &str,) -> Option<DriverTaskOwner> {- owners().driver_tasks.get(&driver_task_key(ctx, task_id)).cloned()+ owners()+ .driver_tasks+ .get(&driver_task_key(ctx, task_id))+ .cloned()}pub(crate) fn note_driver_cancel_reason(@@ -109,10 +112,9 @@ pub(crate) fn note_driver_cancel_reason(task_id: &str,reason: &str,) {- owners().driver_cancel_reasons.insert(- driver_task_key(ctx, task_id),- reason.to_owned(),- );+ owners()+ .driver_cancel_reasons+ .insert(driver_task_key(ctx, task_id), reason.to_owned());}pub(crate) fn take_driver_cancel_reason(@@ -124,10 +126,7 @@ pub(crate) fn take_driver_cancel_reason(.remove(&driver_task_key(ctx, task_id))}-pub(crate) fn clear_driver_cancel_reason(- ctx: &crate::core::runtime::DispatchCtx,- task_id: &str,-) {+pub(crate) fn clear_driver_cancel_reason(ctx: &crate::core::runtime::DispatchCtx, task_id: &str) {owners().driver_cancel_reasons.remove(&driver_task_key(ctx, task_id));@@ -147,7 +146,7 @@ pub(crate) fn driver_tasks_for_thread((owner.profile == profile&& owner.workspace_dir == workspace_dir&& owner.parent_thread_id.as_deref() == Some(thread_id))- .then(|| (owner.task_id.clone(), owner.clone()))+ .then(|| (owner.task_id.clone(), owner.clone()))}).collect()}diff --git a/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs b/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rsindex 565d5ca245..1abc61bd07 100644--- a/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs+++ b/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs@@ -4,9 +4,7 @@use std::path::{Path, PathBuf};-use tinyagents_orchestration::subagent::{- FinishedOutcome, ParentJobScope, SubAgentJobStatus,-};+use tinyagents_orchestration::subagent::{FinishedOutcome, ParentJobScope, SubAgentJobStatus};/// Metadata captured when a sub-agent is cancelled, so the caller can surface/// the cancellation back in the parent chat (record a "cancelled" completion@@ -51,9 +49,9 @@ pub(crate) async fn cancel_by_task_with_workspace_reason(let Some(workspace_dir) = workspace_dir else {return Ok(None);};- let Some(owner_scope) = crate::agent::orchestration::completion_owners::driver_task_owner(- ctx, task_id,- ) else {+ let Some(owner_scope) =+ crate::agent::orchestration::completion_owners::driver_task_owner(ctx, task_id)+ else {return Ok(None);};let Some(parent_thread_id) = owner_scope.parent_thread_id.as_deref() else {@@ -90,10 +88,7 @@ pub(crate) async fn cancel_by_task_with_workspace_reason().map_err(|error| format!("failed to open owner-scoped driver sessions: {error}"))?;let session = session_store- .list_for_parent(- &owner_scope.parent_session,- Some(parent_thread_id),- )+ .list_for_parent(&owner_scope.parent_session, Some(parent_thread_id)).await.map_err(|error| format!("failed to load owner-scoped driver sessions: {error}"))?.into_iter()@@ -109,13 +104,11 @@ pub(crate) async fn cancel_by_task_with_workspace_reason(.map_err(|error| format!("failed to load parent epoch: {error}"))?;let already_finished = job.as_ref().and_then(|job| match job.status {SubAgentJobStatus::Completed => Some(FinishedOutcome::Completed),- SubAgentJobStatus::Failed | SubAgentJobStatus::Incomplete => {- Some(FinishedOutcome::Failed)- }+ SubAgentJobStatus::Failed | SubAgentJobStatus::Incomplete => Some(FinishedOutcome::Failed),_ => None,});- let was_paused = session.status- == tinyagents_orchestration::subagent::DurableSubagentStatus::AwaitingUser;+ let was_paused =+ session.status == tinyagents_orchestration::subagent::DurableSubagentStatus::AwaitingUser;if already_finished.is_none() {let Some(job) = job else {return Ok(None);@@ -129,7 +122,9 @@ pub(crate) async fn cancel_by_task_with_workspace_reason(}}if jobs.cancel_owned(job.id.as_str(), &owner).is_err() {- crate::agent::orchestration::completion_owners::clear_driver_cancel_reason(ctx, task_id);+ crate::agent::orchestration::completion_owners::clear_driver_cancel_reason(+ ctx, task_id,+ );return Ok(None);}}@@ -243,27 +238,24 @@ pub(crate) fn stop_for_thread(let Some(parent_thread_id) = owner_scope.parent_thread_id.as_deref() else {continue;};- let scope = ParentJobScope::new(- owner_scope.workspace.clone(),- parent_thread_id,- );- let has_live_task = jobs- .list_for_parent_scope(&owner, &scope)- .ok()- .is_some_and(|jobs| {- jobs.iter().any(|job| {- job.extensions- .get("task_id")- .and_then(serde_json::Value::as_str)- == Some(task_id.as_str())- && matches!(- job.status,- SubAgentJobStatus::Queued- | SubAgentJobStatus::Running- | SubAgentJobStatus::AwaitingInput- )- })- });+ let scope = ParentJobScope::new(owner_scope.workspace.clone(), parent_thread_id);+ let has_live_task =+ jobs.list_for_parent_scope(&owner, &scope)+ .ok()+ .is_some_and(|jobs| {+ jobs.iter().any(|job| {+ job.extensions+ .get("task_id")+ .and_then(serde_json::Value::as_str)+ == Some(task_id.as_str())+ && matches!(+ job.status,+ SubAgentJobStatus::Queued+ | SubAgentJobStatus::Running+ | SubAgentJobStatus::AwaitingInput+ )+ })+ });if has_live_task {task_ids.push(task_id);if !stopped_scopes.contains(&scope) {diff --git a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_completion.rs b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_completion.rsindex ac48db4727..57a8f5b91c 100644--- a/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_completion.rs+++ b/crates/openhuman-core/src/agent/orchestration/tools/spawn_subagent_completion.rs@@ -80,9 +80,9 @@ pub(super) fn make_completion(Result<SubagentRunOutcome, String>,bool,) -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>- + Send- + Sync- + 'static {++ Send++ Sync++ 'static {move |_target: String,result: Result<SubagentRunOutcome, String>,emit_lifecycle_effects: bool|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.rsindex 7f4a5b710c..08a5e2e46c 100644--- 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@@ -20,10 +20,9 @@ async fn find_reusable_driver_session().await.map_err(|error| error.to_string())?;- let Some(selected) = tinyagents_orchestration::subagent::find_reusable_session(- sessions,- &driver_selector,- ) else {+ let Some(selected) =+ tinyagents_orchestration::subagent::find_reusable_session(sessions, &driver_selector)+ else {return Ok(None);};let parent_epoch = subagent_sessions::parent_epoch_for_context(diff --git a/crates/openhuman-core/src/agent_runs/subagent_control.rs b/crates/openhuman-core/src/agent_runs/subagent_control.rsindex 2ffef7a1fa..b98d0397e2 100644--- a/crates/openhuman-core/src/agent_runs/subagent_control.rs+++ b/crates/openhuman-core/src/agent_runs/subagent_control.rs@@ -15,12 +15,12 @@//! cancelled.use crate::core::runtime::DispatchCtx;-use serde_json::{json, Map, Value};+use serde_json::{Map, Value, json};use crate::agent::orchestration::running_subagents::CancelledSubagent;use crate::agent::orchestration::{background_completions, running_subagents, subagent_sessions};-use crate::core::all::{ControllerFuture, RegisteredController};use crate::core::Outcome;+use crate::core::all::{ControllerFuture, RegisteredController};use crate::core::{ControllerSchema, FieldSchema, TypeSchema};/// Controller schemas exposed for detached sub-agent control.diff --git a/crates/openhuman-core/src/agent_runs/subagent_control_tests.rs b/crates/openhuman-core/src/agent_runs/subagent_control_tests.rsindex f03c013510..f732c3af77 100644--- a/crates/openhuman-core/src/agent_runs/subagent_control_tests.rs+++ b/crates/openhuman-core/src/agent_runs/subagent_control_tests.rs@@ -76,7 +76,7 @@ fn field(out: &Value, name: &str) -> Option<Value> {/// durable session alone, instead of rewriting it as "cancelled by user".#[tokio::test]async fn cancel_of_a_legacy_failed_run_reports_its_outcome_and_rewrites_nothing() {- use crate::agent::orchestration::subagent_sessions::{mark_failed, SubagentSessionStore};+ use crate::agent::orchestration::subagent_sessions::{SubagentSessionStore, mark_failed};use crate::core::runtime::{CoreContext, DispatchCtx, DomainSet};use std::sync::Arc;@@ -141,8 +141,8 @@ async fn cancelling_a_paused_driver_queues_a_failed_delivery_with_reason() {forget_workspace_for_test, pending_for,};use crate::agent::orchestration::subagent_sessions::{- mark_finished, upsert_running, DriverTaskCancellation, DurableSubagentStatus,- SubagentSessionSelector, SubagentSessionStore, SubagentSessionUpsert,+ DriverTaskCancellation, DurableSubagentStatus, SubagentSessionSelector,+ SubagentSessionStore, SubagentSessionUpsert, mark_finished, upsert_running,};use tinyagents_orchestration::subagent::SubagentTaskKey;use tinyagents_tasks::CompletionStatus;@@ -208,14 +208,16 @@ async fn cancelling_a_paused_driver_queues_a_failed_delivery_with_reason() {};forget_workspace_for_test(&workspace_dir);- assert!(settle_paused_driver_cancel(- &DispatchCtx::process_default(),- &observed,- observed.parent_epoch,- Some("user requested stop")- )- .await- .expect("paused cancellation settles"));+ assert!(+ settle_paused_driver_cancel(+ &DispatchCtx::process_default(),+ &observed,+ observed.parent_epoch,+ Some("user requested stop")+ )+ .await+ .expect("paused cancellation settles")+ );let row = store.load().unwrap().remove(0);assert_eq!(row.status, DurableSubagentStatus::Failed);