From f7f2d9700aad9b9599055121815cb9d6de8a036f Mon Sep 17 00:00:00 2001
From: Adam <2363879+adamdotdevin@users.noreply.github.com>
Date: Wed, 21 Jan 2026 09:45:57 -0600
Subject: [PATCH] test(app): fix e2e

---
 packages/app/script/e2e-local.ts | 35 ++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/packages/app/script/e2e-local.ts b/packages/app/script/e2e-local.ts
index 2998a99825..aac2c15bb7 100644
--- a/packages/app/script/e2e-local.ts
+++ b/packages/app/script/e2e-local.ts
@@ -111,20 +111,33 @@ await log.Log.init({
 })
 
 const servermod = await import("../../opencode/src/server/server")
+const inst = await import("../../opencode/src/project/instance")
 const server = servermod.Server.listen({ port: serverPort, hostname: "127.0.0.1" })
 console.log(`opencode server listening on http://127.0.0.1:${serverPort}`)
 
-try {
-  await waitForHealth(`http://127.0.0.1:${serverPort}/global/health`)
+const result = await (async () => {
+  try {
+    await waitForHealth(`http://127.0.0.1:${serverPort}/global/health`)
 
-  const runner = Bun.spawn(["bun", "test:e2e", ...extraArgs], {
-    cwd: appDir,
-    env: runnerEnv,
-    stdout: "inherit",
-    stderr: "inherit",
-  })
+    const runner = Bun.spawn(["bun", "test:e2e", ...extraArgs], {
+      cwd: appDir,
+      env: runnerEnv,
+      stdout: "inherit",
+      stderr: "inherit",
+    })
 
-  process.exitCode = await runner.exited
-} finally {
-  await server.stop()
+    return { code: await runner.exited }
+  } catch (error) {
+    return { error }
+  } finally {
+    await inst.Instance.disposeAll()
+    await server.stop()
+  }
+})()
+
+if ("error" in result) {
+  console.error(result.error)
+  process.exit(1)
 }
+
+process.exit(result.code)