From 52ab8a312f887037b0543517d145f859a6f03177 Mon Sep 17 00:00:00 2001
From: "Fusion (runfusion.ai)" <hi@runfusion.ai>
Date: Sat, 16 May 2026 16:43:36 -0700
Subject: [PATCH] =?UTF-8?q?test(FN-4807):=20complete=20Step=204=20?=
 =?UTF-8?q?=E2=80=94=20harden=20autostash=20suite=20timeout=20and=20cleanu?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fusion-Task-Id: FN-4807
Fusion-Task-Lineage: 3f03bd51-71c3-43c4-abe0-f636edeaf52b
---
 .../merger-autostash-orphan-surface.test.ts   | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/engine/src/__tests__/merger-autostash-orphan-surface.test.ts b/packages/engine/src/__tests__/merger-autostash-orphan-surface.test.ts
index 03a336e23..1316ce0a4 100644
--- a/packages/engine/src/__tests__/merger-autostash-orphan-surface.test.ts
+++ b/packages/engine/src/__tests__/merger-autostash-orphan-surface.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { tmpdir } from "node:os";
 import { execSync } from "node:child_process";
@@ -48,7 +48,34 @@ function assertIsolatedWorkspace(dir: string): void {
   expect(resolve(dir).startsWith(resolve(repoRoot))).toBe(false);
 }
 
-describe("autostash orphan surface", () => {
+function sleepSync(ms: number): void {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function cleanupTempDir(dir?: string): void {
+  if (!dir) return;
+  for (let attempt = 1; attempt <= 5; attempt += 1) {
+    try {
+      if (!existsSync(dir)) return;
+      rmSync(dir, { recursive: true, force: true });
+      if (!existsSync(dir)) return;
+    } catch (error) {
+      if (attempt === 5) {
+        throw error;
+      }
+    }
+
+    sleepSync(attempt * 25);
+  }
+
+  if (existsSync(dir)) {
+    throw new Error(`failed to clean temp dir: ${dir}`);
+  }
+}
+
+// FN-4807: keep this real-git stash suite bounded but above Vitest's default
+// to avoid workspace-contention false timeouts without weakening subprocess guards.
+describe("autostash orphan surface", { timeout: 30_000 }, () => {
   let dir: string;
 
   beforeEach(() => {
@@ -58,7 +85,7 @@ describe("autostash orphan surface", () => {
   });
 
   afterEach(() => {
-    rmSync(dir, { recursive: true, force: true });
+    cleanupTempDir(dir);
   });
 
   it("lists fusion-merger-autostash entries and ignores unrelated stashes", async () => {