Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(agent_harness): embed ensure_ready.sh in nix deploy sources (#5787)

teoc4331494a8a6
diff --git a/crates/agent_harness/src/outbound/provision.rs b/crates/agent_harness/src/outbound/provision.rs
index 85362e35bd..dcc9e6edca 100644
--- a/crates/agent_harness/src/outbound/provision.rs
+++ b/crates/agent_harness/src/outbound/provision.rs
@@ -15,7 +15,8 @@ pub const SIDECAR_LOG: &str = "/tmp/acp-sidecar.log";
pub const SIDECAR_PORT: u16 = 8700;
/// Readiness recipe baked alongside the harness container.
-const ENSURE_READY_SCRIPT: &str = include_str!("../../container/ensure_ready.sh");
+const ENSURE_READY_SCRIPT: &str =
+ include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/container/ensure_ready.sh"));
/// Wrap the readiness recipe as one command for provider exec APIs.
#[must_use]
diff --git a/nix/cloud-storage.nix b/nix/cloud-storage.nix
index 4b43777942..fe80c8ce04 100644
--- a/nix/cloud-storage.nix
+++ b/nix/cloud-storage.nix
@@ -53,7 +53,9 @@
# Include Cargo sources plus the .sqlx offline query cache.
sqlxFilter = path: _type: builtins.match ".*\\.sqlx/.*\\.json$" path != null;
pdfiumFilter = path: _type: builtins.match ".*pdfium-lib/.*\\.(so|dylib)$" path != null;
- assetFilter = path: _type: builtins.match ".*\\.(md|html|txt|json|canvas|sql)$" path != null;
+ # `.sh` is required so `include_str!` of
+ # `crates/agent_harness/container/ensure_ready.sh` survives the prune.
+ assetFilter = path: _type: builtins.match ".*\\.(md|html|txt|json|canvas|sql|sh)$" path != null;
binFilter = path: _type: builtins.match ".*\\.bin$" path != null;
srcFilter =
path: type: