lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(httpapi): install Instance ALS for adapter Promise bridge (#25417)

Browse Source
This commit is contained in:
Kit Langton
2026-05-02 10:49:44 -04:00
committed by GitHub
parent 075f876e6f
commit 5242a1c6b4
4 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/opencode/src/control-plane/workspace.ts
View File

@@ -25,6 +25,7 @@ import { SessionID } from "@/session/schema"
import { errorData } from "@/util/error"
import { waitEvent } from "./util"
import { WorkspaceContext } from "./workspace-context"
import { EffectBridge } from "@/effect/bridge"
import { NonNegativeInt, withStatics } from "@/util/schema"
import { zod as effectZod, zodObject } from "@/util/effect-zod"
@@ -336,7 +337,7 @@ export const layer = Layer.effect(
const syncWorkspaceLoop = Effect.fn("Workspace.syncWorkspaceLoop")(function* (space: Info) {
const adapter = getAdapter(space.projectID, space.type)
const target = yield* Effect.promise(() => Promise.resolve(adapter.target(space)))
const target = yield* EffectBridge.fromPromise(() => adapter.target(space))
if (target.type === "local") return
@@ -420,7 +421,7 @@ export const layer = Layer.effect(
if (!Flag.OPENCODE_EXPERIMENTAL_WORKSPACES) return
const adapter = getAdapter(space.projectID, space.type)
const target = yield* Effect.promise(() => Promise.resolve(adapter.target(space)))
const target = yield* EffectBridge.fromPromise(() => adapter.target(space))
if (target.type === "local") {
setStatus(space.id, (yield* Effect.promise(() => Filesystem.exists(target.directory))) ? "connected" : "error")
@@ -459,8 +460,8 @@ export const layer = Layer.effect(
const create = Effect.fn("Workspace.create")(function* (input: CreateInput) {
const id = WorkspaceID.ascending(input.id)
const adapter = getAdapter(input.projectID, input.type)
const config = yield* Effect.promise(() =>
Promise.resolve(adapter.configure({ ...input, id, name: Slug.create(), directory: null })),
const config = yield* EffectBridge.fromPromise(() =>
adapter.configure({ ...input, id, name: Slug.create(), directory: null }),
)
const info: Info = {
@@ -496,7 +497,7 @@ export const layer = Layer.effect(
OTEL_RESOURCE_ATTRIBUTES: process.env.OTEL_RESOURCE_ATTRIBUTES,
}
yield* Effect.promise(() => adapter.create(config, env))
yield* EffectBridge.fromPromise(() => adapter.create(config, env))
yield* Effect.all(
[
waitEvent({
@@ -532,7 +533,7 @@ export const layer = Layer.effect(
})
const adapter = getAdapter(space.projectID, space.type)
const target = yield* Effect.promise(() => Promise.resolve(adapter.target(space)))
const target = yield* EffectBridge.fromPromise(() => adapter.target(space))
yield* sync.run(Session.Event.Updated, {
sessionID: input.sessionID,
@@ -724,10 +725,10 @@ export const layer = Layer.effect(
yield* stopSync(id)
const info = fromRow(row)
yield* Effect.catch(
yield* Effect.catchCause(
Effect.gen(function* () {
const adapter = getAdapter(info.projectID, row.type)
yield* Effect.tryPromise(() => Promise.resolve(adapter.remove(info)))
yield* EffectBridge.fromPromise(() => adapter.remove(info))
}),
() =>
Effect.sync(() => {