Skip to content

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

style: apply rustfmt formatting to subagent session code

Steven Enamakelf7af6c2bf99c
diff --git a/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs b/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs
index e9932f49e4..0cc6d5ab65 100644
--- a/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs
+++ b/crates/openhuman-core/src/agent/orchestration/running_subagents/cancel.rs
@@ -214,10 +214,8 @@ fn terminal_legacy_session(
let Some(key) = session.lifecycle_key.as_ref() else {
return Ok(None);
};
- let Some(outcome) = crate::agent::subagent_host::load_terminal_outcome(
- workspace_dir,
- key,
- )?
+ let Some(outcome) =
+ crate::agent::subagent_host::load_terminal_outcome(workspace_dir, key)?
else {
return Ok(None);
};
@@ -229,9 +227,7 @@ fn terminal_legacy_session(
Some(FinishedOutcome::Failed)
}
tinyagents_orchestration::subagent::SubagentOutcomeKind::Cancelled
- | tinyagents_orchestration::subagent::SubagentOutcomeKind::AwaitingInput(_) => {
- None
- }
+ | tinyagents_orchestration::subagent::SubagentOutcomeKind::AwaitingInput(_) => None,
}
}
DurableSubagentStatus::Running
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/mod.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/mod.rs
index 34c4ce8146..892b6e0bb4 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/mod.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/mod.rs
@@ -7,10 +7,10 @@ mod tiny_port;
mod types;
pub use ops::{
- action_root_key, cancel_driver_job_by_task, cancel_driver_job_for_observed_session,
- cancel_driver_jobs_for_thread, close_if_current, find_reusable, list_for_parent,
- mark_driver_pause_cancelled, mark_failed, mark_finished, normalize_task_key,
- resolve_lifecycle_key, reuse_decision, upsert_running, DriverTaskCancellation,
+ DriverTaskCancellation, action_root_key, cancel_driver_job_by_task,
+ cancel_driver_job_for_observed_session, cancel_driver_jobs_for_thread, close_if_current,
+ find_reusable, list_for_parent, mark_failed, mark_finished, normalize_task_key,
+ resolve_lifecycle_key, reuse_decision, upsert_running,
};
#[cfg(test)]
pub(crate) use tiny_port::OpenHumanTinySubagentSessionStore;
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops.rs
index db9f131cad..c60209b446 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops.rs
@@ -14,9 +14,8 @@ mod driver;
#[cfg(test)]
use driver::record_cancel_reason;
pub use driver::{
- cancel_driver_job_by_task, cancel_driver_job_for_observed_session,
+ DriverTaskCancellation, cancel_driver_job_by_task, cancel_driver_job_for_observed_session,
cancel_driver_jobs_for_thread, mark_driver_pause_cancelled, resolve_lifecycle_key,
- DriverTaskCancellation,
};
pub use tinyagents_orchestration::subagent::normalize_task_key;
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_followup_tests.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_followup_tests.rs
index e724a1e46c..bf759d26b1 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_followup_tests.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_followup_tests.rs
@@ -38,12 +38,14 @@ fn list_for_parent_without_thread_id_does_not_filter_by_thread() {
let all = list_for_parent(&store, "parent-a", None).unwrap();
assert_eq!(all.len(), 2);
- assert!(all
- .iter()
- .any(|session| session.subagent_session_id == first.subagent_session_id));
- assert!(all
- .iter()
- .any(|session| session.subagent_session_id == second.subagent_session_id));
+ assert!(
+ all.iter()
+ .any(|session| session.subagent_session_id == first.subagent_session_id)
+ );
+ assert!(
+ all.iter()
+ .any(|session| session.subagent_session_id == second.subagent_session_id)
+ );
let thread_a = list_for_parent(&store, "parent-a", Some("thread-a")).unwrap();
assert_eq!(thread_a.len(), 1);
@@ -54,14 +56,16 @@ fn list_for_parent_without_thread_id_does_not_filter_by_thread() {
fn missing_session_updates_return_errors() {
let dir = tempfile::tempdir().unwrap();
let store = SubagentSessionStore::new(dir.path().to_path_buf());
- assert!(mark_finished(
- &store,
- "missing",
- "sub-1",
- &SubagentRunStatus::Completed,
- vec![]
- )
- .is_err());
+ assert!(
+ mark_finished(
+ &store,
+ "missing",
+ "sub-1",
+ &SubagentRunStatus::Completed,
+ vec![]
+ )
+ .is_err()
+ );
assert!(mark_failed(&store, "missing", "sub-1", "boom".into()).is_err());
assert!(!close(&store, "missing").unwrap());
}
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_tests.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_tests.rs
index 8910511776..11b0bd631c 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_tests.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/ops_tests.rs
@@ -111,43 +111,51 @@ fn stale_completion_cannot_overwrite_reused_or_closed_session() {
.unwrap();
assert_eq!(first.subagent_session_id, second.subagent_session_id);
- assert!(mark_finished(
- &store,
- &second.subagent_session_id,
- "first-task",
- &SubagentRunStatus::Completed,
- vec![TranscriptMessage::user("stale")],
- )
- .is_err());
+ assert!(
+ mark_finished(
+ &store,
+ &second.subagent_session_id,
+ "first-task",
+ &SubagentRunStatus::Completed,
+ vec![TranscriptMessage::user("stale")],
+ )
+ .is_err()
+ );
let current = store.load().unwrap().remove(0);
assert_eq!(current.current_task_id.as_deref(), Some("second-task"));
assert_eq!(current.status, DurableSubagentStatus::Running);
assert!(current.latest_history.is_none());
- assert!(mark_failed(
- &store,
- &second.subagent_session_id,
- "first-task",
- "stale failure".into(),
- )
- .is_err());
+ assert!(
+ mark_failed(
+ &store,
+ &second.subagent_session_id,
+ "first-task",
+ "stale failure".into(),
+ )
+ .is_err()
+ );
assert!(store.load().unwrap()[0].latest_error.is_none());
close(&store, &second.subagent_session_id).unwrap();
- assert!(mark_finished(
- &store,
- &second.subagent_session_id,
- "second-task",
- &SubagentRunStatus::Completed,
- vec![TranscriptMessage::user("late after close")],
- )
- .is_err());
- assert!(mark_failed(
- &store,
- &second.subagent_session_id,
- "second-task",
- "late failure".into(),
- )
- .is_err());
+ assert!(
+ mark_finished(
+ &store,
+ &second.subagent_session_id,
+ "second-task",
+ &SubagentRunStatus::Completed,
+ vec![TranscriptMessage::user("late after close")],
+ )
+ .is_err()
+ );
+ assert!(
+ mark_failed(
+ &store,
+ &second.subagent_session_id,
+ "second-task",
+ "late failure".into(),
+ )
+ .is_err()
+ );
let closed = store.load().unwrap().remove(0);
assert_eq!(closed.status, DurableSubagentStatus::Closed);
assert!(closed.latest_history.is_none());
@@ -307,12 +315,14 @@ fn driver_task_cancel_reports_legacy_failure_and_refuses_ambiguous_ids() {
.unwrap()
.is_none()
);
- assert!(store
- .load()
- .unwrap()
- .iter()
- .filter(|row| row.current_task_id.as_deref() == Some("same-public-id"))
- .all(|row| row.status == DurableSubagentStatus::Running));
+ assert!(
+ store
+ .load()
+ .unwrap()
+ .iter()
+ .filter(|row| row.current_task_id.as_deref() == Some("same-public-id"))
+ .all(|row| row.status == DurableSubagentStatus::Running)
+ );
}
#[test]
@@ -589,14 +599,16 @@ fn upsert_persists_the_full_lifecycle_key_without_collapsing_to_task_id() {
)
.unwrap();
assert_eq!(resolved, key);
- assert!(resolve_lifecycle_key(
- &store,
- &session.subagent_session_id,
- "another-parent",
- Some("thread-a"),
- dir.path(),
- )
- .is_err());
+ assert!(
+ resolve_lifecycle_key(
+ &store,
+ &session.subagent_session_id,
+ "another-parent",
+ Some("thread-a"),
+ dir.path(),
+ )
+ .is_err()
+ );
}
#[test]
@@ -630,7 +642,7 @@ fn closed_session_is_not_reusable() {
#[test]
fn an_equal_millisecond_live_close_persists_and_a_stale_snapshot_cannot_reopen_it() {
- use crate::agent::orchestration::subagent_sessions::store_documents::{with_override, Docs};
+ use crate::agent::orchestration::subagent_sessions::store_documents::{Docs, with_override};
use crate::storage::{MemoryStorage, Scope, StorageBackend};
let storage = MemoryStorage::new();
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs
index 3ffc91731b..2dfd42583e 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents.rs
@@ -29,12 +29,12 @@ use serde_json::Value;
use tinyagents_session::transcript::TranscriptMessage;
use tinystoragedrivers::{CollectionSpec, Query, Sort};
-use super::storage_schema::{spec, SESSIONS};
+use super::storage_schema::{SESSIONS, spec};
use super::types::{DurableSubagentSession, DurableSubagentStatus};
+use crate::storage::DocumentStoreExt;
use crate::storage::documents::Repo;
use crate::storage::import_state;
use crate::storage::schema_support::{key_of, ms_rfc3339, rfc3339_ms};
-use crate::storage::DocumentStoreExt;
/// The `tsd.migrations` owner of the legacy-file import.
const OWNER: &str = "subagents";
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents_tests.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents_tests.rs
index d928003878..3f8c6d1605 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents_tests.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/store_documents_tests.rs
@@ -35,10 +35,12 @@ fn session(id: &str) -> DurableSubagentSession {
#[test]
fn a_missing_list_loads_empty() {
- assert!(docs_in(&MemoryStorage::new(), "local")
- .load()
- .unwrap()
- .is_empty());
+ assert!(
+ docs_in(&MemoryStorage::new(), "local")
+ .load()
+ .unwrap()
+ .is_empty()
+ );
}
#[test]
@@ -82,10 +84,11 @@ fn the_store_uses_the_workspace_default_with_no_backend_installed() {
store.save(&[session("a")]).unwrap();
assert_eq!(store.load().unwrap().len(), 1);
// No JSON file store: the records are in the workspace's own database.
- assert!(!dir
- .path()
- .join(".openhuman/subagent_sessions.json")
- .exists());
+ assert!(
+ !dir.path()
+ .join(".openhuman/subagent_sessions.json")
+ .exists()
+ );
assert!(dir.path().join("storage").exists());
}
@@ -118,10 +121,11 @@ fn the_store_dispatches_to_documents_when_a_backend_is_pinned() {
assert_eq!(store.load().unwrap().len(), 1);
});
assert_eq!(docs.load().unwrap().len(), 1);
- assert!(!dir
- .path()
- .join(".openhuman/subagent_sessions.json")
- .exists());
+ assert!(
+ !dir.path()
+ .join(".openhuman/subagent_sessions.json")
+ .exists()
+ );
}
#[test]
diff --git a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port_tests.rs b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port_tests.rs
index 19c699e91d..6bf1790946 100644
--- a/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port_tests.rs
+++ b/crates/openhuman-core/src/agent/orchestration/subagent_sessions/tiny_port_tests.rs
@@ -59,9 +59,11 @@ async fn driver_store_imports_legacy_rows_without_losing_host_epoch() {
assert_eq!(imported.subagent_session_id, "legacy-session");
assert_eq!(imported.current_task_id.as_deref(), Some("legacy-task"));
assert_eq!(imported.status, TinyStatus::Idle);
- assert!(serde_json::to_string(&imported.latest_history)
- .unwrap()
- .contains("legacy history"));
+ assert!(
+ serde_json::to_string(&imported.latest_history)
+ .unwrap()
+ .contains("legacy history")
+ );
let retained = legacy.load().unwrap();
assert_eq!(retained[0].parent_epoch, Some(7));
@@ -206,16 +208,18 @@ async fn old_rows_without_checkpoint_identity_remain_readable_without_fabricated
assert_eq!(sessions[0].subagent_session_id, "legacy-session");
assert_eq!(sessions[0].current_task_id.as_deref(), Some("legacy-task"));
assert!(sessions[0].lifecycle_key.is_none());
- assert!(port
- .list_for_parent("foreign-owner", Some("thread"))
- .await
- .unwrap()
- .is_empty());
- assert!(port
- .list_for_parent("owner", Some("other-thread"))
- .await
- .unwrap()
- .is_empty());
+ assert!(
+ port.list_for_parent("foreign-owner", Some("thread"))
+ .await
+ .unwrap()
+ .is_empty()
+ );
+ assert!(
+ port.list_for_parent("owner", Some("other-thread"))
+ .await
+ .unwrap()
+ .is_empty()
+ );
assert_eq!(port.list_for_parent("owner", None).await.unwrap().len(), 1);
assert!(port.get("legacy-session").await.unwrap().is_some());
let other_thread = OpenHumanTinySubagentSessionStore::new(
@@ -262,11 +266,12 @@ async fn unthreaded_port_lists_only_unthreaded_rows() {
let sessions = port.list_for_parent("owner", None).await.unwrap();
assert_eq!(sessions.len(), 1);
assert_eq!(sessions[0].subagent_session_id, "unthreaded-session");
- assert!(port
- .list_for_parent("owner", Some("thread-a"))
- .await
- .unwrap()
- .is_empty());
+ assert!(
+ port.list_for_parent("owner", Some("thread-a"))
+ .await
+ .unwrap()
+ .is_empty()
+ );
}
#[tokio::test]
@@ -371,37 +376,41 @@ async fn upsert_rejects_a_selector_or_lifecycle_key_outside_bound_scope() {
}
};
- assert!(port
- .upsert_running(upsert(
+ assert!(
+ port.upsert_running(upsert(
"foreign",
Some("thread-a"),
key(Some("thread-a"), "task-1")
))
.await
- .is_err());
- assert!(port
- .upsert_running(upsert(
+ .is_err()
+ );
+ assert!(
+ port.upsert_running(upsert(
"owner",
Some("thread-b"),
key(Some("thread-b"), "task-1")
))
.await
- .is_err());
- assert!(port
- .upsert_running(upsert(
+ .is_err()
+ );
+ assert!(
+ port.upsert_running(upsert(
"owner",
Some("thread-a"),
key(Some("thread-b"), "task-1")
))
.await
- .is_err());
- assert!(port
- .upsert_running(upsert(
+ .is_err()
+ );
+ assert!(
+ port.upsert_running(upsert(
"owner",
Some("thread-a"),
key(Some("thread-a"), "other-task")
))
.await
- .is_err());
+ .is_err()
+ );
assert!(store.load().unwrap().is_empty());
}