can1357
19feec9592
- Added `env` parameter to bash tool for safe environment variable passing without shell re-parsing. - Added support for rendering partial environment variable assignments in command preview during streaming. - Updated bash tool prompt to recommend `env` parameter for multiline, quote-heavy, and untrusted values. - Refactored tool execution component to conditionally merge partial JSON arguments during streaming. - Added helper functions for environment variable normalization, escaping, and formatting.
86 lines
2.8 KiB
TypeScript
86 lines
2.8 KiB
TypeScript
import { afterEach, describe, expect, it } from "bun:test";
|
|
import type { RenderResultOptions } from "@oh-my-pi/pi-agent-core";
|
|
import { getThemeByName } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
|
|
import { bashToolRenderer } from "@oh-my-pi/pi-coding-agent/tools/bash";
|
|
import { sanitizeText } from "@oh-my-pi/pi-natives";
|
|
import { ImageProtocol, TERMINAL } from "@oh-my-pi/pi-tui";
|
|
|
|
type MutableTerminalInfo = {
|
|
imageProtocol: ImageProtocol | null;
|
|
};
|
|
|
|
const terminal = TERMINAL as unknown as MutableTerminalInfo;
|
|
|
|
describe("bashToolRenderer", () => {
|
|
const originalProtocol = TERMINAL.imageProtocol;
|
|
|
|
afterEach(() => {
|
|
terminal.imageProtocol = originalProtocol;
|
|
});
|
|
|
|
it("shows rendered env assignments in the command preview", async () => {
|
|
const theme = await getThemeByName("dark");
|
|
expect(theme).toBeDefined();
|
|
const uiTheme = theme!;
|
|
const component = bashToolRenderer.renderCall(
|
|
{ command: "printf '%s' \"$MERMAID\"", env: { MERMAID: 'line "one"\ntwo' } },
|
|
{ expanded: false, isPartial: false },
|
|
uiTheme,
|
|
);
|
|
const rendered = sanitizeText(component.render(120).join("\n"));
|
|
expect(rendered).toContain('MERMAID="line \\"one\\"\\ntwo"');
|
|
expect(rendered).toContain("printf '%s' \"$MERMAID\"");
|
|
});
|
|
|
|
it("shows partial env assignments while tool args are still streaming", async () => {
|
|
const theme = await getThemeByName("dark");
|
|
expect(theme).toBeDefined();
|
|
const uiTheme = theme!;
|
|
const component = bashToolRenderer.renderCall(
|
|
{
|
|
command: "printf '%s' \"$MERMAID\"",
|
|
__partialJson: '{"command":"printf \'%s\' "$MERMAID"","env":{"MERMAID":"line 1\\nline 2',
|
|
},
|
|
{ expanded: false, isPartial: true },
|
|
uiTheme,
|
|
);
|
|
const rendered = sanitizeText(component.render(120).join("\n"));
|
|
expect(rendered).toContain('MERMAID="line 1\\nline 2"');
|
|
expect(rendered).toContain("printf '%s' \"$MERMAID\"");
|
|
});
|
|
|
|
it("bypasses truncation/styling for SIXEL lines", async () => {
|
|
terminal.imageProtocol = ImageProtocol.Sixel;
|
|
const theme = await getThemeByName("dark");
|
|
expect(theme).toBeDefined();
|
|
const uiTheme = theme!;
|
|
const sixel = "\x1bPqabc\x1b\\";
|
|
const renderOptions: RenderResultOptions & {
|
|
renderContext: {
|
|
output: string;
|
|
expanded: boolean;
|
|
previewLines: number;
|
|
};
|
|
} = {
|
|
expanded: false,
|
|
isPartial: false,
|
|
renderContext: {
|
|
output: `line one\n${sixel}\nline two`,
|
|
expanded: false,
|
|
previewLines: 1,
|
|
},
|
|
};
|
|
|
|
const component = bashToolRenderer.renderResult(
|
|
{ content: [{ type: "text", text: "" }], details: {}, isError: false },
|
|
renderOptions,
|
|
uiTheme,
|
|
{ command: "echo sixel" },
|
|
);
|
|
const lines = component.render(80);
|
|
|
|
expect(lines.filter(line => line === sixel)).toHaveLength(1);
|
|
expect(lines.some(line => line.includes("ctrl+o to expand"))).toBe(false);
|
|
});
|
|
});
|