wip: bun test improvements

packages/opencode/bunfig.toml

@@ -0,0 +1,2 @@
+[test]
+preload = ["./test/preload.ts"]

packages/opencode/test/fixture/fixture.ts

@@ -0,0 +1,24 @@
+import { $ } from "bun"
+import os from "os"
+import path from "path"
+
+type TmpDirOptions<Init extends Record<string, any>> = {
+  git?: boolean
+  init?: (dir: string) => Promise<Init>
+  dispose?: (dir: string) => Promise<void>
+}
+export async function tmpdir<Init extends Record<string, any>>(options?: TmpDirOptions<Init>) {
+  const dirpath = path.join(os.tmpdir(), "opencode-test-" + Math.random().toString(36).slice(2))
+  await $`mkdir -p ${dirpath}`.quiet()
+  if (options?.git) await $`git init`.cwd(dirpath).quiet()
+  const extra = await options?.init?.(dirpath)
+  const result = {
+    [Symbol.asyncDispose]: async () => {
+      await options?.dispose?.(dirpath)
+      await $`rm -rf ${dirpath}`.quiet()
+    },
+    path: dirpath,
+    extra: extra as Init,
+  }
+  return result
+}

packages/opencode/test/fixtures/example/broken.ts

@@ -1 +0,0 @@
-// Test fixture for ListTool

packages/opencode/test/fixtures/example/cli.ts

@@ -1 +0,0 @@
-// Test fixture for ListTool

packages/opencode/test/fixtures/example/ink.tsx

@@ -1 +0,0 @@
-// Test fixture for ListTool

packages/opencode/test/preload.ts

@@ -0,0 +1,7 @@
+import { Log } from "../src/util/log"
+
+Log.init({
+  print: false,
+  dev: true,
+  level: "DEBUG",
+})

packages/opencode/test/snapshot/snapshot.test.ts

@@ -2,40 +2,38 @@ import { test, expect } from "bun:test"
 import { $ } from "bun"
 import { Snapshot } from "../../src/snapshot"
 import { Instance } from "../../src/project/instance"
+import { tmpdir } from "../fixture/fixture"
 
 async function bootstrap() {
-  const dir = await $`mktemp -d`.text().then((t) => t.trim())
-  // Randomize file contents to ensure unique git repos
-  const unique = Math.random().toString(36).slice(2)
-  const aContent = `A${unique}`
-  const bContent = `B${unique}`
-  await Bun.write(`${dir}/a.txt`, aContent)
-  await Bun.write(`${dir}/b.txt`, bContent)
-  await $`git init`.cwd(dir).quiet()
-  await $`git add .`.cwd(dir).quiet()
-  await $`git commit -m init`.cwd(dir).quiet()
-
-  return {
-    [Symbol.asyncDispose]: async () => {
-      await $`rm -rf ${dir}`.quiet()
+  return tmpdir({
+    git: true,
+    init: async (dir) => {
+      const unique = Math.random().toString(36).slice(2)
+      const aContent = `A${unique}`
+      const bContent = `B${unique}`
+      await Bun.write(`${dir}/a.txt`, aContent)
+      await Bun.write(`${dir}/b.txt`, bContent)
+      await $`git add .`.cwd(dir).quiet()
+      await $`git commit -m init`.cwd(dir).quiet()
+      return {
+        aContent,
+        bContent,
+      }
     },
-    dir,
-    aContent,
-    bContent,
-  }
+  })
 }
 
 test("tracks deleted files correctly", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`rm ${tmp.dir}/a.txt`.quiet()
+      await $`rm ${tmp.path}/a.txt`.quiet()
 
-      expect((await Snapshot.patch(before!)).files).toContain(`${tmp.dir}/a.txt`)
+      expect((await Snapshot.patch(before!)).files).toContain(`${tmp.path}/a.txt`)
     },
   })
 })
