fix(coding-agent): filtered brush-incompatible aliases from shell snapshot

brush-core's alias expander resolves aliases via
`value.split_ascii_whitespace()` (`crates/brush-core-vendored/src/interp.rs:1500`,
upstream brush issue reubeno/brush#57): each whitespace piece is dropped
into argv as-is, completely bypassing the shell parser. Any alias body
containing `(`, `)`, `|`, `&`, `;`, `<`, `>`, or `\`` therefore
turns the first piece into the command name, so Fedora's default
`alias which='(alias; declare -f) | /usr/bin/which …'` produces
`error: command not found: (alias;` for every `which` invocation.

The user's shell snapshot is generated by sourcing their real rc-file
under `/bin/bash` or `/bin/zsh` (so we can capture functions, options,
PATH) and then sourced by brush per-session. `sanitizeSnapshotForBrush`
now scans the emitted `alias -- NAME='VALUE'` lines after generation,
drops any whose decoded body contains those metacharacters, and rewrites
the file in place before caching. Compatible aliases (`ll='ls -l'`,
`gc='git --color=auto commit'`, embedded-quote `say='echo '\\''hi'\\'''`)
are preserved untouched; dropped names are logged at debug. brush then
falls through to whatever lives on `PATH`, which is what the user
expected when they ran `which` in the first place.

Covered by unit tests for the sanitizer (Fedora-which case, every
incompatible-metachar shape, every preserve case) and an integration
test that loads a poisoned snapshot and verifies `which sh` now exits
`0` with a real path.

Fixes #3234
This commit is contained in:
roboomp
2026-06-22 06:19:04 +00:00
parent 320261fca9
commit 58fab73699
4 changed files with 195 additions and 1 deletions
@@ -797,6 +797,54 @@ exit 64
expect(result.output.trim()).toBe("snapshot_ok");
});
it("survives compound aliases from the user's shell snapshot (issue #3234)", async () => {
if (process.platform === "win32") return;
const bashPath = Bun.env.SHELL?.includes("bash") ? Bun.env.SHELL : "/bin/bash";
if (!fs.existsSync(bashPath)) return;
// Pre-seed a snapshot that mirrors Fedora's default `which` alias.
// Without the brush-compat scrub, brush's whitespace-only alias
// expander turns `(alias;` into the command name and `which` fails
// with `command not found: (alias;`. With the scrub, the broken
// alias is dropped and brush falls through to `$PATH`.
const snapshotPath = path.join(tempDir, "snapshot.sh");
fs.writeFileSync(
snapshotPath,
[
"unalias -a 2>/dev/null || true",
"alias -- which='(alias; declare -f) | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'",
"alias -- ll='ls -l'",
"",
].join("\n"),
);
const rawSnapshot = fs.readFileSync(snapshotPath, "utf8");
const { content: scrubbed, dropped } =
shellSnapshot.sanitizeSnapshotForBrush(rawSnapshot);
fs.writeFileSync(snapshotPath, scrubbed);
expect(dropped).toEqual(["which"]);
// Compatible aliases must still be installed in brush.
expect(scrubbed).toContain("alias -- ll='ls -l'");
vi.spyOn(Settings.prototype, "getShellConfig").mockReturnValue({
shell: bashPath,
args: ["-l", "-c"],
env: { PATH: Bun.env.PATH ?? "", HOME: Bun.env.HOME ?? tempDir },
prefix: undefined,
});
vi.spyOn(shellSnapshot, "getOrCreateSnapshot").mockResolvedValue(snapshotPath);
const result = await executeBash("which sh", {
cwd: tempDir,
timeout: 5000,
sessionKey: "brush-compound-alias-which",
});
expect(result.cancelled).toBe(false);
expect(result.exitCode).toBe(0);
expect(result.output).not.toContain("command not found");
expect(result.output.trim()).toMatch(/\/sh$/);
});
it("does not allow exec to replace the host", async () => {
const result = await executeBash("exec echo hi", { cwd: tempDir, timeout: 5000 });
expect(result.cancelled).toBe(false);