diff --git a/packages/core/src/workspace.ts b/packages/core/src/workspace.ts index 71391c9580a..43347228325 100644 --- a/packages/core/src/workspace.ts +++ b/packages/core/src/workspace.ts @@ -6,7 +6,7 @@ import { eq } from "drizzle-orm" import { Clock, Context, Deferred, Duration, Effect, Exit, FiberSet, Layer, Ref, Schedule, Schema, Scope } from "effect" import { systemError } from "effect/PlatformError" import { make } from "effect/unstable/process/ChildProcessSpawner" -import type { Driver as EnvironmentDriver } from "./environment/driver.js" +import type { EnvironmentDriver } from "./environment/driver.js" import { Database } from "./database/database.js" import { KeyedMutex } from "./effect/keyed-mutex.js" import { WorkspaceDriver } from "./workspace/driver.js" @@ -43,12 +43,11 @@ export interface Interface { ) => Effect.Effect readonly connect: ( workspaceID: ID, - ) => Effect.Effect + ) => Effect.Effect /** Makes the workspace absent; reports whether this call destroyed an existing workspace. */ - readonly destroy: (workspaceID: ID) => Effect.Effect< - Workspace.DestroyResult, - WorkspaceDriver.Error | WorkspaceDriver.ProviderNotFound - > + readonly destroy: ( + workspaceID: ID, + ) => Effect.Effect } export interface Options { @@ -60,7 +59,7 @@ export class Service extends Context.Service()("@opencode/Wo interface Connection { readonly driver: WorkspaceDriver.Interface - readonly environment: EnvironmentDriver + readonly environment: EnvironmentDriver.Driver readonly saveBinding: (binding: WorkspaceDriver.Binding) => Effect.Effect readonly lastActivity: Ref.Ref readonly active: Ref.Ref @@ -91,12 +90,7 @@ const layer = (options: Options) => const idleThreshold = Duration.toMillis(options.idleThreshold ?? Duration.minutes(20)) const find = (workspaceID: ID) => - db - .select() - .from(WorkspaceTable) - .where(eq(WorkspaceTable.id, workspaceID)) - .get() - .pipe(Effect.orDie) + db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, workspaceID)).get().pipe(Effect.orDie) const load = Effect.fn("Workspace.load")(function* (workspaceID: ID) { const row = yield* find(workspaceID) diff --git a/packages/core/src/workspace/driver.ts b/packages/core/src/workspace/driver.ts index 9780631a2c9..4ddab5579c7 100644 --- a/packages/core/src/workspace/driver.ts +++ b/packages/core/src/workspace/driver.ts @@ -4,7 +4,7 @@ import { Workspace } from "@opencode-ai/schema/workspace" import { makeGlobalNode } from "@opencode-ai/util/effect/app-node" import { Context, Effect, Layer, Schema } from "effect" import type { Scope } from "effect" -import type { Driver as EnvironmentDriver } from "../environment/driver.js" +import type { EnvironmentDriver } from "../environment/driver.js" /** * Smallest provider-owned JSON value required to reconnect to the same @@ -41,7 +41,7 @@ export interface Interface { readonly workspaceID: Workspace.ID readonly binding: Binding readonly saveBinding: (binding: Binding) => Effect.Effect - }) => Effect.Effect + }) => Effect.Effect readonly suspendForIdle: (input: { readonly workspaceID: Workspace.ID readonly binding: Binding