@@ -43,16 +41,16 @@ test("tracks deleted files correctly", async () => {
 test("revert should remove new files", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.dir}/new.txt`, "NEW")
+      await Bun.write(`${tmp.path}/new.txt`, "NEW")
 
       await Snapshot.revert([await Snapshot.patch(before!)])
 
-      expect(await Bun.file(`${tmp.dir}/new.txt`).exists()).toBe(false)
+      expect(await Bun.file(`${tmp.path}/new.txt`).exists()).toBe(false)
     },
   })
 })
@@ -60,17 +58,17 @@ test("revert should remove new files", async () => {
 test("revert in subdirectory", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`mkdir -p ${tmp.dir}/sub`.quiet()
-      await Bun.write(`${tmp.dir}/sub/file.txt`, "SUB")
+      await $`mkdir -p ${tmp.path}/sub`.quiet()
+      await Bun.write(`${tmp.path}/sub/file.txt`, "SUB")
 
       await Snapshot.revert([await Snapshot.patch(before!)])
 
-      expect(await Bun.file(`${tmp.dir}/sub/file.txt`).exists()).toBe(false)
+      expect(await Bun.file(`${tmp.path}/sub/file.txt`).exists()).toBe(false)
       // Note: revert currently only removes files, not directories
       // The empty subdirectory will remain
     },
@@ -80,24 +78,24 @@ test("revert in subdirectory", async () => {
 test("multiple file operations", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`rm ${tmp.dir}/a.txt`.quiet()
-      await Bun.write(`${tmp.dir}/c.txt`, "C")
-      await $`mkdir -p ${tmp.dir}/dir`.quiet()
-      await Bun.write(`${tmp.dir}/dir/d.txt`, "D")
-      await Bun.write(`${tmp.dir}/b.txt`, "MODIFIED")
+      await $`rm ${tmp.path}/a.txt`.quiet()
+      await Bun.write(`${tmp.path}/c.txt`, "C")
+      await $`mkdir -p ${tmp.path}/dir`.quiet()
+      await Bun.write(`${tmp.path}/dir/d.txt`, "D")
+      await Bun.write(`${tmp.path}/b.txt`, "MODIFIED")
 
       await Snapshot.revert([await Snapshot.patch(before!)])
 
-      expect(await Bun.file(`${tmp.dir}/a.txt`).text()).toBe(tmp.aContent)
-      expect(await Bun.file(`${tmp.dir}/c.txt`).exists()).toBe(false)
+      expect(await Bun.file(`${tmp.path}/a.txt`).text()).toBe(tmp.extra.aContent)
+      expect(await Bun.file(`${tmp.path}/c.txt`).exists()).toBe(false)
       // Note: revert currently only removes files, not directories
       // The empty directory will remain
-      expect(await Bun.file(`${tmp.dir}/b.txt`).text()).toBe(tmp.bContent)
+      expect(await Bun.file(`${tmp.path}/b.txt`).text()).toBe(tmp.extra.bContent)
     },
   })
 })
@@ -105,12 +103,12 @@ test("multiple file operations", async () => {
 test("empty directory handling", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`mkdir ${tmp.dir}/empty`.quiet()
+      await $`mkdir ${tmp.path}/empty`.quiet()
 
       expect((await Snapshot.patch(before!)).files.length).toBe(0)
     },
@@ -120,18 +118,18 @@ test("empty directory handling", async () => {
 test("binary file handling", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.dir}/image.png`, Buffer.from([0x89, 0x50, 0x4e, 0x47]))
+      await Bun.write(`${tmp.path}/image.png`, Buffer.from([0x89, 0x50, 0x4e, 0x47]))
 
       const patch = await Snapshot.patch(before!)
-      expect(patch.files).toContain(`${tmp.dir}/image.png`)
+      expect(patch.files).toContain(`${tmp.path}/image.png`)
 
       await Snapshot.revert([patch])
-      expect(await Bun.file(`${tmp.dir}/image.png`).exists()).toBe(false)
+      expect(await Bun.file(`${tmp.path}/image.png`).exists()).toBe(false)
     },
   })
 })
@@ -139,14 +137,14 @@ test("binary file handling", async () => {
 test("symlink handling", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`ln -s ${tmp.dir}/a.txt ${tmp.dir}/link.txt`.quiet()
+      await $`ln -s ${tmp.path}/a.txt ${tmp.path}/link.txt`.quiet()
 
-      expect((await Snapshot.patch(before!)).files).toContain(`${tmp.dir}/link.txt`)
+      expect((await Snapshot.patch(before!)).files).toContain(`${tmp.path}/link.txt`)
     },
   })
 })
