Skip to content

fix: resolve ACP bridge interpreters from home env #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt2e merged 1 commit into from
Jul 6, 2026
Merged

fix: resolve ACP bridge interpreters from home env #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions apps/staged/src-tauri/src/session_runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,20 +442,26 @@ pub fn start_session(
let result = local.block_on(&rt, async {
let driver = driver.with_extra_env(config.extra_env.clone());

// For local sessions, hand the agent the captured
// interactive-login-shell env snapshot for its working directory
// (Hermit-activated, so hermit-first PATH). This is the *same*
// cached snapshot pipeline steps and git ops draw from via
// `shell_env_cache()`, so the agent — and every per-command shell
// it spawns — resolves the same toolchain instead of whatever
// (possibly Homebrew-first) environment Staged happened to inherit.
// Without it the driver falls back to spawning `$SHELL -ils` and
// exec'ing the agent, whose ordering has proven unreliable.
// Remote/workspace sessions proxy through `sq blox acp` and don't
// execute locally, so they keep the fallback. A capture failure is
// non-fatal: log it and let the driver fall back.
// For local sessions, hand the driver two env snapshots:
// - the home/global snapshot, sanitized and PATH-extended, used
// only to resolve env-shebang interpreters for bridge startup;
// - the working-directory snapshot (Hermit-activated), used as the
// actual agent process environment so the agent and every
// per-command shell it spawns see the same toolchain as pipeline
// steps and git ops.
//
// This lets npm ACP bridges start with the user's global Node even
// when a repo-local Hermit Node shadows `node` in the execution
// environment. Remote/workspace sessions proxy through `sq blox
// acp` and don't execute locally, so they keep the fallback. A
// cwd capture failure is non-fatal: log it and let the driver fall
// back to spawning `$SHELL -ils` and exec'ing the agent.
let driver = if config.workspace_name.is_none() {
match shell_env_cache().get(&config.working_dir).await {
let cache = shell_env_cache();
let home_snapshot =
crate::shell_env::home_env_vars_with_extended_path(cache.as_ref()).await;
let driver = driver.with_interpreter_env_snapshot(home_snapshot);
match cache.get(&config.working_dir).await {
Ok(snapshot) => driver.with_env_snapshot(snapshot.vars().to_vec()),
Err(e) => {
log::warn!(
Expand Down
Loading