refactor(core): trim v2 context epoch scope

packages/core/src/event.ts

@@ -381,10 +381,10 @@ export const layerWith = (options?: LayerOptions) =>
         })
       }
 
-      function publishEvent<D extends Definition>(event: Payload<D>, options?: PublishOptions) {
+      function publishEvent<D extends Definition>(event: Payload<D>, commit?: PublishOptions["commit"]) {
         return Effect.gen(function* () {
           const durable = registry.get(event.type)?.sync !== undefined
-          if (!durable && options?.commit)
+          if (!durable && commit)
             return yield* Effect.die(
               new InvalidSyncEventError({
                 type: event.type,
@@ -392,7 +392,7 @@ export const layerWith = (options?: LayerOptions) =>
               }),
             )
           if (durable) {
-            const committed = yield* commitSyncEvent(event as Payload, undefined, options?.commit)
+            const committed = yield* commitSyncEvent(event as Payload, undefined, commit)
             if (committed) {
               event = { ...event, seq: committed.seq }
               yield* Effect.forEach(syncHandlers, (sync) => observe(event as Payload, "sync", sync), { discard: true })
@@ -446,7 +446,7 @@ export const layerWith = (options?: LayerOptions) =>
               ...(location ? { location } : {}),
               data,
             } as Payload<D>,
-            options,
+            options?.commit,
           )
         })
       }

packages/core/src/location-layer.ts

@@ -57,7 +57,7 @@ export class LocationServiceMap extends LayerMap.Service<LocationServiceMap>()("
       Catalog.locationLayer,
       CommandV2.locationLayer,
       AgentV2.locationLayer,
-      PluginBoot.locationLayer.pipe(Layer.provide(systemContext)),
+      PluginBoot.locationLayer,
       FileSystem.locationLayer,
       Watcher.locationLayer,
       Pty.locationLayer,

packages/core/src/plugin/boot.ts

@@ -25,7 +25,6 @@ import { EnvPlugin } from "./env"
 import { ModelsDevPlugin } from "./models-dev"
 import { ProviderPlugins } from "./provider"
 import { SkillV2 } from "../skill"
-import { SystemContextRegistry } from "../system-context-registry"
 
 type Plugin = {
   id: PluginV2.ID
@@ -43,7 +42,6 @@ type Plugin = {
     | Config.Service
     | ModelsDev.Service
     | SkillV2.Service
-    | SystemContextRegistry.Service
   >
 }
 
@@ -69,7 +67,6 @@ export const layer = Layer.effect(
     const fs = yield* FSUtil.Service
     const global = yield* Global.Service
     const skill = yield* SkillV2.Service
-    const systemContext = yield* SystemContextRegistry.Service
     const done = yield* Deferred.make<void>()
 
     const add = Effect.fn("PluginBoot.add")(function* (input: Plugin) {
@@ -89,7 +86,6 @@ export const layer = Layer.effect(
           Effect.provideService(Global.Service, global),
           Effect.provideService(SkillV2.Service, skill),
           Effect.provideService(PluginV2.Service, plugin),
-          Effect.provideService(SystemContextRegistry.Service, systemContext),
         ),
       })
     })

packages/core/src/session/runner/llm.ts

@@ -98,13 +98,6 @@ export const layer = Layer.effect(
     const getContext = Effect.fn("SessionRunner.getContext")(function* (sessionID: SessionSchema.ID) {
       return yield* store.context(sessionID)
     })
-    const getRunnerContext = Effect.fn("SessionRunner.getRunnerContext")(function* (
-      sessionID: SessionSchema.ID,
-      baselineSeq: number,
-    ) {
-      return yield* store.runnerContext(sessionID, baselineSeq)
-    })
-
     const failInterruptedTools = Effect.fn("SessionRunner.failInterruptedTools")(function* (
       sessionID: SessionSchema.ID,
     ) {
@@ -152,7 +145,7 @@ export const layer = Layer.effect(
         }
       }
       const system = initialized ?? (yield* SessionContextEpoch.prepare(db, events, systemContext, session.id))
-      const context = yield* getRunnerContext(session.id, system.baselineSeq)
+      const context = yield* store.runnerContext(session.id, system.baselineSeq)
       const request = LLM.request({
         model,
         system: system.baseline.length > 0 ? [SystemPart.make(system.baseline)] : [],
@@ -251,7 +244,6 @@ export const layer = Layer.effect(
       readonly sessionID: SessionSchema.ID
       readonly force?: boolean
     }) {
-      const session = yield* getSession(input.sessionID)
       const hasSteer = yield* SessionInput.hasPending(db, input.sessionID, "steer")
       const hasQueue = hasSteer ? false : yield* SessionInput.hasPending(db, input.sessionID, "queue")
       if (input.force !== true && !hasSteer && !hasQueue) return
@@ -261,7 +253,7 @@ export const layer = Layer.effect(
       while (openActivity) {
         let needsContinuation = true
         for (let step = 0; step < MAX_STEPS; step++) {
-          needsContinuation = yield* runTurn(session.id, promotion)
+          needsContinuation = yield* runTurn(input.sessionID, promotion)
           promotion = "steer"
           if (!needsContinuation) needsContinuation = yield* SessionInput.hasPending(db, input.sessionID, "steer")
           if (!needsContinuation) break