@@ -154,14 +152,14 @@ test("symlink handling", async () => {
 test("large file handling", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.dir}/large.txt`, "x".repeat(1024 * 1024))
+      await Bun.write(`${tmp.path}/large.txt`, "x".repeat(1024 * 1024))
 
-      expect((await Snapshot.patch(before!)).files).toContain(`${tmp.dir}/large.txt`)
+      expect((await Snapshot.patch(before!)).files).toContain(`${tmp.path}/large.txt`)
     },
   })
 })
@@ -169,17 +167,17 @@ test("large file handling", async () => {
 test("nested directory revert", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`mkdir -p ${tmp.dir}/level1/level2/level3`.quiet()
-      await Bun.write(`${tmp.dir}/level1/level2/level3/deep.txt`, "DEEP")
+      await $`mkdir -p ${tmp.path}/level1/level2/level3`.quiet()
+      await Bun.write(`${tmp.path}/level1/level2/level3/deep.txt`, "DEEP")
 
       await Snapshot.revert([await Snapshot.patch(before!)])
 
-      expect(await Bun.file(`${tmp.dir}/level1/level2/level3/deep.txt`).exists()).toBe(false)
+      expect(await Bun.file(`${tmp.path}/level1/level2/level3/deep.txt`).exists()).toBe(false)
     },
   })
 })
@@ -187,19 +185,19 @@ test("nested directory revert", async () => {
 test("special characters in filenames", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.dir}/file with spaces.txt`, "SPACES")
-      await Bun.write(`${tmp.dir}/file-with-dashes.txt`, "DASHES")
-      await Bun.write(`${tmp.dir}/file_with_underscores.txt`, "UNDERSCORES")
+      await Bun.write(`${tmp.path}/file with spaces.txt`, "SPACES")
+      await Bun.write(`${tmp.path}/file-with-dashes.txt`, "DASHES")
+      await Bun.write(`${tmp.path}/file_with_underscores.txt`, "UNDERSCORES")
 
       const files = (await Snapshot.patch(before!)).files
-      expect(files).toContain(`${tmp.dir}/file with spaces.txt`)
-      expect(files).toContain(`${tmp.dir}/file-with-dashes.txt`)
-      expect(files).toContain(`${tmp.dir}/file_with_underscores.txt`)
+      expect(files).toContain(`${tmp.path}/file with spaces.txt`)
+      expect(files).toContain(`${tmp.path}/file-with-dashes.txt`)
+      expect(files).toContain(`${tmp.path}/file_with_underscores.txt`)
     },
   })
 })
