@opencode/core 0.0.0-dev-19487 → 0.0.0-dev-19491

package/dist/chunks/{job-6vn5aqap.js → skill-ggkj9wzv.js}

@@ -1,28 +1,28 @@
 import {
   Service79,
   node84
-} from "./job-dvam00rs.js";
+} from "./skill-69jddtm0.js";
 import {
-  Service74,
-  node79
-} from "./job-92e5p8bq.js";
+  Service75,
+  node80
+} from "./skill-2vskgd28.js";
 import {
   SessionEvent2
-} from "./job-ec1grn59.js";
+} from "./skill-ec1grn59.js";
 import {
-  Service65,
-  node69
-} from "./job-jz5ydzs3.js";
+  Service72,
+  node77
+} from "./skill-tb969tae.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/session/instructions.ts
 var exports_instructions = {};
 __export(exports_instructions, {
-  Service: () => Service10,
+  Service: () => Service11,
   SessionInstructions: () => exports_instructions,
-  node: () => node13
+  node: () => node14
 });
 import { relative } from "path";
 import { Context, Effect, Layer, Option, Ref, Schema } from "effect";
@@ -32,13 +32,13 @@ var InjectedMetadata = Schema.Struct({
   instruction: Schema.Struct({ paths: Schema.Array(Schema.String) })
 });
 
