jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-10-28 13:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(desktop): use augmented PATH for model discovery subprocess (#2753)

Browse Source 
On Windows, the model dropdown never populates for CLI harnesses (Claude
Code, Codex) while the same flow works on macOS.

Model discovery spawns `buzz-acp models` with `PATH` taken from
`login_shell_path()` — which by design always returns `None` on Windows
(Git Bash's POSIX-shaped PATH would poison native children). The
discovery child therefore ran with only the raw inherited process PATH,
missing the Buzz-managed Node/npm directories and exe-parent sidecar
dir, so the ACP adapter's `.cmd` shims failed to resolve `node` and
discovery returned nothing. macOS worked only because a login-shell PATH
exists there.

The fix reuses the existing `augmented_path()` helper (already used by
CLI login probes and auth commands, built on the same
`build_augmented_path` kernel as the real agent spawn), so model
discovery resolves the identical toolchain the agent will actually run
with. `login_shell_path()` remains the login-shell component inside that
composition — on macOS the composed PATH is a superset of the previous
value.

Related: #2661 (managed Node fallback these entries point at), reported
in the Windows install-issues follow-up.

Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
Co-authored-by: npub1fgdl5qqnh3k3f2xkqrvt7cujalhm623x4s7fdjdj5yrtp5fzjl9qrjpucw <4a1bfa0013bc6d14a8d600d8bf6392efefbd2a26ac3c96c9b2a106b0d12297ca@buzz.block.builderlab.xyz>
This commit is contained in:
Will Pfleger
2026-07-24 13:13:46 -07:00
committed by GitHub
parent fb4a801adf
commit 3bd3a014c6
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/src-tauri/src/commands/agent_model_process.rs
View File

@@ -27,7 +27,13 @@ pub(super) async fn run_agent_models_command(
if let Some(home) = default_agent_workdir() {
cmd.current_dir(home);
}
if let Some(ref path) = crate::managed_agents::login_shell_path() {
// Inject the same augmented PATH used for launched agents and CLI
// probes: managed Node/npm dirs, exe-parent sidecars, login-shell
// PATH, and (Windows) the inherited process PATH. login_shell_path()
// alone is always None on Windows, which left this child with no
// managed Node dirs — the ACP adapter's `.cmd` shims then failed with
// `'node' is not recognized` and the model dropdown stayed empty.
if let Some(ref path) = crate::managed_agents::readiness::cli_probe::augmented_path() {
cmd.env("PATH", path);
}
cmd.arg("models")

6
desktop/src-tauri/src/managed_agents/readiness/cli_probe.rs
View File

@@ -2,8 +2,10 @@ use std::path::Path;
use crate::managed_agents::runtime::build_augmented_path;
/// Build the augmented PATH for CLI probes, including nvm's default Node.js
/// bin directory so `#!/usr/bin/env node` shims (e.g. codex-acp) resolve.
/// Build the augmented PATH for CLI probes and other native child processes
/// (auth commands, `buzz-acp models` discovery), including nvm's default
/// Node.js bin directory so `#!/usr/bin/env node` shims (e.g. codex-acp)
/// resolve.
pub(crate) fn augmented_path() -> Option<String> {
let home = dirs::home_dir();
let nvm_bin = home