d2e21c5006
- InstanceStore: run Instance.provide init inside the ALS context so KilocodeBootstrap (and any forkDetach work it spawns like KiloIndexing.init) can read Instance.directory. Upstream refactor moved init out of the ALS scope; kilo-main's pre-merge Instance.provide wrapped it. Without this, KiloIndexing.init silently fails with "No context found for instance".
- kilocode/agent: thread worktree through planGuard/patchAgents instead of reading Instance.worktree at agent state construction time. Agent state is built inside Effect (no ALS) via InstanceState.make — reading the ALS-backed Instance.worktree there crashed under the new architecture.
- kilocode/agent: drop the "*": "ask" from explore external_directory — defaults already provides it, and redefining here overwrites the tmp/skill allowlist via findLast().
- test/server/httpapi-instance.test.ts: revert the ported Hono-bridge tests. Upstream put the same tests in httpapi-instance.legacy.test.ts (renamed file); the port duplicated them.
- test/server/httpapi-instance.legacy.test.ts: mark the catalog test test.skip with Kilo's original rationale (/agent 500s via the bridge; the bridge is not enabled in any production client).
- test/server/httpapi-ui.test.ts: delete. Tests upstream's proxy-to-app.opencode.ai fallback that Kilo intentionally removed (src/server/routes/ui.ts kilocode_change).
- test/server/httpapi-raw-route-auth.test.ts: basic("opencode", ...) → basic("kilo", ...) to match the Kilo username default.
- test/provider/models.test.ts: skip describe block. Upstream tests assert raw-fixture passthrough but Kilo's ModelsDev.get() filters/injects providers based on Config.get(), which needs an Instance context the test doesn't provide.
213 lines
8.7 KiB
TypeScript
213 lines
8.7 KiB
TypeScript
import { GlobalBus } from "@/bus/global"
|
|
import { WorkspaceContext } from "@/control-plane/workspace-context"
|
|
import { InstanceRef } from "@/effect/instance-ref"
|
|
import { disposeInstance as runDisposers } from "@/effect/instance-registry"
|
|
import { makeRuntime } from "@/effect/run-service"
|
|
import { AppFileSystem } from "@opencode-ai/core/filesystem"
|
|
import { Context, Deferred, Duration, Effect, Exit, Layer, Scope } from "effect"
|
|
import { context as instanceContext, type InstanceContext } from "./instance-context"
|
|
import * as Project from "./project"
|
|
|
|
export interface LoadInput<R = never> {
|
|
directory: string
|
|
/**
|
|
* Additional setup to run after the default InstanceBootstrap.
|
|
* Mainly used by tests for env-var setup or file writes that need the instance ALS context.
|
|
*/
|
|
init?: Effect.Effect<void, never, R>
|
|
worktree?: string
|
|
project?: Project.Info
|
|
}
|
|
|
|
export interface Interface {
|
|
readonly load: <R = never>(input: LoadInput<R>) => Effect.Effect<InstanceContext, never, R>
|
|
readonly reload: <R = never>(input: LoadInput<R>) => Effect.Effect<InstanceContext, never, R>
|
|
readonly dispose: (ctx: InstanceContext) => Effect.Effect<void>
|
|
readonly disposeAll: () => Effect.Effect<void>
|
|
readonly provide: <A, E, R, R2 = never>(
|
|
input: LoadInput<R2>,
|
|
effect: Effect.Effect<A, E, R>,
|
|
) => Effect.Effect<A, E, R | R2>
|
|
}
|
|
|
|
export class Service extends Context.Service<Service, Interface>()("@opencode/InstanceStore") {}
|
|
|
|
interface Entry {
|
|
readonly deferred: Deferred.Deferred<InstanceContext>
|
|
}
|
|
|
|
export const layer: Layer.Layer<Service, never, Project.Service> = Layer.effect(
|
|
Service,
|
|
Effect.gen(function* () {
|
|
const project = yield* Project.Service
|
|
const scope = yield* Scope.Scope
|
|
const cache = new Map<string, Entry>()
|
|
|
|
const boot = <R>(input: LoadInput<R> & { directory: string }) =>
|
|
Effect.gen(function* () {
|
|
const ctx: InstanceContext =
|
|
input.project && input.worktree
|
|
? {
|
|
directory: input.directory,
|
|
worktree: input.worktree,
|
|
project: input.project,
|
|
}
|
|
: yield* project.fromDirectory(input.directory).pipe(
|
|
Effect.map((result) => ({
|
|
directory: input.directory,
|
|
worktree: result.sandbox,
|
|
project: result.project,
|
|
})),
|
|
)
|
|
if (input.init) {
|
|
// kilocode_change - run init inside the Instance ALS so KilocodeBootstrap
|
|
// (and anything it forks via Effect.forkDetach) sees Instance.directory.
|
|
const ready = input.init.pipe(Effect.provideService(InstanceRef, ctx)) as Effect.Effect<void>
|
|
yield* Effect.promise(() => instanceContext.provide(ctx, () => Effect.runPromise(ready)))
|
|
}
|
|
return ctx
|
|
}).pipe(Effect.withSpan("InstanceStore.boot"))
|
|
|
|
const removeEntry = (directory: string, entry: Entry) =>
|
|
Effect.sync(() => {
|
|
if (cache.get(directory) !== entry) return false
|
|
cache.delete(directory)
|
|
return true
|
|
})
|
|
|
|
const completeLoad = <R>(directory: string, input: LoadInput<R>, entry: Entry) =>
|
|
Effect.gen(function* () {
|
|
const exit = yield* Effect.exit(boot({ ...input, directory }))
|
|
if (Exit.isFailure(exit)) yield* removeEntry(directory, entry)
|
|
yield* Deferred.done(entry.deferred, exit).pipe(Effect.asVoid)
|
|
})
|
|
|
|
const emitDisposed = (input: { directory: string; project?: string }) =>
|
|
Effect.sync(() =>
|
|
GlobalBus.emit("event", {
|
|
directory: input.directory,
|
|
project: input.project,
|
|
workspace: WorkspaceContext.workspaceID,
|
|
payload: {
|
|
type: "server.instance.disposed",
|
|
properties: {
|
|
directory: input.directory,
|
|
},
|
|
},
|
|
}),
|
|
)
|
|
|
|
const disposeContext = Effect.fn("InstanceStore.disposeContext")(function* (ctx: InstanceContext) {
|
|
yield* Effect.logInfo("disposing instance", { directory: ctx.directory })
|
|
yield* Effect.promise(() => runDisposers(ctx.directory))
|
|
yield* emitDisposed({ directory: ctx.directory, project: ctx.project.id })
|
|
})
|
|
|
|
const disposeEntry = Effect.fnUntraced(function* (directory: string, entry: Entry, ctx: InstanceContext) {
|
|
if (cache.get(directory) !== entry) return false
|
|
yield* disposeContext(ctx)
|
|
if (cache.get(directory) !== entry) return false
|
|
cache.delete(directory)
|
|
return true
|
|
})
|
|
|
|
const load = <R>(input: LoadInput<R>): Effect.Effect<InstanceContext, never, R> => {
|
|
const directory = AppFileSystem.resolve(input.directory)
|
|
return Effect.uninterruptibleMask((restore) =>
|
|
Effect.gen(function* () {
|
|
const existing = cache.get(directory)
|
|
if (existing) return yield* restore(Deferred.await(existing.deferred))
|
|
|
|
const entry: Entry = { deferred: Deferred.makeUnsafe<InstanceContext>() }
|
|
cache.set(directory, entry)
|
|
yield* Effect.gen(function* () {
|
|
yield* Effect.logInfo("creating instance", { directory })
|
|
yield* completeLoad(directory, input, entry)
|
|
}).pipe(Effect.forkIn(scope, { startImmediately: true }))
|
|
return yield* restore(Deferred.await(entry.deferred))
|
|
}),
|
|
).pipe(Effect.withSpan("InstanceStore.load"))
|
|
}
|
|
|
|
const reload = <R>(input: LoadInput<R>): Effect.Effect<InstanceContext, never, R> => {
|
|
const directory = AppFileSystem.resolve(input.directory)
|
|
return Effect.uninterruptibleMask((restore) =>
|
|
Effect.gen(function* () {
|
|
const previous = cache.get(directory)
|
|
const entry: Entry = { deferred: Deferred.makeUnsafe<InstanceContext>() }
|
|
cache.set(directory, entry)
|
|
yield* Effect.gen(function* () {
|
|
yield* Effect.logInfo("reloading instance", { directory })
|
|
if (previous) {
|
|
yield* Deferred.await(previous.deferred).pipe(Effect.ignore)
|
|
yield* Effect.promise(() => runDisposers(directory))
|
|
yield* emitDisposed({ directory, project: input.project?.id })
|
|
}
|
|
yield* completeLoad(directory, input, entry)
|
|
}).pipe(Effect.forkIn(scope, { startImmediately: true }))
|
|
return yield* restore(Deferred.await(entry.deferred))
|
|
}),
|
|
).pipe(Effect.withSpan("InstanceStore.reload"))
|
|
}
|
|
|
|
const dispose = Effect.fn("InstanceStore.dispose")(function* (ctx: InstanceContext) {
|
|
const entry = cache.get(ctx.directory)
|
|
if (!entry) return yield* disposeContext(ctx)
|
|
|
|
const exit = yield* Deferred.await(entry.deferred).pipe(Effect.exit)
|
|
if (Exit.isFailure(exit)) return yield* removeEntry(ctx.directory, entry).pipe(Effect.asVoid)
|
|
if (exit.value !== ctx) return
|
|
yield* disposeEntry(ctx.directory, entry, ctx).pipe(Effect.asVoid)
|
|
})
|
|
|
|
const disposeAllOnce = Effect.fnUntraced(function* () {
|
|
yield* Effect.logInfo("disposing all instances")
|
|
yield* Effect.forEach(
|
|
[...cache.entries()],
|
|
(item) =>
|
|
Effect.gen(function* () {
|
|
const exit = yield* Deferred.await(item[1].deferred).pipe(Effect.exit)
|
|
if (Exit.isFailure(exit)) {
|
|
yield* Effect.logWarning("instance dispose failed", { key: item[0], cause: exit.cause })
|
|
yield* removeEntry(item[0], item[1])
|
|
return
|
|
}
|
|
yield* disposeEntry(item[0], item[1], exit.value)
|
|
}),
|
|
{ discard: true },
|
|
)
|
|
})
|
|
|
|
const cachedDisposeAll = yield* Effect.cachedWithTTL(disposeAllOnce(), Duration.zero)
|
|
const disposeAll = Effect.fn("InstanceStore.disposeAll")(function* () {
|
|
return yield* cachedDisposeAll
|
|
})
|
|
|
|
const provide = <A, E, R, R2>(input: LoadInput<R2>, effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R | R2> =>
|
|
load(input).pipe(Effect.flatMap((ctx) => effect.pipe(Effect.provideService(InstanceRef, ctx))))
|
|
|
|
yield* Effect.addFinalizer(() => disposeAll().pipe(Effect.ignore))
|
|
|
|
return Service.of({
|
|
load,
|
|
reload,
|
|
dispose,
|
|
disposeAll,
|
|
provide,
|
|
})
|
|
}),
|
|
)
|
|
|
|
export const defaultLayer = layer.pipe(Layer.provide(Project.defaultLayer))
|
|
|
|
export const runtime = makeRuntime(Service, defaultLayer)
|
|
|
|
// Promise-returning helpers for callers without an Effect runtime in scope.
|
|
// They route through `runtime` (not a yielded Service from a fresh runtime)
|
|
// so they share the cache that `Instance.provide` populates.
|
|
export const disposeInstance = (ctx: InstanceContext) => runtime.runPromise((store) => store.dispose(ctx))
|
|
export const disposeAllInstances = () => runtime.runPromise((store) => store.disposeAll())
|
|
export const reloadInstance = (input: LoadInput) => runtime.runPromise((store) => store.reload(input))
|
|
|
|
export * as InstanceStore from "./instance-store"
|