Skip to content

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

refactor(tools): move orchestrator tools into composio integrations

Steven Enamakel32ee50e7eb49
diff --git a/crates/openhuman-core/src/agent/session_host/builder/factory.rs b/crates/openhuman-core/src/agent/session_host/builder/factory.rs
index b0358561ce..c2cd067140 100644
--- a/crates/openhuman-core/src/agent/session_host/builder/factory.rs
+++ b/crates/openhuman-core/src/agent/session_host/builder/factory.rs
@@ -374,7 +374,7 @@ impl OpenHumanSessionHost {
_ if host_only => (Vec::new(), Some(super::host_only::empty_belt())),
(Some(def), Some(_reg)) => {
let synthed = if should_synthesize_delegation_tools(def) {
- tools::orchestrator_tools::collect_orchestrator_tools(
+ crate::integrations::composio::orchestrator_actions::collect_orchestrator_tools(
def,
prewarmed_integrations_slice,
)
@@ -433,7 +433,7 @@ impl OpenHumanSessionHost {
// callers that invoke the old `from_config` on a
// pre-startup or test registry state.
let synthed = match reg.get("orchestrator") {
- Some(orch_def) => tools::orchestrator_tools::collect_orchestrator_tools(
+ Some(orch_def) => crate::integrations::composio::orchestrator_actions::collect_orchestrator_tools(
orch_def,
prewarmed_integrations_slice,
),
diff --git a/crates/openhuman-core/src/agent/session_host/runtime_session_tool_surface.rs b/crates/openhuman-core/src/agent/session_host/runtime_session_tool_surface.rs
index 77cfced345..641b4b10b2 100644
--- a/crates/openhuman-core/src/agent/session_host/runtime_session_tool_surface.rs
+++ b/crates/openhuman-core/src/agent/session_host/runtime_session_tool_surface.rs
@@ -52,7 +52,7 @@ impl OpenHumanTurnPrelude {
/// this request is prepared.
pub(super) fn refresh_delegation_tool_surface(&self) -> anyhow::Result<()> {
use crate::agent_registry::host_definition::AgentDefinitionRegistry;
- use crate::tools::orchestrator_tools::collect_orchestrator_tools;
+ use crate::integrations::composio::orchestrator_actions::collect_orchestrator_tools;
use tinytools::ToolPolicyEngine;
let Some(registry) = AgentDefinitionRegistry::current() else {
diff --git a/crates/openhuman-core/src/channels/runtime/dispatch/routing.rs b/crates/openhuman-core/src/channels/runtime/dispatch/routing.rs
index 57e91e2e53..4c88bd8386 100644
--- a/crates/openhuman-core/src/channels/runtime/dispatch/routing.rs
+++ b/crates/openhuman-core/src/channels/runtime/dispatch/routing.rs
@@ -13,7 +13,7 @@ use crate::integrations::composio::{
FetchConnectedIntegrationsStatus,
};
use crate::integrations::ConnectedIntegration;
-use crate::tools::orchestrator_tools;
+use crate::integrations::composio::orchestrator_actions;
use std::collections::HashSet;
use std::time::Duration;
use tinyagents_definition::ToolScope;
@@ -152,7 +152,7 @@ pub(super) async fn resolve_target_agent(channel: &str) -> AgentScoping {
connected_integration_count = connected.len(),
"[dispatch::routing] fetched connected integrations for delegation expansion"
);
- orchestrator_tools::collect_orchestrator_tools(definition, &connected)
+ orchestrator_actions::collect_orchestrator_tools(definition, &connected)
} else {
Vec::new()
};
diff --git a/crates/openhuman-core/src/integrations/composio/orchestrator_actions.rs b/crates/openhuman-core/src/integrations/composio/orchestrator_actions.rs
index 9739de66b6..bc56779adf 100644
--- a/crates/openhuman-core/src/integrations/composio/orchestrator_actions.rs
+++ b/crates/openhuman-core/src/integrations/composio/orchestrator_actions.rs
@@ -154,5 +154,5 @@ pub(crate) fn sanitise_slug(raw: &str) -> String {
}
#[cfg(test)]
-#[path = "orchestrator_tools_tests.rs"]
+#[path = "orchestrator_actions_tests.rs"]
mod tests;
diff --git a/crates/openhuman-core/src/tools/mod.rs b/crates/openhuman-core/src/tools/mod.rs
index 9557ba3a9c..c3b45a3bd3 100644
--- a/crates/openhuman-core/src/tools/mod.rs
+++ b/crates/openhuman-core/src/tools/mod.rs
@@ -2,7 +2,6 @@ pub mod host_extensions;
pub(crate) mod native_ops;
mod native_ops_types;
pub mod ops;
-pub mod orchestrator_tools;
pub(crate) mod per_call;
pub(crate) mod policy_session;
pub mod registry;