@opencode/core 0.0.0-dev-20092 → 0.0.0-dev-20103

package/dist/chunks/{form-sbnznnja.js → location-service-map-c16s4pd0.js}

@@ -1,51 +1,51 @@
 import {
   AbsolutePath2
-} from "./form-922hggd3.js";
+} from "./location-service-map-922hggd3.js";
 import {
   WorktreeError2,
-  node86
-} from "./form-afed7ext.js";
+  node83
+} from "./location-service-map-0c2xmx3r.js";
 import {
   Slug2
-} from "./form-gebd4c9n.js";
+} from "./location-service-map-gebd4c9n.js";
 import {
   Service84,
   node88
-} from "./form-11pq52jb.js";
+} from "./location-service-map-pwqjnrnh.js";
 import {
   Service83,
   node87
-} from "./form-19tft2ya.js";
+} from "./location-service-map-x7xg137b.js";
 import {
   ProjectTable2
-} from "./form-psazpmmj.js";
+} from "./location-service-map-wd3x2cqz.js";
 import {
   WorktreeTable2
-} from "./form-gfvb90ym.js";
+} from "./location-service-map-94ek1h2f.js";
 import {
-  ID17,
-  NotFoundError11
-} from "./form-v3zyw3t1.js";
+  ID14,
+  NotFoundError10
+} from "./location-service-map-v7tjtnqr.js";
 import {
-  Ref4
-} from "./form-vr6tcf4m.js";
+  Ref3
+} from "./location-service-map-ddvvm6a9.js";
 import {
-  Service54,
-  node56
-} from "./form-eq0p2d4m.js";
+  Service65,
+  node69
+} from "./location-service-map-8e9852ac.js";
 import {
   DirectoryUnavailableError2,
   canonical2
-} from "./form-gv6a8nnw.js";
+} from "./location-service-map-gv6a8nnw.js";
 import {
   make12
-} from "./form-mgmaefw5.js";
+} from "./location-service-map-63kngrnd.js";
 import {
-  Service15
-} from "./form-s5qtarnf.js";
+  Service21
+} from "./location-service-map-4z91h2q2.js";
 import {
   __export
-} from "./form-9rqn6x4v.js";
+} from "./location-service-map-9rqn6x4v.js";
 
 // src/worktree.ts
 var exports_worktree2 = {};
