Skip to content

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

refactor(deps): move tinytools-std imports to tinyagents-harness-tools

Steven Enamakeldb57485768cf
diff --git a/Cargo.toml b/Cargo.toml
index 42cb97601c..e27e25dc75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,6 @@ tinyagents-harness-tools = { path = "vendor/tinyagents/crates/tinyagents-harness
# every host tool link — so there is exactly one `tinytools` package and one
# `Tool` trait. Without this, MCP tools would not satisfy the harness's trait.
tinytools = { path = "vendor/tinyagents/vendor/tinytools/crates/tinytools" }
-tinytools-std = { path = "vendor/tinyagents/vendor/tinytools/crates/tinytools-std" }
tinytools-agent = { path = "vendor/tinyagents/vendor/tinytools/crates/tinytools-agent" }
[patch."https://github.com/tinyhumansai/tinybus"]
diff --git a/crates/openhuman-app/Cargo.toml b/crates/openhuman-app/Cargo.toml
index dfd9835208..ff2ea25e2f 100644
--- a/crates/openhuman-app/Cargo.toml
+++ b/crates/openhuman-app/Cargo.toml
@@ -296,7 +296,6 @@ e2e-test-support = ["openhuman-rpc/e2e-test-support"]
# `Tool` trait. Without this, MCP tools would not satisfy the harness's trait.
tinytools = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools" }
tinytools-agent = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools-agent" }
-tinytools-std = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools-std" }
[patch."https://github.com/tinyhumansai/tinyinference"]
# Crates in this world name tinyinference by git rev; without this the shell
diff --git a/crates/openhuman-cli/Cargo.toml b/crates/openhuman-cli/Cargo.toml
index 924e2f3387..90ad51657f 100644
--- a/crates/openhuman-cli/Cargo.toml
+++ b/crates/openhuman-cli/Cargo.toml
@@ -389,10 +389,9 @@ tinyinference-llm = { path = "../../vendor/tinyagents/vendor/tinyinference/crate
tinystoragedrivers-core = { git = "https://github.com/tinyhumansai/tinystoragedrivers", tag = "v1.0.0" }
tinystoragedrivers = { git = "https://github.com/tinyhumansai/tinystoragedrivers", tag = "v1.0.0", default-features = false, features = ["sqlite"] }
tinytools = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools" }
-tinytools-std = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools-std" }
# The completion log a detached sub-agent leaves, for the SaaS delivery-recovery e2e.
tinyagents-tasks = { path = "../../vendor/tinyagents/crates/tinyagents-tasks" }
-tinyagents-harness-tools = { workspace = true, features = ["goals", "skills"] }
+tinyagents-harness-tools = { workspace = true, features = ["goals", "skills", "fs", "net", "exec"] }
toml = "1.0"
tracing = "0.1"
# The TinyComputer contract, for the live computer-use e2e (`computer_bali_live_e2e`).
diff --git a/crates/openhuman-core/Cargo.toml b/crates/openhuman-core/Cargo.toml
index 9f10a6bcb2..e95b5de95b 100644
--- a/crates/openhuman-core/Cargo.toml
+++ b/crates/openhuman-core/Cargo.toml
@@ -102,7 +102,7 @@ tinyflows-import = { path = "../../vendor/tinyflows/crates/tinyflows-import", de
# below as its own path dependency for the same "one checkout, one type
# identity" reason `tinytools` is.
tinyagents-hooks = { workspace = true, features = ["goals"] }
-tinyagents-harness-tools = { workspace = true, features = ["goals", "todos", "skills", "subagents"] }
+tinyagents-harness-tools = { workspace = true, features = ["goals", "todos", "skills", "subagents", "fs", "net", "exec"] }
tinyagents-harness = { path = "../../vendor/tinyagents/crates/tinyagents-harness", features = [
"sqlite",
"multimodal",
@@ -158,7 +158,6 @@ tinyinference-voice = { path = "../../vendor/tinyagents/vendor/tinyinference/cra
# crates. After cloning: `git submodule update --init --recursive vendor/`.
tinytools = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools" }
tinytools-agent = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools-agent" }
-tinytools-std = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools-std" }
# TinyMemory (https://github.com/tinyhumansai/tinymemory), three crates:
diff --git a/crates/openhuman-core/src/agent/bus.rs b/crates/openhuman-core/src/agent/bus.rs
index 8328a9ccfa..0502b3a905 100644
--- a/crates/openhuman-core/src/agent/bus.rs
+++ b/crates/openhuman-core/src/agent/bus.rs
@@ -33,7 +33,7 @@ use tinytools::Tool;
use super::harness::run_channel_turn_via_graph;
use crate::agent_registry::host_definition::AgentDefinitionRegistry;
use tinyagents_definition::SandboxMode;
-use tinytools_std::file_state::with_file_state_agent_id;
+use tinyagents_harness_tools::fs::file_state::with_file_state_agent_id;
/// Method name used to dispatch an agentic turn through the native bus.
pub const AGENT_RUN_TURN_METHOD: &str = "agent.run_turn";
diff --git a/crates/openhuman-core/src/agent/harness/tool_result_artifacts/mod.rs b/crates/openhuman-core/src/agent/harness/tool_result_artifacts/mod.rs
index ab2cd2665e..4e4e54aa63 100644
--- a/crates/openhuman-core/src/agent/harness/tool_result_artifacts/mod.rs
+++ b/crates/openhuman-core/src/agent/harness/tool_result_artifacts/mod.rs
@@ -33,7 +33,7 @@ use tinyagents_harness::artifacts::tool_results::{self, ArtifactRead, ToolResult
use tinystoragedrivers::BlobStore;
use crate::agent::harness::artifact_offload::{SanitizingRedactor, READ_TOOL};
-use tinytools_std::filesystem::FileReadTool;
+use tinyagents_harness_tools::fs::filesystem::FileReadTool;
/// Namespace of the artifact index in the run's store registry.
pub(crate) const TINYAGENTS_TOOL_RESULT_ARTIFACT_STORE: &str = "openhuman_tool_result_artifacts";
diff --git a/crates/openhuman-core/src/agent/registration.rs b/crates/openhuman-core/src/agent/registration.rs
index ea9aede210..cab416459b 100644
--- a/crates/openhuman-core/src/agent/registration.rs
+++ b/crates/openhuman-core/src/agent/registration.rs
@@ -8,7 +8,7 @@ use crate::skills::run_workflow::{AwaitWorkflowTool, RunWorkflowTool};
use std::path::Path;
use tinyagents_harness_tools as harness_tools;
use tinytools::Tool;
-use tinytools_std::filesystem::WorkspaceStateTool;
+use tinyagents_harness_tools::fs::filesystem::WorkspaceStateTool;
/// Build the dialogue tool family in its persisted catalogue order.
pub(crate) fn dialogue_tools(action_dir: &Path, root_config: &Config) -> Vec<Box<dyn Tool>> {
diff --git a/crates/openhuman-core/src/agent/subagent_host/ops/runner.rs b/crates/openhuman-core/src/agent/subagent_host/ops/runner.rs
index b544380d87..ff8865bb5d 100644
--- a/crates/openhuman-core/src/agent/subagent_host/ops/runner.rs
+++ b/crates/openhuman-core/src/agent/subagent_host/ops/runner.rs
@@ -25,7 +25,7 @@ use crate::inference::provider::AGENT_TURN_MAX_OUTPUT_TOKENS;
use tinyagents_definition::{validate_tier_transition, AgentTier, IterationPolicy, PromptSource};
use tinyagents_harness::context::{current_run_depth, with_run_depth, RunConfig, RunDepth};
use tinytools::{Tool, ToolSpec};
-use tinytools_std::file_state::with_file_state_agent_id;
+use tinyagents_harness_tools::fs::file_state::with_file_state_agent_id;
use super::prompt::compose_subagent_system_prompt;
use super::provider::resolve_subagent_source;
diff --git a/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output.rs b/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output.rs
index 856eeb400c..c17a13fc75 100644
--- a/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output.rs
@@ -211,7 +211,7 @@ pub(crate) struct ToolOutputMiddleware {
/// Calls that only print files the agent can read again (`cat`, `sed -n`,
/// `file_read`, ...), keyed by call id; the same `before_tool` →
/// `after_tool` seam. Their results skip the LLM summary. See
- /// `tinytools_std::filesystem::is_read_only_call`.
+ /// `tinyagents_harness_tools::fs::filesystem::is_read_only_call`.
pub(crate) file_reads: Mutex<std::collections::HashSet<String>>,
}
@@ -284,7 +284,7 @@ impl OutputCapPolicy for ToolOutputMiddleware {
/// An artifact nobody can read back is worse than the processed copy, so
/// a body larger than `file_read` will open is not kept whole.
fn max_persistable_bytes(&self) -> u64 {
- tinytools_std::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES
+ tinyagents_harness_tools::fs::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES
}
}
@@ -462,7 +462,7 @@ impl Middleware<(), crate::agent::tinyagents::host::OpenHumanRunContext> for Too
reads.insert(call.id.clone(), read);
}
}
- if tinytools_std::filesystem::is_read_only_call(&call.name, &call.arguments) {
+ if tinyagents_harness_tools::fs::filesystem::is_read_only_call(&call.name, &call.arguments) {
tracing::debug!(
tool = %call.name,
call_id = %call.id,
@@ -577,7 +577,7 @@ impl Middleware<(), crate::agent::tinyagents::host::OpenHumanRunContext> for Too
);
}
// A file read within the budget goes in verbatim; past it, it never
- // gets an LLM summary (see `tinytools_std::filesystem::is_read_only_call`).
+ // gets an LLM summary (see `tinyagents_harness_tools::fs::filesystem::is_read_only_call`).
let verbatim_file_read =
file_read && (plan.budget_bytes == 0 || content.len() <= plan.budget_bytes);
if file_read {
diff --git a/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output_tests.rs b/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output_tests.rs
index 981fe96fc3..84ab0dcc29 100644
--- a/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output_tests.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/middleware/tool_output_tests.rs
@@ -177,6 +177,6 @@ fn the_untouched_output_is_kept_only_when_it_could_spill_and_be_read_back() {
assert!(plan_output_stages(&mw, "shell", 101, true).keep_full_output);
assert!(!plan_output_stages(&mw, "shell", 101, false).keep_full_output);
assert!(!plan_output_stages(&mw, "shell", 100, true).keep_full_output);
- let too_big = tinytools_std::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES as usize + 1;
+ let too_big = tinyagents_harness_tools::fs::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES as usize + 1;
assert!(!plan_output_stages(&mw, "shell", too_big, true).keep_full_output);
}
diff --git a/crates/openhuman-core/src/agent/tinyagents/middleware_failure_policy_class_tests.rs b/crates/openhuman-core/src/agent/tinyagents/middleware_failure_policy_class_tests.rs
index 839464fc8c..83fedbdb1b 100644
--- a/crates/openhuman-core/src/agent/tinyagents/middleware_failure_policy_class_tests.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/middleware_failure_policy_class_tests.rs
@@ -221,10 +221,10 @@ fn production_read_tools() -> Vec<Box<dyn tinytools::Tool>> {
None,
None,
)),
- Box::new(tinytools_std::filesystem::FileReadTool::new(
+ Box::new(tinyagents_harness_tools::fs::filesystem::FileReadTool::new(
security.clone(),
)),
- Box::new(tinytools_std::filesystem::ListFilesTool::new(security)),
+ Box::new(tinyagents_harness_tools::fs::filesystem::ListFilesTool::new(security)),
];
#[cfg(feature = "modules")]
let tools = {
diff --git a/crates/openhuman-core/src/agent/tinyagents/middleware_tool_output_artifact_tests.rs b/crates/openhuman-core/src/agent/tinyagents/middleware_tool_output_artifact_tests.rs
index 50c4cd2f81..d4640f88f4 100644
--- a/crates/openhuman-core/src/agent/tinyagents/middleware_tool_output_artifact_tests.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/middleware_tool_output_artifact_tests.rs
@@ -159,7 +159,7 @@ async fn an_oversized_result_is_stored_as_the_tool_returned_it_not_as_rewritten(
async fn a_raw_result_file_read_cannot_open_is_stored_as_the_processed_copy() {
let tmp = tempfile::tempdir().unwrap();
let summary = "s".repeat(3_000);
- let raw_len = tinytools_std::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES as usize + 1;
+ let raw_len = tinyagents_harness_tools::fs::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES as usize + 1;
let mw = artifact_mw(Some(summarized(&summary)), tmp.path());
let mut result = tool_result("echo", &"r".repeat(raw_len));
diff --git a/crates/openhuman-core/src/agent/tinyagents/turn_middleware.rs b/crates/openhuman-core/src/agent/tinyagents/turn_middleware.rs
index c2b0dc2821..2eef3c535b 100644
--- a/crates/openhuman-core/src/agent/tinyagents/turn_middleware.rs
+++ b/crates/openhuman-core/src/agent/tinyagents/turn_middleware.rs
@@ -289,7 +289,7 @@ pub(super) fn install_turn_middleware(
.map(std::time::Duration::from_millis);
harness.push_middleware(Arc::new(TurnClockMiddleware::new(turn_budget)));
let shell_turn_budget =
- ShellTurnBudget::with_max_timeout(turn_budget, tinytools_std::timeout::MAX_TIMEOUT_SECS);
+ ShellTurnBudget::with_max_timeout(turn_budget, tinyagents_harness_tools::exec::timeout::MAX_TIMEOUT_SECS);
harness.push_middleware(Arc::new(shell_turn_budget.notes()));
if let Some(mw) = &repeat_progress {
harness.push_middleware(mw.clone());
diff --git a/crates/openhuman-core/src/config/ops/agent.rs b/crates/openhuman-core/src/config/ops/agent.rs
index 4197b557af..c918ccbd11 100644
--- a/crates/openhuman-core/src/config/ops/agent.rs
+++ b/crates/openhuman-core/src/config/ops/agent.rs
@@ -204,7 +204,7 @@ pub async fn apply_agent_settings(
config: &mut Config,
update: AgentSettingsPatch,
) -> Result<Outcome<serde_json::Value>, String> {
- use tinytools_std::timeout::{MAX_TIMEOUT_SECS, MIN_TIMEOUT_SECS};
+ use tinyagents_harness_tools::exec::timeout::{MAX_TIMEOUT_SECS, MIN_TIMEOUT_SECS};
if let Some(timeout_secs) = update.agent_timeout_secs {
if !(MIN_TIMEOUT_SECS..=MAX_TIMEOUT_SECS).contains(&timeout_secs) {
@@ -283,8 +283,8 @@ pub async fn get_agent_settings(ctx: &DispatchCtx) -> Result<Outcome<serde_json:
"agent_timeout_secs": config.agent.agent_timeout_secs,
"effective_timeout_secs": crate::tools::timeout::tool_execution_timeout_secs(),
"env_override": crate::tools::timeout::env_override_active(),
- "min_timeout_secs": tinytools_std::timeout::MIN_TIMEOUT_SECS,
- "max_timeout_secs": tinytools_std::timeout::MAX_TIMEOUT_SECS,
+ "min_timeout_secs": tinyagents_harness_tools::exec::timeout::MIN_TIMEOUT_SECS,
+ "max_timeout_secs": tinyagents_harness_tools::exec::timeout::MAX_TIMEOUT_SECS,
"tool_dispatcher": config.agent.tool_dispatcher,
"tool_dispatcher_env_override": td::tool_dispatcher_env_override(),
});
diff --git a/crates/openhuman-core/src/config/schema/agent.rs b/crates/openhuman-core/src/config/schema/agent.rs
index f4eebba506..a6870b4b95 100644
--- a/crates/openhuman-core/src/config/schema/agent.rs
+++ b/crates/openhuman-core/src/config/schema/agent.rs
@@ -366,7 +366,7 @@ fn default_tool_result_budget_bytes() -> usize {
}
fn default_agent_timeout_secs() -> u64 {
- tinytools_std::timeout::DEFAULT_TIMEOUT_SECS
+ tinyagents_harness_tools::exec::timeout::DEFAULT_TIMEOUT_SECS
}
fn default_agent_max_tool_iterations() -> usize {
diff --git a/crates/openhuman-core/src/core/runtime/bootstrap.rs b/crates/openhuman-core/src/core/runtime/bootstrap.rs
index a5042de38c..53e95fc978 100644
--- a/crates/openhuman-core/src/core/runtime/bootstrap.rs
+++ b/crates/openhuman-core/src/core/runtime/bootstrap.rs
@@ -67,7 +67,7 @@ pub(crate) async fn bootstrap_core_runtime(
if guard_disabled {
log::debug!("[file_state] guard disabled via OPENHUMAN_FILE_STATE_GUARD");
}
- tinytools_std::file_state::init_global(!guard_disabled);
+ tinyagents_harness_tools::fs::file_state::init_global(!guard_disabled);
} else {
log::debug!("[boot] agent file-state coordinator SKIPPED — Agent domain disabled");
}
diff --git a/crates/openhuman-core/src/flows/caps_host/http.rs b/crates/openhuman-core/src/flows/caps_host/http.rs
index 0498629015..b804adf126 100644
--- a/crates/openhuman-core/src/flows/caps_host/http.rs
+++ b/crates/openhuman-core/src/flows/caps_host/http.rs
@@ -28,7 +28,7 @@ use super::{
use super::{EngineError, Result};
/// [`HttpClient`] adapter over `HttpRequestTool`
-/// (`tinytools_std::network::HttpRequestTool`, built by `tools/impl/network/host.rs`). Allowlist + DNS-rebind
+/// (`tinyagents_harness_tools::net::network::HttpRequestTool`, built by `tools/impl/network/host.rs`). Allowlist + DNS-rebind
/// guard live inside `execute`, so this adapter gets them for free.
///
/// **B2:** also routes through the OpenHuman `ApprovalGate` before dispatch
diff --git a/crates/openhuman-core/src/hooks/shell.rs b/crates/openhuman-core/src/hooks/shell.rs
index 8b33c9e760..f648a94a49 100644
--- a/crates/openhuman-core/src/hooks/shell.rs
+++ b/crates/openhuman-core/src/hooks/shell.rs
@@ -92,7 +92,7 @@ pub(super) fn command(command: &str) -> tokio::process::Command {
// A hook leads its own process group and dies with the handle that owns it,
// so a deadline cannot leave its pipeline running.
process.kill_on_drop(true);
- tinytools_std::timeout::own_process_group(process.as_std_mut());
+ tinyagents_harness_tools::exec::timeout::own_process_group(process.as_std_mut());
process
}
diff --git a/crates/openhuman-core/src/inference/tokenjuice/repl_tools.rs b/crates/openhuman-core/src/inference/tokenjuice/repl_tools.rs
index 5fc464f441..056c4b9590 100644
--- a/crates/openhuman-core/src/inference/tokenjuice/repl_tools.rs
+++ b/crates/openhuman-core/src/inference/tokenjuice/repl_tools.rs
@@ -22,7 +22,7 @@ pub fn is_repl_tool(name: &str) -> bool {
/// Largest persisted tool-result artifact read through the handle slot: the
/// same limit `file_read` applies, which is also the most the artifact store
/// ever writes.
-const MAX_ARTIFACT_BYTES: u64 = tinytools_std::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES;
+const MAX_ARTIFACT_BYTES: u64 = tinyagents_harness_tools::fs::filesystem::FileReadTool::MAX_FILE_SIZE_BYTES;
/// The relative pointer form older stores handed out (`artifacts/tool-results/…`).
const RELATIVE_ARTIFACT_PREFIX: &str = "artifacts/tool-results/";
diff --git a/crates/openhuman-core/src/modules/browser.rs b/crates/openhuman-core/src/modules/browser.rs
index 4882a57abe..f797aee8f0 100644
--- a/crates/openhuman-core/src/modules/browser.rs
+++ b/crates/openhuman-core/src/modules/browser.rs
@@ -573,9 +573,9 @@ fn private_or_local(host: &str) -> bool {
// `is_non_global_v4` already covers 0.0.0.0/8; the explicit octet check
// keeps that local-host range visibly blocked at this call site too.
Ok(std::net::IpAddr::V4(ip)) => {
- tinytools_std::url_guard::is_non_global_v4(ip) || ip.octets()[0] == 0
+ tinyagents_harness::url_guard::is_non_global_v4(ip) || ip.octets()[0] == 0
}
- Ok(std::net::IpAddr::V6(ip)) => tinytools_std::url_guard::is_non_global_v6(ip),
+ Ok(std::net::IpAddr::V6(ip)) => tinyagents_harness::url_guard::is_non_global_v6(ip),
Err(_) => false,
}
}
diff --git a/crates/openhuman-core/src/modules/search/proxy.rs b/crates/openhuman-core/src/modules/search/proxy.rs
index 2c71468738..385ef7ed61 100644
--- a/crates/openhuman-core/src/modules/search/proxy.rs
+++ b/crates/openhuman-core/src/modules/search/proxy.rs
@@ -30,7 +30,7 @@ use crate::core::runtime::DispatchCtx;
/// one after another; both routinely exceeded 30 s in production and came back
/// as a bus timeout although the module was still working. 90 s stays under
/// the harness's own default tool deadline
-/// ([`tinytools_std::timeout::DEFAULT_TIMEOUT_SECS`], 120 s), so the module's
+/// ([`tinyagents_harness_tools::exec::timeout::DEFAULT_TIMEOUT_SECS`], 120 s), so the module's
/// answer, not the harness kill, decides the result. This is the floor; a
/// larger configured tool budget extends it (see [`execute_tool_timeout_for`]).
pub(super) const EXECUTE_TOOL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(90);
diff --git a/crates/openhuman-core/src/modules/search/proxy_tests.rs b/crates/openhuman-core/src/modules/search/proxy_tests.rs
index 1ccc36b247..3bf5b4dede 100644
--- a/crates/openhuman-core/src/modules/search/proxy_tests.rs
+++ b/crates/openhuman-core/src/modules/search/proxy_tests.rs
@@ -125,7 +125,7 @@ async fn execute_tool_outlives_the_bus_default_timeout() {
fn the_execute_tool_deadline_stays_under_the_harness_tool_deadline() {
assert!(EXECUTE_TOOL_TIMEOUT > tinybus::connection::DEFAULT_TIMEOUT);
assert!(
- EXECUTE_TOOL_TIMEOUT.as_secs() < tinytools_std::timeout::DEFAULT_TIMEOUT_SECS,
+ EXECUTE_TOOL_TIMEOUT.as_secs() < tinyagents_harness_tools::exec::timeout::DEFAULT_TIMEOUT_SECS,
"the harness would kill the call before the module could answer"
);
}
@@ -142,7 +142,7 @@ fn the_execute_tool_deadline_follows_a_raised_tool_budget() {
// The default budget keeps today's 90 s, and a tighter budget never drops
// the bus deadline below the floor (the harness deadline is tighter).
assert_eq!(
- execute_tool_timeout_for(tinytools_std::timeout::DEFAULT_TIMEOUT_SECS),
+ execute_tool_timeout_for(tinyagents_harness_tools::exec::timeout::DEFAULT_TIMEOUT_SECS),
EXECUTE_TOOL_TIMEOUT
);
assert_eq!(execute_tool_timeout_for(10), EXECUTE_TOOL_TIMEOUT);
diff --git a/crates/openhuman-core/src/sandbox/shell_exec.rs b/crates/openhuman-core/src/sandbox/shell_exec.rs
index 4bb4fa964e..9ff12c5279 100644
--- a/crates/openhuman-core/src/sandbox/shell_exec.rs
+++ b/crates/openhuman-core/src/sandbox/shell_exec.rs
@@ -121,7 +121,7 @@ pub(crate) async fn run(
// the command (`_caller` closes `abandoned`) and holds the turn's
// cleanup open until TinyBox has stopped it, so an awaited turn
// cancellation is acknowledged only after the command is gone.
- let hold = tinytools_std::timeout::ProcessCleanup::hold();
+ let hold = tinyagents_harness_tools::exec::timeout::ProcessCleanup::hold();
let (_caller, abandoned) = tokio::sync::oneshot::channel::<std::convert::Infallible>();
ctx.spawn(async move {
let _hold = hold;
diff --git a/crates/openhuman-core/src/sandbox/shell_exec_fixture.rs b/crates/openhuman-core/src/sandbox/shell_exec_fixture.rs
index 3b53d2600e..64b7aa36d9 100644
--- a/crates/openhuman-core/src/sandbox/shell_exec_fixture.rs
+++ b/crates/openhuman-core/src/sandbox/shell_exec_fixture.rs
@@ -59,8 +59,8 @@ pub(crate) async fn run(run: NativeShellRun) -> anyhow::Result<SandboxExecResult
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.kill_on_drop(true);
- tinytools_std::timeout::own_process_group(command.as_std_mut());
- match tinytools_std::timeout::output_or_kill(&mut command, run.timeout).await {
+ tinyagents_harness_tools::exec::timeout::own_process_group(command.as_std_mut());
+ match tinyagents_harness_tools::exec::timeout::output_or_kill(&mut command, run.timeout).await {
Ok(Ok(output)) => {
// The module streams output into the caller's meter as it reads it;
// the fixture folds the finished output in the same way.
diff --git a/crates/openhuman-core/src/security/policy/enforcement.rs b/crates/openhuman-core/src/security/policy/enforcement.rs
index 183905d966..dd9b239ab2 100644
--- a/crates/openhuman-core/src/security/policy/enforcement.rs
+++ b/crates/openhuman-core/src/security/policy/enforcement.rs
@@ -27,7 +27,7 @@ impl SecurityPolicy {
/// guard, which sits under `MemoryCore::store` and is hit hundreds of times
/// by one bulk ingest — want the tier refusal and nothing else. That is the
/// same shape the ~15 acting tools which gate on bare [`Self::can_act`]
- /// already use (e.g. `tinytools_std::filesystem::FileWriteTool`,
+ /// already use (e.g. `tinyagents_harness_tools::fs::filesystem::FileWriteTool`,
/// `cron/scheduler.rs`).
pub fn enforce_write_tier(&self, operation_name: &str) -> Result<(), String> {
if !self.can_act() {
diff --git a/crates/openhuman-core/src/tools/impl/filesystem/gate.rs b/crates/openhuman-core/src/tools/impl/filesystem/gate.rs
index 91e5c168bc..f83f3d1cd3 100644
--- a/crates/openhuman-core/src/tools/impl/filesystem/gate.rs
+++ b/crates/openhuman-core/src/tools/impl/filesystem/gate.rs
@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
use std::sync::Arc;
use async_trait::async_trait;
-use tinytools_std::filesystem::FsGate;
+use tinyagents_harness_tools::fs::filesystem::FsGate;
use crate::security::policy::{TrustedAccess, TrustedRoot};
use crate::security::{AutonomyLevel, GateDecision, SecurityPolicy};
diff --git a/crates/openhuman-core/src/tools/impl/filesystem/gate_tests.rs b/crates/openhuman-core/src/tools/impl/filesystem/gate_tests.rs
index ad40e3abb7..6f9448071b 100644
--- a/crates/openhuman-core/src/tools/impl/filesystem/gate_tests.rs
+++ b/crates/openhuman-core/src/tools/impl/filesystem/gate_tests.rs
@@ -11,7 +11,7 @@ use std::sync::Arc;
use serde_json::json;
use tinytools::{Tool, ToolCallOptions, ToolRunContext, WorkspaceDescriptor};
-use tinytools_std::filesystem::{
+use tinyagents_harness_tools::fs::filesystem::{
ApplyPatchTool, CsvExportTool, EditFileTool, FileReadTool, FileWriteTool, FsGate,
GitOperationsTool, GlobTool, GrepTool, ListFilesTool,
};
diff --git a/crates/openhuman-core/src/tools/impl/filesystem/mod.rs b/crates/openhuman-core/src/tools/impl/filesystem/mod.rs
index acbdf991c5..70ec97b05d 100644
--- a/crates/openhuman-core/src/tools/impl/filesystem/mod.rs
+++ b/crates/openhuman-core/src/tools/impl/filesystem/mod.rs
@@ -5,7 +5,7 @@
//! `git_operations`, `run_linter`, `run_tests`, `update_memory_md`) live in
//! `tinytools_std::filesystem` and are registered by `tools/ops.rs`. What stays
//! here is the policy they consult: [`gate`] implements
-//! `tinytools_std::filesystem::FsGate` for [`crate::security::SecurityPolicy`],
+//! `tinyagents_harness_tools::fs::filesystem::FsGate` for [`crate::security::SecurityPolicy`],
//! so the autonomy flag, the `is_always_forbidden` floor, `workspace_only`,
//! trusted roots and the approval gate remain host decisions. The tools only
//! ask.
diff --git a/crates/openhuman-core/src/tools/impl/network/gate.rs b/crates/openhuman-core/src/tools/impl/network/gate.rs
index d516e012ec..9dd5b8d3c0 100644
--- a/crates/openhuman-core/src/tools/impl/network/gate.rs
+++ b/crates/openhuman-core/src/tools/impl/network/gate.rs
@@ -5,7 +5,7 @@
//! directly, with the same argument and the same answer. No policy is decided
//! here; the adapter only names the questions.
-use tinytools_std::network::NetGate;
+use tinyagents_harness_tools::net::network::NetGate;
use crate::security::egress::{
emit_external_transfer, local_only_tool_block, DataKind, EgressDescriptor,
diff --git a/crates/openhuman-core/src/tools/impl/network/gate_tests.rs b/crates/openhuman-core/src/tools/impl/network/gate_tests.rs
index b82d8a4eb7..4fd63b62d2 100644
--- a/crates/openhuman-core/src/tools/impl/network/gate_tests.rs
+++ b/crates/openhuman-core/src/tools/impl/network/gate_tests.rs
@@ -3,7 +3,7 @@ use crate::security::{AutonomyLevel, SecurityPolicy};
use serde_json::json;
use std::sync::Arc;
use tinytools::{PermissionLevel, Tool};
-use tinytools_std::network::{CurlTool, HttpRequestTool, PushoverTool, WebFetchTool};
+use tinyagents_harness_tools::net::network::{CurlTool, HttpRequestTool, PushoverTool, WebFetchTool};
fn policy(autonomy: AutonomyLevel, max_actions_per_hour: u32) -> Arc<SecurityPolicy> {
Arc::new(SecurityPolicy {
diff --git a/crates/openhuman-core/src/tools/impl/network/host.rs b/crates/openhuman-core/src/tools/impl/network/host.rs
index e49d25cb44..0037e87cb0 100644
--- a/crates/openhuman-core/src/tools/impl/network/host.rs
+++ b/crates/openhuman-core/src/tools/impl/network/host.rs
@@ -10,7 +10,7 @@ use std::sync::Arc;
#[cfg(feature = "web3")]
use tinytools::{PermissionLevel, Tool, ToolResult};
-use tinytools_std::network::{
+use tinyagents_harness_tools::net::network::{
AsyncHtmlExtractor, CurlTool, HttpLimits, HttpRequestTool, NetGate, WebFetchTool,
};
@@ -251,7 +251,7 @@ mod x402 {
//! x402 machine payment for `http_request`'s `402 Payment Required` retry.
use async_trait::async_trait;
- use tinytools_std::network::{PaymentAttempt, PaymentHook};
+ use tinyagents_harness_tools::net::network::{PaymentAttempt, PaymentHook};
use super::{ApprovalChatContext, DispatchCtx};
use crate::modules::x402_service;
diff --git a/crates/openhuman-core/src/tools/impl/system/install_tool.rs b/crates/openhuman-core/src/tools/impl/system/install_tool.rs
index af799f3c97..1fa51dcc94 100644
--- a/crates/openhuman-core/src/tools/impl/system/install_tool.rs
+++ b/crates/openhuman-core/src/tools/impl/system/install_tool.rs
@@ -19,7 +19,7 @@ use std::time::Duration;
use tinytools::{PermissionLevel, Tool, ToolResult};
use tokio::process::Command as TokioCommand;
-use tinytools_std::detect_tools::find_on_path;
+use tinyagents_harness_tools::exec::detect_tools::find_on_path;
/// Hard cap on an install before it is killed.
const INSTALL_TIMEOUT_SECS: u64 = 300;
@@ -218,7 +218,7 @@ impl InstallToolTool {
cmd.args(&prefix).arg(package);
cmd.current_dir(&self.security.workspace_dir);
- let output = match tinytools_std::timeout::output_or_kill(
+ let output = match tinyagents_harness_tools::exec::timeout::output_or_kill(
&mut cmd,
Duration::from_secs(INSTALL_TIMEOUT_SECS),
)
diff --git a/crates/openhuman-core/src/tools/impl/system/shell.rs b/crates/openhuman-core/src/tools/impl/system/shell.rs
index 53ea453664..2fdfae45bd 100644
--- a/crates/openhuman-core/src/tools/impl/system/shell.rs
+++ b/crates/openhuman-core/src/tools/impl/system/shell.rs
@@ -153,11 +153,11 @@ impl ShellTool {
/// deadline applies only when the caller passes `timeout_secs` (issue
/// #4023). A `0` explicitly disables it. Any positive value is clamped to
/// `1..=3600`. See
- /// [`tinytools_std::timeout::explicit_call_timeout_duration`].
+ /// [`tinyagents_harness_tools::exec::timeout::explicit_call_timeout_duration`].
fn explicit_timeout(&self, requested: Option<u64>) -> Option<Duration> {
- tinytools_std::timeout::explicit_call_timeout_duration(
+ tinyagents_harness_tools::exec::timeout::explicit_call_timeout_duration(
requested,
- tinytools_std::timeout::MAX_TIMEOUT_SECS,
+ tinyagents_harness_tools::exec::timeout::MAX_TIMEOUT_SECS,
)
}
}
@@ -501,7 +501,7 @@ impl ShellTool {
ToolResult::error("Docker environment contains a non-UTF-8 value."),
);
};
- for (name, value) in tinytools_std::filesystem::shell_git_env() {
+ for (name, value) in tinyagents_harness_tools::fs::filesystem::shell_git_env() {
let (Ok(name), Ok(value)) = (name.into_string(), value.into_string()) else {
return (
false,
@@ -559,9 +559,9 @@ impl ShellTool {
// A turn that owns its child environment (library agents) keeps it: the
// module starts from the process snapshot, so the turn's own values for
// the functional variables are passed as approved overrides.
- if tinytools_std::timeout::CommandEnvironment::is_active() {
+ if tinyagents_harness_tools::exec::timeout::CommandEnvironment::is_active() {
for name in crate::sandbox::ops::SANDBOX_ENV_PASSTHROUGH {
- if let Some(value) = tinytools_std::timeout::CommandEnvironment::var_os(name) {
+ if let Some(value) = tinyagents_harness_tools::exec::timeout::CommandEnvironment::var_os(name) {
let Ok(value) = value.into_string() else {
return (
false,
@@ -575,7 +575,7 @@ impl ShellTool {
// Keep command-valued repository Git settings from executing host
// programs when a shell command happens to invoke git.
- for (key, value) in tinytools_std::filesystem::shell_git_env() {
+ for (key, value) in tinyagents_harness_tools::fs::filesystem::shell_git_env() {
let (Ok(key), Ok(value)) = (key.into_string(), value.into_string()) else {
return (
false,
@@ -610,7 +610,7 @@ impl ShellTool {
// gets the module's ceiling.
let explicit_timeout = self.explicit_timeout(requested_timeout);
let effective = explicit_timeout.unwrap_or_else(|| {
- Duration::from_secs(tinytools_std::timeout::SANDBOX_UNBOUNDED_CAP_SECS)
+ Duration::from_secs(tinyagents_harness_tools::exec::timeout::SANDBOX_UNBOUNDED_CAP_SECS)
});
tracing::debug!(
timeout_secs = effective.as_secs(),
@@ -703,7 +703,7 @@ impl ShellTool {
command_environment.as_deref(),
);
// Apply the same Git config hardening to local and sandboxed shells.
- extra_env.extend(tinytools_std::filesystem::shell_git_env());
+ extra_env.extend(tinyagents_harness_tools::fs::filesystem::shell_git_env());
// And the same Python UTF-8 defaults the native path sets.
for (var, val) in python_utf8_env(|name| {
command_environment
@@ -724,7 +724,7 @@ impl ShellTool {
// long command isn't killed while still bounding a wedged sandbox.
let explicit_timeout = self.explicit_timeout(requested_timeout);
let effective = explicit_timeout.unwrap_or_else(|| {
- Duration::from_secs(tinytools_std::timeout::SANDBOX_UNBOUNDED_CAP_SECS)
+ Duration::from_secs(tinyagents_harness_tools::exec::timeout::SANDBOX_UNBOUNDED_CAP_SECS)
});
tracing::debug!(
timeout_secs = effective.as_secs(),
diff --git a/crates/openhuman-core/src/tools/impl/system/shell_support.rs b/crates/openhuman-core/src/tools/impl/system/shell_support.rs
index c402b9b9d6..ee53ea43c5 100644
--- a/crates/openhuman-core/src/tools/impl/system/shell_support.rs
+++ b/crates/openhuman-core/src/tools/impl/system/shell_support.rs
@@ -95,7 +95,7 @@ pub(super) fn container_environment(
crate::sandbox::ops::SANDBOX_ENV_PASSTHROUGH
.iter()
.filter_map(|name| {
- tinytools_std::timeout::CommandEnvironment::var_os(name).map(|value| (*name, value))
+ tinyagents_harness_tools::exec::timeout::CommandEnvironment::var_os(name).map(|value| (*name, value))
})
.collect::<Vec<_>>()
} else {
@@ -108,7 +108,7 @@ pub(super) fn container_environment(
.or_else(|| {
explicit
.is_none()
- .then(|| tinytools_std::timeout::CommandEnvironment::var_os(name))
+ .then(|| tinyagents_harness_tools::exec::timeout::CommandEnvironment::var_os(name))
.flatten()
})
}));
diff --git a/crates/openhuman-core/src/tools/impl/system/shell_tests_platform_tests.rs b/crates/openhuman-core/src/tools/impl/system/shell_tests_platform_tests.rs
index d833a45282..5a0f28a25f 100644
--- a/crates/openhuman-core/src/tools/impl/system/shell_tests_platform_tests.rs
+++ b/crates/openhuman-core/src/tools/impl/system/shell_tests_platform_tests.rs
@@ -94,7 +94,7 @@ fn a_users_own_python_encoding_settings_win() {
#[cfg(feature = "modules")]
#[tokio::test]
async fn the_container_environment_forwards_only_the_allowlist_plus_python_defaults() {
- let scoped = tinytools_std::timeout::CommandEnvironment::new([
+ let scoped = tinyagents_harness_tools::exec::timeout::CommandEnvironment::new([
("PATH".to_owned(), "/bin".to_owned()),
("OPENAI_API_KEY".to_owned(), "sk-secret".to_owned()),
("AWS_SECRET_ACCESS_KEY".to_owned(), "secret".to_owned()),
diff --git a/crates/openhuman-core/src/tools/impl/system/shell_tests_schema_and_env_tests.rs b/crates/openhuman-core/src/tools/impl/system/shell_tests_schema_and_env_tests.rs
index 6fea3ab8c9..ce3f4f31e5 100644
--- a/crates/openhuman-core/src/tools/impl/system/shell_tests_schema_and_env_tests.rs
+++ b/crates/openhuman-core/src/tools/impl/system/shell_tests_schema_and_env_tests.rs
@@ -296,7 +296,7 @@ fn shell_timeout_honors_explicit_per_call_value() {
assert_eq!(
tool.explicit_timeout(Some(9_999)),
Some(Duration::from_secs(
- tinytools_std::timeout::MAX_TIMEOUT_SECS
+ tinyagents_harness_tools::exec::timeout::MAX_TIMEOUT_SECS
))
);
}
diff --git a/crates/openhuman-core/src/tools/ops.rs b/crates/openhuman-core/src/tools/ops.rs
index eaaaf5033a..8fd7836cce 100644
--- a/crates/openhuman-core/src/tools/ops.rs
+++ b/crates/openhuman-core/src/tools/ops.rs
@@ -7,12 +7,12 @@ use crate::security::{AuditLogger, SecurityPolicy};
use std::sync::Arc;
use tinyagents_harness_tools::{CurrentTimeTool, ResolveTimeTool};
use tinytools::Tool;
-use tinytools_std::detect_tools::DetectToolsTool;
-use tinytools_std::filesystem::{
+use tinyagents_harness_tools::exec::detect_tools::DetectToolsTool;
+use tinyagents_harness_tools::fs::filesystem::{
ApplyPatchTool, CsvExportTool, EditFileTool, FileReadTool, FileWriteTool, GitOperationsTool,
GlobTool, GrepTool, ImageInfoTool, ListFilesTool, ReadDiffTool, RunLinterTool, RunTestsTool,
};
-use tinytools_std::network::PushoverTool;
+use tinyagents_harness_tools::net::network::PushoverTool;
/// Create the default tool registry
pub fn default_tools(security: Arc<SecurityPolicy>) -> Vec<Box<dyn Tool>> {
diff --git a/crates/openhuman-core/src/tools/ops_tests_domain_family_tests.rs b/crates/openhuman-core/src/tools/ops_tests_domain_family_tests.rs
index a27021dfd2..62ab39c8ea 100644
--- a/crates/openhuman-core/src/tools/ops_tests_domain_family_tests.rs
+++ b/crates/openhuman-core/src/tools/ops_tests_domain_family_tests.rs
@@ -2,7 +2,7 @@ use super::*;
#[cfg(feature = "modules")]
use crate::tools::BrowserOpenTool;
use crate::tools::{filter_tools_by_user_preference, http_request_tool};
-use tinytools_std::filesystem::{ApplyPatchTool, CsvExportTool};
+use tinyagents_harness_tools::fs::filesystem::{ApplyPatchTool, CsvExportTool};
/// Every acting tool gates on `can_act()` and returns its own read-only refusal
/// string. Each of those must carry [`POLICY_BLOCKED_MARKER`] so the agent
diff --git a/crates/openhuman-core/src/tools/timeout/mod.rs b/crates/openhuman-core/src/tools/timeout/mod.rs
index cfb400f89b..6d5ecc81e6 100644
--- a/crates/openhuman-core/src/tools/timeout/mod.rs
+++ b/crates/openhuman-core/src/tools/timeout/mod.rs
@@ -9,12 +9,12 @@
//! Resolution order, highest precedence first:
//! 1. `OPENHUMAN_TOOL_TIMEOUT_SECS` (operator override, when valid).
//! 2. The value pushed from config via [`set_tool_timeout_secs`].
-//! 3. `tinytools_std::timeout::DEFAULT_TIMEOUT_SECS`.
+//! 3. `tinyagents_harness_tools::exec::timeout::DEFAULT_TIMEOUT_SECS`.
use std::sync::{Once, OnceLock};
use tinyagents_harness::tool::ToolTimeoutSettings;
-use tinytools_std::timeout::{
+use tinyagents_harness_tools::exec::timeout::{
self as module, MAX_TIMEOUT_SECS, MIN_TIMEOUT_SECS, TOOL_TIMEOUT_GRACE_SECS,
};
diff --git a/crates/openhuman-embed/Cargo.toml b/crates/openhuman-embed/Cargo.toml
index cc323f73a4..90a3a3e0f2 100644
--- a/crates/openhuman-embed/Cargo.toml
+++ b/crates/openhuman-embed/Cargo.toml
@@ -78,7 +78,7 @@ tinymcp-bus = { path = "../../vendor/tinymcp/crates/tinymcp-bus" }
# conversations in its own database, and the in-memory provider; same path as
# the core's so one copy resolves.
tinyagents-hooks = { workspace = true }
-tinyagents-harness-tools = { workspace = true, default-features = false, features = ["todos"] }
+tinyagents-harness-tools = { workspace = true, default-features = false, features = ["todos", "exec"] }
tinyagents-harness = { path = "../../vendor/tinyagents/crates/tinyagents-harness", default-features = false }
tinyagents-definition = { path = "../../vendor/tinyagents/crates/tinyagents-definition" }
tinyagents-session = { path = "../../vendor/tinyagents/crates/tinyagents-session" }
@@ -93,7 +93,6 @@ tinyinference-embeddings = { path = "../../vendor/tinyagents/vendor/tinyinferenc
# path as the core's so the trait unifies.
# `AgentDefinitionSpec::tool_rules` takes the shared tool-rule vocabulary too.
tinytools = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools" }
-tinytools-std = { path = "../../vendor/tinyagents/vendor/tinytools/crates/tinytools-std" }
tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync", "time"] }
url = "2"
uuid = { version = "1", features = ["v4"] }
diff --git a/crates/openhuman-embed/src/process.rs b/crates/openhuman-embed/src/process.rs
index e440c5f0a8..493f49522d 100644
--- a/crates/openhuman-embed/src/process.rs
+++ b/crates/openhuman-embed/src/process.rs
@@ -13,7 +13,7 @@ pub use openhuman_core::core::runtime::{AGENT_WORKER_STACK_BYTES, MAX_BLOCKING_T
/// Scoped ownership for host commands outside an agent turn. After dropping
/// the scoped future, await `wait()` before acknowledging cancellation.
-pub use tinytools_std::timeout::ProcessCleanup as CommandCleanup;
+pub use tinyagents_harness_tools::exec::timeout::ProcessCleanup as CommandCleanup;
/// Sentry options and event scrubbing shared by desktop and terminal hosts.
#[cfg(feature = "crash-reporting")]
@@ -118,11 +118,11 @@ pub async fn command_output(
input: Vec<u8>,
deadline: std::time::Duration,
) -> std::io::Result<std::process::Output> {
- let cleanup = tinytools_std::timeout::ProcessCleanup::default();
+ let cleanup = tinyagents_harness_tools::exec::timeout::ProcessCleanup::default();
let result = cleanup
.scope(tokio::time::timeout(
deadline,
- tinytools_std::timeout::output_with_input(command, Some(input)),
+ tinyagents_harness_tools::exec::timeout::output_with_input(command, Some(input)),
))
.await;
cleanup.wait().await;
diff --git a/crates/openhuman-embed/src/turn_cancellation.rs b/crates/openhuman-embed/src/turn_cancellation.rs
index 1ff2b8e877..414a7ff6b3 100644
--- a/crates/openhuman-embed/src/turn_cancellation.rs
+++ b/crates/openhuman-embed/src/turn_cancellation.rs
@@ -2,7 +2,7 @@
use std::sync::Arc;
-use tinytools_std::timeout::ProcessCleanup;
+use tinyagents_harness_tools::exec::timeout::ProcessCleanup;
use tokio::sync::watch;
#[derive(Clone, Copy, PartialEq, Eq)]
diff --git a/crates/openhuman-embed/src/turn_control.rs b/crates/openhuman-embed/src/turn_control.rs
index b23a8b1bf1..3b5aacb900 100644
--- a/crates/openhuman-embed/src/turn_control.rs
+++ b/crates/openhuman-embed/src/turn_control.rs
@@ -28,7 +28,7 @@ impl Turn {
let dispatch = Box::pin(self.send_scoped());
match environment {
Some(environment) => {
- let command_environment = tinytools_std::timeout::CommandEnvironment::new(
+ let command_environment = tinyagents_harness_tools::exec::timeout::CommandEnvironment::new(
environment
.iter()
.map(|(name, value)| (name.clone(), value.clone())),
diff --git a/crates/openhuman-embed/tests/process_cancellation.rs b/crates/openhuman-embed/tests/process_cancellation.rs
index 9d33b347f2..5da924defd 100644
--- a/crates/openhuman-embed/tests/process_cancellation.rs
+++ b/crates/openhuman-embed/tests/process_cancellation.rs
@@ -3,14 +3,14 @@
#![cfg(target_os = "linux")]
use std::time::Duration;
-use tinytools_std::timeout::{output_or_kill, output_unbounded, ProcessCleanup};
+use tinyagents_harness_tools::exec::timeout::{output_or_kill, output_unbounded, ProcessCleanup};
/// A shell child that leads its own process group and dies with its handle, as
/// the module-owned shell children do.
fn shell_child(command: &str) -> tokio::process::Command {
let mut cmd = tokio::process::Command::new("sh");
cmd.arg("-c").arg(command).kill_on_drop(true);
- tinytools_std::timeout::own_process_group(cmd.as_std_mut());
+ tinyagents_harness_tools::exec::timeout::own_process_group(cmd.as_std_mut());
cmd
}
diff --git a/crates/openhuman-embed/tests/tool_environment.rs b/crates/openhuman-embed/tests/tool_environment.rs
index 595c74eb1a..db7aebffac 100644
--- a/crates/openhuman-embed/tests/tool_environment.rs
+++ b/crates/openhuman-embed/tests/tool_environment.rs
@@ -2,7 +2,7 @@
#![cfg(unix)]
-use tinytools_std::timeout::{output_unbounded, CommandEnvironment};
+use tinyagents_harness_tools::exec::timeout::{output_unbounded, CommandEnvironment};
#[tokio::test]
async fn overlapping_command_environments_replace_inheritance_without_crossing_turns() {