diff --git a/Cargo.lock b/Cargo.lock index e75e734e9..c102e5b54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1308,15 +1308,6 @@ dependencies = [ "x509-parser", ] -[[package]] -name = "fabro-beastie" -version = "0.176.2" -dependencies = [ - "core-foundation 0.9.4", - "libc", - "tracing", -] - [[package]] name = "fabro-cli" version = "0.176.2" @@ -1330,13 +1321,13 @@ dependencies = [ "clap", "cli-table", "console 0.15.11", + "core-foundation 0.9.4", "daytona-sdk", "dialoguer", "dirs", "dotenvy", "fabro-agent", "fabro-api", - "fabro-beastie", "fabro-config", "fabro-devcontainer", "fabro-git-storage", diff --git a/lib/crates/fabro-beastie/Cargo.toml b/lib/crates/fabro-beastie/Cargo.toml deleted file mode 100644 index 0b9c94237..000000000 --- a/lib/crates/fabro-beastie/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "fabro-beastie" -edition.workspace = true -version.workspace = true -license.workspace = true -description = "Cross-platform idle sleep prevention (No Sleep Till Brooklyn)" - -[lib] -doctest = false - -[dependencies] -tracing.workspace = true - -[target.'cfg(target_os = "macos")'.dependencies] -core-foundation = "0.9" - -[target.'cfg(target_os = "linux")'.dependencies] -libc = "0.2" diff --git a/lib/crates/fabro-cli/Cargo.toml b/lib/crates/fabro-cli/Cargo.toml index 2973471c5..d547dd147 100644 --- a/lib/crates/fabro-cli/Cargo.toml +++ b/lib/crates/fabro-cli/Cargo.toml @@ -13,7 +13,7 @@ path = "src/main.rs" default = [] server = ["dep:fabro-api"] exedev = ["fabro-sandbox/exe", "fabro-config/exedev", "fabro-workflows/exedev"] -sleep_inhibitor = ["dep:fabro-beastie"] +sleep_inhibitor = ["dep:core-foundation"] [dependencies] fabro-config = { path = "../fabro-config" } @@ -33,7 +33,6 @@ fabro-graphviz = { path = "../fabro-graphviz" } fabro-validate = { path = "../fabro-validate" } fabro-workflows = { path = "../fabro-workflows" } fabro-api = { path = "../fabro-api", optional = true } -fabro-beastie = { path = "../fabro-beastie", optional = true } fabro-telemetry = { path = "../fabro-telemetry" } fabro-util = { path = "../fabro-util" } clap.workspace = true @@ -78,6 +77,9 @@ walkdir.workspace = true [target.'cfg(unix)'.dependencies] libc = "0.2" +[target.'cfg(target_os = "macos")'.dependencies] +core-foundation = { version = "0.9", optional = true } + [build-dependencies] chrono = { workspace = true } diff --git a/lib/crates/fabro-cli/src/commands/exec.rs b/lib/crates/fabro-cli/src/commands/exec.rs index 7d63bcfa7..c0c5abc02 100644 --- a/lib/crates/fabro-cli/src/commands/exec.rs +++ b/lib/crates/fabro-cli/src/commands/exec.rs @@ -6,7 +6,7 @@ use crate::cli_config; pub async fn execute(mut args: fabro_agent::cli::AgentArgs, globals: &GlobalArgs) -> Result<()> { let cli_config = cli_config::load_cli_config(None)?; #[cfg(feature = "sleep_inhibitor")] - let _sleep_guard = fabro_beastie::guard(cli_config.prevent_idle_sleep_enabled()); + let _sleep_guard = crate::sleep_inhibitor::guard(cli_config.prevent_idle_sleep_enabled()); let exec_defaults = cli_config.exec.as_ref(); args.apply_cli_defaults( exec_defaults.and_then(|a| a.provider.as_deref()), diff --git a/lib/crates/fabro-cli/src/commands/run/execute.rs b/lib/crates/fabro-cli/src/commands/run/execute.rs index af503040d..b44a66907 100644 --- a/lib/crates/fabro-cli/src/commands/run/execute.rs +++ b/lib/crates/fabro-cli/src/commands/run/execute.rs @@ -780,7 +780,7 @@ pub async fn execute(mut args: RunArgs, _globals: &GlobalArgs) -> anyhow::Result let (run_id, run_dir) = super::create::create_run(&args, cli_defaults, styles, quiet).await?; #[cfg(feature = "sleep_inhibitor")] - let _sleep_guard = fabro_beastie::guard(_prevent_idle_sleep); + let _sleep_guard = crate::sleep_inhibitor::guard(_prevent_idle_sleep); let child = super::start::start_run(&run_dir, false)?; diff --git a/lib/crates/fabro-cli/src/commands/run/mod.rs b/lib/crates/fabro-cli/src/commands/run/mod.rs index d449e9aea..990c7a863 100644 --- a/lib/crates/fabro-cli/src/commands/run/mod.rs +++ b/lib/crates/fabro-cli/src/commands/run/mod.rs @@ -68,7 +68,7 @@ pub async fn dispatch(cmd: RunCommands, globals: &GlobalArgs) -> Result<()> { #[cfg(feature = "sleep_inhibitor")] let _sleep_guard = { let cli_config = crate::cli_config::load_cli_config(None)?; - fabro_beastie::guard(cli_config.prevent_idle_sleep_enabled()) + crate::sleep_inhibitor::guard(cli_config.prevent_idle_sleep_enabled()) }; resume::resume_command(args, styles).await } diff --git a/lib/crates/fabro-cli/src/main.rs b/lib/crates/fabro-cli/src/main.rs index 76517127d..35fb745b5 100644 --- a/lib/crates/fabro-cli/src/main.rs +++ b/lib/crates/fabro-cli/src/main.rs @@ -3,6 +3,8 @@ mod cli_config; mod commands; mod logging; mod shared; +#[cfg(feature = "sleep_inhibitor")] +mod sleep_inhibitor; use anyhow::Result; use args::*; diff --git a/lib/crates/fabro-beastie/src/dummy.rs b/lib/crates/fabro-cli/src/sleep_inhibitor/dummy.rs similarity index 100% rename from lib/crates/fabro-beastie/src/dummy.rs rename to lib/crates/fabro-cli/src/sleep_inhibitor/dummy.rs diff --git a/lib/crates/fabro-beastie/src/iokit_bindings.rs b/lib/crates/fabro-cli/src/sleep_inhibitor/iokit_bindings.rs similarity index 100% rename from lib/crates/fabro-beastie/src/iokit_bindings.rs rename to lib/crates/fabro-cli/src/sleep_inhibitor/iokit_bindings.rs diff --git a/lib/crates/fabro-beastie/src/linux.rs b/lib/crates/fabro-cli/src/sleep_inhibitor/linux.rs similarity index 100% rename from lib/crates/fabro-beastie/src/linux.rs rename to lib/crates/fabro-cli/src/sleep_inhibitor/linux.rs diff --git a/lib/crates/fabro-beastie/src/macos.rs b/lib/crates/fabro-cli/src/sleep_inhibitor/macos.rs similarity index 98% rename from lib/crates/fabro-beastie/src/macos.rs rename to lib/crates/fabro-cli/src/sleep_inhibitor/macos.rs index 38a0fcf26..419887dec 100644 --- a/lib/crates/fabro-beastie/src/macos.rs +++ b/lib/crates/fabro-cli/src/sleep_inhibitor/macos.rs @@ -1,7 +1,7 @@ use core_foundation::base::TCFType; use tracing::{debug, warn}; -use crate::iokit_bindings::*; +use super::iokit_bindings::*; pub(crate) struct MacOSSleepInhibitor { assertion_id: IOPMAssertionID, diff --git a/lib/crates/fabro-beastie/src/lib.rs b/lib/crates/fabro-cli/src/sleep_inhibitor/mod.rs similarity index 100% rename from lib/crates/fabro-beastie/src/lib.rs rename to lib/crates/fabro-cli/src/sleep_inhibitor/mod.rs