a2854ba768
Migrate 203 test files (356 call sites) from fs.rm/fs.rmSync to
removeWithRetries/removeSyncWithRetries to reduce EBUSY test failures
on Windows. removeWithRetries is now exported from @oh-my-pi/pi-utils.
The migration uses a regex-based approach that:
- Replaces fs.rm(path, { recursive, force }) → removeWithRetries(path)
- Replaces fs.rmSync(path, { recursive, force }) → removeSyncWithRetries(path)
- Replaces fs.rm(path) → removeWithRetries(path) (no options)
- Skips fs.rm/fs.rmSync inside template literals (bun --eval scripts)
- Adds imports to existing @oh-my-pi/pi-utils import or creates new one
- Removes unused fs imports where fs.rm was the only fs usage (4 files)
136 lines
4.7 KiB
TypeScript
136 lines
4.7 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, spyOn } from "bun:test";
|
|
import * as fs from "node:fs/promises";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import { Settings } from "@oh-my-pi/pi-coding-agent/config/settings";
|
|
import { resolveLocalUrlToPath } from "@oh-my-pi/pi-coding-agent/internal-urls";
|
|
import type { PlanModeState } from "@oh-my-pi/pi-coding-agent/plan-mode/state";
|
|
import type { ClientBridge } from "@oh-my-pi/pi-coding-agent/session/client-bridge";
|
|
import type { ToolSession } from "@oh-my-pi/pi-coding-agent/tools";
|
|
import { WriteTool } from "@oh-my-pi/pi-coding-agent/tools/write";
|
|
import { removeWithRetries } from "@oh-my-pi/pi-utils";
|
|
|
|
const FILE_CONTENT = "bridge write content\n";
|
|
|
|
interface SessionOptions {
|
|
bridge?: ClientBridge;
|
|
planMode?: PlanModeState;
|
|
}
|
|
|
|
function createSession(cwd: string, options: SessionOptions = {}): ToolSession {
|
|
const getArtifactsDir = () => path.join(cwd, "artifacts");
|
|
const getSessionId = () => "session-a";
|
|
return {
|
|
cwd,
|
|
hasUI: false,
|
|
enableLsp: false,
|
|
getSessionFile: () => path.join(cwd, "session.jsonl"),
|
|
getSessionSpawns: () => "*",
|
|
getArtifactsDir,
|
|
getSessionId,
|
|
localProtocolOptions: { getArtifactsDir, getSessionId },
|
|
allocateOutputArtifact: async () => ({ id: "artifact-1", path: path.join(cwd, "artifact-1.log") }),
|
|
settings: Settings.isolated(),
|
|
getClientBridge: options.bridge ? () => options.bridge : undefined,
|
|
getPlanModeState: options.planMode ? () => options.planMode : undefined,
|
|
};
|
|
}
|
|
|
|
describe("write tool ACP fs routing", () => {
|
|
let tmpDir: string;
|
|
|
|
beforeEach(async () => {
|
|
tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "write-acp-fs-test-"));
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await removeWithRetries(tmpDir);
|
|
});
|
|
|
|
it("routes plain text writes through the bridge and does not call Bun.write", async () => {
|
|
const filePath = path.join(tmpDir, "output.txt");
|
|
|
|
const bridge: ClientBridge = {
|
|
capabilities: { writeTextFile: true },
|
|
writeTextFile: async () => undefined,
|
|
};
|
|
|
|
const bridgeSpy = spyOn(bridge, "writeTextFile");
|
|
const bunWriteSpy = spyOn(Bun, "write");
|
|
|
|
try {
|
|
const session = createSession(tmpDir, { bridge });
|
|
const tool = new WriteTool(session);
|
|
|
|
await tool.execute("call-1", { path: filePath, content: FILE_CONTENT });
|
|
|
|
// Bridge was called with the exact path and content
|
|
expect(bridgeSpy).toHaveBeenCalledTimes(1);
|
|
expect(bridgeSpy).toHaveBeenCalledWith({ path: filePath, content: FILE_CONTENT });
|
|
// Disk write must not have been called — bridge is the destination
|
|
expect(bunWriteSpy).not.toHaveBeenCalled();
|
|
} finally {
|
|
bunWriteSpy.mockRestore();
|
|
}
|
|
});
|
|
|
|
it("writes local plan artifacts to disk instead of the ACP bridge", async () => {
|
|
const planPath = "local://PLAN.md";
|
|
const planContent = "# Plan\n\nhello world\n";
|
|
const bridge: ClientBridge = {
|
|
capabilities: { writeTextFile: true },
|
|
writeTextFile: async () => {
|
|
throw new Error("Internal error");
|
|
},
|
|
};
|
|
const bridgeSpy = spyOn(bridge, "writeTextFile");
|
|
const session = createSession(tmpDir, {
|
|
bridge,
|
|
planMode: { enabled: true, planFilePath: planPath, workflow: "parallel", reentry: false },
|
|
});
|
|
|
|
await new WriteTool(session).execute("call-plan", { path: planPath, content: planContent });
|
|
|
|
expect(bridgeSpy).not.toHaveBeenCalled();
|
|
expect(
|
|
await Bun.file(
|
|
resolveLocalUrlToPath(planPath, {
|
|
getArtifactsDir: session.getArtifactsDir,
|
|
getSessionId: session.getSessionId,
|
|
}),
|
|
).text(),
|
|
).toBe(planContent);
|
|
});
|
|
|
|
it("treats bracketed `[local://...#TAG]` headers as local artifacts, not bridge writes", async () => {
|
|
const planPath = "local://PLAN.md";
|
|
const scratchPath = "local://scratch.md";
|
|
// Active plan file is unrelated to the scratch artifact we are writing.
|
|
const bracketedScratch = `[${scratchPath}#ABCD]`;
|
|
const scratchContent = "scratch notes\n";
|
|
const bridge: ClientBridge = {
|
|
capabilities: { writeTextFile: true },
|
|
writeTextFile: async () => undefined,
|
|
};
|
|
const bridgeSpy = spyOn(bridge, "writeTextFile");
|
|
const session = createSession(tmpDir, {
|
|
bridge,
|
|
planMode: { enabled: true, planFilePath: planPath, workflow: "parallel", reentry: false },
|
|
});
|
|
|
|
await new WriteTool(session).execute("call-bracketed", { path: bracketedScratch, content: scratchContent });
|
|
|
|
// Bracketed local headers must not slip past the bridge router — they are
|
|
// still session-local artifacts and stay on disk under the local sandbox.
|
|
expect(bridgeSpy).not.toHaveBeenCalled();
|
|
expect(
|
|
await Bun.file(
|
|
resolveLocalUrlToPath(scratchPath, {
|
|
getArtifactsDir: session.getArtifactsDir,
|
|
getSessionId: session.getSessionId,
|
|
}),
|
|
).text(),
|
|
).toBe(scratchContent);
|
|
});
|
|
});
|