dsh-file-convert 0.4.1 → 0.4.3

package/lib/core/utils/write-file.d.ts

@@ -1,6 +1,8 @@
 /**
  * Write `data` to `target` atomically: the bytes land in a sibling temp file
- * first and are renamed into place only when complete, so an interrupted run
- * never leaves a half-written output behind.
+ * (same volume, so rename never hits EXDEV) and are renamed over the target
+ * only when complete. Windows AV scanners can hold the target briefly - those
+ * lock errors are retried a few times; a persistent failure throws loudly
+ * rather than degrading to a non-atomic copy.
  */
 export declare function writeFileAtomic(target: string, data: Buffer | string): Promise<void>;

package/lib/core/utils/write-file.js

@@ -2,20 +2,26 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 /**
  * Write `data` to `target` atomically: the bytes land in a sibling temp file
- * first and are renamed into place only when complete, so an interrupted run
- * never leaves a half-written output behind.
+ * (same volume, so rename never hits EXDEV) and are renamed over the target
+ * only when complete. Windows AV scanners can hold the target briefly - those
+ * lock errors are retried a few times; a persistent failure throws loudly
+ * rather than degrading to a non-atomic copy.
  */
 export async function writeFileAtomic(target, data) {
     const tmp = path.join(path.dirname(target), `.${path.basename(target)}.${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`);
     try {
         await fs.writeFile(tmp, data);
-        try {
-            await fs.rename(tmp, target);
-        }
-        catch {
-            // cross-device or platform quirk: fall back to a full copy
-            await fs.copyFile(tmp, target);
-            await fs.rm(tmp, { force: true });
+        for (let attempt = 0;; attempt++) {
+            try {
+                await fs.rename(tmp, target);
+                return;
+            }
+            catch (err) {
+                const code = err.code;
+                if (attempt >= 2 || (code !== 'EPERM' && code !== 'EACCES' && code !== 'EBUSY'))
+                    throw err;
+                await new Promise((resolve) => setTimeout(resolve, 75 * (attempt + 1)));
+            }
         }
     }
     catch (err) {

package/lib/tools/optimize-file.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import { DetectError, optimizeFile, resolveBinary } from '../core/index.js';
 import { canonicalExtension } from '../core/index.js';
-import { isInsideAnyRoot } from '../core/index.js';
+import { isInsideAnyRoot, isSameFile } from '../core/index.js';
 import { formatBytes, formatDuration, formatFailure } from '../format.js';
 export function createOptimizeFileTool(router, config, logger) {
     return defineTool({
@@ -47,7 +47,7 @@ export function createOptimizeFileTool(router, config, logger) {
             const outExt = format === 'mov' ? '.mp4' : canonicalExtension(format);
             const output = args.output ??
                 path.join(path.dirname(args.input), `${path.basename(args.input, path.extname(args.input))}-min${outExt}`);
-            if (path.resolve(output) === path.resolve(args.input)) {
+            if (await isSameFile(output, args.input)) {
                 throw new Error('Output path equals the input path; optimizing would destroy the source. Use the default -min output name or pick another path.');
             }
             if (args.output !== undefined && config.outputRoots.length > 0 && !(await isInsideAnyRoot(args.output, config.outputRoots))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-file-convert",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Local-first file conversion for DeepSeek Harness - images, PDF, data, audio/video and office documents. No API keys, no uploads, no token cost.",
   "license": "MIT",
   "type": "module",