@@ -53,19 +53,19 @@ __export(exports_worktree2, {
   CreateInput: () => CreateInput3,
   DestinationExistsError: () => DestinationExistsError2,
   DirectoryUnavailableError: () => DirectoryUnavailableError2,
-  Event: () => Event4,
+  Event: () => Event5,
   Info: () => Info4,
   InvalidDirectoryError: () => InvalidDirectoryError2,
   List: () => List2,
   ListEntry: () => ListEntry3,
   OperationError: () => OperationError2,
   RemoveInput: () => RemoveInput2,
-  Service: () => Service14,
+  Service: () => Service20,
   SourceDirectoryNotFoundError: () => SourceDirectoryNotFoundError2,
   StrategyID: () => StrategyID2,
   StrategyUnavailableError: () => StrategyUnavailableError2,
   Worktree: () => exports_worktree2,
-  node: () => node17
+  node: () => node23
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { and, asc, desc, eq, isNull, sql } from "drizzle-orm";
@@ -83,7 +83,7 @@ var Info4 = Worktree.Info;
 var List2 = Worktree.List;
 var ListEntry3 = Worktree.ListEntry;
 
-class SourceDirectoryNotFoundError2 extends Schema.TaggedError()("Worktree.SourceDirectoryNotFoundError", { projectID: ID17, directory: Schema.optional(AbsolutePath2) }) {
+class SourceDirectoryNotFoundError2 extends Schema.TaggedError()("Worktree.SourceDirectoryNotFoundError", { projectID: ID14, directory: Schema.optional(AbsolutePath2) }) {
 }
 
 class DestinationExistsError2 extends Schema.TaggedError()("Worktree.DestinationExistsError", { directory: AbsolutePath2 }) {
@@ -94,22 +94,22 @@ class InvalidDirectoryError2 extends Schema.TaggedError()("Worktree.InvalidDirec
 
 class StrategyUnavailableError2 extends Schema.TaggedError()("Worktree.StrategyUnavailableError", { strategy: StrategyID2 }) {
 }
-var Event4 = Worktree.Event;
+var Event5 = Worktree.Event;
 
-class Service14 extends Context.Service()("@opencode/Worktree") {
+class Service20 extends Context.Service()("@opencode/Worktree") {
 }
-var layer = Layer.effect(Service14, Effect.gen(function* () {
+var layer = Layer.effect(Service20, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const database = yield* Service84;
   const db = database.db;
   const bus = yield* Service83;
   const processService = yield* AppProcess.Service;
-  const locations = yield* Service54;
+  const locations = yield* Service65;
   const gitStrategy = yield* make12;
   const project = Effect.fnUntraced(function* (projectID) {
     const row = yield* db.select().from(ProjectTable2).where(eq(ProjectTable2.id, projectID)).get().pipe(Effect.orDie);
     if (!row)
-      return yield* new NotFoundError11({ projectID });
+      return yield* new NotFoundError10({ projectID });
     return row;
   });
   const load = Effect.fnUntraced(function* (directory, current) {
@@ -118,13 +118,13 @@ var layer = Layer.effect(Service14, Effect.gen(function* () {
     if (current?.directory === directory)
       return current.get();
     const { Plugin } = yield* Effect.promise(() => import("../plugin.js"));
-    const context = yield* locations.contextEffect(Ref4.make({ directory }));
+    const context = yield* locations.contextEffect(Ref3.make({ directory }));
     yield* Context.get(context, Plugin.Service).awaitActivation;
-    return Context.get(context, Service15).get();
+    return Context.get(context, Service21).get();
   });
   const changed = Effect.fnUntraced(function* (projectID, update) {
     if (update)
-      yield* bus.publish(Event4.Updated, { projectID });
+      yield* bus.publish(Event5.Updated, { projectID });
   });
   const ops = {
     list: Effect.fnUntraced(function* (projectID) {
@@ -251,7 +251,7 @@ var layer = Layer.effect(Service14, Effect.gen(function* () {
     })).pipe(Effect.orDie);
     yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0);
   }, Effect.scoped);
-  return Service14.of({
+  return Service20.of({
     list: Effect.fn("Worktree.list")(function* (input) {
       yield* project(input.projectID);
       return yield* ops.list(input.projectID);
@@ -261,10 +261,10 @@ var layer = Layer.effect(Service14, Effect.gen(function* () {
     refresh
   });
 }));
-var node17 = Node.makeGlobalNode({
-  service: Service14,
+var node23 = Node.makeGlobalNode({
+  service: Service20,
   layer,
-  deps: [FSUtil.node, node86, node87, node88, AppProcess.node, node56]
+  deps: [FSUtil.node, node83, node87, node88, AppProcess.node, node69]
 });
 function operationError(strategy, operation, error) {
   if (error instanceof WorktreeError2 || error instanceof DirectoryUnavailableError2 || error instanceof Worktree.OperationError)
@@ -274,4 +274,4 @@ function operationError(strategy, operation, error) {
   });
 }
 
-export { StrategyID2, CreateInput3, RemoveInput2, Info4, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event4, Service14, node17, exports_worktree2, OperationError2 };
+export { StrategyID2, CreateInput3, RemoveInput2, Info4, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event5, Service20, node23, exports_worktree2, OperationError2 };

package/dist/chunks/{form-ba4w6g48.js → location-service-map-c1np9tvh.js}

@@ -1,15 +1,15 @@
 import {
   cleanup3
-} from "./form-gd4qta3r.js";
+} from "./location-service-map-gd4qta3r.js";
 import {
   ascending2
-} from "./form-tvtrv512.js";
+} from "./location-service-map-tvtrv512.js";
 import {
   create3
-} from "./form-rdw6cm16.js";
+} from "./location-service-map-rdw6cm16.js";
 import {
   __export
-} from "./form-9rqn6x4v.js";
+} from "./location-service-map-9rqn6x4v.js";
 
 // src/tool-output.ts
 var exports_tool_output2 = {};
@@ -18,9 +18,9 @@ __export(exports_tool_output2, {
   MAX_BYTES: () => MAX_BYTES2,
   MAX_LINES: () => MAX_LINES2,
   RETENTION: () => RETENTION3,
-  Service: () => Service52,
+  Service: () => Service45,
   ToolOutput: () => exports_tool_output2,
-  node: () => node54
+  node: () => node48
 });
 import path from "path";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";
@@ -32,13 +32,13 @@ var MAX_BYTES2 = 50 * 1024;
 var RETENTION3 = Duration.days(7);
 var DIRECTORY3 = "tool-output";
 
-class Service52 extends Context.Service()("@opencode/ToolOutput") {
+class Service45 extends Context.Service()("@opencode/ToolOutput") {
 }
 var cleanup = Effect.fn("ToolOutput.cleanup")(function* (fs, directory) {
   const entries = yield* fs.readDirectory(directory).pipe(Effect.map((entries) => entries.filter((entry) => /^tool_[0-9a-f]{12}/.test(entry))), Effect.orElseSucceed(() => []));
   yield* cleanup3(fs, entries.map((entry) => path.join(directory, entry)), RETENTION3);
 });
-var layer = Layer.effect(Service52, Effect.gen(function* () {
+var layer = Layer.effect(Service45, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const directory = path.join(global.data, DIRECTORY3);
@@ -122,7 +122,7 @@ var layer = Layer.effect(Service52, Effect.gen(function* () {
       metadata: { ...result.metadata, truncated: true, outputPath: file }
     };
   });
-  return Service52.of({
+  return Service45.of({
     transform: state.transform,
     reload: state.reload,
     truncate,
@@ -139,10 +139,10 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var node54 = makeLocationNode({
-  service: Service52,
+var node48 = makeLocationNode({
+  service: Service45,
   layer,
   deps: [FSUtil.node, Global.node, cleanupNode]
 });
 
-export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service52, node54, exports_tool_output2 };
+export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service45, node48, exports_tool_output2 };

package/dist/chunks/{form-r4yqrmdq.js → location-service-map-ce5fknq2.js}

@@ -1,18 +1,18 @@
 import {
   codeInterpreterArgsSchema2
-} from "./form-eh3zwz77.js";
+} from "./location-service-map-eh3zwz77.js";
 import {
   fileSearchArgsSchema2
-} from "./form-e73j6tqm.js";
+} from "./location-service-map-e73j6tqm.js";
 import {
   webSearchArgsSchema2
-} from "./form-3wcehsnq.js";
+} from "./location-service-map-3wcehsnq.js";
 import {
   webSearchPreviewArgsSchema2
-} from "./form-dap0rakb.js";
+} from "./location-service-map-dap0rakb.js";
 import {
   imageGenerationArgsSchema2
-} from "./form-4y7fprxs.js";
+} from "./location-service-map-4y7fprxs.js";
 
 // src/github-copilot/responses/openai-responses-prepare-tools.ts
 import {

package/dist/chunks/{form-bppvgyma.js → location-service-map-cfmv9c3d.js}

@@ -1,30 +1,30 @@
 import {
-  Service80,
-  node84
-} from "./form-vr6tcf4m.js";
+  Service77,
+  node81
+} from "./location-service-map-ddvvm6a9.js";
 import {
   create3
-} from "./form-rdw6cm16.js";
+} from "./location-service-map-rdw6cm16.js";
 import {
   __export
-} from "./form-9rqn6x4v.js";
+} from "./location-service-map-9rqn6x4v.js";
 
 // src/formatter.ts
-var exports_formatter3 = {};
-__export(exports_formatter3, {
-  Formatter: () => exports_formatter3,
-  Service: () => Service79,
-  node: () => node83
+var exports_formatter2 = {};
+__export(exports_formatter2, {
+  Formatter: () => exports_formatter2,
+  Service: () => Service29,
+  node: () => node32
 });
 import { Context, Effect, Layer } from "effect";
 import { ChildProcess } from "effect/unstable/process";
 import path from "path";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { AppProcess } from "@opencode/util/process";
-class Service79 extends Context.Service()("@opencode/v2/Formatter") {
+class Service29 extends Context.Service()("@opencode/v2/Formatter") {
 }
-var layer = Layer.effect(Service79, Effect.gen(function* () {
-  const location = yield* Service80;
+var layer = Layer.effect(Service29, Effect.gen(function* () {
+  const location = yield* Service77;
   const processes = yield* AppProcess.Service;
   const commands = new WeakMap;
   const state = create3({
@@ -85,12 +85,12 @@ var layer = Layer.effect(Service79, Effect.gen(function* () {
     }
     return false;
   });
-  return Service79.of({ transform: state.transform, reload: state.reload, file });
+  return Service29.of({ transform: state.transform, reload: state.reload, file });
 }));
-var node83 = makeLocationNode({
-  service: Service79,
+var node32 = makeLocationNode({
+  service: Service29,
   layer,
-  deps: [node84, AppProcess.node]
+  deps: [node81, AppProcess.node]
 });
 
-export { Service79, node83, exports_formatter3 };
+export { Service29, node32, exports_formatter2 };

package/dist/chunks/{form-zgqasnrv.js → location-service-map-cgm666vp.js}

@@ -1,26 +1,26 @@
 import {
   useragent2
-} from "./form-qedfkepq.js";
+} from "./location-service-map-d4vrvgq4.js";
 import {
   Service83
-} from "./form-19tft2ya.js";
+} from "./location-service-map-x7xg137b.js";
 import {
   OAuth3,
-  Event17
-} from "./form-hfj9a1t1.js";
+  Event21
+} from "./location-service-map-8ssbnkm6.js";
 import {
-  ID10,
+  ID16,
   MethodID2
-} from "./form-s2hgmt76.js";
+} from "./location-service-map-cn44awdn.js";
 import {
   success2,
   error2
-} from "./form-pjvnvgmy.js";
+} from "./location-service-map-pjvnvgmy.js";
 import {
-  ID9,
+  ID13,
   mergeOverlay2,
   mergeHeaders2
-} from "./form-8rt04me1.js";
+} from "./location-service-map-m1shccce.js";
 
 // src/plugin/provider/openai.ts
 import { define } from "@opencode/plugin/effect/plugin";
@@ -44,7 +44,7 @@ var Claims = Schema.fromJsonString(Schema.Struct({
 }));
 var decodeClaims = Schema.decodeUnknownOption(Claims);
 var browser = (app) => ({
-  integrationID: ID10.make("openai"),
+  integrationID: ID16.make("openai"),
   method: {
     id: browserMethodID,
     type: "oauth",
@@ -117,7 +117,7 @@ function addressInUse(error) {
   return "code" in error && error.code === "EADDRINUSE";
 }
 var headless = (app) => ({
-  integrationID: ID10.make("openai"),
+  integrationID: ID16.make("openai"),
   method: {
     id: headlessMethodID,
     type: "oauth",
@@ -159,7 +159,7 @@ var headless = (app) => ({
   }),
   refresh: (value) => refresh(headlessMethodID, value, app)
 });
-var OpenAIPlugin3 = define({
+var OpenAIPlugin2 = define({
   id: "opencode.provider.openai",
   effect: Effect.fn(function* (ctx) {
     const bus = yield* Service83;
@@ -178,7 +178,7 @@ var OpenAIPlugin3 = define({
     });
     yield* load();
     yield* ctx.provider.transform((providers) => {
-      const item = providers.get(ID9.openai);
+      const item = providers.get(ID13.openai);
       if (!item)
         return;
       const account = chatgpt?.metadata?.accountID;
@@ -197,7 +197,7 @@ var OpenAIPlugin3 = define({
       });
     });
     yield* ctx.model.transform((models) => {
-      for (const model of models.list(ID9.openai)) {
+      for (const model of models.list(ID13.openai)) {
         models.update(model.providerID, model.id, (draft) => {
           if (!chatgpt)
             return;
@@ -225,9 +225,9 @@ var OpenAIPlugin3 = define({
         evt.baseURL = codexBaseURL;
       evt.headers.originator = "opencode";
       evt.headers["session-id"] = evt.sessionID;
-    }), { providerID: ID9.openai });
+    }), { providerID: ID13.openai });
     const refresh = () => loading.withPermit(load().pipe(Effect.andThen(ctx.provider.reload())));
-    yield* bus.subscribe(Event17.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID10.make("openai")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event21.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID16.make("openai")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
   })
 });
 function headers(contentType, app) {
@@ -318,4 +318,4 @@ function claim(token) {
   return claims.chatgpt_account_id ?? claims["https://api.openai.com/auth"]?.chatgpt_account_id ?? claims.organizations?.[0]?.id;
 }
 
-export { OpenAIPlugin3 };
+export { OpenAIPlugin2 };

package/dist/chunks/{form-08tmt5c8.js → location-service-map-cgza1zmh.js}

@@ -1,29 +1,29 @@
 import {
   Service84,
   node88
-} from "./form-11pq52jb.js";
+} from "./location-service-map-pwqjnrnh.js";
 import {
   SessionTable2,
   SessionMessageTable2
-} from "./form-bjtzbw4r.js";
+} from "./location-service-map-z07pqspn.js";
 import {
   decodeMessageRow2,
   load5
-} from "./form-m7eyfjrp.js";
+} from "./location-service-map-te77dbbn.js";
 import {
   fromRow2
-} from "./form-jca4demv.js";
+} from "./location-service-map-a3r4dcrj.js";
 import {
   __export
-} from "./form-9rqn6x4v.js";
+} from "./location-service-map-9rqn6x4v.js";
 
 // src/session/store.ts
 var exports_store = {};
 __export(exports_store, {
-  ListInput: () => ListInput4,
-  Service: () => Service74,
+  ListInput: () => ListInput5,
+  Service: () => Service70,
   SessionStore: () => exports_store,
-  node: () => node78
+  node: () => node74
 });
 import { and, asc, desc, eq, gt, isNotNull, isNull, like, lt, notInArray, or, sql } from "drizzle-orm";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -50,13 +50,13 @@ var ListProjectInput = Schema.Struct({
   subpath: RelativePath.pipe(Schema.optional)
 });
 var ListAllInput = Schema.Struct(ListInputBase);
-var ListInput4 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
+var ListInput5 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
 
-class Service74 extends Context.Service()("@opencode/SessionStore") {
+class Service70 extends Context.Service()("@opencode/SessionStore") {
 }
-var layer = Layer.effect(Service74, Effect.gen(function* () {
+var layer = Layer.effect(Service70, Effect.gen(function* () {
   const { db } = yield* Service84;
-  return Service74.of({
+  return Service70.of({
     get: Effect.fnUntraced(function* (sessionID) {
       const row = yield* db.select().from(SessionTable2).where(eq(SessionTable2.id, sessionID)).get().pipe(Effect.orDie);
       return row ? fromRow2(row) : undefined;
@@ -125,6 +125,6 @@ var layer = Layer.effect(Service74, Effect.gen(function* () {
     })
   });
 }));
-var node78 = makeGlobalNode({ service: Service74, layer, deps: [node88] });
+var node74 = makeGlobalNode({ service: Service70, layer, deps: [node88] });
 
-export { ListInput4, Service74, node78, exports_store };
+export { ListInput5, Service70, node74, exports_store };

package/dist/chunks/{form-54tcyq79.js → location-service-map-ckecvw8r.js}

@@ -1,9 +1,9 @@
 import {
   Timestamps2
-} from "./form-qfa1cgps.js";
+} from "./location-service-map-qfa1cgps.js";
 import {
   ProjectTable2
-} from "./form-psazpmmj.js";
+} from "./location-service-map-wd3x2cqz.js";
 
 // src/permission/sql.ts
 import { sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";

package/dist/chunks/{form-dg66y715.js → location-service-map-ckh625m3.js}

@@ -1,80 +1,80 @@
 import {
   Service84
-} from "./form-11pq52jb.js";
+} from "./location-service-map-pwqjnrnh.js";
 import {
   Service83
-} from "./form-19tft2ya.js";
+} from "./location-service-map-x7xg137b.js";
 import {
-  Service49
-} from "./form-c8bydgjz.js";
+  Service60
+} from "./location-service-map-tegs1ycp.js";
 import {
   userNotification2
-} from "./form-5ekn9679.js";
+} from "./location-service-map-5ekn9679.js";
 import {
   SessionMessage2
-} from "./form-gftt206x.js";
+} from "./location-service-map-gftt206x.js";
 import {
-  NotFoundError10,
+  NotFoundError9,
   PromptConflictError2,
   SyntheticConflictError2,
   CompactionConflictError2,
   BusyError2,
   InboxConflictError2
-} from "./form-3ktbe3hf.js";
+} from "./location-service-map-cmefedvg.js";
 import {
   SessionEvent2
-} from "./form-ec1grn59.js";
+} from "./location-service-map-ec1grn59.js";
 import {
-  Service74
-} from "./form-08tmt5c8.js";
+  Service70
+} from "./location-service-map-cgza1zmh.js";
 import {
   Delivery2,
   SyntheticPayload2,
-  Service47
-} from "./form-4qpgmmah.js";
+  Service59
+} from "./location-service-map-495chtjc.js";
 import {
-  Service45
-} from "./form-fq0xkp38.js";
+  Service56
+} from "./location-service-map-k5h5c7q1.js";
 import {
   prepare2
-} from "./form-5e81w77y.js";
+} from "./location-service-map-a79ds6nc.js";
 import {
   stage2,
   clear2,
   commit2
-} from "./form-g912tqdn.js";
+} from "./location-service-map-dp4kwseh.js";
 import {
   start2
-} from "./form-spbewqtm.js";
+} from "./location-service-map-te3fz92z.js";
 import {
   get4
-} from "./form-r94pzv5m.js";
+} from "./location-service-map-36cphf8b.js";
 import {
   __export
-} from "./form-9rqn6x4v.js";
+} from "./location-service-map-9rqn6x4v.js";
 
 // src/session/session.ts
 var exports_session2 = {};
 __export(exports_session2, {
   Session: () => exports_session2,
-  make: () => make13
+  make: () => make14
 });
 import { DateTime, Effect, Fiber, Scope } from "effect";
 import { Event } from "@opencode/schema/event";
 import { FSUtil } from "@opencode/util/fs-util";
-var make13 = Effect.fn("Session.make")(function* () {
+var make14 = Effect.fn("Session.make")(function* () {
   const bus = yield* Service83;
   const database = yield* Service84;
-  const store = yield* Service74;
-  const instances = yield* Service49;
-  const execution = yield* Service45;
-  const admission = yield* Service47;
+  const store = yield* Service70;
+  const instances = yield* Service60;
+  const execution = yield* Service56;
+  const admission = yield* Service59;
   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 NotFoundError10({ sessionID });
+      return yield* new NotFoundError9({ sessionID });
     return session;
   });
   const message = Effect.fn("Session.message")(function* (sessionID, messageID) {
@@ -135,7 +135,7 @@ var make13 = Effect.fn("Session.make")(function* () {
       });
       if (existing)
         return existing;
-      const item = yield* restore(prepare2({ session, messageID, input }).pipe(Effect.provideService(Service49, instances), Effect.provideService(FSUtil.Service, fs)));
+      const item = yield* restore(prepare2({ session, messageID, input }).pipe(Effect.provideService(Service60, instances), Effect.provideService(FSUtil.Service, fs)));
       if (session.revert)
         yield* commit2(bus, session);
       return yield* admission.admit({
@@ -151,7 +151,7 @@ var make13 = 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(Service49, instances), Effect.tapError((error) => synthetic(sessionID, {
+      const started = yield* start2({ session, command: input.command }).pipe(Effect.provideService(Service60, instances), Effect.tapError((error) => synthetic(sessionID, {
         text: `User shell command failed to start:
 ${input.command}
 
@@ -180,7 +180,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(Service49, instances));
+    const skill = yield* get4({ session, skill: input.skill }).pipe(Effect.provideService(Service60, instances));
     yield* bus.publish(SessionEvent2.Skill.Activated, {
       sessionID,
       id: skill.id,
@@ -237,13 +237,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(Service49, instances), Effect.provideService(Service84, database), Effect.provideService(Service83, bus));
+    return yield* stage2({ session, messageID: input.messageID, files: input.files }).pipe(Effect.provideService(Service60, instances), Effect.provideService(Service84, database), Effect.provideService(Service83, 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(Service49, instances), Effect.provideService(Service83, bus));
+    yield* clear2(session).pipe(Effect.provideService(Service60, instances), Effect.provideService(Service83, bus));
     return yield* execution.wake(sessionID);
   });
   const commit = Effect.fn("Session.revert.commit")(function* (sessionID) {
@@ -329,4 +329,4 @@ ${error.message}`,
   return { forSession };
 });
 
-export { make13, exports_session2 };
+export { make14, exports_session2 };