toolcraft 0.0.26 → 0.0.33

package/node_modules/@poe-code/agent-defs/dist/agents/goose.js

@@ -5,6 +5,7 @@ export const gooseAgent = {
     summary: "Block's open-source AI agent with ACP support.",
     binaryName: "goose",
     apiShapes: ["openai-chat-completions"],
+    otelCapture: {},
     configPath: "~/.config/goose/config.yaml",
     branding: {
         colors: {

package/node_modules/@poe-code/agent-defs/dist/agents/index.d.ts

@@ -1,6 +1,7 @@
 export { claudeCodeAgent } from "./claude-code.js";
 export { claudeDesktopAgent } from "./claude-desktop.js";
 export { codexAgent } from "./codex.js";
+export { cursorAgent } from "./cursor.js";
 export { geminiCliAgent } from "./gemini-cli.js";
 export { openCodeAgent } from "./opencode.js";
 export { kimiAgent } from "./kimi.js";

package/node_modules/@poe-code/agent-defs/dist/agents/index.js

@@ -1,6 +1,7 @@
 export { claudeCodeAgent } from "./claude-code.js";
 export { claudeDesktopAgent } from "./claude-desktop.js";
 export { codexAgent } from "./codex.js";
+export { cursorAgent } from "./cursor.js";
 export { geminiCliAgent } from "./gemini-cli.js";
 export { openCodeAgent } from "./opencode.js";
 export { kimiAgent } from "./kimi.js";

package/node_modules/@poe-code/agent-defs/dist/agents/opencode.js

@@ -5,6 +5,11 @@ export const openCodeAgent = {
     summary: "Configure OpenCode CLI to use the Poe API.",
     binaryName: "opencode",
     apiShapes: ["openai-chat-completions"],
+    otelCapture: {
+        env: {
+            OPENCODE_CONFIG_CONTENT: '{"experimental":{"openTelemetry":true}}'
+        }
+    },
     configPath: "~/.config/opencode/config.json",
     branding: {
         colors: {

package/node_modules/@poe-code/agent-defs/dist/index.d.ts

@@ -1,5 +1,5 @@
-export type { AgentDefinition, ApiShapeId } from "./types.js";
+export type { AgentDefinition, ApiShapeId, OtelCaptureDefinition } from "./types.js";
 export type { AgentSpecifier } from "./specifier.js";
-export { claudeCodeAgent, claudeDesktopAgent, codexAgent, geminiCliAgent, openCodeAgent, kimiAgent, gooseAgent, poeAgentAgent } from "./agents/index.js";
+export { claudeCodeAgent, claudeDesktopAgent, codexAgent, cursorAgent, geminiCliAgent, openCodeAgent, kimiAgent, gooseAgent, poeAgentAgent } from "./agents/index.js";
 export { allAgents, resolveAgentId } from "./registry.js";
 export { parseAgentSpecifier, formatAgentSpecifier, normalizeAgentId } from "./specifier.js";

package/node_modules/@poe-code/agent-defs/dist/index.js

@@ -1,3 +1,3 @@
-export { claudeCodeAgent, claudeDesktopAgent, codexAgent, geminiCliAgent, openCodeAgent, kimiAgent, gooseAgent, poeAgentAgent } from "./agents/index.js";
+export { claudeCodeAgent, claudeDesktopAgent, codexAgent, cursorAgent, geminiCliAgent, openCodeAgent, kimiAgent, gooseAgent, poeAgentAgent } from "./agents/index.js";
 export { allAgents, resolveAgentId } from "./registry.js";
 export { parseAgentSpecifier, formatAgentSpecifier, normalizeAgentId } from "./specifier.js";

package/node_modules/@poe-code/agent-defs/dist/registry.js

@@ -1,4 +1,4 @@
-import { claudeCodeAgent, claudeDesktopAgent, codexAgent, geminiCliAgent, openCodeAgent, kimiAgent, gooseAgent, poeAgentAgent } from "./agents/index.js";
+import { claudeCodeAgent, claudeDesktopAgent, codexAgent, cursorAgent, geminiCliAgent, openCodeAgent, kimiAgent, gooseAgent, poeAgentAgent } from "./agents/index.js";
 function freezeAgent(agent) {
     if (agent.aliases !== undefined) {
         Object.freeze(agent.aliases);
@@ -6,6 +6,12 @@ function freezeAgent(agent) {
     if (agent.apiShapes !== undefined) {
         Object.freeze(agent.apiShapes);
     }
+    if (agent.otelCapture?.env !== undefined) {
+        Object.freeze(agent.otelCapture.env);
+    }
+    if (agent.otelCapture !== undefined) {
+        Object.freeze(agent.otelCapture);
+    }
     Object.freeze(agent.branding.colors);
     Object.freeze(agent.branding);
     return Object.freeze(agent);
@@ -14,6 +20,7 @@ export const allAgents = Object.freeze([
     freezeAgent(claudeCodeAgent),
     freezeAgent(claudeDesktopAgent),
     freezeAgent(codexAgent),
+    freezeAgent(cursorAgent),
     freezeAgent(geminiCliAgent),
     freezeAgent(openCodeAgent),
     freezeAgent(kimiAgent),

package/node_modules/@poe-code/agent-defs/dist/specifier.js

@@ -1,4 +1,7 @@
 import { resolveAgentId } from "./registry.js";
+function getOwnModel(specifier) {
+    return Object.prototype.hasOwnProperty.call(specifier, "model") ? specifier.model : undefined;
+}
 export function parseAgentSpecifier(input) {
     const colonIndex = input.indexOf(":");
     if (colonIndex === -1) {
@@ -12,8 +15,9 @@ export function parseAgentSpecifier(input) {
     };
 }
 export function formatAgentSpecifier(specifier) {
-    if (specifier.model) {
-        return `${specifier.agent}:${specifier.model}`;
+    const model = getOwnModel(specifier);
+    if (model) {
+        return `${specifier.agent}:${model}`;
     }
     return specifier.agent;
 }
@@ -22,6 +26,6 @@ export function normalizeAgentId(input) {
     const agent = resolveAgentId(specifier.agent) ?? specifier.agent;
     return formatAgentSpecifier({
         agent,
-        model: specifier.model
+        model: getOwnModel(specifier)
     });
 }

package/node_modules/@poe-code/agent-defs/dist/types.d.ts

@@ -1,4 +1,8 @@
 export type ApiShapeId = "openai-chat-completions" | "openai-responses" | "anthropic-messages" | "google-generations";
+export interface OtelCaptureDefinition {
+    env?: Record<string, string>;
+    args?: (endpoint: string, content: boolean) => string[];
+}
 export interface AgentDefinition {
     id: string;
     name: string;
@@ -8,6 +12,7 @@ export interface AgentDefinition {
     /** Binary name for CLI agents. Optional for GUI-only apps like Claude Desktop. */
     binaryName?: string;
     readonly apiShapes?: readonly ApiShapeId[];
+    readonly otelCapture?: OtelCaptureDefinition;
     configPath: string;
     branding: {
         colors: {

package/node_modules/@poe-code/agent-human-in-loop/dist/providers/osascript.js

@@ -19,7 +19,7 @@ export function osascriptProvider(options = {}) {
                 return parseStdout(stdout);
             }
             catch (error) {
-                if (error.code === "ENOENT") {
+                if (hasOwnErrorCode(error, "ENOENT")) {
                     throw new Error("osascript not found — provide a different provider on this platform");
                 }
                 if (isUserCanceled(error)) {
@@ -31,3 +31,9 @@ export function osascriptProvider(options = {}) {
         }
     };
 }
+function hasOwnErrorCode(error, code) {
+    return (typeof error === "object" &&
+        error !== null &&
+        Object.prototype.hasOwnProperty.call(error, "code") &&
+        error.code === code);
+}

package/node_modules/@poe-code/agent-mcp-config/dist/configs.js

@@ -31,6 +31,12 @@ const agentMcpConfigs = {
         format: "toml",
         shape: "standard"
     },
+    cursor: {
+        configFile: "~/.cursor/mcp.json",
+        configKey: "mcpServers",
+        format: "json",
+        shape: "standard"
+    },
     opencode: {
         configFile: "~/.config/opencode/opencode.json",
         configKey: "mcp",

package/node_modules/@poe-code/config-mutations/dist/error-codes.d.ts

@@ -0,0 +1 @@
+export declare function hasOwnErrorCode(error: unknown, code: string): error is NodeJS.ErrnoException;

package/node_modules/@poe-code/config-mutations/dist/error-codes.js

@@ -0,0 +1,6 @@
+export function hasOwnErrorCode(error, code) {
+    return (typeof error === "object" &&
+        error !== null &&
+        Object.prototype.hasOwnProperty.call(error, "code") &&
+        error.code === code);
+}

package/node_modules/@poe-code/config-mutations/dist/execution/apply-mutation.js

@@ -1,9 +1,11 @@
+import { randomUUID } from "node:crypto";
 import path from "node:path";
-import { renderTemplate } from "@poe-code/design-system";
+import { renderTemplate } from "toolcraft-design";
 import { getConfigFormat, detectFormat } from "../formats/index.js";
 import { cloneConfigObject, setConfigEntry } from "../formats/object.js";
 import { resolvePath } from "./path-utils.js";
 import { isNotFound, readFileIfExists, pathExists, createTimestamp } from "../fs-utils.js";
+import { hasOwnErrorCode } from "../error-codes.js";
 // ============================================================================
 // Helper Functions
 // ============================================================================
@@ -29,6 +31,7 @@ async function backupInvalidDocument(context, targetPath, content) {
         }
         catch (error) {
             if (!isAlreadyExists(error)) {
+                await context.fs.unlink(backupPath).catch(() => undefined);
                 throw error;
             }
             attempt += 1;
@@ -36,7 +39,7 @@ async function backupInvalidDocument(context, targetPath, content) {
     }
 }
 function isAlreadyExists(error) {
-    return Boolean(error && typeof error === "object" && "code" in error && error.code === "EEXIST");
+    return hasOwnErrorCode(error, "EEXIST");
 }
 async function assertRegularWriteTarget(context, targetPath) {
     // Symlinks inside the managed home directory are untrusted: an attacker could
@@ -65,30 +68,36 @@ async function assertRegularWriteTarget(context, targetPath) {
 }
 async function writeAtomically(context, targetPath, content) {
     await assertRegularWriteTarget(context, targetPath);
-    let attempt = 0;
-    while (true) {
-        const tempPath = `${targetPath}.mutation-tmp-${attempt}`;
+    for (let attempt = 0; attempt < 10; attempt += 1) {
+        const tempPath = `${targetPath}.mutation-tmp-${process.pid}-${randomUUID()}`;
+        let tempCreated = false;
         try {
+            await assertRegularWriteTarget(context, tempPath);
             await context.fs.writeFile(tempPath, content, { encoding: "utf8", flag: "wx" });
+            tempCreated = true;
             await context.fs.rename(tempPath, targetPath);
+            tempCreated = false;
             return;
         }
         catch (error) {
-            if (isAlreadyExists(error)) {
-                attempt += 1;
-                continue;
-            }
-            try {
-                await context.fs.unlink(tempPath);
-            }
-            catch (cleanupError) {
-                if (!isNotFound(cleanupError)) {
-                    void cleanupError;
+            const alreadyExists = isAlreadyExists(error);
+            if (tempCreated || !alreadyExists) {
+                try {
+                    await context.fs.unlink(tempPath);
+                }
+                catch (cleanupError) {
+                    if (!isNotFound(cleanupError)) {
+                        void cleanupError;
+                    }
                 }
             }
+            if (alreadyExists) {
+                continue;
+            }
             throw error;
         }
     }
+    throw new Error(`Unable to create temporary mutation file for ${targetPath}.`);
 }
 function describeMutation(kind, targetPath) {
     const displayPath = targetPath ?? "target";
@@ -392,6 +401,7 @@ async function applyBackup(mutation, context, options) {
             }
             catch (error) {
                 if (!isAlreadyExists(error)) {
+                    await context.fs.unlink(backupPath).catch(() => undefined);
                     throw error;
                 }
                 attempt += 1;

package/node_modules/@poe-code/config-mutations/dist/formats/json.js

@@ -39,7 +39,7 @@ function merge(base, patch) {
         if (value === undefined) {
             continue;
         }
-        const existing = result[key];
+        const existing = hasConfigEntry(result, key) ? result[key] : undefined;
         if (isConfigObject(existing) && isConfigObject(value)) {
             setConfigEntry(result, key, merge(existing, value));
             continue;

package/node_modules/@poe-code/config-mutations/dist/formats/toml.js

@@ -23,7 +23,7 @@ function merge(base, patch) {
         if (value === undefined) {
             continue;
         }
-        const existing = result[key];
+        const existing = hasConfigEntry(result, key) ? result[key] : undefined;
         if (isConfigObject(existing) && isConfigObject(value)) {
             setConfigEntry(result, key, merge(existing, value));
             continue;

package/node_modules/@poe-code/config-mutations/dist/formats/yaml.js

@@ -26,7 +26,7 @@ function merge(base, patch) {
         if (value === undefined) {
             continue;
         }
-        const existing = result[key];
+        const existing = hasConfigEntry(result, key) ? result[key] : undefined;
         if (isConfigObject(existing) && isConfigObject(value)) {
             setConfigEntry(result, key, merge(existing, value));
             continue;

package/node_modules/@poe-code/config-mutations/dist/fs-utils.js

@@ -1,11 +1,9 @@
+import { hasOwnErrorCode } from "./error-codes.js";
 /**
  * Check if an error is a "file not found" (ENOENT) error.
  */
 export function isNotFound(error) {
-    return (typeof error === "object" &&
-        error !== null &&
-        "code" in error &&
-        error.code === "ENOENT");
+    return hasOwnErrorCode(error, "ENOENT");
 }
 /**
  * Read a file if it exists, returning null if not found.

package/node_modules/@poe-code/config-mutations/dist/template/render.js

@@ -1,4 +1,4 @@
-import { renderTemplate as renderDesignTemplate } from "@poe-code/design-system";
+import { renderTemplate as renderDesignTemplate } from "toolcraft-design";
 /**
  * Render a mustache template with the given variables.
  * HTML escaping is disabled.

package/node_modules/@poe-code/config-mutations/package.json

@@ -22,7 +22,7 @@
     "dist"
   ],
   "dependencies": {
-    "@poe-code/design-system": "*",
+    "toolcraft-design": "*",
     "jsonc-parser": "^3.3.1",
     "smol-toml": "^1.3.0",
     "yaml": "^2.8.1"

package/node_modules/@poe-code/process-runner/dist/host/host-execution-env.js

@@ -28,16 +28,23 @@ export const hostExecutionEnvFactory = {
             },
             shell() {
                 const shellSpec = openSpec.shellSpec;
+                const shellArgs = getOwnShellSpecProperty(shellSpec, "args");
+                const shellCwd = getOwnShellSpecProperty(shellSpec, "cwd");
+                const shellEnv = getOwnShellSpecProperty(shellSpec, "env");
+                const shellSignal = getOwnShellSpecProperty(shellSpec, "signal");
                 return createHostRunner().exec({
-                    command: shellSpec?.command ?? openSpec.env.SHELL ?? process.env.SHELL ?? "sh",
-                    ...(shellSpec?.args ? { args: shellSpec.args } : {}),
-                    cwd: shellSpec?.cwd ?? openSpec.cwd,
-                    env: shellSpec && "env" in shellSpec ? shellSpec.env : openSpec.env,
+                    command: getOwnShellSpecProperty(shellSpec, "command") ??
+                        openSpec.env.SHELL ??
+                        process.env.SHELL ??
+                        "sh",
+                    ...(shellArgs ? { args: shellArgs } : {}),
+                    cwd: shellCwd ?? openSpec.cwd,
+                    env: hasOwnShellSpecProperty(shellSpec, "env") ? shellEnv : openSpec.env,
                     stdin: "inherit",
                     stdout: "inherit",
                     stderr: "inherit",
                     tty: true,
-                    signal: shellSpec?.signal
+                    ...(shellSignal === undefined ? {} : { signal: shellSignal })
                 });
             },
             async close() { }
@@ -47,3 +54,9 @@ export const hostExecutionEnvFactory = {
         throw new Error("host runtime does not support reattach");
     }
 };
+function getOwnShellSpecProperty(shellSpec, name) {
+    return hasOwnShellSpecProperty(shellSpec, name) ? shellSpec[name] : undefined;
+}
+function hasOwnShellSpecProperty(shellSpec, name) {
+    return shellSpec !== undefined && Object.prototype.hasOwnProperty.call(shellSpec, name);
+}

package/node_modules/@poe-code/process-runner/dist/host/host-runner.js

@@ -1,9 +1,11 @@
 import { spawn as spawnChildProcess } from "node:child_process";
 export function createHostRunner(options = {}) {
-    const detachedByDefault = options.detached === true;
+    const runnerOptions = normalizeHostRunnerOptions(options);
+    const detachedByDefault = runnerOptions.detached === true;
     return {
         name: "host",
-        exec(spec) {
+        exec(inputSpec) {
+            const spec = normalizeRunSpec(inputSpec);
             if (spec.signal?.aborted === true) {
                 return {
                     pid: null,
@@ -21,12 +23,12 @@ export function createHostRunner(options = {}) {
             const stdio = stdinMode === "inherit" && stdoutMode === "inherit" && stderrMode === "inherit"
                 ? "inherit"
                 : [stdinMode, stdoutMode, stderrMode];
-            const child = spawnChildProcess(spec.command, spec.args ?? [], {
+            const child = spawnChildProcess(spec.command, spec.args ?? [], createNullRecord({
                 cwd: spec.cwd,
                 env: spec.env,
                 stdio,
                 ...(killProcessGroup ? { detached: true } : {})
-            });
+            }));
             if (killProcessGroup) {
                 child.unref();
             }
@@ -75,6 +77,38 @@ export function createHostRunner(options = {}) {
         }
     };
 }
+function normalizeHostRunnerOptions(options) {
+    return createNullRecord({
+        ...optionalOwnProperty(options, "detached")
+    });
+}
+function normalizeRunSpec(spec) {
+    return createNullRecord({
+        command: getOwnProperty(spec, "command"),
+        ...optionalOwnProperty(spec, "args"),
+        ...optionalOwnProperty(spec, "cwd"),
+        ...optionalOwnProperty(spec, "env"),
+        ...optionalOwnProperty(spec, "stdin"),
+        ...optionalOwnProperty(spec, "stdout"),
+        ...optionalOwnProperty(spec, "stderr"),
+        ...optionalOwnProperty(spec, "tty"),
+        ...optionalOwnProperty(spec, "signal"),
+        ...optionalOwnProperty(spec, "killProcessGroup")
+    });
+}
+function optionalOwnProperty(value, name) {
+    const property = getOwnProperty(value, name);
+    return property === undefined ? {} : { [name]: property };
+}
+function getOwnProperty(value, name) {
+    return hasOwnProperty(value, name) ? value[name] : undefined;
+}
+function hasOwnProperty(value, name) {
+    return Object.prototype.hasOwnProperty.call(value, name);
+}
+function createNullRecord(value) {
+    return Object.assign(Object.create(null), value);
+}
 function bindAbortSignal(signal, onAbort) {
     if (signal === undefined) {
         return () => { };

package/node_modules/@poe-code/process-runner/dist/workspace-transfer.js

@@ -496,8 +496,14 @@ function stripSlashes(value) {
     return value.slice(start, end);
 }
 function isNotFoundError(error) {
-    return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+    return hasOwnErrorCode(error, "ENOENT");
 }
 function isAlreadyExistsError(error) {
-    return typeof error === "object" && error !== null && "code" in error && error.code === "EEXIST";
+    return hasOwnErrorCode(error, "EEXIST");
+}
+function hasOwnErrorCode(error, code) {
+    return (typeof error === "object" &&
+        error !== null &&
+        Object.prototype.hasOwnProperty.call(error, "code") &&
+        error.code === code);
 }

package/node_modules/@poe-code/task-list/dist/backends/gh-issues-sync.js

@@ -126,6 +126,14 @@ function buildVerifyReport(lookup, opts) {
 export async function syncGhProject(opts) {
     const client = resolveGhClient(opts);
     let lookup = await lookupProject(client, opts.owner, opts.number);
+    const initialReport = buildVerifyReport(lookup, opts);
+    if (initialReport.ok || opts.yes !== true) {
+        return {
+            ...initialReport,
+            created: [],
+            updated: []
+        };
+    }
     let resolvedNumber = opts.number;
     const created = [];
     if (lookup.project === null) {
@@ -320,20 +328,23 @@ function isExactStatusField(field) {
 function isStatusOption(value) {
     return (typeof value === "object" &&
         value !== null &&
-        "id" in value &&
+        hasOwnProperty(value, "id") &&
         typeof value.id === "string" &&
-        "name" in value &&
+        hasOwnProperty(value, "name") &&
         typeof value.name === "string" &&
-        (!("color" in value) || typeof value.color === "string") &&
-        (!("description" in value) || typeof value.description === "string"));
+        (!hasOwnProperty(value, "color") || typeof value.color === "string") &&
+        (!hasOwnProperty(value, "description") || typeof value.description === "string"));
 }
 function isStatusField(value) {
     return (typeof value === "object" &&
         value !== null &&
-        "id" in value &&
+        hasOwnProperty(value, "id") &&
         typeof value.id === "string" &&
-        (!("name" in value) || typeof value.name === "string") &&
-        "options" in value &&
+        (!hasOwnProperty(value, "name") || typeof value.name === "string") &&
+        hasOwnProperty(value, "options") &&
         Array.isArray(value.options) &&
         value.options.every(isStatusOption));
 }
+function hasOwnProperty(value, name) {
+    return Object.prototype.hasOwnProperty.call(value, name);
+}

package/node_modules/@poe-code/task-list/dist/backends/markdown-dir.js

@@ -139,29 +139,36 @@ function readFrontmatter(frontmatterContent, filePath) {
     return parsed;
 }
 function assertValidTaskRecord(frontmatter, filePath, validStates) {
-    if ("$schema" in frontmatter && frontmatter.$schema !== TASK_SCHEMA_ID) {
+    if (hasOwnTaskField(frontmatter, "$schema") && frontmatter.$schema !== TASK_SCHEMA_ID) {
         throw malformedTask(filePath, "$schema");
     }
-    if ("kind" in frontmatter && frontmatter.kind !== TASK_KIND) {
+    if (hasOwnTaskField(frontmatter, "kind") && frontmatter.kind !== TASK_KIND) {
         throw malformedTask(filePath, "kind");
     }
-    if ("version" in frontmatter) {
+    if (hasOwnTaskField(frontmatter, "version")) {
         if (typeof frontmatter.version !== "number" ||
             !Number.isInteger(frontmatter.version) ||
             frontmatter.version !== TASK_VERSION) {
             throw malformedTask(filePath, "version");
         }
     }
-    if (typeof frontmatter.name !== "string" || frontmatter.name.length === 0) {
+    if (!hasOwnTaskField(frontmatter, "name") ||
+        typeof frontmatter.name !== "string" ||
+        frontmatter.name.length === 0) {
         throw malformedTask(filePath, "name");
     }
-    if (typeof frontmatter.state !== "string" || !validStates.has(frontmatter.state)) {
+    if (!hasOwnTaskField(frontmatter, "state") ||
+        typeof frontmatter.state !== "string" ||
+        !validStates.has(frontmatter.state)) {
         throw malformedTask(filePath, "state");
     }
-    if ("description" in frontmatter && typeof frontmatter.description !== "string") {
+    if (hasOwnTaskField(frontmatter, "description") && typeof frontmatter.description !== "string") {
         throw malformedTask(filePath, "description");
     }
 }
+function hasOwnTaskField(frontmatter, key) {
+    return Object.prototype.hasOwnProperty.call(frontmatter, key);
+}
 function reservedFrontmatterKeys(mode) {
     return mode === "passthrough" ? PASSTHROUGH_RESERVED_FRONTMATTER_KEYS : RESERVED_FRONTMATTER_KEYS;
 }

package/node_modules/@poe-code/task-list/dist/backends/utils.js

@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
 import path from "node:path";
 export function compareCreated(left, right) {
     const leftCreated = typeof left.raw.created === "string" ? left.raw.created : "";
@@ -20,11 +21,10 @@ export function applyOrder(entries, order) {
     }
     return entries.map((entry) => entry.task);
 }
-let tmpFileCounter = 0;
 export function hasErrorCode(error, code) {
     return (!!error &&
         typeof error === "object" &&
-        "code" in error &&
+        Object.prototype.hasOwnProperty.call(error, "code") &&
         error.code === code);
 }
 export function isRecord(value) {
@@ -78,20 +78,24 @@ export async function rejectSymbolicLinkComponents(fs, filePath) {
     }
 }
 export async function writeAtomically(fs, filePath, content) {
-    const tempPath = `${filePath}.tmp-${process.pid}-${tmpFileCounter}`;
-    tmpFileCounter += 1;
+    const tempPath = `${filePath}.${process.pid}.${randomUUID()}.tmp`;
+    let tempCreated = false;
     await fs.mkdir(path.dirname(filePath), { recursive: true });
     try {
         await fs.writeFile(tempPath, content, { encoding: "utf8", flag: "wx" });
+        tempCreated = true;
         await fs.rename(tempPath, filePath);
+        tempCreated = false;
     }
     catch (error) {
-        try {
-            await fs.unlink(tempPath);
-        }
-        catch (unlinkError) {
-            if (!hasErrorCode(unlinkError, "ENOENT")) {
-                throw unlinkError;
+        if (tempCreated || !hasErrorCode(error, "EEXIST")) {
+            try {
+                await fs.unlink(tempPath);
+            }
+            catch (unlinkError) {
+                if (!hasErrorCode(unlinkError, "ENOENT")) {
+                    throw unlinkError;
+                }
             }
         }
         throw error;
@@ -106,6 +110,7 @@ export async function withFileLock(fs, lockPath, operation) {
         }
         catch (error) {
             if (!hasErrorCode(error, "EEXIST")) {
+                await fs.unlink(lockPath).catch(() => undefined);
                 throw error;
             }
             if (await removeAbandonedLock(fs, lockPath)) {