From 27c3a720511919ec704625ad4ecdba4e1a5cd588 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:45:11 +1000
Subject: [PATCH 01/33] fix: support windows script execution via fileURLToPath
 and explicit bun runtime

---
 packages/console/app/package.json | 2 +-
 packages/plugin/script/publish.ts | 3 ++-
 packages/sdk/js/package.json      | 2 +-
 packages/sdk/js/script/build.ts   | 3 ++-
 packages/sdk/js/script/publish.ts | 3 ++-
 script/publish.ts                 | 5 +++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/console/app/package.json b/packages/console/app/package.json
index 904aeadd8e06..395feeb4af5c 100644
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -7,7 +7,7 @@
     "typecheck": "tsgo --noEmit",
     "dev": "vite dev --host 0.0.0.0",
     "dev:remote": "VITE_AUTH_URL=https://auth.dev.opencode.ai VITE_STRIPE_PUBLISHABLE_KEY=pk_test_51RtuLNE7fOCwHSD4mewwzFejyytjdGoSDK7CAvhbffwaZnPbNb2rwJICw6LTOXCmWO320fSNXvb5NzI08RZVkAxd00syfqrW7t bun sst shell --stage=dev bun dev",
-    "build": "./script/generate-sitemap.ts && vite build && ../../opencode/script/schema.ts ./.output/public/config.json",
+    "build": "bun ./script/generate-sitemap.ts && vite build && bun ../../opencode/script/schema.ts ./.output/public/config.json",
     "start": "vite start"
   },
   "dependencies": {
diff --git a/packages/plugin/script/publish.ts b/packages/plugin/script/publish.ts
index 647b56e5e2dd..d2fe49f23ce3 100755
--- a/packages/plugin/script/publish.ts
+++ b/packages/plugin/script/publish.ts
@@ -1,8 +1,9 @@
 #!/usr/bin/env bun
 import { Script } from "@opencode-ai/script"
 import { $ } from "bun"
+import { fileURLToPath } from "url"
 
-const dir = new URL("..", import.meta.url).pathname
+const dir = fileURLToPath(new URL("..", import.meta.url))
 process.chdir(dir)
 
 await $`bun tsc`
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 4fe0794d0cea..bd3627e35b4c 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "typecheck": "tsgo --noEmit",
-    "build": "./script/build.ts"
+    "build": "bun ./script/build.ts"
   },
   "exports": {
     ".": "./src/index.ts",
diff --git a/packages/sdk/js/script/build.ts b/packages/sdk/js/script/build.ts
index 7568c54b0f2a..7063c96453c5 100755
--- a/packages/sdk/js/script/build.ts
+++ b/packages/sdk/js/script/build.ts
@@ -1,6 +1,7 @@
 #!/usr/bin/env bun
 
-const dir = new URL("..", import.meta.url).pathname
+import { fileURLToPath } from "url"
+const dir = fileURLToPath(new URL("..", import.meta.url))
 process.chdir(dir)
 
 import { $ } from "bun"
diff --git a/packages/sdk/js/script/publish.ts b/packages/sdk/js/script/publish.ts
index c21f06230d18..ea5c5d634b2b 100755
--- a/packages/sdk/js/script/publish.ts
+++ b/packages/sdk/js/script/publish.ts
@@ -2,8 +2,9 @@
 
 import { Script } from "@opencode-ai/script"
 import { $ } from "bun"
+import { fileURLToPath } from "url"
 
-const dir = new URL("..", import.meta.url).pathname
+const dir = fileURLToPath(new URL("..", import.meta.url))
 process.chdir(dir)
 
 const pkg = (await import("../package.json").then((m) => m.default)) as {
diff --git a/script/publish.ts b/script/publish.ts
index 8aa921daa834..b7ed5c8221ca 100755
--- a/script/publish.ts
+++ b/script/publish.ts
@@ -2,6 +2,7 @@
 
 import { $ } from "bun"
 import { Script } from "@opencode-ai/script"
+import { fileURLToPath } from "url"
 
 const highlightsTemplate = `
 <!--
@@ -46,7 +47,7 @@ for (const file of pkgjsons) {
   await Bun.file(file).write(pkg)
 }
 
-const extensionToml = new URL("../packages/extensions/zed/extension.toml", import.meta.url).pathname
+const extensionToml = fileURLToPath(new URL("../packages/extensions/zed/extension.toml", import.meta.url))
 let toml = await Bun.file(extensionToml).text()
 toml = toml.replace(/^version = "[^"]+"/m, `version = "${Script.version}"`)
 toml = toml.replaceAll(/releases\/download\/v[^/]+\//g, `releases/download/v${Script.version}/`)
@@ -78,5 +79,5 @@ await import(`../packages/sdk/js/script/publish.ts`)
 console.log("\n=== plugin ===\n")
 await import(`../packages/plugin/script/publish.ts`)
 
-const dir = new URL("..", import.meta.url).pathname
+const dir = fileURLToPath(new URL("..", import.meta.url))
 process.chdir(dir)

From 743a05a3fa48fc017f9e55248a9ccfe55a31ce27 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:47:33 +1000
Subject: [PATCH 02/33] build(turbo): ensure dependencies build before
 typecheck

---
 turbo.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/turbo.json b/turbo.json
index f06ddb0e8b76..ba3d01d3603b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -3,7 +3,9 @@
   "globalEnv": ["CI", "OPENCODE_DISABLE_SHARE"],
   "globalPassThroughEnv": ["CI", "OPENCODE_DISABLE_SHARE"],
   "tasks": {
-    "typecheck": {},
+    "typecheck": {
+      "dependsOn": ["^build"]
+    },
     "build": {
       "dependsOn": ["^build"],
       "outputs": ["dist/**"]

From 26c8cc3efcfb601c7e1ce5a6f34fe41fe8554461 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:30:39 +1000
Subject: [PATCH 03/33] fix(win32): resolve various test flakes and pathing
 issues

---
 packages/opencode/src/config/config.ts       | 20 +++++++++++++++++---
 packages/opencode/src/file/ignore.ts         |  2 +-
 packages/opencode/test/config/config.test.ts |  9 ++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index aad0fd76c4be..bca1e7bbcce3 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -342,10 +342,11 @@ export namespace Config {
   }
 
   function rel(item: string, patterns: string[]) {
+    const normalizedItem = item.replaceAll("\\", "/")
     for (const pattern of patterns) {
-      const index = item.indexOf(pattern)
+      const index = normalizedItem.indexOf(pattern)
       if (index === -1) continue
-      return item.slice(index + pattern.length)
+      return normalizedItem.slice(index + pattern.length)
     }
   }
 
@@ -1332,7 +1333,20 @@ export namespace Config {
           const plugin = data.plugin[i]
           try {
             data.plugin[i] = import.meta.resolve!(plugin, options.path)
-          } catch (err) {}
+          } catch (e) {
+            try {
+              // import.meta.resolve sometimes fails with newly created node_modules on Windows
+              const url = new URL(options.path)
+              let pathname = url.pathname
+              if (process.platform === "win32" && pathname.startsWith("/")) {
+                pathname = pathname.slice(1)
+              }
+              const resolvedPath = Bun.resolveSync(plugin, path.dirname(pathname))
+              data.plugin[i] = pathToFileURL(resolvedPath).href
+            } catch (err) {
+              data.plugin[i] = import.meta.resolve!(plugin, options.path)
+            }
+          }
         }
       }
       return data
diff --git a/packages/opencode/src/file/ignore.ts b/packages/opencode/src/file/ignore.ts
index 94ffaf5ce049..b9731040c7d7 100644
--- a/packages/opencode/src/file/ignore.ts
+++ b/packages/opencode/src/file/ignore.ts
@@ -67,7 +67,7 @@ export namespace FileIgnore {
       if (Glob.match(pattern, filepath)) return false
     }
 
-    const parts = filepath.split(sep)
+    const parts = filepath.split(/[/\\]/)
     for (let i = 0; i < parts.length; i++) {
       if (FOLDERS.has(parts[i])) return true
     }
diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts
index 56773570af57..3f05a2d6ed89 100644
--- a/packages/opencode/test/config/config.test.ts
+++ b/packages/opencode/test/config/config.test.ts
@@ -689,7 +689,14 @@ test("resolves scoped npm plugins in config", async () => {
       const pluginEntries = config.plugin ?? []
 
       const baseUrl = pathToFileURL(path.join(tmp.path, "opencode.json")).href
-      const expected = import.meta.resolve("@scope/plugin", baseUrl)
+      let expected: string
+      try {
+        expected = import.meta.resolve("@scope/plugin", baseUrl)
+      } catch (e) {
+        // Fallback for Windows where dynamically created node_modules aren't immediately available to import.meta.resolve
+        const resolvedPath = Bun.resolveSync("@scope/plugin", tmp.path)
+        expected = pathToFileURL(resolvedPath).href
+      }
 
       expect(pluginEntries.includes(expected)).toBe(true)
 

From 6204724406356175978ad915bd50720ec2c2f2b5 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:31:04 +1000
Subject: [PATCH 04/33] fix(win32): resolve various test flakes and pathing
 issues without fallbacks

---
 packages/opencode/src/config/config.ts        |  6 +-
 .../opencode/test/config/markdown.test.ts     |  2 +-
 packages/opencode/test/fixture/fixture.ts     | 56 ++++++++++++++++++-
 packages/opencode/test/preload.ts             |  6 +-
 4 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index bca1e7bbcce3..f747dd9236f1 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -1344,7 +1344,11 @@ export namespace Config {
               const resolvedPath = Bun.resolveSync(plugin, path.dirname(pathname))
               data.plugin[i] = pathToFileURL(resolvedPath).href
             } catch (err) {
-              data.plugin[i] = import.meta.resolve!(plugin, options.path)
+              try {
+                data.plugin[i] = import.meta.resolve!(plugin, options.path)
+              } catch {
+                // Ignore, plugin might be a generic string identifier like "jira"
+              }
             }
           }
         }
diff --git a/packages/opencode/test/config/markdown.test.ts b/packages/opencode/test/config/markdown.test.ts
index c6133317e2c0..865af2107738 100644
--- a/packages/opencode/test/config/markdown.test.ts
+++ b/packages/opencode/test/config/markdown.test.ts
@@ -197,7 +197,7 @@ describe("ConfigMarkdown: frontmatter parsing w/ Markdown header", async () => {
   test("should parse and match", () => {
     expect(result).toBeDefined()
     expect(result.data).toEqual({})
-    expect(result.content.trim()).toBe(`# Response Formatting Requirements
+    expect(result.content.trim().replace(/\r\n/g, "\n")).toBe(`# Response Formatting Requirements
 
 Always structure your responses using clear markdown formatting:
 
diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts
index ed8c5e344a81..d1eec6106a70 100644
--- a/packages/opencode/test/fixture/fixture.ts
+++ b/packages/opencode/test/fixture/fixture.ts
@@ -9,6 +9,58 @@ function sanitizePath(p: string): string {
   return p.replace(/\0/g, "")
 }
 
+const GIT_TEMPLATE = [
+  {
+    path: ".git/config",
+    content:
+      "W2NvcmVdCglyZXBvc2l0b3J5Zm9ybWF0dmVyc2lvbiA9IDAKCWZpbGVtb2RlID0gZmFsc2UKCWJhcmUgPSBmYWxzZQoJbG9nYWxscmVmdXBkYXRlcyA9IHRydWUKCWlnbm9yZWNhc2UgPSB0cnVlCg==",
+  },
+  {
+    path: ".git/description",
+    content: "VW5uYW1lZCByZXBvc2l0b3J5OyBlZGl0IHRoaXMgZmlsZSAnZGVzY3JpcHRpb24nIHRvIG5hbWUgdGhlIHJlcG9zaXRvcnkuCg==",
+  },
+  {
+    path: ".git/HEAD",
+    content: "cmVmOiByZWZzL2hlYWRzL21hc3Rlcgo=",
+  },
+  {
+    path: ".git/info/exclude",
+    content:
+      "IyBnaXQgbHMtZmlsZXMgLS1vdGhlcnMgLS1leGNsdWRlLWZyb209LmdpdC9pbmZvL2V4Y2x1ZGUKIyBMaW5lcyB0aGF0IHN0YXJ0IHdpdGggJyMnIGFyZSBjb21tZW50cy4KIyBGb3IgYSBwcm9qZWN0IG1vc3RseSBpbiBDLCB0aGUgZm9sbG93aW5nIHdvdWxkIGJlIGEgZ29vZCBzZXQgb2YKIyBleGNsdWRlIHBhdHRlcm5zICh1bmNvbW1lbnQgdGhlbSBpZiB5b3Ugd2FudCB0byB1c2UgdGhlbSk6CiMgKi5bb2FdCiMgKn4K",
+  },
+  {
+    path: ".git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904",
+    content: "eAErKUpNVTBgAAAKLAIB",
+  },
+  {
+    path: ".git/objects/57/47945c9cea2d26bb461e85f2f92fde96a86069",
+    content:
+      "eAGtzk0KwjAQQGHXOcXsC2US0/yAiAsXLlx4hSSdWqntSJoI3t6CV3D7Fh8v8Tw/CiiFu5KJQEenuj4ZrVI0FH1Ag9TpOLjeeOXcEIm0Ry1CLSNnuNaJbiFPlM/0hoNEvUfnsbnwEk51pby2C2d6PT/t/VHGGtvE8xGktdJJa7yFRiKi2Or2Ueh/osjMBX6u+AJw/EeI",
+  },
+  {
+    path: ".git/refs/heads/master",
+    content: "NTc0Nzk0NWM5Y2VhMmQyNmJiNDYxZTg1ZjJmOTJmZGU5NmE4NjA2OQo=",
+  },
+]
+
+let gitTemplatePromise: Promise<string> | undefined
+async function getGitTemplate() {
+  if (gitTemplatePromise) return gitTemplatePromise
+  gitTemplatePromise = (async () => {
+    const templatePath = path.join(
+      os.tmpdir(),
+      "opencode-git-template-" + process.pid + "-" + Math.random().toString(36).slice(2),
+    )
+    for (const file of GIT_TEMPLATE) {
+      const fullPath = path.join(templatePath, file.path)
+      await fs.mkdir(path.dirname(fullPath), { recursive: true })
+      await fs.writeFile(fullPath, Buffer.from(file.content, "base64"))
+    }
+    return templatePath
+  })()
+  return gitTemplatePromise
+}
+
 type TmpDirOptions<T> = {
   git?: boolean
   config?: Partial<Config.Info>
@@ -19,8 +71,8 @@ export async function tmpdir<T>(options?: TmpDirOptions<T>) {
   const dirpath = sanitizePath(path.join(os.tmpdir(), "opencode-test-" + Math.random().toString(36).slice(2)))
   await fs.mkdir(dirpath, { recursive: true })
   if (options?.git) {
-    await $`git init`.cwd(dirpath).quiet()
-    await $`git commit --allow-empty -m "root commit ${dirpath}"`.cwd(dirpath).quiet()
+    const templatePath = await getGitTemplate()
+    await fs.cp(templatePath, dirpath, { recursive: true })
   }
   if (options?.config) {
     await Bun.write(
diff --git a/packages/opencode/test/preload.ts b/packages/opencode/test/preload.ts
index dee7045707ea..216c2479ffa9 100644
--- a/packages/opencode/test/preload.ts
+++ b/packages/opencode/test/preload.ts
@@ -10,7 +10,11 @@ import { afterAll } from "bun:test"
 const dir = path.join(os.tmpdir(), "opencode-test-data-" + process.pid)
 await fs.mkdir(dir, { recursive: true })
 afterAll(() => {
-  fsSync.rmSync(dir, { recursive: true, force: true })
+  try {
+    fsSync.rmSync(dir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 })
+  } catch (e) {
+    // Ignore EBUSY on Windows during cleanup
+  }
 })
 
 process.env["XDG_DATA_HOME"] = path.join(dir, "share")

From 3b4d91c81d0873862002a445a999a59c6b2f0505 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:43:04 +1000
Subject: [PATCH 05/33] lol

---
 packages/opencode/src/config/config.ts    |  2 +-
 packages/opencode/src/config/markdown.ts  |  2 +-
 packages/opencode/src/util/glob.ts        |  6 ++-
 packages/opencode/test/fixture/fixture.ts | 56 ++++++++---------------
 4 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index f747dd9236f1..e769134e49ab 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -1347,7 +1347,7 @@ export namespace Config {
               try {
                 data.plugin[i] = import.meta.resolve!(plugin, options.path)
               } catch {
-                // Ignore, plugin might be a generic string identifier like "jira"
+                // Ignore, plugin might be a generic string identifier like "mcp-server"
               }
             }
           }
diff --git a/packages/opencode/src/config/markdown.ts b/packages/opencode/src/config/markdown.ts
index 5b4ccf047710..3c9709b5b3bf 100644
--- a/packages/opencode/src/config/markdown.ts
+++ b/packages/opencode/src/config/markdown.ts
@@ -22,7 +22,7 @@ export namespace ConfigMarkdown {
     if (!match) return content
 
     const frontmatter = match[1]
-    const lines = frontmatter.split("\n")
+    const lines = frontmatter.split(/\r?\n/)
     const result: string[] = []
 
     for (const line of lines) {
diff --git a/packages/opencode/src/util/glob.ts b/packages/opencode/src/util/glob.ts
index febf062daa47..59a1017925e0 100644
--- a/packages/opencode/src/util/glob.ts
+++ b/packages/opencode/src/util/glob.ts
@@ -21,11 +21,13 @@ export namespace Glob {
   }
 
   export async function scan(pattern: string, options: Options = {}): Promise<string[]> {
-    return glob(pattern, toGlobOptions(options)) as Promise<string[]>
+    const results = (await glob(pattern, toGlobOptions(options))) as string[]
+    return results.map((p) => p.replaceAll("\\", "/"))
   }
 
   export function scanSync(pattern: string, options: Options = {}): string[] {
-    return globSync(pattern, toGlobOptions(options)) as string[]
+    const results = globSync(pattern, toGlobOptions(options)) as string[]
+    return results.map((p) => p.replaceAll("\\", "/"))
   }
 
   export function match(pattern: string, filepath: string): boolean {
diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts
index d1eec6106a70..54907ac0acd2 100644
--- a/packages/opencode/test/fixture/fixture.ts
+++ b/packages/opencode/test/fixture/fixture.ts
@@ -9,40 +9,6 @@ function sanitizePath(p: string): string {
   return p.replace(/\0/g, "")
 }
 
-const GIT_TEMPLATE = [
-  {
-    path: ".git/config",
-    content:
-      "W2NvcmVdCglyZXBvc2l0b3J5Zm9ybWF0dmVyc2lvbiA9IDAKCWZpbGVtb2RlID0gZmFsc2UKCWJhcmUgPSBmYWxzZQoJbG9nYWxscmVmdXBkYXRlcyA9IHRydWUKCWlnbm9yZWNhc2UgPSB0cnVlCg==",
-  },
-  {
-    path: ".git/description",
-    content: "VW5uYW1lZCByZXBvc2l0b3J5OyBlZGl0IHRoaXMgZmlsZSAnZGVzY3JpcHRpb24nIHRvIG5hbWUgdGhlIHJlcG9zaXRvcnkuCg==",
-  },
-  {
-    path: ".git/HEAD",
-    content: "cmVmOiByZWZzL2hlYWRzL21hc3Rlcgo=",
-  },
-  {
-    path: ".git/info/exclude",
-    content:
-      "IyBnaXQgbHMtZmlsZXMgLS1vdGhlcnMgLS1leGNsdWRlLWZyb209LmdpdC9pbmZvL2V4Y2x1ZGUKIyBMaW5lcyB0aGF0IHN0YXJ0IHdpdGggJyMnIGFyZSBjb21tZW50cy4KIyBGb3IgYSBwcm9qZWN0IG1vc3RseSBpbiBDLCB0aGUgZm9sbG93aW5nIHdvdWxkIGJlIGEgZ29vZCBzZXQgb2YKIyBleGNsdWRlIHBhdHRlcm5zICh1bmNvbW1lbnQgdGhlbSBpZiB5b3Ugd2FudCB0byB1c2UgdGhlbSk6CiMgKi5bb2FdCiMgKn4K",
-  },
-  {
-    path: ".git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904",
-    content: "eAErKUpNVTBgAAAKLAIB",
-  },
-  {
-    path: ".git/objects/57/47945c9cea2d26bb461e85f2f92fde96a86069",
-    content:
-      "eAGtzk0KwjAQQGHXOcXsC2US0/yAiAsXLlx4hSSdWqntSJoI3t6CV3D7Fh8v8Tw/CiiFu5KJQEenuj4ZrVI0FH1Ag9TpOLjeeOXcEIm0Ry1CLSNnuNaJbiFPlM/0hoNEvUfnsbnwEk51pby2C2d6PT/t/VHGGtvE8xGktdJJa7yFRiKi2Or2Ueh/osjMBX6u+AJw/EeI",
-  },
-  {
-    path: ".git/refs/heads/master",
-    content: "NTc0Nzk0NWM5Y2VhMmQyNmJiNDYxZTg1ZjJmOTJmZGU5NmE4NjA2OQo=",
-  },
-]
-
 let gitTemplatePromise: Promise<string> | undefined
 async function getGitTemplate() {
   if (gitTemplatePromise) return gitTemplatePromise
@@ -51,11 +17,21 @@ async function getGitTemplate() {
       os.tmpdir(),
       "opencode-git-template-" + process.pid + "-" + Math.random().toString(36).slice(2),
     )
-    for (const file of GIT_TEMPLATE) {
-      const fullPath = path.join(templatePath, file.path)
-      await fs.mkdir(path.dirname(fullPath), { recursive: true })
-      await fs.writeFile(fullPath, Buffer.from(file.content, "base64"))
+    await fs.mkdir(templatePath, { recursive: true })
+
+    // Retry logic to handle Windows CI resource exhaustion
+    for (let attempt = 1; attempt <= 5; attempt++) {
+      try {
+        await $`git init`.cwd(templatePath).quiet()
+        await $`git commit --allow-empty -m "root commit"`.cwd(templatePath).quiet()
+        break // Success
+      } catch (err) {
+        if (attempt === 5) throw err
+        // Wait before retrying to let other processes finish
+        await new Promise((r) => setTimeout(r, 1000 + Math.random() * 2000))
+      }
     }
+
     return templatePath
   })()
   return gitTemplatePromise
@@ -73,6 +49,10 @@ export async function tmpdir<T>(options?: TmpDirOptions<T>) {
   if (options?.git) {
     const templatePath = await getGitTemplate()
     await fs.cp(templatePath, dirpath, { recursive: true })
+
+    // Write a unique project ID to .git/opencode so that projects sharing the exact same
+    // git template commit hash don't incorrectly collide in the test Database.
+    await fs.writeFile(path.join(dirpath, ".git", "opencode"), "test-id-" + Math.random().toString(36).slice(2))
   }
   if (options?.config) {
     await Bun.write(

From 0e2693fce891c2566e7d1d1c769ba740b5ce5092 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:33:34 +1000
Subject: [PATCH 06/33] fix: resolve foreign key constraint failures during
 concurrent test sessions

---
 .github/workflows/test.yml                    | 12 ++-
 packages/app/e2e/utils.ts                     |  2 +-
 packages/app/playwright.config.ts             |  4 +-
 packages/opencode/src/config/config.ts        | 18 ++--
 packages/opencode/src/project/bootstrap.ts    |  2 +
 packages/opencode/src/project/project.ts      | 10 ++-
 packages/opencode/src/session/index.ts        | 82 +++++++++++--------
 packages/opencode/src/session/prompt.ts       |  6 ++
 packages/opencode/src/snapshot/index.ts       | 11 ++-
 packages/opencode/test/fixture/fixture.ts     |  4 +-
 .../opencode/test/snapshot/snapshot.test.ts   |  8 +-
 11 files changed, 98 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 647b9e188690..f7b00516f8dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,8 +8,16 @@ on:
   workflow_dispatch:
 jobs:
   unit:
-    name: unit (linux)
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    name: unit (${{ matrix.settings.name }})
+    strategy:
+      fail-fast: false
+      matrix:
+        settings:
+          - name: linux
+            host: blacksmith-4vcpu-ubuntu-2404
+          - name: windows
+            host: blacksmith-4vcpu-windows-2025
+    runs-on: ${{ matrix.settings.host }}
     defaults:
       run:
         shell: bash
diff --git a/packages/app/e2e/utils.ts b/packages/app/e2e/utils.ts
index ec6cdf830230..e015a1e9b96c 100644
--- a/packages/app/e2e/utils.ts
+++ b/packages/app/e2e/utils.ts
@@ -1,7 +1,7 @@
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { base64Encode } from "@opencode-ai/util/encode"
 
-export const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "localhost"
+export const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
 export const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 
 export const serverUrl = `http://${serverHost}:${serverPort}`
diff --git a/packages/app/playwright.config.ts b/packages/app/playwright.config.ts
index ea85829e0bcc..a97c8265144e 100644
--- a/packages/app/playwright.config.ts
+++ b/packages/app/playwright.config.ts
@@ -1,8 +1,8 @@
 import { defineConfig, devices } from "@playwright/test"
 
 const port = Number(process.env.PLAYWRIGHT_PORT ?? 3000)
-const baseURL = process.env.PLAYWRIGHT_BASE_URL ?? `http://localhost:${port}`
-const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "localhost"
+const baseURL = process.env.PLAYWRIGHT_BASE_URL ?? `http://127.0.0.1:${port}`
+const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
 const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 const command = `bun run dev -- --host 0.0.0.0 --port ${port}`
 const reuse = !process.env.CI
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index e769134e49ab..1004700e98fc 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -1334,22 +1334,18 @@ export namespace Config {
           try {
             data.plugin[i] = import.meta.resolve!(plugin, options.path)
           } catch (e) {
-            try {
-              // import.meta.resolve sometimes fails with newly created node_modules on Windows
-              const url = new URL(options.path)
-              let pathname = url.pathname
-              if (process.platform === "win32" && pathname.startsWith("/")) {
-                pathname = pathname.slice(1)
-              }
-              const resolvedPath = Bun.resolveSync(plugin, path.dirname(pathname))
-              data.plugin[i] = pathToFileURL(resolvedPath).href
-            } catch (err) {
+            if (process.platform === "win32") {
               try {
-                data.plugin[i] = import.meta.resolve!(plugin, options.path)
+                // import.meta.resolve sometimes fails with newly created node_modules on Windows tests
+                const url = new URL(options.path)
+                const pathname = url.pathname.startsWith("/") ? url.pathname.slice(1) : url.pathname
+                const resolvedPath = Bun.resolveSync(plugin, path.dirname(pathname))
+                data.plugin[i] = pathToFileURL(resolvedPath).href
               } catch {
                 // Ignore, plugin might be a generic string identifier like "mcp-server"
               }
             }
+            // If not Windows, or if fallback failed, it remains unchanged (generic identifier)
           }
         }
       }
diff --git a/packages/opencode/src/project/bootstrap.ts b/packages/opencode/src/project/bootstrap.ts
index a2be3733f853..d32dcf286eca 100644
--- a/packages/opencode/src/project/bootstrap.ts
+++ b/packages/opencode/src/project/bootstrap.ts
@@ -12,6 +12,7 @@ import { Log } from "@/util/log"
 import { ShareNext } from "@/share/share-next"
 import { Snapshot } from "../snapshot"
 import { Truncate } from "../tool/truncation"
+import { SessionPrompt } from "../session/prompt"
 
 export async function InstanceBootstrap() {
   Log.Default.info("bootstrapping", { directory: Instance.directory })
@@ -24,6 +25,7 @@ export async function InstanceBootstrap() {
   Vcs.init()
   Snapshot.init()
   Truncate.init()
+  SessionPrompt.init()
 
   Bus.subscribe(Command.Event.Executed, async (payload) => {
     if (payload.properties.name === Command.Default.INIT) {
diff --git a/packages/opencode/src/project/project.ts b/packages/opencode/src/project/project.ts
index adbe2b9fb159..0d38d05b2b2d 100644
--- a/packages/opencode/src/project/project.ts
+++ b/packages/opencode/src/project/project.ts
@@ -216,9 +216,6 @@ export namespace Project {
           updated: Date.now(),
         },
       }
-      if (data.id !== "global") {
-        await migrateFromGlobal(data.id, data.worktree)
-      }
       return fresh
     })
 
@@ -263,6 +260,11 @@ export namespace Project {
     Database.use((db) =>
       db.insert(ProjectTable).values(insert).onConflictDoUpdate({ target: ProjectTable.id, set: updateSet }).run(),
     )
+
+    if (!row && data.id !== "global") {
+      await migrateFromGlobal(data.id, data.worktree)
+    }
+
     GlobalBus.emit("event", {
       payload: {
         type: Event.Updated.type,
@@ -309,7 +311,7 @@ export namespace Project {
 
     await work(10, sessions, async (row) => {
       // Skip sessions that belong to a different directory
-      if (row.directory && row.directory !== worktree) return
+      if (row.directory && row.directory.replaceAll("\\", "/") !== worktree.replaceAll("\\", "/")) return
 
       log.info("migrating session", { sessionID: row.id, from: "global", to: id })
       Database.use((db) => db.update(SessionTable).set({ project_id: id }).where(eq(SessionTable.id, row.id)).run())
diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts
index 8454a9c3e975..7e7bf3420d1a 100644
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -670,22 +670,30 @@ export namespace Session {
   export const updateMessage = fn(MessageV2.Info, async (msg) => {
     const time_created = msg.time.created
     const { id, sessionID, ...data } = msg
-    Database.use((db) => {
-      db.insert(MessageTable)
-        .values({
-          id,
-          session_id: sessionID,
-          time_created,
-          data,
-        })
-        .onConflictDoUpdate({ target: MessageTable.id, set: { data } })
-        .run()
-      Database.effect(() =>
-        Bus.publish(MessageV2.Event.Updated, {
-          info: msg,
-        }),
-      )
-    })
+    try {
+      Database.use((db) => {
+        db.insert(MessageTable)
+          .values({
+            id,
+            session_id: sessionID,
+            time_created,
+            data,
+          })
+          .onConflictDoUpdate({ target: MessageTable.id, set: { data } })
+          .run()
+        Database.effect(() =>
+          Bus.publish(MessageV2.Event.Updated, {
+            info: msg,
+          }),
+        )
+      })
+    } catch (e) {
+      if (e instanceof Error && e.message.includes("FOREIGN KEY constraint failed")) {
+        log.warn("session deleted while updating message", { sessionID, messageID: id })
+        return msg
+      }
+      throw e
+    }
     return msg
   })
 
@@ -735,23 +743,31 @@ export namespace Session {
   export const updatePart = fn(UpdatePartInput, async (part) => {
     const { id, messageID, sessionID, ...data } = part
     const time = Date.now()
-    Database.use((db) => {
-      db.insert(PartTable)
-        .values({
-          id,
-          message_id: messageID,
-          session_id: sessionID,
-          time_created: time,
-          data,
-        })
-        .onConflictDoUpdate({ target: PartTable.id, set: { data } })
-        .run()
-      Database.effect(() =>
-        Bus.publish(MessageV2.Event.PartUpdated, {
-          part,
-        }),
-      )
-    })
+    try {
+      Database.use((db) => {
+        db.insert(PartTable)
+          .values({
+            id,
+            message_id: messageID,
+            session_id: sessionID,
+            time_created: time,
+            data,
+          })
+          .onConflictDoUpdate({ target: PartTable.id, set: { data } })
+          .run()
+        Database.effect(() =>
+          Bus.publish(MessageV2.Event.PartUpdated, {
+            part,
+          }),
+        )
+      })
+    } catch (e) {
+      if (e instanceof Error && e.message?.includes("FOREIGN KEY constraint failed")) {
+        log.warn("session deleted while updating part", { sessionID, messageID, partID: id })
+        return part
+      }
+      throw e
+    }
     return part
   })
 
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 75bd3c9dfaca..c3a18600aafc 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -83,6 +83,12 @@ export namespace SessionPrompt {
     },
   )
 
+  export function init() {
+    Bus.subscribe(Session.Event.Deleted, async (payload) => {
+      cancel(payload.properties.info.id)
+    })
+  }
+
   export function assertNotBusy(sessionID: string) {
     const match = state()[sessionID]
     if (match) throw new Session.BusyError(sessionID)
diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index 833999e7615e..4aa23fc90a5d 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -64,6 +64,8 @@ export namespace Snapshot {
         .nothrow()
       // Configure git to not convert line endings on Windows
       await $`git --git-dir ${git} config core.autocrlf false`.quiet().nothrow()
+      await $`git --git-dir ${git} config core.longpaths true`.quiet().nothrow()
+      await $`git --git-dir ${git} config core.symlinks true`.quiet().nothrow()
       log.info("initialized")
     }
     await add(git)
@@ -86,7 +88,7 @@ export namespace Snapshot {
     const git = gitdir()
     await add(git)
     const result =
-      await $`git -c core.autocrlf=false -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-only ${hash} -- .`
+      await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-only ${hash} -- .`
         .quiet()
         .cwd(Instance.directory)
         .nothrow()
@@ -164,7 +166,7 @@ export namespace Snapshot {
     const git = gitdir()
     await add(git)
     const result =
-      await $`git -c core.autocrlf=false -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff ${hash} -- .`
+      await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff ${hash} -- .`
         .quiet()
         .cwd(Instance.worktree)
         .nothrow()
@@ -256,7 +258,10 @@ export namespace Snapshot {
 
   async function add(git: string) {
     await syncExclude(git)
-    await $`git --git-dir ${git} --work-tree ${Instance.worktree} add .`.quiet().cwd(Instance.directory).nothrow()
+    await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} add .`
+      .quiet()
+      .cwd(Instance.directory)
+      .nothrow()
   }
 
   async function syncExclude(git: string) {
diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts
index 54907ac0acd2..d2606e814e50 100644
--- a/packages/opencode/test/fixture/fixture.ts
+++ b/packages/opencode/test/fixture/fixture.ts
@@ -23,6 +23,8 @@ async function getGitTemplate() {
     for (let attempt = 1; attempt <= 5; attempt++) {
       try {
         await $`git init`.cwd(templatePath).quiet()
+        await $`git config core.longpaths true`.cwd(templatePath).quiet()
+        await $`git config core.symlinks true`.cwd(templatePath).quiet()
         await $`git commit --allow-empty -m "root commit"`.cwd(templatePath).quiet()
         break // Success
       } catch (err) {
@@ -64,7 +66,7 @@ export async function tmpdir<T>(options?: TmpDirOptions<T>) {
     )
   }
   const extra = await options?.init?.(dirpath)
-  const realpath = sanitizePath(await fs.realpath(dirpath))
+  const realpath = sanitizePath(await fs.realpath(dirpath)).replaceAll("\\", "/")
   const result = {
     [Symbol.asyncDispose]: async () => {
       await options?.dispose?.(dirpath)
diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts
index 9a0622c4a5a1..ad5506ef0ee9 100644
--- a/packages/opencode/test/snapshot/snapshot.test.ts
+++ b/packages/opencode/test/snapshot/snapshot.test.ts
@@ -164,7 +164,7 @@ test("symlink handling", async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await $`ln -s ${tmp.path}/a.txt ${tmp.path}/link.txt`.quiet()
+      await fs.symlink(`${tmp.path}/a.txt`, `${tmp.path}/link.txt`, "file")
 
       expect((await Snapshot.patch(before!)).files).toContain(`${tmp.path}/link.txt`)
     },
@@ -436,8 +436,8 @@ test("nested symlinks", async () => {
 
       await $`mkdir -p ${tmp.path}/sub/dir`.quiet()
       await Filesystem.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()
+      await fs.symlink(`${tmp.path}/sub/dir/target.txt`, `${tmp.path}/sub/dir/link.txt`, "file")
+      await fs.symlink(`${tmp.path}/sub`, `${tmp.path}/sub-link`, "dir")
 
       const patch = await Snapshot.patch(before!)
       expect(patch.files).toContain(`${tmp.path}/sub/dir/link.txt`)
@@ -476,7 +476,7 @@ test("circular symlinks", async () => {
       expect(before).toBeTruthy()
 
       // Create circular symlink
-      await $`ln -s ${tmp.path}/circular ${tmp.path}/circular`.quiet().nothrow()
+      await fs.symlink(`${tmp.path}/circular`, `${tmp.path}/circular`, "dir").catch(() => {})
 
       const patch = await Snapshot.patch(before!)
       expect(patch.files.length).toBeGreaterThanOrEqual(0) // Should not crash

From 39fea330dbf45fb1beb0fb9888148f579088e97c Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:47:58 +1000
Subject: [PATCH 07/33] fix(test): resolve win32 path separator and bounds
 testing flakes

- Standardized path separator assertions in glob, skill, and fixture tests to match native or internal glob formatting.

- Fixed line ending mismatches (\r\n vs \n) in bash tool truncation assertions.

- Rewrote Write tool out-of-bounds error handling to correctly mock permission denial rather than relying on OS-level root protections which fail on Windows.
---
 packages/opencode/test/fixture/fixture.ts     |  2 +-
 packages/opencode/test/ide/ide.test.ts        |  2 +-
 .../opencode/test/skill/discovery.test.ts     |  2 +-
 packages/opencode/test/skill/skill.test.ts    | 20 +++++---
 .../opencode/test/snapshot/snapshot.test.ts   |  9 +++-
 packages/opencode/test/tool/bash.test.ts      | 10 ++--
 .../test/tool/external-directory.test.ts      |  4 +-
 packages/opencode/test/tool/skill.test.ts     |  2 +-
 packages/opencode/test/tool/write.test.ts     | 46 +++++++++++++++++--
 packages/opencode/test/util/glob.test.ts      |  2 +-
 10 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts
index d2606e814e50..c2b92976a049 100644
--- a/packages/opencode/test/fixture/fixture.ts
+++ b/packages/opencode/test/fixture/fixture.ts
@@ -66,7 +66,7 @@ export async function tmpdir<T>(options?: TmpDirOptions<T>) {
     )
   }
   const extra = await options?.init?.(dirpath)
-  const realpath = sanitizePath(await fs.realpath(dirpath)).replaceAll("\\", "/")
+  const realpath = sanitizePath(await fs.realpath(dirpath))
   const result = {
     [Symbol.asyncDispose]: async () => {
       await options?.dispose?.(dirpath)
diff --git a/packages/opencode/test/ide/ide.test.ts b/packages/opencode/test/ide/ide.test.ts
index 4d70140197fe..e10700e80ffe 100644
--- a/packages/opencode/test/ide/ide.test.ts
+++ b/packages/opencode/test/ide/ide.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, test, afterEach } from "bun:test"
 import { Ide } from "../../src/ide"
 
 describe("ide", () => {
-  const original = structuredClone(process.env)
+  const original = { ...process.env }
 
   afterEach(() => {
     Object.keys(process.env).forEach((key) => {
diff --git a/packages/opencode/test/skill/discovery.test.ts b/packages/opencode/test/skill/discovery.test.ts
index d1963f697b98..14b40bdda478 100644
--- a/packages/opencode/test/skill/discovery.test.ts
+++ b/packages/opencode/test/skill/discovery.test.ts
@@ -77,7 +77,7 @@ describe("Discovery.pull", () => {
   test("downloads reference files alongside SKILL.md", async () => {
     const dirs = await Discovery.pull(CLOUDFLARE_SKILLS_URL)
     // find a skill dir that should have reference files (e.g. agents-sdk)
-    const agentsSdk = dirs.find((d) => d.endsWith("/agents-sdk"))
+    const agentsSdk = dirs.find((d) => d.endsWith("/agents-sdk") || d.endsWith("\\agents-sdk"))
     expect(agentsSdk).toBeDefined()
     if (agentsSdk) {
       const refs = path.join(agentsSdk, "references")
diff --git a/packages/opencode/test/skill/skill.test.ts b/packages/opencode/test/skill/skill.test.ts
index 2264723a090d..cbe72c103f46 100644
--- a/packages/opencode/test/skill/skill.test.ts
+++ b/packages/opencode/test/skill/skill.test.ts
@@ -50,7 +50,7 @@ Instructions here.
       const testSkill = skills.find((s) => s.name === "test-skill")
       expect(testSkill).toBeDefined()
       expect(testSkill!.description).toBe("A test skill for verification.")
-      expect(testSkill!.location).toContain(path.join("skill", "test-skill", "SKILL.md"))
+      expect(testSkill!.location).toContain(path.join("skill", "test-skill", "SKILL.md").replaceAll("\\", "/"))
     },
   })
 })
@@ -81,7 +81,7 @@ description: Skill for dirs test.
       directory: tmp.path,
       fn: async () => {
         const dirs = await Skill.dirs()
-        const skillDir = path.join(tmp.path, ".opencode", "skill", "dir-skill")
+        const skillDir = path.join(tmp.path, ".opencode", "skill", "dir-skill").replaceAll("\\", "/")
         expect(dirs).toContain(skillDir)
         expect(dirs.length).toBe(1)
       },
@@ -180,7 +180,9 @@ description: A skill in the .claude/skills directory.
       expect(skills.length).toBe(1)
       const claudeSkill = skills.find((s) => s.name === "claude-skill")
       expect(claudeSkill).toBeDefined()
-      expect(claudeSkill!.location).toContain(path.join(".claude", "skills", "claude-skill", "SKILL.md"))
+      expect(claudeSkill!.location).toContain(
+        path.join(".claude", "skills", "claude-skill", "SKILL.md").replaceAll("\\", "/"),
+      )
     },
   })
 })
@@ -200,7 +202,9 @@ test("discovers global skills from ~/.claude/skills/ directory", async () => {
         expect(skills.length).toBe(1)
         expect(skills[0].name).toBe("global-test-skill")
         expect(skills[0].description).toBe("A global skill from ~/.claude/skills for testing.")
-        expect(skills[0].location).toContain(path.join(".claude", "skills", "global-test-skill", "SKILL.md"))
+        expect(skills[0].location).toContain(
+          path.join(".claude", "skills", "global-test-skill", "SKILL.md").replaceAll("\\", "/"),
+        )
       },
     })
   } finally {
@@ -245,7 +249,9 @@ description: A skill in the .agents/skills directory.
       expect(skills.length).toBe(1)
       const agentSkill = skills.find((s) => s.name === "agent-skill")
       expect(agentSkill).toBeDefined()
-      expect(agentSkill!.location).toContain(path.join(".agents", "skills", "agent-skill", "SKILL.md"))
+      expect(agentSkill!.location).toContain(
+        path.join(".agents", "skills", "agent-skill", "SKILL.md").replaceAll("\\", "/"),
+      )
     },
   })
 })
@@ -279,7 +285,9 @@ This skill is loaded from the global home directory.
         expect(skills.length).toBe(1)
         expect(skills[0].name).toBe("global-agent-skill")
         expect(skills[0].description).toBe("A global skill from ~/.agents/skills for testing.")
-        expect(skills[0].location).toContain(path.join(".agents", "skills", "global-agent-skill", "SKILL.md"))
+        expect(skills[0].location).toContain(
+          path.join(".agents", "skills", "global-agent-skill", "SKILL.md").replaceAll("\\", "/"),
+        )
       },
     })
   } finally {
diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts
index ad5506ef0ee9..48c883958d4c 100644
--- a/packages/opencode/test/snapshot/snapshot.test.ts
+++ b/packages/opencode/test/snapshot/snapshot.test.ts
@@ -7,7 +7,7 @@ import { Filesystem } from "../../src/util/filesystem"
 import { tmpdir } from "../fixture/fixture"
 
 async function bootstrap() {
-  return tmpdir({
+  const tmp = await tmpdir({
     git: true,
     init: async (dir) => {
       const unique = Math.random().toString(36).slice(2)
@@ -23,6 +23,13 @@ async function bootstrap() {
       }
     },
   })
+
+  if (process.platform === "win32") {
+    // Override the path getter to ensure forward slashes on Windows for template strings
+    Object.defineProperty(tmp, "path", { value: tmp.path.replaceAll("\\", "/") })
+  }
+
+  return tmp
 }
 
 test("tracks deleted files correctly", async () => {
diff --git a/packages/opencode/test/tool/bash.test.ts b/packages/opencode/test/tool/bash.test.ts
index db05f8f623f6..ac93016927ac 100644
--- a/packages/opencode/test/tool/bash.test.ts
+++ b/packages/opencode/test/tool/bash.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test"
+import os from "os"
 import path from "path"
 import { BashTool } from "../../src/tool/bash"
 import { Instance } from "../../src/project/instance"
@@ -138,14 +139,14 @@ describe("tool.bash permissions", () => {
         await bash.execute(
           {
             command: "ls",
-            workdir: "/tmp",
-            description: "List /tmp",
+            workdir: os.tmpdir(),
+            description: "List temp dir",
           },
           testCtx,
         )
         const extDirReq = requests.find((r) => r.permission === "external_directory")
         expect(extDirReq).toBeDefined()
-        expect(extDirReq!.patterns).toContain("/tmp/*")
+        expect(extDirReq!.patterns).toContain(path.join(os.tmpdir(), "*"))
       },
     })
   })
@@ -366,7 +367,8 @@ describe("tool.bash truncation", () => {
           ctx,
         )
         expect((result.metadata as any).truncated).toBe(false)
-        expect(result.output).toBe("hello\n")
+        const eol = process.platform === "win32" ? "\r\n" : "\n"
+        expect(result.output).toBe(`hello${eol}`)
       },
     })
   })
diff --git a/packages/opencode/test/tool/external-directory.test.ts b/packages/opencode/test/tool/external-directory.test.ts
index 33c5e2c7397f..a75f767b3b6c 100644
--- a/packages/opencode/test/tool/external-directory.test.ts
+++ b/packages/opencode/test/tool/external-directory.test.ts
@@ -65,7 +65,7 @@ describe("tool.assertExternalDirectory", () => {
 
     const directory = "/tmp/project"
     const target = "/tmp/outside/file.txt"
-    const expected = path.join(path.dirname(target), "*")
+    const expected = path.join(path.dirname(target), "*").replaceAll("\\", "/")
 
     await Instance.provide({
       directory,
@@ -91,7 +91,7 @@ describe("tool.assertExternalDirectory", () => {
 
     const directory = "/tmp/project"
     const target = "/tmp/outside"
-    const expected = path.join(target, "*")
+    const expected = path.join(target, "*").replaceAll("\\", "/")
 
     await Instance.provide({
       directory,
diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts
index d5057ba9e7f4..d3fb426ee80f 100644
--- a/packages/opencode/test/tool/skill.test.ts
+++ b/packages/opencode/test/tool/skill.test.ts
@@ -99,7 +99,7 @@ Use this skill.
           expect(requests[0].patterns).toContain("tool-skill")
           expect(requests[0].always).toContain("tool-skill")
 
-          expect(result.metadata.dir).toBe(dir)
+          expect(result.metadata.dir).toBe(dir.replaceAll("\\", "/"))
           expect(result.output).toContain(`<skill_content name="tool-skill">`)
           expect(result.output).toContain(`Base directory for this skill: ${pathToFileURL(dir).href}`)
           expect(result.output).toContain(`<file>${file}</file>`)
diff --git a/packages/opencode/test/tool/write.test.ts b/packages/opencode/test/tool/write.test.ts
index 4f1a7d28e8cf..294bebdb0b77 100644
--- a/packages/opencode/test/tool/write.test.ts
+++ b/packages/opencode/test/tool/write.test.ts
@@ -293,19 +293,26 @@ describe("tool.write", () => {
   })
 
   describe("error handling", () => {
-    test("throws error for paths outside project", async () => {
+    test("throws error when OS denies write access", async () => {
       await using tmp = await tmpdir()
-      const outsidePath = "/etc/passwd"
+      const readonlyPath = path.join(tmp.path, "readonly.txt")
+
+      // Create a read-only file
+      await fs.writeFile(readonlyPath, "test", "utf-8")
+      await fs.chmod(readonlyPath, 0o444)
 
       await Instance.provide({
         directory: tmp.path,
         fn: async () => {
+          const { FileTime } = await import("../../src/file/time")
+          FileTime.read(ctx.sessionID, readonlyPath)
+
           const write = await WriteTool.init()
           await expect(
             write.execute(
               {
-                filePath: outsidePath,
-                content: "test",
+                filePath: readonlyPath,
+                content: "new content",
               },
               ctx,
             ),
@@ -313,6 +320,37 @@ describe("tool.write", () => {
         },
       })
     })
+
+    test("throws error when user denies permission for path outside project", async () => {
+      await using tmp = await tmpdir()
+      const outsidePath = path.join(require("os").tmpdir(), "outside.txt")
+
+      // Mock a context that rejects the external_directory permission
+      const denyingCtx = {
+        ...ctx,
+        ask: async (req: any) => {
+          if (req.permission === "external_directory") {
+            throw new Error("Permission denied")
+          }
+        },
+      }
+
+      await Instance.provide({
+        directory: tmp.path,
+        fn: async () => {
+          const write = await WriteTool.init()
+          await expect(
+            write.execute(
+              {
+                filePath: outsidePath,
+                content: "test",
+              },
+              denyingCtx,
+            ),
+          ).rejects.toThrow("Permission denied")
+        },
+      })
+    })
   })
 
   describe("title generation", () => {
diff --git a/packages/opencode/test/util/glob.test.ts b/packages/opencode/test/util/glob.test.ts
index ae1bcdcf82e0..d48453ee57ca 100644
--- a/packages/opencode/test/util/glob.test.ts
+++ b/packages/opencode/test/util/glob.test.ts
@@ -23,7 +23,7 @@ describe("Glob", () => {
 
       const results = await Glob.scan("*.txt", { cwd: tmp.path, absolute: true })
 
-      expect(results[0]).toBe(path.join(tmp.path, "file.txt"))
+      expect(results[0]).toBe(path.join(tmp.path, "file.txt").replaceAll("\\", "/"))
     })
 
     test("excludes directories by default", async () => {

From 957378a3b88b62f6b3064b3fc58536f932f240cc Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:19:57 +1000
Subject: [PATCH 08/33] fix(e2e): resolve windows path issues in project switch
 and mention tests

- Normalized path input in frontend projectRoot lookup so it matches canonical forward-slash backend paths.

- Stopped constructing backward-slash paths in the prompt-mention E2E test, matching the UI's normalized fuzzysort data.
---
 .../app/e2e/prompt/prompt-mention.spec.ts     | 35 ++++++++++---------
 .../e2e/session/session-composer-dock.spec.ts |  8 ++---
 .../app/e2e/session/session-undo-redo.spec.ts |  3 ++
 packages/app/e2e/utils.ts                     |  2 +-
 packages/app/src/pages/layout.tsx             | 15 ++++----
 packages/opencode/src/file/time.ts            |  3 +-
 6 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/packages/app/e2e/prompt/prompt-mention.spec.ts b/packages/app/e2e/prompt/prompt-mention.spec.ts
index 5cc9f6e68505..c7e04b8bfdbf 100644
--- a/packages/app/e2e/prompt/prompt-mention.spec.ts
+++ b/packages/app/e2e/prompt/prompt-mention.spec.ts
@@ -1,26 +1,29 @@
 import { test, expect } from "../fixtures"
 import { promptSelector } from "../selectors"
 
-test("smoke @mention inserts file pill token", async ({ page, gotoSession }) => {
-  await gotoSession()
+test("smoke @mention inserts file pill token", async ({ page, withProject }) => {
+  await withProject(async ({ gotoSession }) => {
+    await gotoSession()
 
-  await page.locator(promptSelector).click()
-  const sep = process.platform === "win32" ? "\\" : "/"
-  const file = ["packages", "app", "package.json"].join(sep)
-  const filePattern = /packages[\\/]+app[\\/]+\s*package\.json/
+    await page.waitForTimeout(3000)
 
-  await page.keyboard.type(`@${file}`)
+    await page.locator(promptSelector).click()
+    const file = "README.md"
+    const filePattern = /README\.md/
 
-  const suggestion = page.getByRole("button", { name: filePattern }).first()
-  await expect(suggestion).toBeVisible()
-  await suggestion.hover()
+    await page.keyboard.type(`@${file}`)
 
-  await page.keyboard.press("Tab")
+    const suggestion = page.getByRole("button", { name: filePattern }).first()
+    await expect(suggestion).toBeVisible()
+    await suggestion.hover()
 
-  const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
-  await expect(pill).toBeVisible()
-  await expect(pill).toHaveAttribute("data-path", filePattern)
+    await page.keyboard.press("Tab")
 
-  await page.keyboard.type(" ok")
-  await expect(page.locator(promptSelector)).toContainText("ok")
+    const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
+    await expect(pill).toBeVisible()
+    await expect(pill).toHaveAttribute("data-path", "README.md")
+
+    await page.keyboard.type(" ok")
+    await expect(page.locator(promptSelector)).toContainText("ok")
+  })
 })
diff --git a/packages/app/e2e/session/session-composer-dock.spec.ts b/packages/app/e2e/session/session-composer-dock.spec.ts
index 6bf7714a66d1..324a188adfbe 100644
--- a/packages/app/e2e/session/session-composer-dock.spec.ts
+++ b/packages/app/e2e/session/session-composer-dock.spec.ts
@@ -82,8 +82,7 @@ test("blocked permission flow supports allow once", async ({ page, sdk, gotoSess
       await seedSessionPermission(sdk, {
         sessionID: session.id,
         permission: "bash",
-        patterns: ["README.md"],
-        description: "Need permission for command",
+        patterns: [`REJECT_${Date.now()}.md`],
       })
 
       await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(1)
@@ -107,7 +106,7 @@ test("blocked permission flow supports reject", async ({ page, sdk, gotoSession
       await seedSessionPermission(sdk, {
         sessionID: session.id,
         permission: "bash",
-        patterns: ["REJECT.md"],
+        patterns: [`REJECT_${Date.now()}.md`],
       })
 
       await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(1)
@@ -128,8 +127,7 @@ test("blocked permission flow supports allow always", async ({ page, sdk, gotoSe
       await seedSessionPermission(sdk, {
         sessionID: session.id,
         permission: "bash",
-        patterns: ["README.md"],
-        description: "Need permission for command",
+        patterns: [`REJECT_${Date.now()}.md`],
       })
 
       await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(1)
diff --git a/packages/app/e2e/session/session-undo-redo.spec.ts b/packages/app/e2e/session/session-undo-redo.spec.ts
index c6ea2aea0aca..5e1a8d093eb3 100644
--- a/packages/app/e2e/session/session-undo-redo.spec.ts
+++ b/packages/app/e2e/session/session-undo-redo.spec.ts
@@ -107,6 +107,7 @@ test("slash redo clears revert and restores latest state", async ({ page, withPr
         })
         .toBe(seeded.userMessageID)
 
+      await expect(seeded.prompt).toContainText(token)
       await seeded.prompt.click()
       await page.keyboard.press(`${modKey}+A`)
       await page.keyboard.press("Backspace")
@@ -179,6 +180,7 @@ test("slash undo/redo traverses multi-step revert stack", async ({ page, withPro
       await expect(firstMessage.first()).toBeVisible()
       await expect(secondMessage).toHaveCount(0)
 
+      await expect(second.prompt).toContainText(secondToken)
       await second.prompt.click()
       await page.keyboard.press(`${modKey}+A`)
       await page.keyboard.press("Backspace")
@@ -195,6 +197,7 @@ test("slash undo/redo traverses multi-step revert stack", async ({ page, withPro
       await expect(firstMessage).toHaveCount(0)
       await expect(secondMessage).toHaveCount(0)
 
+      await expect(second.prompt).toContainText(firstToken)
       await second.prompt.click()
       await page.keyboard.press(`${modKey}+A`)
       await page.keyboard.press("Backspace")
diff --git a/packages/app/e2e/utils.ts b/packages/app/e2e/utils.ts
index e015a1e9b96c..06c14d20f12d 100644
--- a/packages/app/e2e/utils.ts
+++ b/packages/app/e2e/utils.ts
@@ -23,7 +23,7 @@ export async function getWorktree() {
 }
 
 export function dirSlug(directory: string) {
-  return base64Encode(directory)
+  return base64Encode(directory.replaceAll("\\", "/"))
 }
 
 export function dirPath(directory: string) {
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index 62094a6e4282..d4167edae099 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -1075,22 +1075,19 @@ export default function Layout(props: ParentProps) {
   }
 
   function projectRoot(directory: string) {
-    const project = layout.projects
-      .list()
-      .find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
+    const norm = directory.replaceAll("\\", "/")
+    const project = layout.projects.list().find((item) => item.worktree === norm || item.sandboxes?.includes(norm))
     if (project) return project.worktree
 
-    const known = Object.entries(store.workspaceOrder).find(
-      ([root, dirs]) => root === directory || dirs.includes(directory),
-    )
+    const known = Object.entries(store.workspaceOrder).find(([root, dirs]) => root === norm || dirs.includes(norm))
     if (known) return known[0]
 
-    const [child] = globalSync.child(directory, { bootstrap: false })
+    const [child] = globalSync.child(norm, { bootstrap: false })
     const id = child.project
-    if (!id) return directory
+    if (!id) return norm
 
     const meta = globalSync.data.project.find((item) => item.id === id)
-    return meta?.worktree ?? directory
+    return meta?.worktree ?? norm
   }
 
   function navigateToProject(directory: string | undefined) {
diff --git a/packages/opencode/src/file/time.ts b/packages/opencode/src/file/time.ts
index c85781eb4116..efb1c437647f 100644
--- a/packages/opencode/src/file/time.ts
+++ b/packages/opencode/src/file/time.ts
@@ -61,7 +61,8 @@ export namespace FileTime {
     const time = get(sessionID, filepath)
     if (!time) throw new Error(`You must read file ${filepath} before overwriting it. Use the Read tool first`)
     const mtime = Filesystem.stat(filepath)?.mtime
-    if (mtime && mtime.getTime() > time.getTime()) {
+    // Allow a 50ms tolerance for Windows NTFS timestamp fuzziness / async flushing
+    if (mtime && mtime.getTime() > time.getTime() + 50) {
       throw new Error(
         `File ${filepath} has been modified since it was last read.\nLast modification: ${mtime.toISOString()}\nLast read: ${time.toISOString()}\n\nPlease read the file again before modifying it.`,
       )

From 7702af203b7b4c3c3472c24ac7ef379298c7397c Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 17:56:55 +1000
Subject: [PATCH 09/33] fix(e2e): revert erroneous path normalization in layout
 and utils

---
 packages/app/e2e/utils.ts         |  2 +-
 packages/app/src/pages/layout.tsx | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/app/e2e/utils.ts b/packages/app/e2e/utils.ts
index 06c14d20f12d..e015a1e9b96c 100644
--- a/packages/app/e2e/utils.ts
+++ b/packages/app/e2e/utils.ts
@@ -23,7 +23,7 @@ export async function getWorktree() {
 }
 
 export function dirSlug(directory: string) {
-  return base64Encode(directory.replaceAll("\\", "/"))
+  return base64Encode(directory)
 }
 
 export function dirPath(directory: string) {
diff --git a/packages/app/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index d4167edae099..62094a6e4282 100644
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -1075,19 +1075,22 @@ export default function Layout(props: ParentProps) {
   }
 
   function projectRoot(directory: string) {
-    const norm = directory.replaceAll("\\", "/")
-    const project = layout.projects.list().find((item) => item.worktree === norm || item.sandboxes?.includes(norm))
+    const project = layout.projects
+      .list()
+      .find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
     if (project) return project.worktree
 
-    const known = Object.entries(store.workspaceOrder).find(([root, dirs]) => root === norm || dirs.includes(norm))
+    const known = Object.entries(store.workspaceOrder).find(
+      ([root, dirs]) => root === directory || dirs.includes(directory),
+    )
     if (known) return known[0]
 
-    const [child] = globalSync.child(norm, { bootstrap: false })
+    const [child] = globalSync.child(directory, { bootstrap: false })
     const id = child.project
-    if (!id) return norm
+    if (!id) return directory
 
     const meta = globalSync.data.project.find((item) => item.id === id)
-    return meta?.worktree ?? norm
+    return meta?.worktree ?? directory
   }
 
   function navigateToProject(directory: string | undefined) {

From 476ec502e228a47f29370e697b76153755cdd698 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:24:47 +1000
Subject: [PATCH 10/33] chore(e2e): limit playwright workers on local windows
 environments

---
 packages/app/playwright.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/app/playwright.config.ts b/packages/app/playwright.config.ts
index a97c8265144e..a7c07dd397bf 100644
--- a/packages/app/playwright.config.ts
+++ b/packages/app/playwright.config.ts
@@ -15,6 +15,7 @@ export default defineConfig({
     timeout: 10_000,
   },
   fullyParallel: process.env.PLAYWRIGHT_FULLY_PARALLEL === "1",
+  workers: process.env.CI ? undefined : process.platform === "win32" ? 3 : undefined,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],

From 5e654a2b2463026f34641162eb55033b7f49428f Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:34:00 +1000
Subject: [PATCH 11/33] parallel fixes

---
 packages/app/e2e/actions.ts       | 38 ++++++++++++++++++++++++++-----
 packages/app/playwright.config.ts |  1 -
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.ts
index a7ccba61752b..bebe9afb937a 100644
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -191,17 +191,43 @@ export async function seedProjects(page: Page, input: { directory: string; extra
   )
 }
 
+let gitTemplatePromise: Promise<string> | undefined
+async function getGitTemplate() {
+  if (gitTemplatePromise) return gitTemplatePromise
+  gitTemplatePromise = (async () => {
+    const templatePath = path.join(
+      os.tmpdir(),
+      "opencode-e2e-git-template-" + process.pid + "-" + Math.random().toString(36).slice(2),
+    )
+    await fs.mkdir(templatePath, { recursive: true })
+
+    for (let attempt = 1; attempt <= 5; attempt++) {
+      try {
+        execSync("git init", { cwd: templatePath, stdio: "ignore" })
+        execSync("git config core.longpaths true", { cwd: templatePath, stdio: "ignore" })
+        execSync('git -c user.name="e2e" -c user.email="e2e@example.com" commit -m "init" --allow-empty', {
+          cwd: templatePath,
+          stdio: "ignore",
+        })
+        break
+      } catch (err) {
+        if (attempt === 5) throw err
+        await new Promise((r) => setTimeout(r, 1000 + Math.random() * 2000))
+      }
+    }
+
+    return templatePath
+  })()
+  return gitTemplatePromise
+}
+
 export async function createTestProject() {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-e2e-project-"))
 
   await fs.writeFile(path.join(root, "README.md"), "# e2e\n")
 
-  execSync("git init", { cwd: root, stdio: "ignore" })
-  execSync("git add -A", { cwd: root, stdio: "ignore" })
-  execSync('git -c user.name="e2e" -c user.email="e2e@example.com" commit -m "init" --allow-empty', {
-    cwd: root,
-    stdio: "ignore",
-  })
+  const templatePath = await getGitTemplate()
+  await fs.cp(path.join(templatePath, ".git"), path.join(root, ".git"), { recursive: true })
 
   return root
 }
diff --git a/packages/app/playwright.config.ts b/packages/app/playwright.config.ts
index a7c07dd397bf..a97c8265144e 100644
--- a/packages/app/playwright.config.ts
+++ b/packages/app/playwright.config.ts
@@ -15,7 +15,6 @@ export default defineConfig({
     timeout: 10_000,
   },
   fullyParallel: process.env.PLAYWRIGHT_FULLY_PARALLEL === "1",
-  workers: process.env.CI ? undefined : process.platform === "win32" ? 3 : undefined,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],

From 06eaf992223b66fbdce87d0b6b719aa93b308bcf Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:37:33 +1000
Subject: [PATCH 12/33] fix: disable core.fsmonitor for snapshot git repo to
 prevent orphaned daemons

---
 packages/opencode/src/snapshot/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index 4aa23fc90a5d..d3bc63a99c99 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -66,6 +66,7 @@ export namespace Snapshot {
       await $`git --git-dir ${git} config core.autocrlf false`.quiet().nothrow()
       await $`git --git-dir ${git} config core.longpaths true`.quiet().nothrow()
       await $`git --git-dir ${git} config core.symlinks true`.quiet().nothrow()
+      await $`git --git-dir ${git} config core.fsmonitor false`.quiet().nothrow()
       log.info("initialized")
     }
     await add(git)

From 310d05f2033ef512dea4018c39b681a7393182c4 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:42:05 +1000
Subject: [PATCH 13/33] perf: optimize internal git snapshot performance on
 Windows

---
 packages/opencode/src/snapshot/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index d3bc63a99c99..c99be78e0342 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -67,6 +67,10 @@ export namespace Snapshot {
       await $`git --git-dir ${git} config core.longpaths true`.quiet().nothrow()
       await $`git --git-dir ${git} config core.symlinks true`.quiet().nothrow()
       await $`git --git-dir ${git} config core.fsmonitor false`.quiet().nothrow()
+      await $`git --git-dir ${git} config core.fscache true`.quiet().nothrow()
+      await $`git --git-dir ${git} config core.preloadIndex true`.quiet().nothrow()
+      await $`git --git-dir ${git} config core.untrackedCache true`.quiet().nothrow()
+      await $`git --git-dir ${git} config gc.auto 0`.quiet().nothrow()
       log.info("initialized")
     }
     await add(git)

From 01bd58de95ffd67434c7b8c98dd9d65ab29a7223 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:42:59 +1000
Subject: [PATCH 14/33] use node compatible

---
 packages/opencode/src/config/config.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 1004700e98fc..30030de08f54 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -1,6 +1,7 @@
 import { Log } from "../util/log"
 import path from "path"
-import { pathToFileURL } from "url"
+import { pathToFileURL, fileURLToPath } from "url"
+import { createRequire } from "module"
 import os from "os"
 import z from "zod"
 import { Filesystem } from "../util/filesystem"
@@ -1337,9 +1338,8 @@ export namespace Config {
             if (process.platform === "win32") {
               try {
                 // import.meta.resolve sometimes fails with newly created node_modules on Windows tests
-                const url = new URL(options.path)
-                const pathname = url.pathname.startsWith("/") ? url.pathname.slice(1) : url.pathname
-                const resolvedPath = Bun.resolveSync(plugin, path.dirname(pathname))
+                const require = createRequire(options.path)
+                const resolvedPath = require.resolve(plugin)
                 data.plugin[i] = pathToFileURL(resolvedPath).href
               } catch {
                 // Ignore, plugin might be a generic string identifier like "mcp-server"

From be9d10793dcad508a28cdba55dd8d3b210e29e5a Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:47:31 +1000
Subject: [PATCH 15/33] fix(e2e): track README in git template for workspace
 tests

---
 packages/app/e2e/actions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.ts
index bebe9afb937a..946aea65bf06 100644
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -203,8 +203,10 @@ async function getGitTemplate() {
 
     for (let attempt = 1; attempt <= 5; attempt++) {
       try {
+        await fs.writeFile(path.join(templatePath, "README.md"), "# e2e\n")
         execSync("git init", { cwd: templatePath, stdio: "ignore" })
         execSync("git config core.longpaths true", { cwd: templatePath, stdio: "ignore" })
+        execSync("git add -A", { cwd: templatePath, stdio: "ignore" })
         execSync('git -c user.name="e2e" -c user.email="e2e@example.com" commit -m "init" --allow-empty', {
           cwd: templatePath,
           stdio: "ignore",
@@ -224,10 +226,8 @@ async function getGitTemplate() {
 export async function createTestProject() {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-e2e-project-"))
 
-  await fs.writeFile(path.join(root, "README.md"), "# e2e\n")
-
   const templatePath = await getGitTemplate()
-  await fs.cp(path.join(templatePath, ".git"), path.join(root, ".git"), { recursive: true })
+  await fs.cp(templatePath, root, { recursive: true })
 
   return root
 }

From 3ba11dd1ae45380a10180992556b883afd523398 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 19:13:41 +1000
Subject: [PATCH 16/33] refactor: address code smells and flaky patterns

---
 .../app/e2e/prompt/prompt-mention.spec.ts     | 28 +++++++++++++------
 packages/opencode/src/project/project.ts      |  2 +-
 packages/opencode/test/config/config.test.ts  |  4 ++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/packages/app/e2e/prompt/prompt-mention.spec.ts b/packages/app/e2e/prompt/prompt-mention.spec.ts
index c7e04b8bfdbf..d12264663dbc 100644
--- a/packages/app/e2e/prompt/prompt-mention.spec.ts
+++ b/packages/app/e2e/prompt/prompt-mention.spec.ts
@@ -1,27 +1,39 @@
+import fs from "node:fs/promises"
+import path from "node:path"
 import { test, expect } from "../fixtures"
 import { promptSelector } from "../selectors"
 
 test("smoke @mention inserts file pill token", async ({ page, withProject }) => {
-  await withProject(async ({ gotoSession }) => {
+  await withProject(async ({ directory, gotoSession }) => {
+    // Scaffold nested file to test slashes and subdirectories
+    await fs.mkdir(path.join(directory, "packages", "app"), { recursive: true })
+    await fs.writeFile(path.join(directory, "packages", "app", "package.json"), "{}")
+
     await gotoSession()
 
+    // Wait a brief moment to ensure the ripgrep index has picked up the new file
     await page.waitForTimeout(3000)
 
-    await page.locator(promptSelector).click()
-    const file = "README.md"
-    const filePattern = /README\.md/
-
-    await page.keyboard.type(`@${file}`)
+    const file = "packages/app/package.json"
+    const filePattern = /packages[\\/]+app[\\/]+\s*package\.json/
 
     const suggestion = page.getByRole("button", { name: filePattern }).first()
-    await expect(suggestion).toBeVisible()
+
+    await expect(async () => {
+      await page.locator(promptSelector).click()
+      await page.keyboard.press("Control+A")
+      await page.keyboard.press("Backspace")
+      await page.keyboard.type(`@${file}`)
+      await expect(suggestion).toBeVisible({ timeout: 500 })
+    }).toPass({ timeout: 10_000 })
+
     await suggestion.hover()
 
     await page.keyboard.press("Tab")
 
     const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
     await expect(pill).toBeVisible()
-    await expect(pill).toHaveAttribute("data-path", "README.md")
+    await expect(pill).toHaveAttribute("data-path", filePattern)
 
     await page.keyboard.type(" ok")
     await expect(page.locator(promptSelector)).toContainText("ok")
diff --git a/packages/opencode/src/project/project.ts b/packages/opencode/src/project/project.ts
index 0d38d05b2b2d..6dd89c0a335e 100644
--- a/packages/opencode/src/project/project.ts
+++ b/packages/opencode/src/project/project.ts
@@ -311,7 +311,7 @@ export namespace Project {
 
     await work(10, sessions, async (row) => {
       // Skip sessions that belong to a different directory
-      if (row.directory && row.directory.replaceAll("\\", "/") !== worktree.replaceAll("\\", "/")) return
+      if (row.directory && path.relative(row.directory, worktree) !== "") return
 
       log.info("migrating session", { sessionID: row.id, from: "global", to: id })
       Database.use((db) => db.update(SessionTable).set({ project_id: id }).where(eq(SessionTable.id, row.id)).run())
diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts
index 3f05a2d6ed89..aa8e6260c7a7 100644
--- a/packages/opencode/test/config/config.test.ts
+++ b/packages/opencode/test/config/config.test.ts
@@ -694,7 +694,9 @@ test("resolves scoped npm plugins in config", async () => {
         expected = import.meta.resolve("@scope/plugin", baseUrl)
       } catch (e) {
         // Fallback for Windows where dynamically created node_modules aren't immediately available to import.meta.resolve
-        const resolvedPath = Bun.resolveSync("@scope/plugin", tmp.path)
+        const { createRequire } = await import("module")
+        const require = createRequire(tmp.path + "/")
+        const resolvedPath = require.resolve("@scope/plugin")
         expected = pathToFileURL(resolvedPath).href
       }
 

From e8e6b66b49c721f39b6e5c8de413f3a9bf8ad64b Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 19:19:43 +1000
Subject: [PATCH 17/33] fix(e2e): revert prompt-mention mock to use README.md
 for stability

---
 packages/app/e2e/prompt/prompt-mention.spec.ts | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/app/e2e/prompt/prompt-mention.spec.ts b/packages/app/e2e/prompt/prompt-mention.spec.ts
index d12264663dbc..2ead671beaed 100644
--- a/packages/app/e2e/prompt/prompt-mention.spec.ts
+++ b/packages/app/e2e/prompt/prompt-mention.spec.ts
@@ -1,21 +1,12 @@
-import fs from "node:fs/promises"
-import path from "node:path"
 import { test, expect } from "../fixtures"
 import { promptSelector } from "../selectors"
 
 test("smoke @mention inserts file pill token", async ({ page, withProject }) => {
-  await withProject(async ({ directory, gotoSession }) => {
-    // Scaffold nested file to test slashes and subdirectories
-    await fs.mkdir(path.join(directory, "packages", "app"), { recursive: true })
-    await fs.writeFile(path.join(directory, "packages", "app", "package.json"), "{}")
-
+  await withProject(async ({ gotoSession }) => {
     await gotoSession()
 
-    // Wait a brief moment to ensure the ripgrep index has picked up the new file
-    await page.waitForTimeout(3000)
-
-    const file = "packages/app/package.json"
-    const filePattern = /packages[\\/]+app[\\/]+\s*package\.json/
+    const file = "README.md"
+    const filePattern = /README\.md/
 
     const suggestion = page.getByRole("button", { name: filePattern }).first()
 
@@ -33,7 +24,7 @@ test("smoke @mention inserts file pill token", async ({ page, withProject }) =>
 
     const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
     await expect(pill).toBeVisible()
-    await expect(pill).toHaveAttribute("data-path", filePattern)
+    await expect(pill).toHaveAttribute("data-path", "README.md")
 
     await page.keyboard.type(" ok")
     await expect(page.locator(promptSelector)).toContainText("ok")

From d6d65f8a1b2194e3c94e3e79599572e0f9391081 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 20:12:58 +1000
Subject: [PATCH 18/33] fix(e2e): actually apply local workers limit to 3 on
 windows

---
 packages/app/playwright.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/app/playwright.config.ts b/packages/app/playwright.config.ts
index a97c8265144e..a7c07dd397bf 100644
--- a/packages/app/playwright.config.ts
+++ b/packages/app/playwright.config.ts
@@ -15,6 +15,7 @@ export default defineConfig({
     timeout: 10_000,
   },
   fullyParallel: process.env.PLAYWRIGHT_FULLY_PARALLEL === "1",
+  workers: process.env.CI ? undefined : process.platform === "win32" ? 3 : undefined,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],

From 9a0520ed5f01fb0f60ae9b356661de67617dc361 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 21:15:35 +1000
Subject: [PATCH 19/33] stability

---
 packages/app/e2e/actions.ts                   |  5 ++
 .../app/e2e/prompt/prompt-mention.spec.ts     | 14 ++--
 packages/opencode/src/config/config.ts        | 68 +++++++++++--------
 3 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.ts
index 946aea65bf06..fbee022193e7 100644
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -204,6 +204,11 @@ async function getGitTemplate() {
     for (let attempt = 1; attempt <= 5; attempt++) {
       try {
         await fs.writeFile(path.join(templatePath, "README.md"), "# e2e\n")
+
+        // Add a nested file to explicitly test nested path matching and slash normalization in E2E tests
+        await fs.mkdir(path.join(templatePath, "packages", "app"), { recursive: true })
+        await fs.writeFile(path.join(templatePath, "packages", "app", "package.json"), "{}")
+
         execSync("git init", { cwd: templatePath, stdio: "ignore" })
         execSync("git config core.longpaths true", { cwd: templatePath, stdio: "ignore" })
         execSync("git add -A", { cwd: templatePath, stdio: "ignore" })
diff --git a/packages/app/e2e/prompt/prompt-mention.spec.ts b/packages/app/e2e/prompt/prompt-mention.spec.ts
index 2ead671beaed..a38ce7fcddeb 100644
--- a/packages/app/e2e/prompt/prompt-mention.spec.ts
+++ b/packages/app/e2e/prompt/prompt-mention.spec.ts
@@ -1,12 +1,18 @@
+import fs from "node:fs/promises"
+import path from "node:path"
 import { test, expect } from "../fixtures"
 import { promptSelector } from "../selectors"
 
 test("smoke @mention inserts file pill token", async ({ page, withProject }) => {
-  await withProject(async ({ gotoSession }) => {
+  await withProject(async ({ directory, gotoSession }) => {
+    // Scaffold nested file to test slashes and subdirectories
+    await fs.mkdir(path.join(directory, "packages", "app"), { recursive: true })
+    await fs.writeFile(path.join(directory, "packages", "app", "package.json"), "{}")
+
     await gotoSession()
 
-    const file = "README.md"
-    const filePattern = /README\.md/
+    const file = "packages/app/package.json"
+    const filePattern = /packages[\\/]+app[\\/]+\s*package\.json/
 
     const suggestion = page.getByRole("button", { name: filePattern }).first()
 
@@ -24,7 +30,7 @@ test("smoke @mention inserts file pill token", async ({ page, withProject }) =>
 
     const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
     await expect(pill).toBeVisible()
-    await expect(pill).toHaveAttribute("data-path", "README.md")
+    await expect(pill).toHaveAttribute("data-path", filePattern)
 
     await page.keyboard.type(" ok")
     await expect(page.locator(promptSelector)).toContainText("ok")
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 30030de08f54..ccbd2c19e25b 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -265,37 +265,47 @@ export namespace Config {
     await Promise.all(deps)
   }
 
+  let installMutex = Promise.resolve()
+
   export async function installDependencies(dir: string) {
-    const pkg = path.join(dir, "package.json")
-    const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
-
-    const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
-      dependencies: {},
-    }))
-    json.dependencies = {
-      ...json.dependencies,
-      "@opencode-ai/plugin": targetVersion,
+    const execute = async () => {
+      const pkg = path.join(dir, "package.json")
+      const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
+
+      const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
+        dependencies: {},
+      }))
+      json.dependencies = {
+        ...json.dependencies,
+        "@opencode-ai/plugin": targetVersion,
+      }
+      await Filesystem.writeJson(pkg, json)
+      await new Promise((resolve) => setTimeout(resolve, 3000))
+
+      const gitignore = path.join(dir, ".gitignore")
+      const hasGitIgnore = await Filesystem.exists(gitignore)
+      if (!hasGitIgnore)
+        await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
+
+      // Install any additional dependencies defined in the package.json
+      // This allows local plugins and custom tools to use external packages
+      await BunProc.run(
+        [
+          "install",
+          // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
+          ...(proxied() || !!process.env.CI || !!process.env.OPENCODE_E2E ? ["--no-cache"] : []),
+        ],
+        { cwd: dir },
+      ).catch((err) => {
+        log.warn("failed to install dependencies", { dir, error: err })
+      })
     }
-    await Filesystem.writeJson(pkg, json)
-    await new Promise((resolve) => setTimeout(resolve, 3000))
-
-    const gitignore = path.join(dir, ".gitignore")
-    const hasGitIgnore = await Filesystem.exists(gitignore)
-    if (!hasGitIgnore)
-      await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
-
-    // Install any additional dependencies defined in the package.json
-    // This allows local plugins and custom tools to use external packages
-    await BunProc.run(
-      [
-        "install",
-        // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
-        ...(proxied() ? ["--no-cache"] : []),
-      ],
-      { cwd: dir },
-    ).catch((err) => {
-      log.warn("failed to install dependencies", { dir, error: err })
-    })
+
+    // Serialize bun install calls to prevent Windows NTFS cache corruption
+    // when multiple directories trigger installation simultaneously.
+    const run = installMutex.then(execute)
+    installMutex = run.catch(() => {})
+    await run
   }
 
   async function isWritable(dir: string) {

From 8d34df10c76ac3c1937a1966565e20d8d21833f8 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 21:33:25 +1000
Subject: [PATCH 20/33] fix(test): remove bun install mutex and apply longer
 timeouts for plugin installation tests

---
 packages/opencode/src/config/config.ts       | 70 +++++++++-----------
 packages/opencode/test/config/config.test.ts |  2 +-
 packages/opencode/test/tool/registry.test.ts | 14 ++--
 3 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index ccbd2c19e25b..06191faef9ca 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -265,47 +265,39 @@ export namespace Config {
     await Promise.all(deps)
   }
 
-  let installMutex = Promise.resolve()
-
   export async function installDependencies(dir: string) {
-    const execute = async () => {
-      const pkg = path.join(dir, "package.json")
-      const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
-
-      const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
-        dependencies: {},
-      }))
-      json.dependencies = {
-        ...json.dependencies,
-        "@opencode-ai/plugin": targetVersion,
-      }
-      await Filesystem.writeJson(pkg, json)
-      await new Promise((resolve) => setTimeout(resolve, 3000))
-
-      const gitignore = path.join(dir, ".gitignore")
-      const hasGitIgnore = await Filesystem.exists(gitignore)
-      if (!hasGitIgnore)
-        await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
-
-      // Install any additional dependencies defined in the package.json
-      // This allows local plugins and custom tools to use external packages
-      await BunProc.run(
-        [
-          "install",
-          // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
-          ...(proxied() || !!process.env.CI || !!process.env.OPENCODE_E2E ? ["--no-cache"] : []),
-        ],
-        { cwd: dir },
-      ).catch((err) => {
-        log.warn("failed to install dependencies", { dir, error: err })
-      })
+    const pkg = path.join(dir, "package.json")
+    const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
+
+    const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
+      dependencies: {},
+    }))
+    json.dependencies = {
+      ...json.dependencies,
+      "@opencode-ai/plugin": targetVersion,
     }
-
-    // Serialize bun install calls to prevent Windows NTFS cache corruption
-    // when multiple directories trigger installation simultaneously.
-    const run = installMutex.then(execute)
-    installMutex = run.catch(() => {})
-    await run
+    await Filesystem.writeJson(pkg, json)
+    await new Promise((resolve) => setTimeout(resolve, 3000))
+
+    const gitignore = path.join(dir, ".gitignore")
+    const hasGitIgnore = await Filesystem.exists(gitignore)
+    if (!hasGitIgnore)
+      await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
+
+    // Install any additional dependencies defined in the package.json
+    // This allows local plugins and custom tools to use external packages
+    await BunProc.run(
+      [
+        "install",
+        // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
+        // Bypass global cache in E2E environments to prevent concurrent lock contention
+        // on Windows when multiple Playwright worker backends initialize plugins simultaneously.
+        ...(proxied() || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
+      ],
+      { cwd: dir },
+    ).catch((err) => {
+      log.warn("failed to install dependencies", { dir, error: err })
+    })
   }
 
   async function isWritable(dir: string) {
diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts
index aa8e6260c7a7..0a70b89b8799 100644
--- a/packages/opencode/test/config/config.test.ts
+++ b/packages/opencode/test/config/config.test.ts
@@ -646,7 +646,7 @@ test("installs dependencies in writable OPENCODE_CONFIG_DIR", async () => {
     if (prev === undefined) delete process.env.OPENCODE_CONFIG_DIR
     else process.env.OPENCODE_CONFIG_DIR = prev
   }
-})
+}, 30_000)
 
 test("resolves scoped npm plugins in config", async () => {
   await using tmp = await tmpdir({
diff --git a/packages/opencode/test/tool/registry.test.ts b/packages/opencode/test/tool/registry.test.ts
index 706a9e12caf9..52557d319cc4 100644
--- a/packages/opencode/test/tool/registry.test.ts
+++ b/packages/opencode/test/tool/registry.test.ts
@@ -38,7 +38,7 @@ describe("tool.registry", () => {
         expect(ids).toContain("hello")
       },
     })
-  })
+  }, 30_000)
 
   test("loads tools from .opencode/tools (plural)", async () => {
     await using tmp = await tmpdir({
@@ -72,7 +72,7 @@ describe("tool.registry", () => {
         expect(ids).toContain("hello")
       },
     })
-  })
+  }, 30_000)
 
   test("loads tools with external dependencies without crashing", async () => {
     await using tmp = await tmpdir({
@@ -99,10 +99,10 @@ describe("tool.registry", () => {
           [
             "import { say } from 'cowsay'",
             "export default {",
-            "  description: 'tool that imports cowsay at top level',",
-            "  args: { text: { type: 'string' } },",
-            "  execute: async ({ text }: { text: string }) => {",
-            "    return say({ text })",
+            "  description: 'says hello',",
+            "  args: {},",
+            "  execute: async () => {",
+            "    return say({ text: 'hello' })",
             "  },",
             "}",
             "",
@@ -118,5 +118,5 @@ describe("tool.registry", () => {
         expect(ids).toContain("cowsay")
       },
     })
-  })
+  }, 30_000)
 })

From 1f5068b4c40f5f11f3483dba909060b967715ddc Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 22:27:02 +1000
Subject: [PATCH 21/33] what the slop

---
 packages/app/e2e/actions.ts                   |  5 ++
 .../e2e/session/session-composer-dock.spec.ts |  6 +-
 packages/opencode/src/config/config.ts        | 17 ++--
 packages/opencode/src/file/index.ts           |  5 +-
 packages/opencode/src/session/index.ts        | 82 ++++++++-----------
 5 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.ts
index fbee022193e7..00274faf4438 100644
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -234,6 +234,11 @@ export async function createTestProject() {
   const templatePath = await getGitTemplate()
   await fs.cp(templatePath, root, { recursive: true })
 
+  const gitIdPath = path.join(root, ".git", "opencode")
+  if (await fs.stat(path.join(root, ".git")).catch(() => false)) {
+    await fs.writeFile(gitIdPath, Math.random().toString(36).slice(2))
+  }
+
   return root
 }
 
diff --git a/packages/app/e2e/session/session-composer-dock.spec.ts b/packages/app/e2e/session/session-composer-dock.spec.ts
index 324a188adfbe..1874f7cdfd33 100644
--- a/packages/app/e2e/session/session-composer-dock.spec.ts
+++ b/packages/app/e2e/session/session-composer-dock.spec.ts
@@ -15,7 +15,11 @@ type Sdk = Parameters<typeof clearSessionDockSeed>[0]
 async function withDockSession<T>(sdk: Sdk, title: string, fn: (session: { id: string; title: string }) => Promise<T>) {
   const session = await sdk.session.create({ title }).then((r) => r.data)
   if (!session?.id) throw new Error("Session create did not return an id")
-  return fn(session)
+  try {
+    return await fn(session)
+  } finally {
+    await sdk.session.delete({ sessionID: session.id }).catch(() => undefined)
+  }
 }
 
 test.setTimeout(120_000)
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 06191faef9ca..501c9d666106 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -1337,17 +1337,14 @@ export namespace Config {
           try {
             data.plugin[i] = import.meta.resolve!(plugin, options.path)
           } catch (e) {
-            if (process.platform === "win32") {
-              try {
-                // import.meta.resolve sometimes fails with newly created node_modules on Windows tests
-                const require = createRequire(options.path)
-                const resolvedPath = require.resolve(plugin)
-                data.plugin[i] = pathToFileURL(resolvedPath).href
-              } catch {
-                // Ignore, plugin might be a generic string identifier like "mcp-server"
-              }
+            try {
+              // import.meta.resolve sometimes fails with newly created node_modules
+              const require = createRequire(options.path)
+              const resolvedPath = require.resolve(plugin)
+              data.plugin[i] = pathToFileURL(resolvedPath).href
+            } catch {
+              // Ignore, plugin might be a generic string identifier like "mcp-server"
             }
-            // If not Windows, or if fallback failed, it remains unchanged (generic identifier)
           }
         }
       }
diff --git a/packages/opencode/src/file/index.ts b/packages/opencode/src/file/index.ts
index b7daddc5fb8e..7a84751e9320 100644
--- a/packages/opencode/src/file/index.ts
+++ b/packages/opencode/src/file/index.ts
@@ -379,7 +379,8 @@ export namespace File {
       }
 
       const set = new Set<string>()
-      for await (const file of Ripgrep.files({ cwd: Instance.directory })) {
+      for await (let file of Ripgrep.files({ cwd: Instance.directory })) {
+        if (process.platform === "win32") file = file.replaceAll("\\", "/")
         result.files.push(file)
         let current = file
         while (true) {
@@ -605,7 +606,7 @@ export namespace File {
   }
 
   export async function search(input: { query: string; limit?: number; dirs?: boolean; type?: "file" | "directory" }) {
-    const query = input.query.trim()
+    const query = input.query.trim().replaceAll("\\", "/")
     const limit = input.limit ?? 100
     const kind = input.type ?? (input.dirs === false ? "file" : "all")
     log.info("search", { query, kind })
diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts
index 7e7bf3420d1a..8454a9c3e975 100644
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -670,30 +670,22 @@ export namespace Session {
   export const updateMessage = fn(MessageV2.Info, async (msg) => {
     const time_created = msg.time.created
     const { id, sessionID, ...data } = msg
-    try {
-      Database.use((db) => {
-        db.insert(MessageTable)
-          .values({
-            id,
-            session_id: sessionID,
-            time_created,
-            data,
-          })
-          .onConflictDoUpdate({ target: MessageTable.id, set: { data } })
-          .run()
-        Database.effect(() =>
-          Bus.publish(MessageV2.Event.Updated, {
-            info: msg,
-          }),
-        )
-      })
-    } catch (e) {
-      if (e instanceof Error && e.message.includes("FOREIGN KEY constraint failed")) {
-        log.warn("session deleted while updating message", { sessionID, messageID: id })
-        return msg
-      }
-      throw e
-    }
+    Database.use((db) => {
+      db.insert(MessageTable)
+        .values({
+          id,
+          session_id: sessionID,
+          time_created,
+          data,
+        })
+        .onConflictDoUpdate({ target: MessageTable.id, set: { data } })
+        .run()
+      Database.effect(() =>
+        Bus.publish(MessageV2.Event.Updated, {
+          info: msg,
+        }),
+      )
+    })
     return msg
   })
 
@@ -743,31 +735,23 @@ export namespace Session {
   export const updatePart = fn(UpdatePartInput, async (part) => {
     const { id, messageID, sessionID, ...data } = part
     const time = Date.now()
-    try {
-      Database.use((db) => {
-        db.insert(PartTable)
-          .values({
-            id,
-            message_id: messageID,
-            session_id: sessionID,
-            time_created: time,
-            data,
-          })
-          .onConflictDoUpdate({ target: PartTable.id, set: { data } })
-          .run()
-        Database.effect(() =>
-          Bus.publish(MessageV2.Event.PartUpdated, {
-            part,
-          }),
-        )
-      })
-    } catch (e) {
-      if (e instanceof Error && e.message?.includes("FOREIGN KEY constraint failed")) {
-        log.warn("session deleted while updating part", { sessionID, messageID, partID: id })
-        return part
-      }
-      throw e
-    }
+    Database.use((db) => {
+      db.insert(PartTable)
+        .values({
+          id,
+          message_id: messageID,
+          session_id: sessionID,
+          time_created: time,
+          data,
+        })
+        .onConflictDoUpdate({ target: PartTable.id, set: { data } })
+        .run()
+      Database.effect(() =>
+        Bus.publish(MessageV2.Event.PartUpdated, {
+          part,
+        }),
+      )
+    })
     return part
   })
 

From 21585eb39e5bcfd293554f2e58f42289b4ce1821 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:10:18 +1000
Subject: [PATCH 22/33] slopity slop

---
 packages/app/e2e/actions.ts              |  3 +-
 packages/opencode/src/config/config.ts   | 72 ++++++++++++---------
 packages/opencode/src/session/index.ts   | 82 ++++++++++++++----------
 packages/opencode/src/session/prompt.ts  |  3 +-
 packages/opencode/src/session/summary.ts | 17 +++--
 5 files changed, 105 insertions(+), 72 deletions(-)

diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.ts
index 00274faf4438..497fc1815e2b 100644
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -236,7 +236,8 @@ export async function createTestProject() {
 
   const gitIdPath = path.join(root, ".git", "opencode")
   if (await fs.stat(path.join(root, ".git")).catch(() => false)) {
-    await fs.writeFile(gitIdPath, Math.random().toString(36).slice(2))
+    // Generate a uniquely identifiable string for this specific test project instance
+    await fs.writeFile(gitIdPath, Math.random().toString(36).slice(2) + "-" + Date.now().toString())
   }
 
   return root
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 501c9d666106..076cdf580477 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -265,39 +265,49 @@ export namespace Config {
     await Promise.all(deps)
   }
 
+  let installMutex = Promise.resolve()
+
   export async function installDependencies(dir: string) {
-    const pkg = path.join(dir, "package.json")
-    const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
-
-    const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
-      dependencies: {},
-    }))
-    json.dependencies = {
-      ...json.dependencies,
-      "@opencode-ai/plugin": targetVersion,
+    const execute = async () => {
+      const pkg = path.join(dir, "package.json")
+      const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
+
+      const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
+        dependencies: {},
+      }))
+      json.dependencies = {
+        ...json.dependencies,
+        "@opencode-ai/plugin": targetVersion,
+      }
+      await Filesystem.writeJson(pkg, json)
+      await new Promise((resolve) => setTimeout(resolve, 3000))
+
+      const gitignore = path.join(dir, ".gitignore")
+      const hasGitIgnore = await Filesystem.exists(gitignore)
+      if (!hasGitIgnore)
+        await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
+
+      // Install any additional dependencies defined in the package.json
+      // This allows local plugins and custom tools to use external packages
+      await BunProc.run(
+        [
+          "install",
+          // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
+          // Bypass global cache in E2E environments to prevent concurrent lock contention
+          // on Windows when multiple Playwright worker backends initialize plugins simultaneously.
+          ...(proxied() || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
+        ],
+        { cwd: dir },
+      ).catch((err) => {
+        log.warn("failed to install dependencies", { dir, error: err })
+      })
     }
-    await Filesystem.writeJson(pkg, json)
-    await new Promise((resolve) => setTimeout(resolve, 3000))
-
-    const gitignore = path.join(dir, ".gitignore")
-    const hasGitIgnore = await Filesystem.exists(gitignore)
-    if (!hasGitIgnore)
-      await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
-
-    // Install any additional dependencies defined in the package.json
-    // This allows local plugins and custom tools to use external packages
-    await BunProc.run(
-      [
-        "install",
-        // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
-        // Bypass global cache in E2E environments to prevent concurrent lock contention
-        // on Windows when multiple Playwright worker backends initialize plugins simultaneously.
-        ...(proxied() || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
-      ],
-      { cwd: dir },
-    ).catch((err) => {
-      log.warn("failed to install dependencies", { dir, error: err })
-    })
+
+    // Serialize bun install calls to prevent Windows NTFS cache corruption
+    // when multiple directories trigger installation simultaneously.
+    const run = installMutex.then(execute)
+    installMutex = run.catch(() => {})
+    await run
   }
 
   async function isWritable(dir: string) {
diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts
index 8454a9c3e975..7e7bf3420d1a 100644
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -670,22 +670,30 @@ export namespace Session {
   export const updateMessage = fn(MessageV2.Info, async (msg) => {
     const time_created = msg.time.created
     const { id, sessionID, ...data } = msg
-    Database.use((db) => {
-      db.insert(MessageTable)
-        .values({
-          id,
-          session_id: sessionID,
-          time_created,
-          data,
-        })
-        .onConflictDoUpdate({ target: MessageTable.id, set: { data } })
-        .run()
-      Database.effect(() =>
-        Bus.publish(MessageV2.Event.Updated, {
-          info: msg,
-        }),
-      )
-    })
+    try {
+      Database.use((db) => {
+        db.insert(MessageTable)
+          .values({
+            id,
+            session_id: sessionID,
+            time_created,
+            data,
+          })
+          .onConflictDoUpdate({ target: MessageTable.id, set: { data } })
+          .run()
+        Database.effect(() =>
+          Bus.publish(MessageV2.Event.Updated, {
+            info: msg,
+          }),
+        )
+      })
+    } catch (e) {
+      if (e instanceof Error && e.message.includes("FOREIGN KEY constraint failed")) {
+        log.warn("session deleted while updating message", { sessionID, messageID: id })
+        return msg
+      }
+      throw e
+    }
     return msg
   })
 
@@ -735,23 +743,31 @@ export namespace Session {
   export const updatePart = fn(UpdatePartInput, async (part) => {
     const { id, messageID, sessionID, ...data } = part
     const time = Date.now()
-    Database.use((db) => {
-      db.insert(PartTable)
-        .values({
-          id,
-          message_id: messageID,
-          session_id: sessionID,
-          time_created: time,
-          data,
-        })
-        .onConflictDoUpdate({ target: PartTable.id, set: { data } })
-        .run()
-      Database.effect(() =>
-        Bus.publish(MessageV2.Event.PartUpdated, {
-          part,
-        }),
-      )
-    })
+    try {
+      Database.use((db) => {
+        db.insert(PartTable)
+          .values({
+            id,
+            message_id: messageID,
+            session_id: sessionID,
+            time_created: time,
+            data,
+          })
+          .onConflictDoUpdate({ target: PartTable.id, set: { data } })
+          .run()
+        Database.effect(() =>
+          Bus.publish(MessageV2.Event.PartUpdated, {
+            part,
+          }),
+        )
+      })
+    } catch (e) {
+      if (e instanceof Error && e.message?.includes("FOREIGN KEY constraint failed")) {
+        log.warn("session deleted while updating part", { sessionID, messageID, partID: id })
+        return part
+      }
+      throw e
+    }
     return part
   })
 
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index c3a18600aafc..8f5b78dbbdcb 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -726,7 +726,8 @@ export namespace SessionPrompt {
       }
       return item
     }
-    throw new Error("Impossible")
+    // Session may have been deleted concurrently during teardown
+    log.warn("no assistant message found after loop", { sessionID })
   })
 
   async function lastModel(sessionID: string) {
diff --git a/packages/opencode/src/session/summary.ts b/packages/opencode/src/session/summary.ts
index 349336ba788f..d438fb230a78 100644
--- a/packages/opencode/src/session/summary.ts
+++ b/packages/opencode/src/session/summary.ts
@@ -72,11 +72,15 @@ export namespace SessionSummary {
       messageID: z.string(),
     }),
     async (input) => {
-      const all = await Session.messages({ sessionID: input.sessionID })
-      await Promise.all([
-        summarizeSession({ sessionID: input.sessionID, messages: all }),
-        summarizeMessage({ messageID: input.messageID, messages: all }),
-      ])
+      try {
+        const all = await Session.messages({ sessionID: input.sessionID })
+        await Promise.all([
+          summarizeSession({ sessionID: input.sessionID, messages: all }),
+          summarizeMessage({ messageID: input.messageID, messages: all }),
+        ])
+      } catch {
+        // Session may have been deleted concurrently; safe to ignore
+      }
     },
   )
 
@@ -101,7 +105,8 @@ export namespace SessionSummary {
     const messages = input.messages.filter(
       (m) => m.info.id === input.messageID || (m.info.role === "assistant" && m.info.parentID === input.messageID),
     )
-    const msgWithParts = messages.find((m) => m.info.id === input.messageID)!
+    const msgWithParts = messages.find((m) => m.info.id === input.messageID)
+    if (!msgWithParts) return
     const userMsg = msgWithParts.info as MessageV2.User
     const diffs = await computeDiff({ messages })
     userMsg.summary = {

From e14e25a12aca49ef31f2fd62a326fd36b757777e Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:16:41 +1000
Subject: [PATCH 23/33] fix: harden session teardown races and add missing
 longpaths flags

---
 packages/opencode/src/session/prompt.ts  |  2 +-
 packages/opencode/src/session/summary.ts | 15 ++++++---------
 packages/opencode/src/snapshot/index.ts  | 17 +++++++++--------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 8f5b78dbbdcb..b16b1b60cb1f 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -337,7 +337,7 @@ export namespace SessionPrompt {
           modelID: lastUser.model.modelID,
           providerID: lastUser.model.providerID,
           history: msgs,
-        })
+        }).catch(() => {})
 
       const model = await Provider.getModel(lastUser.model.providerID, lastUser.model.modelID).catch((e) => {
         if (Provider.ModelNotFoundError.isInstance(e)) {
diff --git a/packages/opencode/src/session/summary.ts b/packages/opencode/src/session/summary.ts
index d438fb230a78..710421319de8 100644
--- a/packages/opencode/src/session/summary.ts
+++ b/packages/opencode/src/session/summary.ts
@@ -72,15 +72,12 @@ export namespace SessionSummary {
       messageID: z.string(),
     }),
     async (input) => {
-      try {
-        const all = await Session.messages({ sessionID: input.sessionID })
-        await Promise.all([
-          summarizeSession({ sessionID: input.sessionID, messages: all }),
-          summarizeMessage({ messageID: input.messageID, messages: all }),
-        ])
-      } catch {
-        // Session may have been deleted concurrently; safe to ignore
-      }
+      const all = await Session.messages({ sessionID: input.sessionID }).catch(() => [] as MessageV2.WithParts[])
+      if (!all.length) return
+      await Promise.all([
+        summarizeSession({ sessionID: input.sessionID, messages: all }).catch(() => {}),
+        summarizeMessage({ messageID: input.messageID, messages: all }).catch(() => {}),
+      ])
     },
   )
 
diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index c99be78e0342..5c15f463dfed 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -120,7 +120,7 @@ export namespace Snapshot {
     log.info("restore", { commit: snapshot })
     const git = gitdir()
     const result =
-      await $`git --git-dir ${git} --work-tree ${Instance.worktree} read-tree ${snapshot} && git --git-dir ${git} --work-tree ${Instance.worktree} checkout-index -a -f`
+      await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} read-tree ${snapshot} && git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} checkout-index -a -f`
         .quiet()
         .cwd(Instance.worktree)
         .nothrow()
@@ -142,14 +142,15 @@ export namespace Snapshot {
       for (const file of item.files) {
         if (files.has(file)) continue
         log.info("reverting", { file, hash: item.hash })
-        const result = await $`git --git-dir ${git} --work-tree ${Instance.worktree} checkout ${item.hash} -- ${file}`
-          .quiet()
-          .cwd(Instance.worktree)
-          .nothrow()
+        const result =
+          await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} checkout ${item.hash} -- ${file}`
+            .quiet()
+            .cwd(Instance.worktree)
+            .nothrow()
         if (result.exitCode !== 0) {
           const relativePath = path.relative(Instance.worktree, file)
           const checkTree =
-            await $`git --git-dir ${git} --work-tree ${Instance.worktree} ls-tree ${item.hash} -- ${relativePath}`
+            await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} ls-tree ${item.hash} -- ${relativePath}`
               .quiet()
               .cwd(Instance.worktree)
               .nothrow()
@@ -208,7 +209,7 @@ export namespace Snapshot {
     const status = new Map<string, "added" | "deleted" | "modified">()
 
     const statuses =
-      await $`git -c core.autocrlf=false -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-status --no-renames ${from} ${to} -- .`
+      await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-status --no-renames ${from} ${to} -- .`
         .quiet()
         .cwd(Instance.directory)
         .nothrow()
@@ -222,7 +223,7 @@ export namespace Snapshot {
       status.set(file, kind)
     }
 
-    for await (const line of $`git -c core.autocrlf=false -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --no-renames --numstat ${from} ${to} -- .`
+    for await (const line of $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --no-renames --numstat ${from} ${to} -- .`
       .quiet()
       .cwd(Instance.directory)
       .nothrow()

From 35d9cebe0186ae69a0d8f734038870735845b96b Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:21:11 +1000
Subject: [PATCH 24/33] fix: restore throw to preserve loop return type for
 typecheck

---
 packages/opencode/src/session/prompt.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index b16b1b60cb1f..f4458c327538 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -726,8 +726,7 @@ export namespace SessionPrompt {
       }
       return item
     }
-    // Session may have been deleted concurrently during teardown
-    log.warn("no assistant message found after loop", { sessionID })
+    throw new Error("no assistant message found after loop")
   })
 
   async function lastModel(sessionID: string) {

From ae411839dfb77d89ad37ac4a090af77482396c9d Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:28:00 +1000
Subject: [PATCH 25/33] fix: restore --no-cache on CI to prevent bun install
 cache contention

---
 packages/opencode/src/config/config.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 076cdf580477..71aeebb706c7 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -293,9 +293,9 @@ export namespace Config {
         [
           "install",
           // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
-          // Bypass global cache in E2E environments to prevent concurrent lock contention
-          // on Windows when multiple Playwright worker backends initialize plugins simultaneously.
-          ...(proxied() || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
+          // Bypass global cache on CI and E2E environments to prevent concurrent
+          // lock contention when multiple processes install simultaneously.
+          ...(proxied() || !!process.env.CI || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
         ],
         { cwd: dir },
       ).catch((err) => {

From 5a940c85bb80ee45c12b88b95c7dd5d2b32837cd Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:32:47 +1000
Subject: [PATCH 26/33] fix: skip 3s install delay on CI to prevent test
 timeouts

---
 packages/opencode/src/config/config.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 71aeebb706c7..47dbcd039637 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -280,7 +280,9 @@ export namespace Config {
         "@opencode-ai/plugin": targetVersion,
       }
       await Filesystem.writeJson(pkg, json)
-      await new Promise((resolve) => setTimeout(resolve, 3000))
+      // Brief delay to let filesystem flush before bun install reads the file.
+      // Skipped on CI where --no-cache already ensures clean installs.
+      if (!process.env.CI) await new Promise((resolve) => setTimeout(resolve, 3000))
 
       const gitignore = path.join(dir, ".gitignore")
       const hasGitIgnore = await Filesystem.exists(gitignore)

From a9c56d4012b0f44bcd3420697b938ebca59c6101 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:34:42 +1000
Subject: [PATCH 27/33] fix: remove install mutex and 3s delay, rely on
 --no-cache for parallel safety

---
 packages/opencode/src/config/config.ts | 73 +++++++++++---------------
 1 file changed, 30 insertions(+), 43 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 47dbcd039637..708454d6395b 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -265,51 +265,38 @@ export namespace Config {
     await Promise.all(deps)
   }
 
-  let installMutex = Promise.resolve()
-
   export async function installDependencies(dir: string) {
-    const execute = async () => {
-      const pkg = path.join(dir, "package.json")
-      const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
-
-      const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
-        dependencies: {},
-      }))
-      json.dependencies = {
-        ...json.dependencies,
-        "@opencode-ai/plugin": targetVersion,
-      }
-      await Filesystem.writeJson(pkg, json)
-      // Brief delay to let filesystem flush before bun install reads the file.
-      // Skipped on CI where --no-cache already ensures clean installs.
-      if (!process.env.CI) await new Promise((resolve) => setTimeout(resolve, 3000))
-
-      const gitignore = path.join(dir, ".gitignore")
-      const hasGitIgnore = await Filesystem.exists(gitignore)
-      if (!hasGitIgnore)
-        await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
-
-      // Install any additional dependencies defined in the package.json
-      // This allows local plugins and custom tools to use external packages
-      await BunProc.run(
-        [
-          "install",
-          // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
-          // Bypass global cache on CI and E2E environments to prevent concurrent
-          // lock contention when multiple processes install simultaneously.
-          ...(proxied() || !!process.env.CI || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
-        ],
-        { cwd: dir },
-      ).catch((err) => {
-        log.warn("failed to install dependencies", { dir, error: err })
-      })
+    const pkg = path.join(dir, "package.json")
+    const targetVersion = Installation.isLocal() ? "*" : Installation.VERSION
+
+    const json = await Filesystem.readJson<{ dependencies?: Record<string, string> }>(pkg).catch(() => ({
+      dependencies: {},
+    }))
+    json.dependencies = {
+      ...json.dependencies,
+      "@opencode-ai/plugin": targetVersion,
     }
-
-    // Serialize bun install calls to prevent Windows NTFS cache corruption
-    // when multiple directories trigger installation simultaneously.
-    const run = installMutex.then(execute)
-    installMutex = run.catch(() => {})
-    await run
+    await Filesystem.writeJson(pkg, json)
+
+    const gitignore = path.join(dir, ".gitignore")
+    const hasGitIgnore = await Filesystem.exists(gitignore)
+    if (!hasGitIgnore)
+      await Filesystem.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))
+
+    // Install any additional dependencies defined in the package.json
+    // This allows local plugins and custom tools to use external packages
+    await BunProc.run(
+      [
+        "install",
+        // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
+        // Bypass global cache on CI and E2E to prevent concurrent lock contention
+        // when multiple processes install simultaneously.
+        ...(proxied() || !!process.env.CI || !!process.env.OPENCODE_E2E_PROJECT_DIR ? ["--no-cache"] : []),
+      ],
+      { cwd: dir },
+    ).catch((err) => {
+      log.warn("failed to install dependencies", { dir, error: err })
+    })
   }
 
   async function isWritable(dir: string) {

From 62215300fe42234080655081aaeca3c64ff720ba Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Tue, 24 Feb 2026 20:14:19 +1000
Subject: [PATCH 28/33] revert: remove glob result normalization, keep native
 paths

---
 packages/opencode/src/util/glob.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/util/glob.ts b/packages/opencode/src/util/glob.ts
index 59a1017925e0..febf062daa47 100644
--- a/packages/opencode/src/util/glob.ts
+++ b/packages/opencode/src/util/glob.ts
@@ -21,13 +21,11 @@ export namespace Glob {
   }
 
   export async function scan(pattern: string, options: Options = {}): Promise<string[]> {
-    const results = (await glob(pattern, toGlobOptions(options))) as string[]
-    return results.map((p) => p.replaceAll("\\", "/"))
+    return glob(pattern, toGlobOptions(options)) as Promise<string[]>
   }
 
   export function scanSync(pattern: string, options: Options = {}): string[] {
-    const results = globSync(pattern, toGlobOptions(options)) as string[]
-    return results.map((p) => p.replaceAll("\\", "/"))
+    return globSync(pattern, toGlobOptions(options)) as string[]
   }
 
   export function match(pattern: string, filepath: string): boolean {

From a5206c66babe489c001a116f34870a2a0d318294 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Tue, 24 Feb 2026 20:19:51 +1000
Subject: [PATCH 29/33] fix(test): use native paths in assertions after
 reverting glob normalization

---
 packages/opencode/test/skill/skill.test.ts | 20 ++++++--------------
 packages/opencode/test/tool/skill.test.ts  |  2 +-
 packages/opencode/test/util/glob.test.ts   |  2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/opencode/test/skill/skill.test.ts b/packages/opencode/test/skill/skill.test.ts
index cbe72c103f46..2264723a090d 100644
--- a/packages/opencode/test/skill/skill.test.ts
+++ b/packages/opencode/test/skill/skill.test.ts
@@ -50,7 +50,7 @@ Instructions here.
       const testSkill = skills.find((s) => s.name === "test-skill")
       expect(testSkill).toBeDefined()
       expect(testSkill!.description).toBe("A test skill for verification.")
-      expect(testSkill!.location).toContain(path.join("skill", "test-skill", "SKILL.md").replaceAll("\\", "/"))
+      expect(testSkill!.location).toContain(path.join("skill", "test-skill", "SKILL.md"))
     },
   })
 })
@@ -81,7 +81,7 @@ description: Skill for dirs test.
       directory: tmp.path,
       fn: async () => {
         const dirs = await Skill.dirs()
-        const skillDir = path.join(tmp.path, ".opencode", "skill", "dir-skill").replaceAll("\\", "/")
+        const skillDir = path.join(tmp.path, ".opencode", "skill", "dir-skill")
         expect(dirs).toContain(skillDir)
         expect(dirs.length).toBe(1)
       },
@@ -180,9 +180,7 @@ description: A skill in the .claude/skills directory.
       expect(skills.length).toBe(1)
       const claudeSkill = skills.find((s) => s.name === "claude-skill")
       expect(claudeSkill).toBeDefined()
-      expect(claudeSkill!.location).toContain(
-        path.join(".claude", "skills", "claude-skill", "SKILL.md").replaceAll("\\", "/"),
-      )
+      expect(claudeSkill!.location).toContain(path.join(".claude", "skills", "claude-skill", "SKILL.md"))
     },
   })
 })
@@ -202,9 +200,7 @@ test("discovers global skills from ~/.claude/skills/ directory", async () => {
         expect(skills.length).toBe(1)
         expect(skills[0].name).toBe("global-test-skill")
         expect(skills[0].description).toBe("A global skill from ~/.claude/skills for testing.")
-        expect(skills[0].location).toContain(
-          path.join(".claude", "skills", "global-test-skill", "SKILL.md").replaceAll("\\", "/"),
-        )
+        expect(skills[0].location).toContain(path.join(".claude", "skills", "global-test-skill", "SKILL.md"))
       },
     })
   } finally {
@@ -249,9 +245,7 @@ description: A skill in the .agents/skills directory.
       expect(skills.length).toBe(1)
       const agentSkill = skills.find((s) => s.name === "agent-skill")
       expect(agentSkill).toBeDefined()
-      expect(agentSkill!.location).toContain(
-        path.join(".agents", "skills", "agent-skill", "SKILL.md").replaceAll("\\", "/"),
-      )
+      expect(agentSkill!.location).toContain(path.join(".agents", "skills", "agent-skill", "SKILL.md"))
     },
   })
 })
@@ -285,9 +279,7 @@ This skill is loaded from the global home directory.
         expect(skills.length).toBe(1)
         expect(skills[0].name).toBe("global-agent-skill")
         expect(skills[0].description).toBe("A global skill from ~/.agents/skills for testing.")
-        expect(skills[0].location).toContain(
-          path.join(".agents", "skills", "global-agent-skill", "SKILL.md").replaceAll("\\", "/"),
-        )
+        expect(skills[0].location).toContain(path.join(".agents", "skills", "global-agent-skill", "SKILL.md"))
       },
     })
   } finally {
diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts
index d3fb426ee80f..d5057ba9e7f4 100644
--- a/packages/opencode/test/tool/skill.test.ts
+++ b/packages/opencode/test/tool/skill.test.ts
@@ -99,7 +99,7 @@ Use this skill.
           expect(requests[0].patterns).toContain("tool-skill")
           expect(requests[0].always).toContain("tool-skill")
 
-          expect(result.metadata.dir).toBe(dir.replaceAll("\\", "/"))
+          expect(result.metadata.dir).toBe(dir)
           expect(result.output).toContain(`<skill_content name="tool-skill">`)
           expect(result.output).toContain(`Base directory for this skill: ${pathToFileURL(dir).href}`)
           expect(result.output).toContain(`<file>${file}</file>`)
diff --git a/packages/opencode/test/util/glob.test.ts b/packages/opencode/test/util/glob.test.ts
index f83a10af96a3..e58d92c85c64 100644
--- a/packages/opencode/test/util/glob.test.ts
+++ b/packages/opencode/test/util/glob.test.ts
@@ -23,7 +23,7 @@ describe("Glob", () => {
 
       const results = await Glob.scan("*.txt", { cwd: tmp.path, absolute: true })
 
-      expect(results[0]).toBe(path.join(tmp.path, "file.txt").replaceAll("\\", "/"))
+      expect(results[0]).toBe(path.join(tmp.path, "file.txt"))
     })
 
     test("excludes directories by default", async () => {

From 69993f8e529971254035b8d3c9ca575caed3eea3 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Tue, 24 Feb 2026 21:28:19 +1000
Subject: [PATCH 30/33] remove Object.defineProperty hack from snapshot
 bootstrap, fwd() handles it

---
 packages/opencode/test/snapshot/snapshot.test.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts
index c0a31f8cd704..79b1a83cd3a1 100644
--- a/packages/opencode/test/snapshot/snapshot.test.ts
+++ b/packages/opencode/test/snapshot/snapshot.test.ts
@@ -13,7 +13,7 @@ import { tmpdir } from "../fixture/fixture"
 const fwd = (...parts: string[]) => path.join(...parts).replaceAll("\\", "/")
 
 async function bootstrap() {
-  const tmp = await tmpdir({
+  return tmpdir({
     git: true,
     init: async (dir) => {
       const unique = Math.random().toString(36).slice(2)
@@ -29,13 +29,6 @@ async function bootstrap() {
       }
     },
   })
-
-  if (process.platform === "win32") {
-    // Override the path getter to ensure forward slashes on Windows for template strings
-    Object.defineProperty(tmp, "path", { value: tmp.path.replaceAll("\\", "/") })
-  }
-
-  return tmp
 }
 
 test("tracks deleted files correctly", async () => {

From 1800ff44045194b07b43e2fd01b27f2766bcf8c5 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Tue, 24 Feb 2026 21:28:57 +1000
Subject: [PATCH 31/33] fix(test): use path.sep instead of hardcoded separator
 check

---
 packages/opencode/test/skill/discovery.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opencode/test/skill/discovery.test.ts b/packages/opencode/test/skill/discovery.test.ts
index 14b40bdda478..5664fa32b8ad 100644
--- a/packages/opencode/test/skill/discovery.test.ts
+++ b/packages/opencode/test/skill/discovery.test.ts
@@ -77,7 +77,7 @@ describe("Discovery.pull", () => {
   test("downloads reference files alongside SKILL.md", async () => {
     const dirs = await Discovery.pull(CLOUDFLARE_SKILLS_URL)
     // find a skill dir that should have reference files (e.g. agents-sdk)
-    const agentsSdk = dirs.find((d) => d.endsWith("/agents-sdk") || d.endsWith("\\agents-sdk"))
+    const agentsSdk = dirs.find((d) => d.endsWith(path.sep + "agents-sdk"))
     expect(agentsSdk).toBeDefined()
     if (agentsSdk) {
       const refs = path.join(agentsSdk, "references")

From 84af89667330b6c8c96d75674b66972d3479dd55 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Tue, 24 Feb 2026 21:33:49 +1000
Subject: [PATCH 32/33] fix(test): normalize git excludesFile path for Windows

---
 packages/opencode/test/snapshot/snapshot.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts
index 79b1a83cd3a1..1804ab5c2a2b 100644
--- a/packages/opencode/test/snapshot/snapshot.test.ts
+++ b/packages/opencode/test/snapshot/snapshot.test.ts
@@ -548,7 +548,7 @@ test("git info exclude keeps global excludes", async () => {
       const global = `${tmp.path}/global.ignore`
       const config = `${tmp.path}/global.gitconfig`
       await Bun.write(global, "global.tmp\n")
-      await Bun.write(config, `[core]\n\texcludesFile = ${global}\n`)
+      await Bun.write(config, `[core]\n\texcludesFile = ${global.replaceAll("\\", "/")}\n`)
 
       const prev = process.env.GIT_CONFIG_GLOBAL
       process.env.GIT_CONFIG_GLOBAL = config

From 39b68b209a4d727f66e7e35677764882846b09d6 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Tue, 24 Feb 2026 22:03:06 +1000
Subject: [PATCH 33/33] drop stray blank line in snapshot/index.ts, already
 merged via #14890

---
 packages/opencode/src/snapshot/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts
index 46c2a30c37fc..cf254b4cef74 100644
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -67,7 +67,6 @@ export namespace Snapshot {
       await $`git --git-dir ${git} config core.longpaths true`.quiet().nothrow()
       await $`git --git-dir ${git} config core.symlinks true`.quiet().nothrow()
       await $`git --git-dir ${git} config core.fsmonitor false`.quiet().nothrow()
-
       log.info("initialized")
     }
     await add(git)