-class Service10 extends Context.Service()("@opencode/SessionInstructions") {
+class Service11 extends Context.Service()("@opencode/SessionInstructions") {
 }
-var layer = Layer.effect(Service10, Effect.gen(function* () {
+var layer = Layer.effect(Service11, Effect.gen(function* () {
   const bus = yield* Service79;
   const fs = yield* FSUtil.Service;
-  const store = yield* Service65;
-  const location = yield* Service74;
+  const store = yield* Service72;
+  const location = yield* Service75;
   const root = yield* fs.resolve(location.project.directory);
   const inFlight = yield* Ref.make(new Map);
   const load = Effect.fn("SessionInstructions.load")(function* (input) {
@@ -84,7 +84,7 @@ ${file.content}`).join(`
       return next;
     })));
   });
-  return Service10.of({ load });
+  return Service11.of({ load });
 }));
 function previouslyInjected(store, sessionID) {
   return Effect.gen(function* () {
@@ -95,10 +95,10 @@ function previouslyInjected(store, sessionID) {
 function describePath(root, path) {
   return FSUtil.contains(root, path) ? relative(root, path) : path;
 }
-var node13 = makeLocationNode({
+var node14 = makeLocationNode({
   name: "session-instructions",
   layer,
-  deps: [node84, FSUtil.node, node79, node69]
+  deps: [node84, FSUtil.node, node80, node77]
 });
 
-export { Service10, node13, exports_instructions };
+export { Service11, node14, exports_instructions };

package/dist/chunks/{job-6sjc8c0h.js → skill-gna7rjh2.js}

@@ -3,34 +3,34 @@ import {
   WrongKind2,
   Failed2,
   typeFollowing2
-} from "./job-2a5m3afh.js";
+} from "./skill-2a5m3afh.js";
 import {
   execDefaults2
-} from "./job-1dazxqgg.js";
+} from "./skill-1dazxqgg.js";
 import {
   makeLocalDriver2
-} from "./job-b6gygkdw.js";
+} from "./skill-b6gygkdw.js";
 import {
   makeMemoryDriver2
-} from "./job-aaet6srn.js";
+} from "./skill-aaet6srn.js";
 import {
-  Service74,
-  node79
-} from "./job-92e5p8bq.js";
+  Service75,
+  node80
+} from "./skill-2vskgd28.js";
 import {
-  Service70,
-  node74
-} from "./job-smgfxgse.js";
+  Service49,
+  node53
+} from "./skill-gx0k0zre.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/environment/environment.ts
 var exports_environment2 = {};
 __export(exports_environment2, {
   EnvironmentService: () => exports_environment2,
-  Service: () => Service69,
-  node: () => node73
+  Service: () => Service45,
+  node: () => node49
 });
 import { CrossSpawnSpawner } from "@opencode/util/cross-spawn-spawner";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -43,13 +43,13 @@ __export(exports_environment3, {
   Environment: () => exports_environment3,
   Failed: () => Failed2,
   NotFound: () => NotFound2,
-  Service: () => Service69,
+  Service: () => Service45,
   WrongKind: () => WrongKind2,
   execDefaults: () => execDefaults2,
   makeFiles: () => makeFiles2,
   makeLocalDriver: () => makeLocalDriver2,
   makeMemoryDriver: () => makeMemoryDriver2,
-  node: () => node73,
+  node: () => node49,
   typeFollowing: () => typeFollowing2
 });
 var makeFiles2 = (driver) => ({
@@ -58,19 +58,19 @@ var makeFiles2 = (driver) => ({
 });
 
 // src/environment/environment.ts
-class Service69 extends Context.Service()("@opencode/Environment") {
+class Service45 extends Context.Service()("@opencode/Environment") {
 }
-var layer = Layer.effect(Service69, Effect.gen(function* () {
+var layer = Layer.effect(Service45, Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner;
-  const location = yield* Service74;
-  const workspace = yield* Service70;
+  const location = yield* Service75;
+  const workspace = yield* Service49;
   const driver = location.workspaceID ? yield* workspace.connect(location.workspaceID).pipe(Effect.mapError((cause) => new Error(`Failed to bind Environment to workspace ${location.workspaceID}`, { cause })), Effect.orDie) : makeLocalDriver2(spawner);
-  return Service69.of({ files: makeFiles2(driver), spawner: driver.spawner });
+  return Service45.of({ files: makeFiles2(driver), spawner: driver.spawner });
 }));
-var node73 = makeLocationNode({
-  service: Service69,
+var node49 = makeLocationNode({
+  service: Service45,
   layer,
-  deps: [CrossSpawnSpawner.node, node79, node74]
+  deps: [CrossSpawnSpawner.node, node80, node53]
 });
 
-export { Service69, node73, exports_environment2, makeFiles2, exports_environment3 };
+export { Service45, node49, exports_environment2, makeFiles2, exports_environment3 };

package/dist/chunks/{job-2fha9ajs.js → skill-grc1sz1y.js}

@@ -1,57 +1,57 @@
 import {
   Service80
-} from "./job-n2jnf84z.js";
+} from "./skill-vnc5pt4r.js";
 import {
   Service79
-} from "./job-dvam00rs.js";
+} from "./skill-69jddtm0.js";
 import {
-  Service41
-} from "./job-3c1tgrea.js";
+  Service57
+} from "./skill-8q9myf25.js";
 import {
   userNotification2
-} from "./job-fxbjtjnd.js";
+} from "./skill-fxbjtjnd.js";
 import {
   SessionMessage2
-} from "./job-gftt206x.js";
+} from "./skill-gftt206x.js";
 import {
-  NotFoundError8,
+  NotFoundError9,
   PromptConflictError2,
   SyntheticConflictError2,
   CompactionConflictError2,
   BusyError2,
   InboxConflictError2
-} from "./job-jzy4mkh2.js";
+} from "./skill-qwkytnft.js";
 import {
   SessionEvent2
-} from "./job-ec1grn59.js";
+} from "./skill-ec1grn59.js";
 import {
-  Service65
-} from "./job-jz5ydzs3.js";
+  Service72
+} from "./skill-tb969tae.js";
 import {
   Delivery2,
   SyntheticPayload2,
-  Service40
-} from "./job-pfpaa7gq.js";
+  Service55
+} from "./skill-bmw4j1xk.js";
 import {
-  Service37
-} from "./job-hvskjtw3.js";
+  Service53
+} from "./skill-tbbq327f.js";
 import {
   prepare2
-} from "./job-7y8hdne7.js";
+} from "./skill-hq3rzvmw.js";
 import {
   stage2,
   clear2,
   commit2
-} from "./job-wh1vm43f.js";
+} from "./skill-hgezhq2t.js";
 import {
   start2
-} from "./job-pgp2hfz4.js";
+} from "./skill-7q2nyqgm.js";
 import {
   get4
-} from "./job-5vktnwp6.js";
+} from "./skill-esbcw9x0.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/session/session.ts
 var exports_session2 = {};