@@ -207,7 +205,7 @@ test("special characters in filenames", async () => {
 test("revert with empty patches", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       // Should not crash with empty patches
       expect(Snapshot.revert([])).resolves.toBeUndefined()
@@ -221,13 +219,13 @@ test("revert with empty patches", async () => {
 test("patch with invalid hash", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       // Create a change
-      await Bun.write(`${tmp.dir}/test.txt`, "TEST")
+      await Bun.write(`${tmp.path}/test.txt`, "TEST")
 
       // Try to patch with invalid hash - should handle gracefully
       const patch = await Snapshot.patch("invalid-hash-12345")
@@ -240,7 +238,7 @@ test("patch with invalid hash", async () => {
 test("revert non-existent file", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
@@ -251,7 +249,7 @@ test("revert non-existent file", async () => {
         Snapshot.revert([
           {
             hash: before!,
-            files: [`${tmp.dir}/nonexistent.txt`],
+            files: [`${tmp.path}/nonexistent.txt`],
           },
         ]),
       ).resolves.toBeUndefined()
@@ -262,16 +260,16 @@ test("revert non-existent file", async () => {
 test("unicode filenames", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       const unicodeFiles = [
-        `${tmp.dir}/文件.txt`,
-        `${tmp.dir}/🚀rocket.txt`,
-        `${tmp.dir}/café.txt`,
-        `${tmp.dir}/файл.txt`,
+        `${tmp.path}/文件.txt`,
+        `${tmp.path}/🚀rocket.txt`,
+        `${tmp.path}/café.txt`,
+        `${tmp.path}/файл.txt`,
       ]
 
       for (const file of unicodeFiles) {
@@ -292,13 +290,13 @@ test("unicode filenames", async () => {
 test("very long filenames", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       const longName = "a".repeat(200) + ".txt"
-      const longFile = `${tmp.dir}/${longName}`
+      const longFile = `${tmp.path}/${longName}`
 
       await Bun.write(longFile, "long filename content")
 
@@ -314,19 +312,19 @@ test("very long filenames", async () => {
 test("hidden files", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.dir}/.hidden`, "hidden content")
-      await Bun.write(`${tmp.dir}/.gitignore`, "*.log")
-      await Bun.write(`${tmp.dir}/.config`, "config content")
+      await Bun.write(`${tmp.path}/.hidden`, "hidden content")
+      await Bun.write(`${tmp.path}/.gitignore`, "*.log")
+      await Bun.write(`${tmp.path}/.config`, "config content")
 
       const patch = await Snapshot.patch(before!)
-      expect(patch.files).toContain(`${tmp.dir}/.hidden`)
-      expect(patch.files).toContain(`${tmp.dir}/.gitignore`)
-      expect(patch.files).toContain(`${tmp.dir}/.config`)
+      expect(patch.files).toContain(`${tmp.path}/.hidden`)
+      expect(patch.files).toContain(`${tmp.path}/.gitignore`)
+      expect(patch.files).toContain(`${tmp.path}/.config`)
     },
   })
 })
@@ -334,19 +332,19 @@ test("hidden files", async () => {
 test("nested symlinks", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`mkdir -p ${tmp.dir}/sub/dir`.quiet()
-      await Bun.write(`${tmp.dir}/sub/dir/target.txt`, "target content")
-      await $`ln -s ${tmp.dir}/sub/dir/target.txt ${tmp.dir}/sub/dir/link.txt`.quiet()
-      await $`ln -s ${tmp.dir}/sub ${tmp.dir}/sub-link`.quiet()
+      await $`mkdir -p ${tmp.path}/sub/dir`.quiet()
+      await Bun.write(`${tmp.path}/sub/dir/target.txt`, "target content")
+      await $`ln -s ${tmp.path}/sub/dir/target.txt ${tmp.path}/sub/dir/link.txt`.quiet()
+      await $`ln -s ${tmp.path}/sub ${tmp.path}/sub-link`.quiet()
 
       const patch = await Snapshot.patch(before!)
-      expect(patch.files).toContain(`${tmp.dir}/sub/dir/link.txt`)
-      expect(patch.files).toContain(`${tmp.dir}/sub-link`)
+      expect(patch.files).toContain(`${tmp.path}/sub/dir/link.txt`)
+      expect(patch.files).toContain(`${tmp.path}/sub-link`)
     },
   })
 })
@@ -354,15 +352,15 @@ test("nested symlinks", async () => {
 test("file permissions and ownership changes", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       // Change permissions multiple times
-      await $`chmod 600 ${tmp.dir}/a.txt`.quiet()
-      await $`chmod 755 ${tmp.dir}/a.txt`.quiet()
-      await $`chmod 644 ${tmp.dir}/a.txt`.quiet()
+      await $`chmod 600 ${tmp.path}/a.txt`.quiet()
+      await $`chmod 755 ${tmp.path}/a.txt`.quiet()
+      await $`chmod 644 ${tmp.path}/a.txt`.quiet()
 
       const patch = await Snapshot.patch(before!)
       // Note: git doesn't track permission changes on existing files by default
@@ -375,13 +373,13 @@ test("file permissions and ownership changes", async () => {
 test("circular symlinks", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       // Create circular symlink
-      await $`ln -s ${tmp.dir}/circular ${tmp.dir}/circular`.quiet().nothrow()
+      await $`ln -s ${tmp.path}/circular ${tmp.path}/circular`.quiet().nothrow()
 
       const patch = await Snapshot.patch(before!)
       expect(patch.files.length).toBeGreaterThanOrEqual(0) // Should not crash
@@ -392,23 +390,23 @@ test("circular symlinks", async () => {
 test("gitignore changes", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.dir}/.gitignore`, "*.ignored")
-      await Bun.write(`${tmp.dir}/test.ignored`, "ignored content")
-      await Bun.write(`${tmp.dir}/normal.txt`, "normal content")
+      await Bun.write(`${tmp.path}/.gitignore`, "*.ignored")
+      await Bun.write(`${tmp.path}/test.ignored`, "ignored content")
+      await Bun.write(`${tmp.path}/normal.txt`, "normal content")
 
       const patch = await Snapshot.patch(before!)
 
       // Should track gitignore itself
-      expect(patch.files).toContain(`${tmp.dir}/.gitignore`)
+      expect(patch.files).toContain(`${tmp.path}/.gitignore`)
       // Should track normal files
-      expect(patch.files).toContain(`${tmp.dir}/normal.txt`)
+      expect(patch.files).toContain(`${tmp.path}/normal.txt`)
       // Should not track ignored files (git won't see them)
-      expect(patch.files).not.toContain(`${tmp.dir}/test.ignored`)
+      expect(patch.files).not.toContain(`${tmp.path}/test.ignored`)
     },
   })
 })
@@ -416,7 +414,7 @@ test("gitignore changes", async () => {
 test("concurrent file operations during patch", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
@@ -424,7 +422,7 @@ test("concurrent file operations during patch", async () => {
       // Start creating files
       const createPromise = (async () => {
         for (let i = 0; i < 10; i++) {
-          await Bun.write(`${tmp.dir}/concurrent${i}.txt`, `concurrent${i}`)
+          await Bun.write(`${tmp.path}/concurrent${i}.txt`, `concurrent${i}`)
           // Small delay to simulate concurrent operations
           await new Promise((resolve) => setTimeout(resolve, 1))
         }
@@ -448,25 +446,25 @@ test("snapshot state isolation between projects", async () => {
   await using tmp2 = await bootstrap()
 
   await Instance.provide({
-    directory: tmp1.dir,
+    directory: tmp1.path,
     fn: async () => {
       const before1 = await Snapshot.track()
-      await Bun.write(`${tmp1.dir}/project1.txt`, "project1 content")
+      await Bun.write(`${tmp1.path}/project1.txt`, "project1 content")
       const patch1 = await Snapshot.patch(before1!)
-      expect(patch1.files).toContain(`${tmp1.dir}/project1.txt`)
+      expect(patch1.files).toContain(`${tmp1.path}/project1.txt`)
     },
   })
 
   await Instance.provide({
-    directory: tmp2.dir,
+    directory: tmp2.path,
     fn: async () => {
       const before2 = await Snapshot.track()
-      await Bun.write(`${tmp2.dir}/project2.txt`, "project2 content")
+      await Bun.write(`${tmp2.path}/project2.txt`, "project2 content")
       const patch2 = await Snapshot.patch(before2!)
-      expect(patch2.files).toContain(`${tmp2.dir}/project2.txt`)
+      expect(patch2.files).toContain(`${tmp2.path}/project2.txt`)
 
       // Ensure project1 files don't appear in project2
-      expect(patch2.files).not.toContain(`${tmp1?.dir}/project1.txt`)
+      expect(patch2.files).not.toContain(`${tmp1?.path}/project1.txt`)
     },
   })
 })
@@ -474,7 +472,7 @@ test("snapshot state isolation between projects", async () => {
 test("track with no changes returns same hash", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const hash1 = await Snapshot.track()
       expect(hash1).toBeTruthy()
@@ -493,15 +491,15 @@ test("track with no changes returns same hash", async () => {
 test("diff function with various changes", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       // Make various changes
-      await $`rm ${tmp.dir}/a.txt`.quiet()
-      await Bun.write(`${tmp.dir}/new.txt`, "new content")
-      await Bun.write(`${tmp.dir}/b.txt`, "modified content")
+      await $`rm ${tmp.path}/a.txt`.quiet()
+      await Bun.write(`${tmp.path}/new.txt`, "new content")
+      await Bun.write(`${tmp.path}/b.txt`, "modified content")
 
       const diff = await Snapshot.diff(before!)
       expect(diff).toContain("deleted")
@@ -514,23 +512,23 @@ test("diff function with various changes", async () => {
 test("restore function", async () => {
   await using tmp = await bootstrap()
   await Instance.provide({
-    directory: tmp.dir,
+    directory: tmp.path,
     fn: async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
       // Make changes
-      await $`rm ${tmp.dir}/a.txt`.quiet()
-      await Bun.write(`${tmp.dir}/new.txt`, "new content")
-      await Bun.write(`${tmp.dir}/b.txt`, "modified")
+      await $`rm ${tmp.path}/a.txt`.quiet()
+      await Bun.write(`${tmp.path}/new.txt`, "new content")
+      await Bun.write(`${tmp.path}/b.txt`, "modified")
 
       // Restore to original state
       await Snapshot.restore(before!)
 
-      expect(await Bun.file(`${tmp.dir}/a.txt`).exists()).toBe(true)
-      expect(await Bun.file(`${tmp.dir}/a.txt`).text()).toBe(tmp.aContent)
-      expect(await Bun.file(`${tmp.dir}/new.txt`).exists()).toBe(true) // New files should remain
-      expect(await Bun.file(`${tmp.dir}/b.txt`).text()).toBe(tmp.bContent)
+      expect(await Bun.file(`${tmp.path}/a.txt`).exists()).toBe(true)
+      expect(await Bun.file(`${tmp.path}/a.txt`).text()).toBe(tmp.extra.aContent)
+      expect(await Bun.file(`${tmp.path}/new.txt`).exists()).toBe(true) // New files should remain
+      expect(await Bun.file(`${tmp.path}/b.txt`).text()).toBe(tmp.extra.bContent)
     },
   })
 })