fix(win32): add Windows to CI test matrix and fix cross-platform test stability

packages/app/e2e/actions.ts

@@ -191,17 +191,54 @@ 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 {
+        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" })
+        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")
+  const templatePath = await getGitTemplate()
+  await fs.cp(templatePath, root, { recursive: true })
 
-  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 gitIdPath = path.join(root, ".git", "opencode")
+  if (await fs.stat(path.join(root, ".git")).catch(() => false)) {
+    // 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
 }

packages/app/e2e/prompt/prompt-mention.spec.ts

@@ -1,26 +1,38 @@
+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, gotoSession }) => {
-  await gotoSession()
+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 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 gotoSession()
 
-  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 suggestion.hover()
+    const suggestion = page.getByRole("button", { name: filePattern }).first()
 
-  await page.keyboard.press("Tab")
+    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 })
 
-  const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
-  await expect(pill).toBeVisible()
-  await expect(pill).toHaveAttribute("data-path", filePattern)
+    await suggestion.hover()
 
-  await page.keyboard.type(" ok")
-  await expect(page.locator(promptSelector)).toContainText("ok")
+    await page.keyboard.press("Tab")
+
+    const pill = page.locator(`${promptSelector} [data-type="file"]`).first()
+    await expect(pill).toBeVisible()
+    await expect(pill).toHaveAttribute("data-path", filePattern)
+
+    await page.keyboard.type(" ok")
+    await expect(page.locator(promptSelector)).toContainText("ok")
+  })
 })

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)
@@ -82,8 +86,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 +110,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 +131,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)

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")

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"]],

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"
@@ -276,7 +277,6 @@ export namespace Config {
       "@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)
@@ -289,7 +289,9 @@ export namespace Config {
       [
         "install",
         // TODO: get rid of this case (see: https://github.com/oven-sh/bun/issues/19936)
-        ...(proxied() ? ["--no-cache"] : []),
+        // 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) => {
@@ -342,10 +344,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 +1335,16 @@ 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
+              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"
+            }
+          }
         }
       }
       return data

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
     }

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 })

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.`,
       )

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) {

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 && 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())