From 8310e7df7047d63d032c0f5d562b8eac270809d6 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Tue, 12 May 2026 21:37:34 -0400
Subject: [PATCH] test(server): migrate missing patch diff test (#27202)

---
 .../server/session-diff-missing-patch.test.ts | 87 +++++++++----------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/packages/opencode/test/server/session-diff-missing-patch.test.ts b/packages/opencode/test/server/session-diff-missing-patch.test.ts
index 5f27a4e2fd..875c031d57 100644
--- a/packages/opencode/test/server/session-diff-missing-patch.test.ts
+++ b/packages/opencode/test/server/session-diff-missing-patch.test.ts
@@ -10,19 +10,20 @@
  * asserts that GET /session/<id>/diff returns 200 with the row intact.
  */
 import { afterEach, describe, expect } from "bun:test"
-import { Effect } from "effect"
+import { Effect, Layer } from "effect"
 import { Server } from "@/server/server"
 import { SessionPaths } from "@/server/routes/instance/httpapi/groups/session"
 import { Session } from "@/session/session"
 import { Storage } from "@/storage/storage"
-import { WithInstance } from "@/project/with-instance"
 import { resetDatabase } from "../fixture/db"
-import { disposeAllInstances, tmpdir } from "../fixture/fixture"
-import { it } from "../lib/effect"
+import { disposeAllInstances, TestInstance } from "../fixture/fixture"
+import { testEffect } from "../lib/effect"
 import * as Log from "@opencode-ai/core/util/log"
 
 void Log.init({ print: false })
 
+const it = testEffect(Layer.mergeAll(Session.defaultLayer, Storage.defaultLayer))
+
 afterEach(async () => {
   await disposeAllInstances()
   await resetDatabase()
@@ -32,50 +33,46 @@ function pathFor(template: string, params: Record<string, string>) {
   return Object.entries(params).reduce((result, [key, value]) => result.replace(`:${key}`, value), template)
 }
 
+const withSession = (input?: Parameters<Session.Interface["create"]>[0]) =>
+  Effect.acquireRelease(
+    Session.Service.use((session) => session.create(input)),
+    (created) => Session.Service.use((session) => session.remove(created.id)).pipe(Effect.ignore),
+  )
+
 describe("session diff with missing patch (#26574)", () => {
-  it.live("GET /session/<id>/diff returns 200 when summary_diffs row has no patch", () =>
-    Effect.gen(function* () {
-      const tmp = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir({ git: true, config: { formatter: false, lsp: false } })),
-        (t) => Effect.promise(() => t[Symbol.asyncDispose]()),
-      )
+  it.instance(
+    "GET /session/<id>/diff returns 200 when summary_diffs row has no patch",
+    () =>
+      Effect.gen(function* () {
+        const test = yield* TestInstance
+        const session = yield* withSession({ title: "missing-patch" })
 
-      yield* Effect.promise(() =>
-        WithInstance.provide({
-          directory: tmp.path,
-          fn: async () => {
-            const session = await Effect.runPromise(
-              Effect.provide(
-                Session.Service.use((s) => s.create({ title: "missing-patch" })),
-                Session.defaultLayer,
-              ),
-            )
+        // Mimic legacy/imported on-disk shape: a diff entry with no
+        // `patch` text. Pre-fix the typed response encoder rejects
+        // this and returns 400.
+        yield* Storage.Service.use((storage) =>
+          storage.write(["session_diff", session.id], [{ file: "legacy.txt", additions: 1, deletions: 0 }]),
+        )
 
-            // Mimic legacy/imported on-disk shape: a diff entry with no
-            // `patch` text. Pre-fix the typed response encoder rejects
-            // this and returns 400.
-            await Effect.runPromise(
-              Effect.provide(
-                Storage.Service.use((s) =>
-                  s.write(["session_diff", session.id], [{ file: "legacy.txt", additions: 1, deletions: 0 }]),
-                ),
-                Storage.defaultLayer,
-              ),
-            )
+        const response = yield* Effect.promise(() =>
+          Promise.resolve(
+            Server.Default().app.request(pathFor(SessionPaths.diff, { sessionID: session.id }), {
+              headers: { "x-opencode-directory": test.directory },
+            }),
+          ),
+        )
 
-            const headers = { "x-opencode-directory": tmp.path }
-            const response = await Server.Default().app.request(pathFor(SessionPaths.diff, { sessionID: session.id }), {
-              headers,
-            })
-            expect(response.status).toBe(200)
-            const body = (await response.json()) as Array<{ file: string; patch?: string; additions: number }>
-            expect(body).toHaveLength(1)
-            expect(body[0]?.file).toBe("legacy.txt")
-            expect(body[0]?.additions).toBe(1)
-            expect(body[0]?.patch).toBeUndefined()
-          },
-        }),
-      )
-    }),
+        expect(response.status).toBe(200)
+        const body = (yield* Effect.promise(() => response.json())) as Array<{
+          file: string
+          patch?: string
+          additions: number
+        }>
+        expect(body).toHaveLength(1)
+        expect(body[0]?.file).toBe("legacy.txt")
+        expect(body[0]?.additions).toBe(1)
+        expect(body[0]?.patch).toBeUndefined()
+      }),
+    { git: true, config: { formatter: false, lsp: false } },
   )
 })