From 162da4bd9705557512410bfe884a899768ce034b Mon Sep 17 00:00:00 2001
From: Ryan Vogel <me@ryan.ceo>
Date: Thu, 16 Apr 2026 13:39:25 +0000
Subject: [PATCH] fix: update imports after dev namespace reorganization

- Log: @/util/log -> @/util
- Project: ../../project/project -> ../../project
- Database.use -> use (direct export from @/storage/db)
---
 packages/opencode/src/cli/cmd/serve.ts     | 4 ++--
 packages/opencode/src/server/push-relay.ts | 6 +++---
 packages/opencode/src/session/status.ts    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/serve.ts b/packages/opencode/src/cli/cmd/serve.ts
index 4e3ea41ce0..c184a56ed6 100644
--- a/packages/opencode/src/cli/cmd/serve.ts
+++ b/packages/opencode/src/cli/cmd/serve.ts
@@ -6,10 +6,10 @@ import { cmd } from "./cmd"
 import { withNetworkOptions, resolveNetworkOptions } from "../network"
 import { Flag } from "../../flag/flag"
 import { Workspace } from "../../control-plane/workspace"
-import { Project } from "../../project/project"
+import { Project } from "../../project"
 import { Installation } from "../../installation"
 import { PushRelay } from "../../server/push-relay"
-import { Log } from "../../util/log"
+import { Log } from "../../util"
 import * as QRCode from "qrcode"
 
 const log = Log.create({ service: "serve" })
diff --git a/packages/opencode/src/server/push-relay.ts b/packages/opencode/src/server/push-relay.ts
index b73a3e729d..c410231be9 100644
--- a/packages/opencode/src/server/push-relay.ts
+++ b/packages/opencode/src/server/push-relay.ts
@@ -2,7 +2,7 @@ import os from "node:os"
 import { createHash } from "node:crypto"
 import { SessionID } from "@/session/schema"
 import { GlobalBus } from "@/bus/global"
-import { Log } from "@/util/log"
+import { Log } from "@/util"
 
 type Type = "complete" | "permission" | "error"
 
@@ -326,14 +326,14 @@ async function notify(input: { type: Type; sessionID: string }): Promise<Notify>
   }
 
   try {
-    const [{ Session }, { MessageV2 }, { SessionTable }, { Database, eq }] = await Promise.all([
+    const [{ Session }, { MessageV2 }, { SessionTable }, { use, eq }] = await Promise.all([
       import("@/session"),
       import("@/session/message-v2"),
       import("@/session/session.sql"),
       import("@/storage/db"),
     ])
     const sessionID = SessionID.make(input.sessionID)
-    const row = Database.use((db) => db.select().from(SessionTable).where(eq(SessionTable.id, sessionID)).get())
+    const row = use((db) => db.select().from(SessionTable).where(eq(SessionTable.id, sessionID)).get())
     const session = row ? Session.fromRow(row) : undefined
     out.title = session?.title
 
diff --git a/packages/opencode/src/session/status.ts b/packages/opencode/src/session/status.ts
index b8fdd55864..1d559f760d 100644
--- a/packages/opencode/src/session/status.ts
+++ b/packages/opencode/src/session/status.ts
@@ -1,7 +1,7 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { InstanceState } from "@/effect"
-import { Log } from "@/util/log"
+import { Log } from "@/util"
 import { SessionID } from "./schema"
 import { Effect, Layer, Context } from "effect"
 import z from "zod"