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
fix(orchestration): resolve subagent cancellation from typed terminal outcomes
Steven Enamakeld5f511c43ce7
diff --git a/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs b/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rsindex 6e90288f07..cf90245e86 100644--- a/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs+++ b/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs@@ -102,25 +102,39 @@ pub(crate) async fn cancel_by_task_with_workspace_reason(session.subagent_session_id.clone(),).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)- }- _ => None,- })- .or_else(|| match session.status {- tinyagents_orchestration::subagent::DurableSubagentStatus::Idle => {+ let typed_finished = || -> Result<Option<FinishedOutcome>, String> {+ let Some(key) = session.lifecycle_key.as_ref() else {+ return Ok(None);+ };+ let Some(outcome) =+ crate::agent::subagent_host::load_terminal_outcome(&owner_scope.workspace_dir, key)?+ else {+ return Ok(None);+ };+ Ok(match outcome.status {+ tinyagents_orchestration::subagent::SubagentOutcomeKind::Completed => {Some(FinishedOutcome::Completed)}- tinyagents_orchestration::subagent::DurableSubagentStatus::Failed- | tinyagents_orchestration::subagent::DurableSubagentStatus::Closed => {+ tinyagents_orchestration::subagent::SubagentOutcomeKind::Incomplete(_) => {Some(FinishedOutcome::Failed)}- _ => None,- });+ tinyagents_orchestration::subagent::SubagentOutcomeKind::Cancelled+ | tinyagents_orchestration::subagent::SubagentOutcomeKind::AwaitingInput(_) => None,+ })+ };+ let already_finished = match session.status {+ tinyagents_orchestration::subagent::DurableSubagentStatus::Idle => typed_finished()?,+ tinyagents_orchestration::subagent::DurableSubagentStatus::Failed => {+ match typed_finished()? {+ Some(finished) => Some(finished),+ None if session.lifecycle_key.is_none() => Some(FinishedOutcome::Failed),+ None => None,+ }+ }+ tinyagents_orchestration::subagent::DurableSubagentStatus::Running+ | tinyagents_orchestration::subagent::DurableSubagentStatus::AwaitingUser+ | tinyagents_orchestration::subagent::DurableSubagentStatus::Closed => None,+ };let was_paused =session.status == tinyagents_orchestration::subagent::DurableSubagentStatus::AwaitingUser;if already_finished.is_none() {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.rsindex 77561228db..9472c3c1dc 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@@ -51,14 +51,15 @@ impl SpawnSubagentTool {.or(run_context.thread_id.as_deref()).map(str::to_owned);- let store = match SubagentSessionStore::new_in_context(&dispatch, parent.workspace_dir.clone()) {- Ok(store) => store,- Err(error) => {- return Ok(ToolResult::error(format!(- "spawn_subagent: failed to open the caller-scoped session store: {error}"- )));- }- };+ let store =+ match SubagentSessionStore::new_in_context(&dispatch, parent.workspace_dir.clone()) {+ Ok(store) => store,+ Err(error) => {+ return Ok(ToolResult::error(format!(+ "spawn_subagent: failed to open the caller-scoped session store: {error}"+ )));+ }+ };let jobs = crate::core::runtime::slot_for::<tinyagents_harness_tools::subagents::SubAgentJobRegistry,>(&dispatch);@@ -175,9 +176,7 @@ impl SpawnSubagentTool {).await{- return Ok(ToolResult::error(format!(- "spawn_subagent: {error}"- )));+ return Ok(ToolResult::error(format!("spawn_subagent: {error}")));}}Ok(None) => {}@@ -261,19 +260,20 @@ impl SpawnSubagentTool {));}let checkpoint_resume = crate::agent::subagent_host::checkpoint_resume(&checkpoint);- let completion_target = match crate::agent::orchestration::background_completions::CompletionTarget::new(- dispatch.clone(),- parent.workspace_dir.clone(),- parent_session.clone(),- parent_thread_id.clone(),- ) {- Ok(target) => target,- Err(error) => {- return Ok(ToolResult::error(format!(- "spawn_subagent: parent lifecycle admission failed: {error}"- )));- }- };+ let completion_target =+ match crate::agent::orchestration::background_completions::CompletionTarget::new(+ dispatch.clone(),+ parent.workspace_dir.clone(),+ parent_session.clone(),+ parent_thread_id.clone(),+ ) {+ Ok(target) => target,+ Err(error) => {+ return Ok(ToolResult::error(format!(+ "spawn_subagent: parent lifecycle admission failed: {error}"+ )));+ }+ };if let Some(thread_id) = parent_thread_id.as_deref() {if crate::agent::orchestration::background_completions::mark_stopped_task_if_thread_stopped(&dispatch,@@ -383,9 +383,9 @@ impl SpawnSubagentTool {let message = error.to_string();let _ = driver_store.mark_failed(- &resumed_session.subagent_session_id,- task_id,- message.clone(),+ &resumed_session.subagent_session_id,+ task_id,+ message.clone(),).await;completion_target@@ -492,19 +492,20 @@ impl SpawnSubagentTool {// Capture the admitted parent generation before creating a worker// thread, writing a durable running session, or publishing spawn// events. A denied lifecycle admission must leave no phantom child.- let completion_target = match crate::agent::orchestration::background_completions::CompletionTarget::new(- dispatch.clone(),- parent.workspace_dir.clone(),- parent_session.clone(),- parent_thread_id.clone(),- ) {- Ok(target) => target,- Err(error) => {- return Ok(ToolResult::error(format!(- "spawn_subagent: parent lifecycle admission failed: {error}"- )));- }- };+ let completion_target =+ match crate::agent::orchestration::background_completions::CompletionTarget::new(+ dispatch.clone(),+ parent.workspace_dir.clone(),+ parent_session.clone(),+ parent_thread_id.clone(),+ ) {+ Ok(target) => target,+ Err(error) => {+ return Ok(ToolResult::error(format!(+ "spawn_subagent: parent lifecycle admission failed: {error}"+ )));+ }+ };let worker_thread_id = reusable.as_ref().and_then(|session| session.worker_thread_id.clone())@@ -553,7 +554,7 @@ impl SpawnSubagentTool {parent_thread_id.clone(),),),- parent_epoch: completion_target.parent_epoch(),+ parent_epoch: completion_target.parent_epoch(),},force_fresh,)@@ -612,7 +613,7 @@ impl SpawnSubagentTool {&dispatch,&task_id,parent.workspace_dir.clone(),- task_workspace,+ task_workspace.clone(),parent_session.clone(),parent_thread_id.clone(),);@@ -694,7 +695,7 @@ impl SpawnSubagentTool {worker_thread_id: background_worker_thread_id,initial_history,checkpoint_dir: None,- workspace_descriptor,+ workspace_descriptor: Some(task_workspace),run_queue: None,message_run_queue: None,};