refactor(core): move database schema ownership (#29068)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

packages/opencode/src/worktree/index.ts

@@ -2,14 +2,14 @@ import { Global } from "@opencode-ai/core/global"
 import { InstanceLayer } from "@/project/instance-layer"
 import { InstanceStore } from "@/project/instance-store"
 import { Project } from "@/project/project"
-import { Database } from "@/storage/db"
+import { Database } from "@opencode-ai/core/database/database"
 import { eq } from "drizzle-orm"
-import { ProjectTable } from "../project/project.sql"
-import type { ProjectID } from "../project/schema"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
+import type { ProjectV2 } from "@opencode-ai/core/project"
 import * as Log from "@opencode-ai/core/util/log"
 import { Slug } from "@opencode-ai/core/util/slug"
 import { errorMessage } from "../util/error"
-import { BusEvent } from "@/bus/bus-event"
+import { EventV2 } from "@opencode-ai/core/event"
 import { GlobalBus } from "@/bus/global"
 import { Git } from "@/git"
 import { Effect, Layer, Path, Schema, Scope, Context } from "effect"
@@ -22,19 +22,19 @@ import { InstanceState } from "@/effect/instance-state"
 const log = Log.create({ service: "worktree" })
 
 export const Event = {
-  Ready: BusEvent.define(
-    "worktree.ready",
-    Schema.Struct({
+  Ready: EventV2.define({
+    type: "worktree.ready",
+    schema: {
       name: Schema.String,
       branch: Schema.optional(Schema.String),
-    }),
-  ),
-  Failed: BusEvent.define(
-    "worktree.failed",
-    Schema.Struct({
+    },
+  }),
+  Failed: EventV2.define({
+    type: "worktree.failed",
+    schema: {
       message: Schema.String,
-    }),
-  ),
+    },
+  }),
 }
 
 export const Info = Schema.Struct({
@@ -149,7 +149,7 @@ type GitResult = { code: number; text: string; stderr: string }
 export const layer: Layer.Layer<
   Service,
   never,
-  AppFileSystem.Service | Path.Path | AppProcess.Service | Git.Service | Project.Service | InstanceStore.Service
+  AppFileSystem.Service | Path.Path | AppProcess.Service | Git.Service | Project.Service | InstanceStore.Service | Database.Service
 > = Layer.effect(
   Service,
   Effect.gen(function* () {
@@ -157,6 +157,7 @@ export const layer: Layer.Layer<
     const fs = yield* AppFileSystem.Service
     const pathSvc = yield* Path.Path
     const appProcess = yield* AppProcess.Service
+    const { db } = yield* Database.Service
     const gitSvc = yield* Git.Service
     const project = yield* Project.Service
     const store = yield* InstanceStore.Service
@@ -394,6 +395,9 @@ export const layer: Layer.Layer<
 
       const directory = yield* canonical(input.directory)
 
+      // Preserve the loaded path casing for the store cache; `directory` is lowercased on Windows.
+      if (directory !== (yield* canonical(ctx.worktree))) yield* store.disposeDirectory(input.directory)
+
       const list = yield* git(["worktree", "list", "--porcelain"], { cwd: ctx.worktree })
       if (list.code !== 0) {
         return yield* new RemoveFailedError({ message: list.stderr || list.text || "Failed to read git worktrees" })
@@ -411,6 +415,8 @@ export const layer: Layer.Layer<
         return true
       }
 
+      // Git may return the original casing when a caller supplied a normalized Windows path.
+      yield* store.disposeDirectory(entry.path)
       yield* stopFsmonitor(entry.path)
       const removed = yield* git(["worktree", "remove", "--force", entry.path], { cwd: ctx.worktree })
       if (removed.code !== 0) {
@@ -476,11 +482,9 @@ export const layer: Layer.Layer<
 
     const runStartScripts = Effect.fnUntraced(function* (
       directory: string,
-      input: { projectID: ProjectID; extra?: string },
+      input: { projectID: ProjectV2.ID; extra?: string },
     ) {
-      const row = yield* Effect.sync(() =>
-        Database.use((db) => db.select().from(ProjectTable).where(eq(ProjectTable.id, input.projectID)).get()),
-      )
+      const row = yield* db.select().from(ProjectTable).where(eq(ProjectTable.id, input.projectID)).get().pipe(Effect.orDie)
       const project = row ? Project.fromRow(row) : undefined
       const startup = project?.commands?.start?.trim() ?? ""
       const ok = yield* runStartScript(directory, startup, "project")
@@ -611,6 +615,7 @@ export const appLayer = layer.pipe(
   Layer.provide(Git.defaultLayer),
   Layer.provide(AppProcess.defaultLayer),
   Layer.provide(Project.defaultLayer),
+  Layer.provide(Database.defaultLayer),
   Layer.provide(AppFileSystem.defaultLayer),
   Layer.provide(NodePath.layer),
 )