@@ -65,16 +65,16 @@ import { FSUtil } from "@opencode/util/fs-util";
 var make12 = Effect.fn("Session.make")(function* () {
   const bus = yield* Service79;
   const database = yield* Service80;
-  const store = yield* Service65;
-  const instances = yield* Service41;
-  const execution = yield* Service37;
-  const admission = yield* Service40;
+  const store = yield* Service72;
+  const instances = yield* Service57;
+  const execution = yield* Service53;
+  const admission = yield* Service55;
   const fs = yield* FSUtil.Service;
   const scope = yield* Scope.Scope;
   const get = Effect.fn("Session.get")(function* (sessionID) {
     const session = yield* store.get(sessionID);
     if (!session)
-      return yield* new NotFoundError8({ sessionID });
+      return yield* new NotFoundError9({ sessionID });
     return session;
   });
   const message = Effect.fn("Session.message")(function* (sessionID, messageID) {
@@ -131,7 +131,7 @@ var make12 = Effect.fn("Session.make")(function* () {
       });
       if (existing)
         return existing;
-      const item = yield* restore(prepare2({ session, messageID, input }).pipe(Effect.provideService(Service41, instances), Effect.provideService(FSUtil.Service, fs)));
+      const item = yield* restore(prepare2({ session, messageID, input }).pipe(Effect.provideService(Service57, instances), Effect.provideService(FSUtil.Service, fs)));
       if (session.revert)
         yield* commit2(bus, session);
       return yield* admission.admit({
@@ -147,7 +147,7 @@ var make12 = Effect.fn("Session.make")(function* () {
   const shell = Effect.fn("Session.shell")(function* (sessionID, input) {
     const session = yield* get(sessionID);
     const running = yield* Effect.gen(function* () {
-      const started = yield* start2({ session, command: input.command }).pipe(Effect.provideService(Service41, instances), Effect.tapError((error) => synthetic(sessionID, {
+      const started = yield* start2({ session, command: input.command }).pipe(Effect.provideService(Service57, instances), Effect.tapError((error) => synthetic(sessionID, {
         text: `User shell command failed to start:
 ${input.command}
 
@@ -176,7 +176,7 @@ ${error.message}`,
   });
   const skill = Effect.fn("Session.skill")(function* (sessionID, input) {
     const session = yield* get(sessionID);
-    const skill = yield* get4({ session, skill: input.skill }).pipe(Effect.provideService(Service41, instances));
+    const skill = yield* get4({ session, skill: input.skill }).pipe(Effect.provideService(Service57, instances));
     yield* bus.publish(SessionEvent2.Skill.Activated, {
       sessionID,
       id: skill.id,
@@ -233,13 +233,13 @@ ${error.message}`,
     const session = yield* get(sessionID);
     if (yield* execution.isActive(sessionID))
       return yield* new BusyError2({ sessionID });
-    return yield* stage2({ session, messageID: input.messageID, files: input.files }).pipe(Effect.provideService(Service41, instances), Effect.provideService(Service80, database), Effect.provideService(Service79, bus));
+    return yield* stage2({ session, messageID: input.messageID, files: input.files }).pipe(Effect.provideService(Service57, instances), Effect.provideService(Service80, database), Effect.provideService(Service79, bus));
   });
   const clear = Effect.fn("Session.revert.clear")(function* (sessionID) {
     const session = yield* get(sessionID);
     if (yield* execution.isActive(sessionID))
       return yield* new BusyError2({ sessionID });
-    yield* clear2(session).pipe(Effect.provideService(Service41, instances), Effect.provideService(Service79, bus));
+    yield* clear2(session).pipe(Effect.provideService(Service57, instances), Effect.provideService(Service79, bus));
     return yield* execution.wake(sessionID);
   });
   const commit = Effect.fn("Session.revert.commit")(function* (sessionID) {

package/dist/chunks/{job-mw934p8z.js → skill-gwydwvmj.js}

@@ -1,21 +1,21 @@
 import {
   call2
-} from "./job-56gdpj1q.js";
+} from "./skill-1ygqh575.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/plugin/websearch/exa.ts
 var exports_exa = {};
 __export(exports_exa, {
-  Plugin: () => Plugin34,
+  Plugin: () => Plugin4,
   WebSearchExa: () => exports_exa,
-  endpoint: () => endpoint3
+  endpoint: () => endpoint4
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect, Schema } from "effect";
 import { HttpClient } from "effect/unstable/http";
-var endpoint3 = "https://mcp.exa.ai/mcp";
+var endpoint4 = "https://mcp.exa.ai/mcp";
 var McpInput = Schema.Struct({
   query: Schema.String,
   numResults: Schema.Number.pipe(Schema.optional)
@@ -27,7 +27,7 @@ var McpOutput = Schema.Struct({
     _meta: Schema.Struct({ searchTime: Schema.Number }).pipe(Schema.optional)
   }))
 });
-var Plugin34 = define({
+var Plugin4 = define({
   id: "opencode.websearch.exa",
   effect: Effect.fn("WebSearchExa.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -49,7 +49,7 @@ var Plugin34 = define({
         execute: (input) => Effect.gen(function* () {
           const connection = yield* ctx.integration.connection.active("exa");
           const credential = connection ? yield* ctx.integration.connection.resolve(connection) : undefined;
-          const url = new URL(endpoint3);
+          const url = new URL(endpoint4);
           if (credential?.type === "key")
             url.searchParams.set("exaApiKey", credential.key);
           const result = yield* call2(http, url.toString(), "web_search_exa", { input: McpInput, output: McpOutput }, { query: input.query, numResults: 8 });
@@ -80,4 +80,4 @@ function parseResults(text) {
   });
 }
 
-export { endpoint3, Plugin34, exports_exa };
+export { endpoint4, Plugin4, exports_exa };

package/dist/chunks/{job-smgfxgse.js → skill-gx0k0zre.js}

@@ -1,33 +1,33 @@
 import {
   Service80,
   node85
-} from "./job-n2jnf84z.js";
+} from "./skill-vnc5pt4r.js";
 import {
   makeUnsafe2
-} from "./job-y71avatq.js";
+} from "./skill-dpkg50ah.js";
 import {
   Binding2,
   RegistryService2,
-  node75
-} from "./job-mvfdckk2.js";
+  node54
+} from "./skill-r9th2xkr.js";
 import {
   WorkspaceTable2
-} from "./job-faypxj3z.js";
+} from "./skill-faypxj3z.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/workspace.ts
 var exports_workspace = {};
 __export(exports_workspace, {
   CreateConflict: () => CreateConflict2,
-  ID: () => ID16,
-  Info: () => Info29,
+  ID: () => ID6,
+  Info: () => Info17,
   NotFound: () => NotFound3,
-  Service: () => Service70,
+  Service: () => Service49,
   Workspace: () => exports_workspace,
-  configured: () => configured9,
-  node: () => node74
+  configured: () => configured10,
+  node: () => node53
 });
 import { Workspace } from "@opencode/schema/workspace";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
@@ -35,10 +35,10 @@ 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";
-var ID16 = Workspace.ID;
+var ID6 = Workspace.ID;
 
-class Info29 extends Schema.Class("Workspace.Info")({
-  id: ID16,
+class Info17 extends Schema.Class("Workspace.Info")({
+  id: ID6,
   provider: Schema.String,
   binding: Binding2,
   createdAt: Schema.Number,
@@ -46,24 +46,24 @@ class Info29 extends Schema.Class("Workspace.Info")({
 }) {
 }
 
-class NotFound3 extends Schema.TaggedError()("Workspace.NotFound", { workspaceID: ID16 }) {
+class NotFound3 extends Schema.TaggedError()("Workspace.NotFound", { workspaceID: ID6 }) {
 }
 
 class CreateConflict2 extends Schema.TaggedError()("Workspace.CreateConflict", {
-  workspaceID: ID16,
+  workspaceID: ID6,
   provider: Schema.String,
   existingProvider: Schema.String
 }) {
 }
 
-class Service70 extends Context.Service()("@opencode/Workspace") {
+class Service49 extends Context.Service()("@opencode/Workspace") {
 }
-var configured9 = (options = {}) => makeGlobalNode({
-  service: Service70,
+var configured10 = (options = {}) => makeGlobalNode({
+  service: Service49,
   layer: layer(options),
-  deps: [node85, node75]
+  deps: [node85, node54]
 });
-var layer = (options) => Layer.effect(Service70, Effect.gen(function* () {
+var layer = (options) => Layer.effect(Service49, Effect.gen(function* () {
   const db = (yield* Service80).db;
   const registry = yield* RegistryService2;
   const lifetime = yield* Scope.Scope;
@@ -80,7 +80,7 @@ var layer = (options) => Layer.effect(Service70, Effect.gen(function* () {
     return row;
   });
   const saveBinding = (workspaceID, binding) => db.update(WorkspaceTable2).set({ binding }).where(eq(WorkspaceTable2.id, workspaceID)).run().pipe(Effect.orDie);
-  const info = (row, binding) => new Info29({
+  const info = (row, binding) => new Info17({
     id: row.id,
     provider: row.provider,
     binding,
@@ -154,9 +154,9 @@ var layer = (options) => Layer.effect(Service70, Effect.gen(function* () {
       yield* Scope.close(connection.scope, Exit.void);
     }).pipe(Effect.catchCause((cause) => Effect.logError("workspace idle suspension failed", cause)))), { concurrency: "unbounded", discard: true });
   }).pipe(Effect.repeat(Schedule.spaced(options.pollInterval ?? Duration.minutes(1))), Effect.forkScoped);
-  return Service70.of({
+  return Service49.of({
     create: Effect.fn("Workspace.create")(function* (input) {
-      const workspaceID = input.id ?? ID16.create();
+      const workspaceID = input.id ?? ID6.create();
       const existing = yield* db.select({ provider: WorkspaceTable2.provider }).from(WorkspaceTable2).where(eq(WorkspaceTable2.id, workspaceID)).get().pipe(Effect.orDie);
       if (existing) {
         if (existing.provider === input.provider)
@@ -221,6 +221,6 @@ var layer = (options) => Layer.effect(Service70, Effect.gen(function* () {
     })
   });
 }));
-var node74 = configured9();
+var node53 = configured10();
 
-export { ID16, Info29, NotFound3, CreateConflict2, Service70, configured9, node74, exports_workspace };
+export { ID6, Info17, NotFound3, CreateConflict2, Service49, configured10, node53, exports_workspace };

package/dist/chunks/skill-gyce5qg1.js

@@ -0,0 +1,18 @@
+import {
+  __export
+} from "./skill-9rqn6x4v.js";
+
+// src/plugin/service.ts
+var exports_service = {};
+__export(exports_service, {
+  Plugin: () => exports_service,
+  Service: () => Service21,
+  awaitActivation: () => awaitActivation2
+});
+import { Context } from "effect";
+
+class Service21 extends Context.Service()("@opencode/Plugin") {
+}
+var awaitActivation2 = Service21.use((plugins) => plugins.awaitActivation);
+
+export { Service21, awaitActivation2, exports_service };

package/dist/chunks/{job-h03wrkyp.js → skill-h03wrkyp.js}

@@ -1,9 +1,9 @@
 import {
   SessionEvent2
-} from "./job-ec1grn59.js";
+} from "./skill-ec1grn59.js";
 import {
   tokens2
-} from "./job-tdstcens.js";
+} from "./skill-tdstcens.js";
 
 // src/session/runner/publish-llm-event.ts
 import { Effect, Fiber, Iterable } from "effect";

package/dist/chunks/{job-n32rgk8k.js → skill-h0n6thkm.js}

@@ -1,29 +1,29 @@
 import {
   Service80,
   node85
-} from "./job-n2jnf84z.js";
+} from "./skill-vnc5pt4r.js";
 import {
   KVTable2
-} from "./job-3hepkmqq.js";
+} from "./skill-3hepkmqq.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/kv.ts
 var exports_kv = {};
 __export(exports_kv, {
   KV: () => exports_kv,
-  Service: () => Service78,
-  node: () => node83
+  Service: () => Service66,
+  node: () => node70
 });
 import { and, asc, eq, gt, gte, lt } from "drizzle-orm";
 import { Context, Effect, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
-class Service78 extends Context.Service()("@opencode/KV") {
+class Service66 extends Context.Service()("@opencode/KV") {
 }
-var layer = Layer.effect(Service78, Effect.gen(function* () {
+var layer = Layer.effect(Service66, Effect.gen(function* () {
   const db = (yield* Service80).db;
-  return Service78.of({
+  return Service66.of({
     get: Effect.fn("KV.get")(function* (key) {
       return (yield* db.select({ value: KVTable2.value }).from(KVTable2).where(eq(KVTable2.key, key)).get().pipe(Effect.orDie))?.value;
     }),
@@ -51,6 +51,6 @@ function prefixEnd(prefix) {
     return;
   return `${points.slice(0, index).join("")}${String.fromCodePoint(points[index].codePointAt(0) + 1)}`;
 }
-var node83 = makeGlobalNode({ service: Service78, layer, deps: [node85] });
+var node70 = makeGlobalNode({ service: Service66, layer, deps: [node85] });
 
-export { Service78, node83, exports_kv };
+export { Service66, node70, exports_kv };

package/dist/chunks/{job-h6vf3j39.js → skill-h6vf3j39.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/util/token.ts
 var exports_token = {};

package/dist/chunks/{job-wh1vm43f.js → skill-hgezhq2t.js}

@@ -1,34 +1,34 @@
 import {
   Service80
-} from "./job-n2jnf84z.js";
+} from "./skill-vnc5pt4r.js";
 import {
   Service79
-} from "./job-dvam00rs.js";
+} from "./skill-69jddtm0.js";
 import {
-  Service41
-} from "./job-3c1tgrea.js";
+  Service57
+} from "./skill-8q9myf25.js";
 import {
   RelativePath2
-} from "./job-922hggd3.js";
+} from "./skill-922hggd3.js";
 import {
-  ID5,
-  Service36
-} from "./job-pchzg8ns.js";
+  ID4,
+  Service32
+} from "./skill-kcdqxvh5.js";
 import {
   SessionEvent2
-} from "./job-ec1grn59.js";
+} from "./skill-ec1grn59.js";
 import {
   SessionMessage2
-} from "./job-gftt206x.js";
+} from "./skill-gftt206x.js";
 import {
   MessageNotFoundError2
-} from "./job-jzy4mkh2.js";
+} from "./skill-qwkytnft.js";
 import {
   SessionMessageTable2
-} from "./job-a1bz86dw.js";
+} from "./skill-a1bz86dw.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./skill-9rqn6x4v.js";
 
 // src/session/revert.ts
 var exports_revert = {};
@@ -42,12 +42,12 @@ __export(exports_revert, {
 import { and, asc, eq, gt } from "drizzle-orm";
 import { Effect, Schema } from "effect";
 var stage2 = Effect.fn("SessionRevert.stage")(function* (input) {
-  const instances = yield* Service41;
+  const instances = yield* Service57;
   const database = yield* Service80;
   const bus = yield* Service79;
   return yield* Effect.gen(function* () {
-    const snapshot = yield* Service36;
-    const original = input.session.revert?.snapshot ? ID5.make(input.session.revert.snapshot) : yield* snapshot.capture();
+    const snapshot = yield* Service32;
+    const original = input.session.revert?.snapshot ? ID4.make(input.session.revert.snapshot) : yield* snapshot.capture();
     const next = yield* plan(database.db, { sessionID: input.session.id, messageID: input.messageID });
     const restore = new Map;
     if (original) {
@@ -74,13 +74,13 @@ var stage2 = Effect.fn("SessionRevert.stage")(function* (input) {
   }).pipe(instances.provide(input.session));
 });
 var clear2 = Effect.fn("SessionRevert.clear")(function* (session) {
-  const instances = yield* Service41;
+  const instances = yield* Service57;
   const bus = yield* Service79;
   yield* Effect.gen(function* () {
-    const snapshot = yield* Service36;
+    const snapshot = yield* Service32;
     if (!session.revert)
       return;
-    const original = session.revert.snapshot ? ID5.make(session.revert.snapshot) : undefined;
+    const original = session.revert.snapshot ? ID4.make(session.revert.snapshot) : undefined;
     if (original)
       yield* snapshot.restore({
         files: new Map((session.revert.files ?? []).map((file) => [RelativePath2.make(file.file), original]))
@@ -111,7 +111,7 @@ var plan = Effect.fn("SessionRevert.plan")(function* (db, input) {
       continue;
     for (const file of message.snapshot.files ?? [])
       if (!files.has(file))
-        files.set(file, ID5.make(message.snapshot.start));
+        files.set(file, ID4.make(message.snapshot.start));
   }
   return files;
 });