oldschoola
cd578a86d1
F1 (coding-agent): close the withFileLock mkdir-vs-writeLockInfo race that
let a losing contender wipe the winner's freshly-created lock directory.
Every lock now carries a per-process UUID token; releaseLock verifies the
token before fs.rm, and isLockStale no longer treats an info-less but
fresh dir (or a dir that vanished mid-check) as stale.
F4 (coding-agent): sanitize tabs and truncate oversized error strings in
formatErrorMessage so error renderings that embed file content
(apply_patch, hashline, etc.) cannot break terminal alignment or
overflow the line width.
F7 (ai): support named-tool routing on Google providers. Widens
GoogleSharedStreamOptions.toolChoice and GoogleGeminiCliOptions.toolChoice
to accept { mode: 'ANY'; allowedFunctionNames }. mapGoogleToolChoice
now converts ToolChoice { type: 'tool'|'function', name } to the wire
shape (mirroring mapAnthropicToolChoice). buildGoogleGenerateContentParams
and the gemini-cli request serializer honor the allow-list.
90 lines
2.8 KiB
TypeScript
90 lines
2.8 KiB
TypeScript
import { afterAll, describe, expect, test } from "bun:test";
|
|
import * as fs from "node:fs/promises";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import { __internalsForTesting, withFileLock } from "../src/config/file-lock";
|
|
|
|
const { tryAcquireLock, releaseLock, readLockInfo, isLockStale, getLockPath } = __internalsForTesting;
|
|
|
|
const ROOTS: string[] = [];
|
|
|
|
async function mkRoot(): Promise<string> {
|
|
const root = await fs.mkdtemp(path.join(os.tmpdir(), "filelock-test-"));
|
|
ROOTS.push(root);
|
|
return root;
|
|
}
|
|
|
|
afterAll(async () => {
|
|
for (const root of ROOTS) {
|
|
await fs.rm(root, { recursive: true, force: true }).catch(() => {});
|
|
}
|
|
});
|
|
|
|
describe("file-lock token ownership (F1)", () => {
|
|
test("releaseLock with the wrong token leaves the lock intact", async () => {
|
|
const root = await mkRoot();
|
|
const target = path.join(root, "data.json");
|
|
const lockPath = getLockPath(target);
|
|
|
|
const token = await tryAcquireLock(lockPath);
|
|
expect(token).not.toBeNull();
|
|
expect(typeof token).toBe("string");
|
|
|
|
// A contender that lost a race calling release with a guessed/empty token
|
|
// must NOT remove the rightful owner's lock.
|
|
await releaseLock(lockPath, "not-the-real-token");
|
|
|
|
const info = await readLockInfo(lockPath);
|
|
expect(info).not.toBeNull();
|
|
expect(info?.token).toBe(token!);
|
|
|
|
// The rightful owner can still release.
|
|
await releaseLock(lockPath, token!);
|
|
expect(await readLockInfo(lockPath)).toBeNull();
|
|
});
|
|
|
|
test("isLockStale does NOT declare a freshly-created empty dir stale", async () => {
|
|
const root = await mkRoot();
|
|
const target = path.join(root, "race.json");
|
|
const lockPath = getLockPath(target);
|
|
|
|
// Simulate the precise window: mkdir succeeded for the winner but the
|
|
// info file has not been written yet.
|
|
await fs.mkdir(lockPath);
|
|
|
|
const stale = await isLockStale(lockPath, 10_000);
|
|
expect(stale).toBe(false);
|
|
|
|
await fs.rm(lockPath, { recursive: true });
|
|
});
|
|
|
|
test("withFileLock serializes N concurrent writers without lost updates", async () => {
|
|
const root = await mkRoot();
|
|
const target = path.join(root, "counter.json");
|
|
await fs.writeFile(target, JSON.stringify({ counter: 0 }));
|
|
|
|
const N = 30;
|
|
await Promise.all(
|
|
Array.from({ length: N }, () =>
|
|
withFileLock(
|
|
target,
|
|
async () => {
|
|
const text = await fs.readFile(target, "utf-8");
|
|
const data = JSON.parse(text) as { counter: number };
|
|
data.counter += 1;
|
|
// Widen the critical-section window so any concurrency leak
|
|
// surfaces as a lost update.
|
|
await Bun.sleep(2);
|
|
await fs.writeFile(target, JSON.stringify(data));
|
|
},
|
|
{ retries: 500, retryDelayMs: 5 },
|
|
),
|
|
),
|
|
);
|
|
|
|
const text = await fs.readFile(target, "utf-8");
|
|
const final = JSON.parse(text) as { counter: number };
|
|
expect(final.counter).toBe(N);
|
|
}, 30_000);
|
|
});
|