58fab73699
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
250 lines
8.4 KiB
TypeScript
250 lines
8.4 KiB
TypeScript
/**
|
|
* Shell environment snapshot for preserving user aliases, functions, and options.
|
|
*
|
|
* Creates a snapshot file that captures the user's shell environment from their
|
|
* .bashrc/.zshrc, which can be sourced before each command to provide a familiar
|
|
* shell experience.
|
|
*/
|
|
import * as fs from "node:fs";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import { logger, postmortem } from "@oh-my-pi/pi-utils";
|
|
|
|
const cachedSnapshotPaths = new Map<string, string>();
|
|
const SNAPSHOT_TIMEOUT_MS = 2_000;
|
|
|
|
/**
|
|
* Characters that force brush's primitive alias expander down a path it does
|
|
* not implement. brush-core resolves aliases via `value.split_ascii_whitespace()`
|
|
* (`crates/brush-core-vendored/src/interp.rs:1500`, tracking
|
|
* https://github.com/reubeno/brush/issues/57): the resulting pieces are dropped
|
|
* into argv verbatim instead of going through the shell parser. Any alias body
|
|
* containing subshells `(...)`, pipes `|`, redirections `<` `>`, separators
|
|
* `;` `&`, or command substitutions `` ` `` turns the first whitespace-split
|
|
* piece into the command name and produces `command not found: (alias;` style
|
|
* failures (issue #3234, Fedora's default `which` alias is the canonical case).
|
|
*
|
|
* Until brush implements proper alias parsing we drop these from the snapshot;
|
|
* brush then falls through to whatever lives on `PATH`, which is what the user
|
|
* actually expected when they invoked `which` / `ls` / etc.
|
|
*/
|
|
const BRUSH_INCOMPATIBLE_ALIAS_BODY = /[()|&;<>`]/;
|
|
|
|
/** Matches `alias -- NAME='VALUE'` lines emitted by `generateSnapshotScript`. */
|
|
const SNAPSHOT_ALIAS_LINE = /^alias -- ([^\s=]+)='(.*)'\s*$/;
|
|
|
|
/**
|
|
* Strip alias definitions brush's whitespace-only expander cannot execute.
|
|
*
|
|
* Returns the rewritten snapshot plus the list of dropped alias names so the
|
|
* caller can surface them in the debug log.
|
|
*/
|
|
export function sanitizeSnapshotForBrush(content: string): { content: string; dropped: string[] } {
|
|
const dropped: string[] = [];
|
|
const lines = content.split("\n");
|
|
const out: string[] = [];
|
|
for (const line of lines) {
|
|
const m = line.match(SNAPSHOT_ALIAS_LINE);
|
|
if (m) {
|
|
// Decode the bash-quoting escape `'\''` → `'` so we test the real value.
|
|
const value = m[2].replace(/'\\''/g, "'");
|
|
if (BRUSH_INCOMPATIBLE_ALIAS_BODY.test(value)) {
|
|
dropped.push(m[1]);
|
|
continue;
|
|
}
|
|
}
|
|
out.push(line);
|
|
}
|
|
return { content: out.join("\n"), dropped };
|
|
}
|
|
|
|
/**
|
|
* Apply {@link sanitizeSnapshotForBrush} to the freshly generated snapshot
|
|
* file. Best-effort: I/O failures here must not poison `getOrCreateSnapshot`.
|
|
*/
|
|
function scrubSnapshotInPlace(snapshotPath: string): void {
|
|
try {
|
|
const raw = fs.readFileSync(snapshotPath, "utf8");
|
|
const { content, dropped } = sanitizeSnapshotForBrush(raw);
|
|
if (dropped.length === 0) return;
|
|
fs.writeFileSync(snapshotPath, content);
|
|
logger.debug("shell-snapshot: dropped brush-incompatible aliases", { dropped });
|
|
} catch (err) {
|
|
logger.debug("shell-snapshot: scrub failed", { err: String(err) });
|
|
}
|
|
}
|
|
|
|
function sanitizeSnapshotEnv(env: Record<string, string | undefined>): Record<string, string | undefined> {
|
|
const sanitized = { ...env };
|
|
delete sanitized.BASH_ENV;
|
|
delete sanitized.ENV;
|
|
return sanitized;
|
|
}
|
|
|
|
/**
|
|
* Get the user's shell config file path.
|
|
*/
|
|
function getShellConfigFile(shell: string): string {
|
|
const home = os.homedir();
|
|
if (shell.includes("zsh")) return path.join(home, ".zshrc");
|
|
if (shell.includes("bash")) return path.join(home, ".bashrc");
|
|
return path.join(home, ".profile");
|
|
}
|
|
|
|
/**
|
|
* Generate the snapshot creation script.
|
|
* This script sources the user's rc file and extracts functions, aliases, and options.
|
|
* Matches Claude Code's snapshot generation logic.
|
|
*/
|
|
function generateSnapshotScript(shell: string, snapshotPath: string, rcFile: string): string {
|
|
const hasRcFile = fs.existsSync(rcFile);
|
|
const isZsh = shell.includes("zsh");
|
|
const commonToolsRegex =
|
|
"^(ls|dir|vdir|cat|head|tail|less|more|grep|egrep|fgrep|rg|find|fd|locate|sed|awk|perl|cp|mv|rm|mkdir|rmdir|touch|chmod|chown|ln|pwd|readlink|stat|cut|sort|uniq|xargs|tee|tr|basename|dirname)$";
|
|
|
|
// Escape the snapshot path for shell
|
|
const escapedPath = snapshotPath.replace(/'/g, "'\\''");
|
|
|
|
// Function extraction differs between bash and zsh
|
|
const functionScript = isZsh
|
|
? `
|
|
echo "# Functions" >> "$SNAPSHOT_FILE"
|
|
# Force autoload all functions first
|
|
typeset -f > /dev/null 2>&1
|
|
# Get user function names - filter system/private ones
|
|
typeset +f 2>/dev/null | grep -vE '^(_|__)' | grep -vE '${commonToolsRegex}' | while read func; do
|
|
typeset -f "$func" >> "$SNAPSHOT_FILE" 2>/dev/null
|
|
done
|
|
`
|
|
: `
|
|
echo "# Functions" >> "$SNAPSHOT_FILE"
|
|
# Force autoload all functions first
|
|
declare -f > /dev/null 2>&1
|
|
# Get user function names - filter system/private ones
|
|
declare -F 2>/dev/null | cut -d' ' -f3 | grep -vE '^(_|__)' | grep -vE '${commonToolsRegex}' | while read func; do
|
|
declare -f "$func" >> "$SNAPSHOT_FILE" 2>/dev/null
|
|
done
|
|
`;
|
|
|
|
// Shell options extraction
|
|
const optionsScript = isZsh
|
|
? `
|
|
echo "# Shell Options" >> "$SNAPSHOT_FILE"
|
|
setopt 2>/dev/null | sed 's/^/setopt /' | head -n 1000 >> "$SNAPSHOT_FILE"
|
|
`
|
|
: `
|
|
echo "# Shell Options" >> "$SNAPSHOT_FILE"
|
|
shopt -p 2>/dev/null | head -n 1000 >> "$SNAPSHOT_FILE"
|
|
set -o 2>/dev/null | awk '$2 == "on" && $1 !~ /^(onecmd|monitor|restricted)$/ {print "set -o " $1}' | head -n 1000 >> "$SNAPSHOT_FILE"
|
|
echo "shopt -s expand_aliases" >> "$SNAPSHOT_FILE"
|
|
`;
|
|
|
|
return `
|
|
SNAPSHOT_FILE='${escapedPath}'
|
|
|
|
# Source user's rc file if it exists
|
|
${hasRcFile ? `source "${rcFile}" < /dev/null 2>/dev/null` : "# No user config file to source"}
|
|
|
|
# Create/clear the snapshot file
|
|
echo "# Shell snapshot - generated by omp agent" >| "$SNAPSHOT_FILE"
|
|
|
|
# Unalias everything first to avoid conflicts when sourced
|
|
echo "unalias -a 2>/dev/null || true" >> "$SNAPSHOT_FILE"
|
|
|
|
${functionScript}
|
|
|
|
${optionsScript}
|
|
|
|
# Export aliases (limit to 1000)
|
|
echo "# Aliases" >> "$SNAPSHOT_FILE"
|
|
# Filter out winpty aliases on Windows to avoid "stdin is not a tty" errors
|
|
if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "cygwin" ]]; then
|
|
alias 2>/dev/null | grep -v "='winpty " | grep -vE '^alias (${commonToolsRegex})=' | sed 's/^alias //g' | sed 's/^/alias -- /' | head -n 1000 >> "$SNAPSHOT_FILE"
|
|
else
|
|
alias 2>/dev/null | grep -vE '^alias (${commonToolsRegex})=' | sed 's/^alias //g' | sed 's/^/alias -- /' | head -n 1000 >> "$SNAPSHOT_FILE"
|
|
fi
|
|
|
|
# Export PATH
|
|
echo "export PATH='$PATH'" >> "$SNAPSHOT_FILE"
|
|
|
|
# Verify snapshot was created
|
|
if [ ! -f "$SNAPSHOT_FILE" ]; then
|
|
echo "Error: Snapshot file was not created" >&2
|
|
exit 1
|
|
fi
|
|
`.trim();
|
|
}
|
|
|
|
/**
|
|
* Create a shell snapshot, caching the result.
|
|
* Returns the path to the snapshot file, or null if creation failed.
|
|
*/
|
|
export async function getOrCreateSnapshot(
|
|
shell: string,
|
|
env: Record<string, string | undefined>,
|
|
): Promise<string | null> {
|
|
const cacheKey = shell;
|
|
// Return cached snapshot if valid
|
|
const cached = cachedSnapshotPaths.get(cacheKey);
|
|
if (cached && fs.existsSync(cached)) {
|
|
return cached;
|
|
}
|
|
if (cached) {
|
|
cachedSnapshotPaths.delete(cacheKey);
|
|
}
|
|
|
|
// Skip on Windows (no .bashrc in standard location)
|
|
if (process.platform === "win32") {
|
|
return null;
|
|
}
|
|
|
|
const rcFile = getShellConfigFile(shell);
|
|
|
|
// Create snapshot directory
|
|
const snapshotDir = path.join(os.tmpdir(), "omp-shell-snapshots");
|
|
fs.mkdirSync(snapshotDir, { recursive: true });
|
|
|
|
// Generate unique snapshot path
|
|
const shellName = shell.includes("zsh") ? "zsh" : shell.includes("bash") ? "bash" : "sh";
|
|
const snapshotPath = path.join(snapshotDir, `snapshot-${shellName}-${crypto.randomUUID()}.sh`);
|
|
|
|
// Generate and execute snapshot script
|
|
const script = generateSnapshotScript(shell, snapshotPath, rcFile);
|
|
|
|
try {
|
|
const snapshotEnv = sanitizeSnapshotEnv(env);
|
|
const spawnEnv: Record<string, string> = {};
|
|
for (const [key, value] of Object.entries(snapshotEnv)) {
|
|
if (value !== undefined) {
|
|
spawnEnv[key] = value;
|
|
}
|
|
}
|
|
const child = Bun.spawn([shell, "-c", script], {
|
|
env: spawnEnv,
|
|
stdin: "ignore",
|
|
stdout: "ignore",
|
|
stderr: "ignore",
|
|
timeout: SNAPSHOT_TIMEOUT_MS,
|
|
killSignal: "SIGKILL",
|
|
});
|
|
|
|
await child.exited;
|
|
if (child.exitCode === 0 && fs.existsSync(snapshotPath)) {
|
|
scrubSnapshotInPlace(snapshotPath);
|
|
cachedSnapshotPaths.set(cacheKey, snapshotPath);
|
|
return snapshotPath;
|
|
}
|
|
} catch {
|
|
// Snapshot creation failed, proceed without it
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
postmortem.register("shell-snapshot", () => {
|
|
for (const snapshotPath of cachedSnapshotPaths.values()) {
|
|
fs.unlinkSync(snapshotPath);
|
|
}
|
|
cachedSnapshotPaths.clear();
|
|
});
|