Claude Code. Any Model. The most powerful AI coding agent now speaks every language.
fix(catalog): add a random suffix to atomic-write temp file names
Jack Rudenko85290388ad76
diff --git a/packages/cli/src/fs-atomic.test.ts b/packages/cli/src/fs-atomic.test.tsindex b85e5b77..b18ab753 100644--- a/packages/cli/src/fs-atomic.test.ts+++ b/packages/cli/src/fs-atomic.test.ts@@ -1,5 +1,5 @@import { afterEach, beforeEach, describe, expect, test } from "bun:test";-import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync } from "node:fs";+import { mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync } from "node:fs";import { tmpdir } from "node:os";import { join } from "node:path";import { writeFileAtomic } from "./fs-atomic.js";@@ -21,7 +21,7 @@ describe("writeFileAtomic", () => {writeFileAtomic(path, content);expect(readFileSync(path, "utf8")).toBe(content);expect(readdirSync(root)).toEqual(["cache.json"]);- expect(existsSync(`${path}.tmp.${process.pid}`)).toBe(false);+ expect(readdirSync(root).filter((name) => name.startsWith("cache.json.tmp."))).toEqual([]);});test("creates parent directories and replaces previous content completely", () => {@@ -44,8 +44,14 @@ describe("writeFileAtomic", () => {expect(error).toBeInstanceOf(Error);expect(error?.syscall).toBe("rename");expect(error?.code).toBe("EISDIR");- expect(error?.path).toBe(`${path}.tmp.${process.pid}`);- expect(existsSync(`${path}.tmp.${process.pid}`)).toBe(false);+ const prefix = `${path}.tmp.${process.pid}.`;+ expect(error?.path).toStartWith(prefix);+ expect(error?.path?.slice(prefix.length)).toMatch(+ /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/+ );+ expect(readdirSync(root).filter((name) => name.startsWith("target-directory.tmp."))).toEqual(+ []+ );expect(readdirSync(root)).toEqual(["target-directory"]);expect(readdirSync(path)).toEqual([]);});diff --git a/packages/cli/src/fs-atomic.ts b/packages/cli/src/fs-atomic.tsindex 838ced44..ee8d2d11 100644--- a/packages/cli/src/fs-atomic.ts+++ b/packages/cli/src/fs-atomic.ts@@ -1,3 +1,4 @@+import { randomUUID } from "node:crypto";import { mkdirSync, renameSync, unlinkSync, writeFileSync } from "node:fs";import { dirname } from "node:path";@@ -9,7 +10,8 @@ import { dirname } from "node:path";*/export function writeFileAtomic(path: string, text: string): void {mkdirSync(dirname(path), { recursive: true });- const tmp = `${path}.tmp.${process.pid}`;+ // pid alone can repeat across PID namespaces sharing one ~/.claudish (containers).+ const tmp = `${path}.tmp.${process.pid}.${randomUUID()}`;try {writeFileSync(tmp, text, "utf-8");renameSync(tmp, path);