diff --git a/packages/core/src/workspace.ts b/packages/core/src/workspace.ts
index 57a2d01d2d..4e2846e684 100644
--- a/packages/core/src/workspace.ts
+++ b/packages/core/src/workspace.ts
@@ -10,7 +10,7 @@ import type { Driver as EnvironmentDriver } from "./environment/driver.js"
 import { Database } from "./database/database.js"
 import { KeyedMutex } from "./effect/keyed-mutex.js"
 import { WorkspaceDriver } from "./workspace/driver.js"
-import { WorkspaceTable } from "./worktree/sql.js"
+import { WorkspaceTable } from "./workspace/sql.js"
 
 export const ID = Workspace.ID
 export type ID = Workspace.ID
diff --git a/packages/core/src/worktree/sql.ts b/packages/core/src/workspace/sql.ts
similarity index 87%
rename from packages/core/src/worktree/sql.ts
rename to packages/core/src/workspace/sql.ts
index 1dd5a88945..6c8b701f08 100644
--- a/packages/core/src/worktree/sql.ts
+++ b/packages/core/src/workspace/sql.ts
@@ -1,6 +1,6 @@
 import { Workspace } from "@opencode-ai/schema/workspace"
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core"
-import type { WorkspaceDriver } from "../workspace/driver.js"
+import type { WorkspaceDriver } from "./driver.js"
 
 export const WorkspaceTable = sqliteTable("workspace", {
   id: text().$type<Workspace.ID>().primaryKey(),
diff --git a/packages/core/test/workspace.test.ts b/packages/core/test/workspace.test.ts
index 9242360a18..262212e9c7 100644
--- a/packages/core/test/workspace.test.ts
+++ b/packages/core/test/workspace.test.ts
@@ -4,7 +4,7 @@ import { Database } from "@opencode-ai/core/database/database"
 import { makeMemoryDriver } from "@opencode-ai/core/environment/index"
 import { Workspace } from "@opencode-ai/core/workspace"
 import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { WorkspaceTable } from "@opencode-ai/core/worktree/sql"
+import { WorkspaceTable } from "@opencode-ai/core/workspace/sql"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { eq } from "drizzle-orm"
 import { Effect } from "effect"