Skip to content

Turn any idea, plan, or codebase into a beautiful interactive diagram. An agent skill for Claude Code, Codex, and more.

fix: tolerate SMB deletion visibility delay

sunsunsun0e72ae85ea7c
diff --git a/archify.zip b/archify.zip
index 452f81b9..17ff9ca5 100644
Binary files a/archify.zip and b/archify.zip differ
diff --git a/archify/renderers/shared/atomic-output.mjs b/archify/renderers/shared/atomic-output.mjs
index 87ae85a3..8a0fd130 100644
--- a/archify/renderers/shared/atomic-output.mjs
+++ b/archify/renderers/shared/atomic-output.mjs
@@ -92,6 +92,8 @@ function captureRegularFileHandle(filePath, initial, subject) {
const regularFileBindings = new WeakMap();
const digestChunkBytes = 64 * 1024;
+const removalCleanupSignal = new Int32Array(new SharedArrayBuffer(4));
+const removalCleanupAttempts = 10;
function validExpectedLinks(value) {
return Number.isSafeInteger(value) && value > 0;
@@ -460,14 +462,28 @@ function createRemovalQuarantine(parentPath) {
}
function removeEmptyQuarantine(directory) {
- try {
- fs.rmdirSync(directory);
- return null;
- } catch (error) {
- return filesystemFailure('removal-quarantine-cleanup-failed', error, {
- recoveryDirectory: directory,
- });
+ let failure;
+ for (let attempt = 0; attempt < removalCleanupAttempts; attempt += 1) {
+ try {
+ fs.rmdirSync(directory);
+ return null;
+ } catch (error) {
+ failure = error;
+ // SMB can acknowledge unlink before a following directory removal sees
+ // the deleted entry disappear. Retrying rmdir is claimant-safe: a real
+ // entry keeps the directory non-empty and is never removed recursively.
+ if (error?.code !== 'ENOTEMPTY' || attempt === removalCleanupAttempts - 1) break;
+ Atomics.wait(
+ removalCleanupSignal,
+ 0,
+ 0,
+ Math.min(5 * (2 ** attempt), 250),
+ );
+ }
}
+ return filesystemFailure('removal-quarantine-cleanup-failed', failure, {
+ recoveryDirectory: directory,
+ });
}
function removalRecovery(subject, code, filePath, quarantineDirectory, quarantineFile, error) {
diff --git a/archify/test/renderer-atomic-write.test.mjs b/archify/test/renderer-atomic-write.test.mjs
index 2becff8a..b37be316 100644
--- a/archify/test/renderer-atomic-write.test.mjs
+++ b/archify/test/renderer-atomic-write.test.mjs
@@ -1285,6 +1285,40 @@ test('quarantine removal deletes only the public entry still owned by its bindin
}
});
+test('quarantine removal retries transient remote ENOTEMPTY after deleting the owned entry', (t) => {
+ const root = workspace(t, 'archify-quarantine-remove-remote-delay-');
+ const target = path.join(root, 'public.lock');
+ fs.writeFileSync(target, 'owned\n');
+ const captured = captureRegularFileBinding(target, { subject: 'test-owned-entry' });
+ assert.equal(captured.status, 'captured');
+ const rmdirSync = fs.rmdirSync.bind(fs);
+ let delayedAttempts = 0;
+ t.mock.method(fs, 'rmdirSync', (directory) => {
+ if (path.basename(String(directory)).startsWith('.archify-remove-')
+ && delayedAttempts < 2) {
+ delayedAttempts += 1;
+ throw Object.assign(new Error('injected remote deletion visibility delay'), {
+ code: 'ENOTEMPTY',
+ });
+ }
+ return rmdirSync(directory);
+ });
+ try {
+ const removed = quarantineRemoveRegularFileBinding(captured.binding, target, {
+ subject: 'test-owned-entry',
+ });
+ assert.equal(removed.status, 'removed');
+ assert.equal(delayedAttempts, 2);
+ assert.equal(fs.existsSync(target), false);
+ assert.deepEqual(
+ fs.readdirSync(root).filter((entry) => entry.startsWith('.archify-remove-')),
+ [],
+ );
+ } finally {
+ releaseRegularFileBinding(captured.binding);
+ }
+});
+
test('owned-file cleanup preserves a successor swapped at the unlink boundary', (t) => {
const root = workspace(t, 'archify-owned-cleanup-successor-');
const target = path.join(root, 'candidate.html');