From 282b644cde9bc6240312a0cba72b8dc35a4c9282 Mon Sep 17 00:00:00 2001 From: Dax Date: Sat, 22 Aug 2026 20:21:37 -0400 Subject: [PATCH] fix(core): expire locations from session activity (#44275) --- packages/core/src/location-activity.ts | 74 +++++++++++++++++++++++ packages/core/src/location-services.ts | 4 +- packages/core/test/location-layer.test.ts | 54 ++++++++++++++++- packages/server/src/routes.ts | 2 + 4 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 packages/core/src/location-activity.ts diff --git a/packages/core/src/location-activity.ts b/packages/core/src/location-activity.ts new file mode 100644 index 00000000000..713b1a3392c --- /dev/null +++ b/packages/core/src/location-activity.ts @@ -0,0 +1,74 @@ +export * as LocationActivity from "./location-activity.js" + +import { Clock, Context, Duration, Effect, Layer, RcMap, Schema } from "effect" +import { Bus } from "./bus.js" +import { Location } from "./location.js" +import { LocationServiceMap } from "./location-service-map.js" +import { SessionEvent } from "./session/event.js" +import { makeGlobalNode } from "@opencode-ai/util/effect/app-node" + +const isSessionEvent = Schema.is(SessionEvent.Durable) + +export class Service extends Context.Service()("@opencode/LocationActivity") {} + +export function layer(options: { readonly timeToLive?: Duration.Input; readonly sweepInterval?: Duration.Input } = {}) { + return Layer.effect( + Service, + Effect.gen(function* () { + const clock = yield* Clock.Clock + const bus = yield* Bus.Service + const locations = yield* LocationServiceMap.Service + const timeToLive = Duration.toMillis(options.timeToLive ?? "60 minutes") + const entries = new Map() + const key = (ref: Location.Ref) => `${ref.directory}\0${ref.workspaceID ?? ""}` + const touch = (ref: Location.Ref) => + Effect.sync(() => { + entries.set(key(ref), { ref, expiresAt: clock.currentTimeMillisUnsafe() + timeToLive }) + }) + + const unsubscribe = yield* bus.listen((event) => { + if (!isSessionEvent(event)) return Effect.void + const location = event.location + if (!location) return Effect.void + return RcMap.has(locations.rcMap, location).pipe( + Effect.flatMap((active) => (active ? touch(location) : Effect.void)), + ) + }) + yield* Effect.addFinalizer(() => unsubscribe) + yield* Effect.gen(function* () { + yield* Effect.sleep(options.sweepInterval ?? "1 minute") + const refs = Array.from(yield* RcMap.keys(locations.rcMap)) + const cached = new Set(refs.map(key)) + yield* Effect.forEach( + refs, + (ref) => (entries.has(key(ref)) ? Effect.void : touch(ref)), + { discard: true }, + ) + for (const id of entries.keys()) { + if (!cached.has(id)) entries.delete(id) + } + const now = clock.currentTimeMillisUnsafe() + const expired = Array.from(entries.values()).filter((entry) => entry.expiresAt <= now) + yield* Effect.forEach( + expired, + (entry) => { + entries.delete(key(entry.ref)) + return Effect.logInfo("location services evicted", { + directory: entry.ref.directory, + workspaceID: entry.ref.workspaceID, + }).pipe(Effect.andThen(locations.invalidate(entry.ref))) + }, + { discard: true }, + ) + }).pipe(Effect.forever, Effect.forkScoped) + + return Service.of({}) + }), + ) +} + +export const node = makeGlobalNode({ + service: Service, + layer: layer(), + deps: [Bus.node, LocationServiceMap.node], +}) diff --git a/packages/core/src/location-services.ts b/packages/core/src/location-services.ts index c1e2fda6af2..0baa9392c18 100644 --- a/packages/core/src/location-services.ts +++ b/packages/core/src/location-services.ts @@ -1,4 +1,4 @@ -import { Effect, Layer, LayerMap } from "effect" +import { Duration, Effect, Layer, LayerMap } from "effect" import { existsSync } from "fs" import path from "path" import { Agent } from "./agent.js" @@ -147,7 +147,7 @@ export function buildLocationServiceMap( Layer.provide(LayerNode.compile(location.hoisted)), ) }, - { idleTimeToLive: (ref) => (existsSync(ref.directory) ? "60 minutes" : 0) }, + { idleTimeToLive: (ref) => (existsSync(ref.directory) ? Duration.infinity : Duration.zero) }, ), (inner) => ({ ...inner, diff --git a/packages/core/test/location-layer.test.ts b/packages/core/test/location-layer.test.ts index e9c4d09135f..092b4f6d257 100644 --- a/packages/core/test/location-layer.test.ts +++ b/packages/core/test/location-layer.test.ts @@ -3,14 +3,16 @@ import path from "path" import { describe, expect } from "bun:test" import { Config } from "@opencode-ai/schema/config" import { Money } from "@opencode-ai/schema/money" -import { DateTime, Deferred, Effect, Equal, Fiber, Hash, RcMap, Schema, Stream } from "effect" +import { DateTime, Deferred, Duration, Effect, Equal, Fiber, Hash, Layer, LayerMap, RcMap, Schema, Stream } from "effect" +import { TestClock } from "effect/testing" import { Plugin as EffectPlugin } from "@opencode-ai/plugin/effect" import { Agent } from "@opencode-ai/core/agent" import { Catalog } from "@opencode-ai/core/catalog" import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder" import { LayerNode } from "@opencode-ai/util/effect/layer-node" import { Global } from "@opencode-ai/util/global" -import { LocationServiceMap } from "@opencode-ai/core/location-services" +import { LocationServiceMap, type LocationServices } from "@opencode-ai/core/location-services" +import { LocationActivity } from "@opencode-ai/core/location-activity" import { Location } from "@opencode-ai/core/location" import { Plugin } from "@opencode-ai/core/plugin" import { SdkPlugins } from "@opencode-ai/core/plugin/sdk" @@ -21,6 +23,7 @@ import { Project } from "@opencode-ai/core/project" import { Provider } from "@opencode-ai/core/provider" import { AbsolutePath } from "@opencode-ai/core/schema" import { Session } from "@opencode-ai/core/session" +import { SessionEvent } from "@opencode-ai/core/session/event" import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model" import { tmpdir } from "./fixture/tmpdir" import { tempGlobalLayer } from "./fixture/global" @@ -41,8 +44,55 @@ const itWithSdk = testEffect( [Global.node, tempGlobalLayer], ]), ) +const activityLocations = Layer.effect( + LocationServiceMap.Service, + LayerMap.make( + (ref) => + // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion + Layer.succeed( + Location.Service, + Location.Service.of({ + directory: ref.directory, + workspaceID: ref.workspaceID, + project: { id: Project.ID.global, directory: ref.directory, canonical: ref.directory }, + }), + ) as unknown as Layer.Layer, + { idleTimeToLive: Duration.infinity }, + ), +) +const itWithActivity = testEffect( + AppNodeBuilder.build( + LayerNode.group([Database.node, Bus.node, LocationServiceMap.node, LocationActivity.node]), + [[LocationServiceMap.node, activityLocations]], + ), +) describe("LocationServiceMap", () => { + itWithActivity.effect("refreshes lifetime from Session events only", () => + Effect.gen(function* () { + const locations = yield* LocationServiceMap.Service + const bus = yield* Bus.Service + const ref = Location.Ref.make({ directory: AbsolutePath.make("/project") }) + const sessionID = Session.ID.make("ses_location_activity") + const read = Location.Service.pipe(Effect.provide(locations.get(ref)), Effect.scoped) + + yield* read + yield* TestClock.adjust("59 minutes") + yield* bus.publish(Catalog.Event.Updated, {}, { location: ref }) + yield* TestClock.adjust("2 minutes") + expect(Array.from(yield* RcMap.keys(locations.rcMap))).toEqual([]) + + yield* read + yield* bus.publish(SessionEvent.Execution.Started, { sessionID }, { location: ref }) + yield* TestClock.adjust("59 minutes") + yield* bus.publish(SessionEvent.Execution.Succeeded, { sessionID }, { location: ref }) + yield* TestClock.adjust("1 minute") + expect(Array.from(yield* RcMap.keys(locations.rcMap))).toEqual([ref]) + yield* TestClock.adjust("59 minutes") + expect(Array.from(yield* RcMap.keys(locations.rcMap))).toEqual([]) + }), + ) + it.live("retries a location after its missing directory is recreated", () => Effect.acquireRelease( Effect.promise(() => tmpdir()), diff --git a/packages/server/src/routes.ts b/packages/server/src/routes.ts index a38c830c654..cf2a2f81b03 100644 --- a/packages/server/src/routes.ts +++ b/packages/server/src/routes.ts @@ -20,6 +20,7 @@ import { MCP } from "@opencode-ai/core/mcp/index" import { Global } from "@opencode-ai/util/global" import { InstructionDiscovery } from "@opencode-ai/core/instruction-discovery" import { LocationServiceMap } from "@opencode-ai/core/location-service-map" +import { LocationActivity } from "@opencode-ai/core/location-activity" import { ModelsDev } from "@opencode-ai/core/models-dev" import { SessionRestart } from "@opencode-ai/core/session/execution/restart" import { PluginRuntime } from "@opencode-ai/core/plugin/runtime" @@ -62,6 +63,7 @@ const applicationServiceNodes = [ WellKnown.node, PtyEnvironment.node, LocationServiceMap.node, + LocationActivity.node, SessionRestart.node, ] as const const applicationServices = LayerNode.group(applicationServiceNodes)