roboomp
2597244b00
The `cd <path> && ...` extractor matched everything up to the first `&&` with a greedy regex, so a redirect or extra argument before the `&&` was swallowed into the structured cwd. `cd /tmp 2>/dev/null && echo ok` became cwd `/tmp 2>/dev/null`, which failed fs.stat and killed the command before the shell ran. Replace the regex with `extractLeadingCdTarget`, a quote/escape-aware scanner in shell-tokenize.ts that captures exactly one path token and bails (leaving the command for the shell) when anything else — a redirect, extra argument, shell expansion, or a non-`&&` separator — precedes the top-level `&&`. Fixes #7883
56 lines
2.3 KiB
TypeScript
56 lines
2.3 KiB
TypeScript
import { describe, expect, it } from "bun:test";
|
|
import { extractLeadingCdTarget } from "@oh-my-pi/pi-coding-agent/tools/shell-tokenize";
|
|
|
|
describe("extractLeadingCdTarget", () => {
|
|
it("extracts a bare cd target and returns the remainder", () => {
|
|
expect(extractLeadingCdTarget("cd /some/dir && echo ok")).toEqual({
|
|
path: "/some/dir",
|
|
rest: "echo ok",
|
|
});
|
|
});
|
|
|
|
it("resolves quoted and escaped path tokens", () => {
|
|
expect(extractLeadingCdTarget('cd "/my dir" && ls')).toEqual({ path: "/my dir", rest: "ls" });
|
|
expect(extractLeadingCdTarget("cd '/a b' && ls")).toEqual({ path: "/a b", rest: "ls" });
|
|
expect(extractLeadingCdTarget("cd /a\\ b && ls")).toEqual({ path: "/a b", rest: "ls" });
|
|
});
|
|
|
|
it("preserves ~ so resolveToCwd can expand it", () => {
|
|
expect(extractLeadingCdTarget("cd ~/proj && make")).toEqual({ path: "~/proj", rest: "make" });
|
|
});
|
|
|
|
it("accepts a && with no leading whitespace", () => {
|
|
expect(extractLeadingCdTarget("cd /tmp&& echo ok")).toEqual({ path: "/tmp", rest: "echo ok" });
|
|
});
|
|
|
|
// Regression for #7883: a redirect between the path and `&&` must not be
|
|
// absorbed into the cwd token — the command belongs to the shell intact.
|
|
it("bails when a redirect follows the path", () => {
|
|
expect(extractLeadingCdTarget("cd /tmp 2>/dev/null && echo ok")).toBeNull();
|
|
expect(extractLeadingCdTarget("cd /tmp >/dev/null && echo ok")).toBeNull();
|
|
expect(extractLeadingCdTarget("cd /tmp >/dev/null 2>&1 && echo ok")).toBeNull();
|
|
});
|
|
|
|
it("bails when an extra argument follows the path", () => {
|
|
expect(extractLeadingCdTarget("cd /tmp extra && echo ok")).toBeNull();
|
|
});
|
|
|
|
it("bails on paths that need shell expansion", () => {
|
|
expect(extractLeadingCdTarget("cd $HOME && ls")).toBeNull();
|
|
expect(extractLeadingCdTarget('cd "$(git rev-parse --show-toplevel)" && make')).toBeNull();
|
|
expect(extractLeadingCdTarget("cd `pwd` && ls")).toBeNull();
|
|
});
|
|
|
|
it("requires a top-level && separator", () => {
|
|
expect(extractLeadingCdTarget("cd /tmp; echo ok")).toBeNull();
|
|
expect(extractLeadingCdTarget("cd /foo || echo fail")).toBeNull();
|
|
expect(extractLeadingCdTarget("cd /tmp &echo")).toBeNull();
|
|
});
|
|
|
|
it("bails when there is no cd target", () => {
|
|
expect(extractLeadingCdTarget("cd && echo")).toBeNull();
|
|
expect(extractLeadingCdTarget("ls -la")).toBeNull();
|
|
expect(extractLeadingCdTarget("cdx /tmp && ls")).toBeNull();
|
|
});
|
|
});
|