chore(vendor): import pi 1.3.0
Imported as a linear vendor commit so forge rebases do not replay the upstream root tree. git-subtree-dir: third_party/pi git-subtree-split: 71023aec1546d6d677a65669c5665c0927ce0dd0
This commit is contained in:
alexion committed
1 parent
719370c8f7
commit
6081e3e325
1743 files changed
+205459
-131704
No files matched your search
Vendored
+272
@@ -0,0 +1,272 @@
|
||||
import { afterEach, describe, expect, test, vi } from "vitest";
|
||||
import type { AgentSessionRuntime } from "../../../src/core/agent-session-runtime.ts";
|
||||
import type { ExtensionAPI, UserBashEvent, UserBashEventResult } from "../../../src/core/extensions/types.ts";
|
||||
import { InteractiveMode } from "../../../src/modes/interactive/interactive-mode.ts";
|
||||
import { runRpcMode } from "../../../src/modes/rpc/rpc-mode.ts";
|
||||
import { createHarness, type Harness } from "../harness.ts";
|
||||
|
||||
// Regression for https://github.com/earendil-works/pi/issues/9068
|
||||
|
||||
const rpcIo = vi.hoisted(() => ({
|
||||
outputLines: [] as string[],
|
||||
lineHandler: undefined as ((line: string) => void) | undefined,
|
||||
}));
|
||||
|
||||
vi.mock("../../../src/core/output-guard.js", () => ({
|
||||
flushRawStdout: vi.fn(async () => {}),
|
||||
takeOverStdout: vi.fn(),
|
||||
waitForRawStdoutBackpressure: vi.fn(async () => {}),
|
||||
writeRawStdout: (line: string) => {
|
||||
rpcIo.outputLines.push(line);
|
||||
},
|
||||
}));
|
||||
|
||||
vi.mock("../../../src/modes/interactive/theme/theme.js", () => ({ theme: {} }));
|
||||
|
||||
vi.mock("../../../src/modes/interactive/components/bash-execution.js", () => ({
|
||||
BashExecutionComponent: class {
|
||||
appendOutput(): void {}
|
||||
setComplete(): void {}
|
||||
},
|
||||
}));
|
||||
|
||||
vi.mock("../../../src/modes/rpc/jsonl.js", () => ({
|
||||
attachJsonlLineReader: vi.fn((_stream: NodeJS.ReadableStream, onLine: (line: string) => void) => {
|
||||
rpcIo.lineHandler = onLine;
|
||||
return () => {
|
||||
rpcIo.lineHandler = undefined;
|
||||
};
|
||||
}),
|
||||
serializeJsonLine: (value: unknown) => `${JSON.stringify(value)}\n`,
|
||||
}));
|
||||
|
||||
type NodeListener = Parameters<typeof process.on>[1];
|
||||
|
||||
type ListenerSnapshot = {
|
||||
stdinEnd: NodeListener[];
|
||||
signals: Map<NodeJS.Signals, NodeListener[]>;
|
||||
};
|
||||
|
||||
function takeListenerSnapshot(): ListenerSnapshot {
|
||||
const signals: NodeJS.Signals[] = process.platform === "win32" ? ["SIGTERM"] : ["SIGTERM", "SIGHUP"];
|
||||
return {
|
||||
stdinEnd: process.stdin.listeners("end") as NodeListener[],
|
||||
signals: new Map(signals.map((signal) => [signal, process.listeners(signal) as NodeListener[]])),
|
||||
};
|
||||
}
|
||||
|
||||
function restoreListeners(snapshot: ListenerSnapshot): void {
|
||||
for (const listener of process.stdin.listeners("end") as NodeListener[]) {
|
||||
if (!snapshot.stdinEnd.includes(listener)) process.stdin.off("end", listener);
|
||||
}
|
||||
for (const [signal, previousListeners] of snapshot.signals) {
|
||||
for (const listener of process.listeners(signal) as NodeListener[]) {
|
||||
if (!previousListeners.includes(listener)) process.off(signal, listener);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function parseOutputLines(): Array<Record<string, unknown>> {
|
||||
return rpcIo.outputLines
|
||||
.flatMap((line) => line.split("\n"))
|
||||
.filter((line) => line.trim().length > 0)
|
||||
.map((line) => JSON.parse(line) as Record<string, unknown>);
|
||||
}
|
||||
|
||||
function createRuntimeHost(harness: Harness): AgentSessionRuntime {
|
||||
return {
|
||||
session: harness.session,
|
||||
newSession: vi.fn(async () => ({ cancelled: true })),
|
||||
switchSession: vi.fn(async () => ({ cancelled: true })),
|
||||
fork: vi.fn(async () => ({ cancelled: true, selectedText: "" })),
|
||||
dispose: vi.fn(async () => {}),
|
||||
setRebindSession: vi.fn(),
|
||||
} as unknown as AgentSessionRuntime;
|
||||
}
|
||||
|
||||
async function startRpcHarness(extension: (pi: ExtensionAPI) => void): Promise<{
|
||||
harness: Harness;
|
||||
send(command: Record<string, unknown>): void;
|
||||
cleanup(): void;
|
||||
}> {
|
||||
const listenerSnapshot = takeListenerSnapshot();
|
||||
const harness = await createHarness({ extensionFactories: [extension] });
|
||||
const cleanup = () => {
|
||||
harness.cleanup();
|
||||
restoreListeners(listenerSnapshot);
|
||||
};
|
||||
|
||||
try {
|
||||
void runRpcMode(createRuntimeHost(harness));
|
||||
await vi.waitFor(() => expect(rpcIo.lineHandler).toBeDefined());
|
||||
} catch (error) {
|
||||
cleanup();
|
||||
throw error;
|
||||
}
|
||||
|
||||
return {
|
||||
harness,
|
||||
send(command) {
|
||||
if (!rpcIo.lineHandler) throw new Error("RPC line handler is not attached");
|
||||
rpcIo.lineHandler(JSON.stringify(command));
|
||||
},
|
||||
cleanup,
|
||||
};
|
||||
}
|
||||
|
||||
type InteractiveBashContext = {
|
||||
defaultEditor: { onSubmit?: (text: string) => Promise<void> | void };
|
||||
editor: { addToHistory?: (text: string) => void };
|
||||
session: Harness["session"];
|
||||
sessionManager: Harness["sessionManager"];
|
||||
ui: { requestRender(): void };
|
||||
chatContainer: { addChild(component: unknown): void };
|
||||
pendingMessagesContainer: { addChild(component: unknown): void };
|
||||
pendingBashComponents: unknown[];
|
||||
isBashMode: boolean;
|
||||
handleBashCommand(command: string, excludeFromContext?: boolean): Promise<void>;
|
||||
showError(message: string): void;
|
||||
updateEditorBorderColor(): void;
|
||||
};
|
||||
|
||||
const interactiveModePrototype = InteractiveMode.prototype as unknown as {
|
||||
setupEditorSubmitHandler(this: InteractiveBashContext): void;
|
||||
handleBashCommand(this: InteractiveBashContext, command: string, excludeFromContext?: boolean): Promise<void>;
|
||||
};
|
||||
|
||||
const localResult = {
|
||||
output: "local output",
|
||||
exitCode: 0,
|
||||
cancelled: false,
|
||||
truncated: false,
|
||||
};
|
||||
|
||||
const rpcCases: Array<{
|
||||
name: string;
|
||||
extension: (pi: ExtensionAPI) => void;
|
||||
error?: string;
|
||||
executeCount: number;
|
||||
}> = [
|
||||
{
|
||||
name: "fails the request without executing bash when a handler throws",
|
||||
extension: (pi) => {
|
||||
pi.on("user_bash", async () => {
|
||||
throw new Error("Routing failed");
|
||||
});
|
||||
},
|
||||
error: "Routing failed",
|
||||
executeCount: 0,
|
||||
},
|
||||
{
|
||||
name: "fails the request without executing bash when a handler returns an empty result",
|
||||
extension: (pi) => {
|
||||
pi.on("user_bash", async () => ({}) as unknown as UserBashEventResult);
|
||||
},
|
||||
error: "Invalid user_bash handler result",
|
||||
executeCount: 0,
|
||||
},
|
||||
{
|
||||
name: "executes bash normally when a handler returns undefined",
|
||||
extension: (pi) => {
|
||||
pi.on("user_bash", async () => undefined);
|
||||
},
|
||||
executeCount: 1,
|
||||
},
|
||||
];
|
||||
|
||||
afterEach(() => {
|
||||
rpcIo.outputLines = [];
|
||||
rpcIo.lineHandler = undefined;
|
||||
});
|
||||
|
||||
describe("RPC user_bash failure handling (#9068)", () => {
|
||||
test.each(rpcCases)("$name", async ({ extension, error, executeCount }) => {
|
||||
const rpc = await startRpcHarness(extension);
|
||||
const executeBash = vi.spyOn(rpc.harness.session, "executeBash").mockResolvedValue(localResult);
|
||||
|
||||
try {
|
||||
rpc.send({ id: "bash-request", type: "bash", command: "pwd" });
|
||||
|
||||
await vi.waitFor(() => {
|
||||
const response = parseOutputLines().find(
|
||||
(output) => output.type === "response" && output.id === "bash-request",
|
||||
);
|
||||
expect(response).toMatchObject({
|
||||
id: "bash-request",
|
||||
type: "response",
|
||||
command: "bash",
|
||||
success: error === undefined,
|
||||
...(error ? { error: expect.stringContaining(error) } : { data: localResult }),
|
||||
});
|
||||
});
|
||||
|
||||
if (error) {
|
||||
expect(parseOutputLines()).toEqual(
|
||||
expect.arrayContaining([
|
||||
expect.objectContaining({
|
||||
type: "extension_error",
|
||||
event: "user_bash",
|
||||
error: expect.stringContaining(error),
|
||||
}),
|
||||
]),
|
||||
);
|
||||
}
|
||||
expect(executeBash).toHaveBeenCalledTimes(executeCount);
|
||||
} finally {
|
||||
executeBash.mockRestore();
|
||||
rpc.cleanup();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe("Interactive user_bash failure handling (#9068)", () => {
|
||||
test.each([
|
||||
["!pwd", false],
|
||||
["!!pwd", true],
|
||||
])("fails closed for %s when a handler returns an empty result", async (input, excludeFromContext) => {
|
||||
const events: UserBashEvent[] = [];
|
||||
const harness = await createHarness({
|
||||
extensionFactories: [
|
||||
(pi) => {
|
||||
pi.on("user_bash", async (event) => {
|
||||
events.push(event);
|
||||
return {} as unknown as UserBashEventResult;
|
||||
});
|
||||
},
|
||||
],
|
||||
});
|
||||
const executeBash = vi.spyOn(harness.session, "executeBash").mockResolvedValue(localResult);
|
||||
const context: InteractiveBashContext = {
|
||||
defaultEditor: {},
|
||||
editor: { addToHistory: vi.fn() },
|
||||
session: harness.session,
|
||||
sessionManager: harness.sessionManager,
|
||||
ui: { requestRender: vi.fn() },
|
||||
chatContainer: { addChild: vi.fn() },
|
||||
pendingMessagesContainer: { addChild: vi.fn() },
|
||||
pendingBashComponents: [],
|
||||
isBashMode: true,
|
||||
handleBashCommand: interactiveModePrototype.handleBashCommand,
|
||||
showError: vi.fn(),
|
||||
updateEditorBorderColor: vi.fn(),
|
||||
};
|
||||
interactiveModePrototype.setupEditorSubmitHandler.call(context);
|
||||
|
||||
try {
|
||||
await context.defaultEditor.onSubmit?.(input);
|
||||
|
||||
expect(events).toEqual([
|
||||
{
|
||||
type: "user_bash",
|
||||
command: "pwd",
|
||||
excludeFromContext,
|
||||
cwd: harness.sessionManager.getCwd(),
|
||||
},
|
||||
]);
|
||||
expect(executeBash).not.toHaveBeenCalled();
|
||||
} finally {
|
||||
executeBash.mockRestore();
|
||||
harness.cleanup();
|
||||
}
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user