diff --git a/packages/core/test/database-drizzle.test.ts b/packages/core/test/database-drizzle.test.ts
index 3f0cbc6c022..d07efaad144 100644
--- a/packages/core/test/database-drizzle.test.ts
+++ b/packages/core/test/database-drizzle.test.ts
@@ -7,7 +7,7 @@ import { SqliteClient } from "@effect/sql-sqlite-bun"
import { eq, sql } from "drizzle-orm"
import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core"
import { Effect, Tracer } from "effect"
-import type { SqlClient as SqlClientService } from "effect/unstable/sql/SqlClient"
+import type { SqlClient } from "effect/unstable/sql/SqlClient"
import { isSqlError } from "effect/unstable/sql/SqlError"
import { EffectDrizzleSqlite } from "@opencode-ai/core/database/drizzle"
@@ -16,7 +16,7 @@ const users = sqliteTable("users", {
name: text().notNull(),
})
-const run = (effect: Effect.Effect) =>
+const run = (effect: Effect.Effect) =>
Effect.runPromise(
effect.pipe(Effect.provide(SqliteClient.layer({ filename: ":memory:", disableWAL: true })), Effect.scoped),
)
diff --git a/packages/core/test/effect/cross-spawn-spawner.test.ts b/packages/core/test/effect/cross-spawn-spawner.test.ts
index 42367a529ff..c3dda72e346 100644
--- a/packages/core/test/effect/cross-spawn-spawner.test.ts
+++ b/packages/core/test/effect/cross-spawn-spawner.test.ts
@@ -2,8 +2,7 @@ import { describe, expect } from "bun:test"
import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path"
-import { Effect, Exit, Stream } from "effect"
-import type * as PlatformError from "effect/PlatformError"
+import { Effect, Exit, PlatformError, Stream } from "effect"
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
import { CrossSpawnSpawner } from "@opencode-ai/util/cross-spawn-spawner"
import { LayerNode } from "@opencode-ai/util/effect/layer-node"
diff --git a/packages/core/test/fixture/tmpdir.ts b/packages/core/test/fixture/tmpdir.ts
index 36781de510c..455faa9b63c 100644
--- a/packages/core/test/fixture/tmpdir.ts
+++ b/packages/core/test/fixture/tmpdir.ts
@@ -1,10 +1,10 @@
import fs from "fs/promises"
-import { tmpdir as osTmpdir } from "os"
+import os from "os"
import path from "path"
import { Effect } from "effect"
export const tmpdir = async (prefix = "opencode-core-test-") => {
- const dir = await fs.realpath(await fs.mkdtemp(path.join(osTmpdir(), prefix)))
+ const dir = await fs.realpath(await fs.mkdtemp(path.join(os.tmpdir(), prefix)))
return {
path: dir,
async [Symbol.asyncDispose]() {
diff --git a/packages/core/test/instructions/builtins.test.ts b/packages/core/test/instructions/builtins.test.ts
index 59971ebdd2f..db700aef88c 100644
--- a/packages/core/test/instructions/builtins.test.ts
+++ b/packages/core/test/instructions/builtins.test.ts
@@ -1,7 +1,7 @@
import { describe, expect } from "bun:test"
import os from "os"
import { Effect, Layer } from "effect"
-import * as TestClock from "effect/testing/TestClock"
+import { TestClock } from "effect/testing"
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
import { Location } from "@opencode-ai/core/location"
import { FSUtil } from "@opencode-ai/util/fs-util"
diff --git a/packages/core/test/integration.test.ts b/packages/core/test/integration.test.ts
index 0ece7d2459a..3c2918d1408 100644
--- a/packages/core/test/integration.test.ts
+++ b/packages/core/test/integration.test.ts
@@ -1,6 +1,6 @@
import { describe, expect } from "bun:test"
import { Cause, Clock, Duration, Effect, Exit, Fiber, Layer, Scope, Stream } from "effect"
-import * as TestClock from "effect/testing/TestClock"
+import { TestClock } from "effect/testing"
import { Credential } from "@opencode-ai/core/credential"
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
diff --git a/packages/core/test/lib/effect.ts b/packages/core/test/lib/effect.ts
index c42bf02bdcf..f179fcb206d 100644
--- a/packages/core/test/lib/effect.ts
+++ b/packages/core/test/lib/effect.ts
@@ -1,7 +1,6 @@
import { test, type TestOptions } from "bun:test"
-import { Cause, Effect, Exit, Layer, Scope } from "effect"
-import * as TestClock from "effect/testing/TestClock"
-import * as TestConsole from "effect/testing/TestConsole"
+import { Cause, Effect, Exit, Layer, type Scope } from "effect"
+import { TestClock, TestConsole } from "effect/testing"
type Body = Effect.Effect | (() => Effect.Effect)
diff --git a/packages/core/test/lib/tool.ts b/packages/core/test/lib/tool.ts
index 09f977f0ca2..b2e85d033cf 100644
--- a/packages/core/test/lib/tool.ts
+++ b/packages/core/test/lib/tool.ts
@@ -4,7 +4,7 @@ import { SessionMessage } from "@opencode-ai/core/session/message"
import { toSessionError } from "@opencode-ai/core/session/to-session-error"
import type { SessionError } from "@opencode-ai/schema/session-error"
import { Tool } from "@opencode-ai/core/tool"
-import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
+import type { Context } from "@opencode-ai/plugin/effect/plugin"
import { Effect, type Scope } from "effect"
import { host } from "../plugin/host"
@@ -52,7 +52,7 @@ export function waitForCodeModeTool(
export const registerToolPlugin = (
plugin: {
readonly id: string
- readonly effect: (context: PluginContext) => Effect.Effect
+ readonly effect: (context: Context) => Effect.Effect
},
overrides: Parameters[0] = {},
): Effect.Effect =>