@opencode/core 0.0.0-dev-19617 → 0.0.0-dev-19619

package/dist/chunks/{file-retention-a9tcrq61.js → state-29wq7zbx.js}

@@ -1,27 +1,27 @@
 import {
   Service81
-} from "./file-retention-924ykxna.js";
+} from "./state-sxmda080.js";
 import {
-  Service60
-} from "./file-retention-4m2pmvxz.js";
+  Service31
+} from "./state-s90d8d6b.js";
 import {
   awaitActivation2
-} from "./file-retention-q509s3k3.js";
+} from "./state-gyce5qg1.js";
 import {
   provenance2
-} from "./file-retention-06dxphr1.js";
+} from "./state-bccb6npm.js";
 import {
   preview2
-} from "./file-retention-nvv2w69t.js";
+} from "./state-d66s3x2y.js";
 import {
   baseTranscript2
-} from "./file-retention-cqxef839.js";
+} from "./state-m4hmv5tv.js";
 import {
-  Service17
-} from "./file-retention-8rr5w2ew.js";
+  Service16
+} from "./state-29rcqgc7.js";
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/session/generate.ts
 var exports_generate = {};
@@ -32,12 +32,12 @@ __export(exports_generate, {
 import { LLMClient, Message } from "@opencode/ai";
 import { Effect } from "effect";
 var generate3 = Effect.fn("SessionGenerate.generate")(function* (input) {
-  const instances = yield* Service60;
+  const instances = yield* Service31;
   const database = yield* Service81;
   const llm = yield* LLMClient.Service;
   return yield* Effect.gen(function* () {
     yield* awaitActivation2;
-    const context = yield* Service17;
+    const context = yield* Service16;
     const selection = yield* context.select(input.session.id);
     const model = yield* context.resolveModel(selection.session);
     const history = yield* preview2(database.db, selection.session.id, selection.instructions, provenance2(model) ?? "local");

package/dist/chunks/{file-retention-z63w68vq.js → state-29x78va6.js}

@@ -1,14 +1,14 @@
 import {
   NamedError2
-} from "./file-retention-2axfhc9x.js";
+} from "./state-2axfhc9x.js";
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/v1/config/error.ts
-var exports_error = {};
-__export(exports_error, {
-  ConfigErrorV1: () => exports_error,
+var exports_error2 = {};
+__export(exports_error2, {
+  ConfigErrorV1: () => exports_error2,
   DirectoryTypoError: () => DirectoryTypoError2,
   FrontmatterError: () => FrontmatterError2,
   InvalidError: () => InvalidError2,
@@ -43,4 +43,4 @@ var RemoteAuthError2 = NamedError2.create("ConfigRemoteAuthError", {
   remote: Schema.String
 });
 
-export { JsonError2, InvalidError2, FrontmatterError2, DirectoryTypoError2, RemoteAuthError2, exports_error };
+export { JsonError2, InvalidError2, FrontmatterError2, DirectoryTypoError2, RemoteAuthError2, exports_error2 };

package/dist/chunks/{file-retention-aqeqq1tf.js → state-2a1p01cj.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./file-retention-dpkg50ah.js";
+} from "./state-dpkg50ah.js";
 import {
   Service80,
   node85
-} from "./file-retention-pmc74pb4.js";
+} from "./state-zmhc1ceh.js";
 import {
-  Event20,
-  Service75,
-  node80
-} from "./file-retention-r5depw3d.js";
+  Event19,
+  Service74,
+  node79
+} from "./state-ds6yvnwz.js";
 import {
-  Service77,
-  node82
-} from "./file-retention-kcyfyv8v.js";
+  Service76,
+  node81
+} from "./state-ezc4vqg9.js";
 import {
-  Service54,
-  node59
-} from "./file-retention-5ffqwp29.js";
+  Service72,
+  node76
+} from "./state-cw6ezj50.js";
 import {
-  ID15,
-  Service74,
-  node79
-} from "./file-retention-z8y90bmn.js";
+  ID18,
+  Service79,
+  node84
+} from "./state-d2y84238.js";
 import {
   reconcile2,
   create3
-} from "./file-retention-rdw6cm16.js";
+} from "./state-rdw6cm16.js";
 import {
-  ID14,
+  ID13,
   MethodID2,
-  Service73,
-  node78
-} from "./file-retention-mw7s1qqm.js";
+  Service70,
+  node74
+} from "./state-a8279h33.js";
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError3,
-  Options: () => Options3,
+  NotFoundError: () => NotFoundError2,
+  Options: () => Options2,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service27,
+  Service: () => Service26,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured3,
-  layer: () => layer13,
-  node: () => node31
+  configured: () => configured2,
+  layer: () => layer12,
+  node: () => node30
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -74,7 +74,7 @@ var ResourceCatalog2 = Mcp.ResourceCatalog;
 var ResourceContentPart2 = Mcp.ResourceContentPart;
 var ResourceContent2 = Mcp.ResourceContent;
 
-class NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError2 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -92,21 +92,21 @@ var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
 var cloneConfig = (config) => structuredClone(config);
 
-class Service27 extends Context.Service()("@opencode/MCP") {
+class Service26 extends Context.Service()("@opencode/MCP") {
 }
-var Options3 = Schema.Struct({
+var Options2 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
-  const location = yield* Service77;
-  const environment = yield* Service54;
+var layer12 = (options) => Layer.effect(Service26, Effect.gen(function* () {
+  const location = yield* Service76;
+  const environment = yield* Service72;
   const bus = yield* Service80;
-  const forms = yield* Service74;
-  const integration = yield* Service73;
-  const credentials = yield* Service75;
+  const forms = yield* Service79;
+  const integration = yield* Service70;
+  const credentials = yield* Service74;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -118,7 +118,7 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
       return;
     const remote = entry.config;
     const suffix = "mcp_" + createHash("sha1").update(name + "\x00" + remote.url).digest("hex").slice(0, 16);
-    const integrationID = ID14.make(suffix);
+    const integrationID = ID13.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -134,7 +134,7 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
         method: { id: methodID, type: "oauth", label: name },
         authorize: () => Effect.gen(function* () {
           const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service75, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service74, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -143,19 +143,19 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError3({ server: name });
+      return yield* new NotFoundError2({ server: name });
     return { name, entry };
   });
   const connectProvider = Effect.fnUntraced(function* (entry) {
     if (entry.config.type !== "remote" || !entry.integrationID)
       return;
     const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service75, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service74, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID15.create();
+        const formID = ID18.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -239,7 +239,7 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const result = yield* McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service54, environment), Scope.provide(scope), Effect.exit);
+    const result = yield* McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service72, environment), Scope.provide(scope), Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
       entry.tools = result.value.tools.map((tool) => toTool(name, entry, tool));
@@ -363,7 +363,7 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event20.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
   const state = create3({
     name: "mcp",
     initial: () => ({
@@ -389,7 +389,7 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service27.of({
+  return Service26.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -508,14 +508,14 @@ var layer13 = (options) => Layer.effect(Service27, Effect.gen(function* () {
     })
   });
 }));
-function configured3(options) {
+function configured2(options) {
   return makeLocationNode({
-    service: Service27,
-    layer: layer13(options),
-    deps: [node82, node59, node85, node79, node78, node80]
+    service: Service26,
+    layer: layer12(options),
+    deps: [node81, node76, node85, node84, node74, node79]
   });
 }
-var node31 = configured3();
+var node30 = configured2();
 function toElicitationField(key, property, required) {
   const machineTitle = /^(boolean|string|number|integer|array|object)(\s+with\b.*|\s+in\b.*)?$/i;
   const title = property.title && !machineTitle.test(property.title.trim()) ? property.title : property.description ?? key;
@@ -566,4 +566,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service27, Options3, layer13, configured3, node31, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError2, ToolCallError2, Service26, Options2, layer12, configured2, node30, exports_mcp4 };

package/dist/chunks/{file-retention-2a5m3afh.js → state-2a5m3afh.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/environment/files.ts
 var exports_files = {};

package/dist/chunks/{file-retention-h7ygw6q4.js → state-2bt6bea8.js}

@@ -1,16 +1,16 @@
 import {
   AbsolutePath2
-} from "./file-retention-922hggd3.js";
+} from "./state-922hggd3.js";
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/skill/discovery.ts
 var exports_discovery = {};
 __export(exports_discovery, {
-  Service: () => Service12,
+  Service: () => Service11,
   SkillDiscovery: () => exports_discovery,
-  node: () => node15
+  node: () => node14
 });
 import path from "path";
 import { Context, Effect, Layer, Schedule, Schema } from "effect";
@@ -48,9 +48,9 @@ class Index extends Schema.Class("SkillDiscovery.Index")({
 }) {
 }
 
-class Service12 extends Context.Service()("@opencode/SkillDiscovery") {
+class Service11 extends Context.Service()("@opencode/SkillDiscovery") {
 }
-var layer = Layer.effect(Service12, Effect.gen(function* () {
+var layer = Layer.effect(Service11, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const http = (yield* HttpClient.HttpClient).pipe(HttpClient.retryTransient({
@@ -63,7 +63,7 @@ var layer = Layer.effect(Service12, Effect.gen(function* () {
       return true;
     return yield* HttpClientRequest.get(url).pipe(http.execute, Effect.flatMap((response) => response.arrayBuffer), Effect.flatMap((body) => fs.writeWithDirs(destination, new Uint8Array(body))), Effect.as(true), Effect.catch((error) => Effect.logError("failed to download skill file", { url, error }).pipe(Effect.as(false))));
   });
-  return Service12.of({
+  return Service11.of({
     pull: Effect.fn("SkillDiscovery.pull")(function* (url) {
       const base = url.endsWith("/") ? url : `${url}/`;
       const source = new URL(base);
@@ -150,6 +150,6 @@ var layer = Layer.effect(Service12, Effect.gen(function* () {
     })
   });
 }));
-var node15 = makeGlobalNode({ service: Service12, layer, deps: [httpClient, FSUtil.node, Global.node] });
+var node14 = makeGlobalNode({ service: Service11, layer, deps: [httpClient, FSUtil.node, Global.node] });
 
-export { Service12, node15, exports_discovery };
+export { Service11, node14, exports_discovery };

package/dist/chunks/{file-retention-agq2sn5n.js → state-2e147z16.js}

@@ -1,23 +1,23 @@
 import {
   useragent2
-} from "./file-retention-2h7tr172.js";
+} from "./state-hzm9egg4.js";
 import {
-  ID13,
+  ID12,
   isAISDK2
-} from "./file-retention-v6wrn1g2.js";
+} from "./state-vzy7bsbz.js";
 import {
   iife2
-} from "./file-retention-1kg9ymc8.js";
+} from "./state-1kg9ymc8.js";
 import {
   configuredSettings2
-} from "./file-retention-h1afk52f.js";
+} from "./state-dq66pm2h.js";
 
 // src/plugin/provider/cloudflare-workers-ai.ts
 import os from "os";
 import { Effect } from "effect";
 import { define } from "@opencode/plugin/effect/plugin";
 import { Form } from "@opencode/schema/form";
-var providerID = ID13.make("cloudflare-workers-ai");
+var providerID = ID12.make("cloudflare-workers-ai");
 var CloudflareWorkersAIPlugin2 = define({
   id: "opencode.provider.cloudflare.workers.ai",
   effect: Effect.fn(function* (ctx) {

package/dist/chunks/{file-retention-57ez7d0k.js → state-2fgn2we9.js}

@@ -1,31 +1,31 @@
 import {
   AbsolutePath2
-} from "./file-retention-922hggd3.js";
+} from "./state-922hggd3.js";
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/project/schema.ts
 var exports_schema = {};
 __export(exports_schema, {
   Current: () => Current3,
-  Event: () => Event21,
-  ID: () => ID18,
-  Info: () => Info34,
+  Event: () => Event20,
+  ID: () => ID17,
+  Info: () => Info33,
   ProjectSchema: () => exports_schema,
   UpdateInput: () => UpdateInput4,
   Vcs: () => Vcs3
 });
 import { Schema } from "effect";
 import { Project } from "@opencode/schema/project";
-var ID18 = Project.ID;
+var ID17 = Project.ID;
 var Current3 = Project.Current;
-var Info34 = Project.Info;
+var Info33 = Project.Info;
 var UpdateInput4 = Project.UpdateInput;
-var Event21 = Project.Event;
+var Event20 = Project.Event;
 var Vcs3 = Schema.Struct({
   type: Project.Vcs,
   store: AbsolutePath2
 });
 
-export { ID18, Current3, Info34, UpdateInput4, Event21, Vcs3, exports_schema };
+export { ID17, Current3, Info33, UpdateInput4, Event20, Vcs3, exports_schema };

package/dist/chunks/{file-retention-qgn6gcr1.js → state-2k8khapm.js}

@@ -1,16 +1,16 @@
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/v1/config/plugin.ts
 var exports_plugin3 = {};
 __export(exports_plugin3, {
   ConfigPluginV1: () => exports_plugin3,
-  Options: () => Options7,
+  Options: () => Options8,
   Spec: () => Spec2
 });
 import { Schema } from "effect";
-var Options7 = Schema.Record(Schema.String, Schema.Unknown);
-var Spec2 = Schema.Union([Schema.String, Schema.mutable(Schema.Tuple([Schema.String, Options7]))]);
+var Options8 = Schema.Record(Schema.String, Schema.Unknown);
+var Spec2 = Schema.Union([Schema.String, Schema.mutable(Schema.Tuple([Schema.String, Options8]))]);
 
-export { Options7, Spec2, exports_plugin3 };
+export { Options8, Spec2, exports_plugin3 };

package/dist/chunks/{file-retention-mypwhdkk.js → state-2p5y98w0.js}

@@ -1,21 +1,21 @@
 import {
   convertToOpenAICompatibleChatMessages2
-} from "./file-retention-fxgpk5d8.js";
+} from "./state-fxgpk5d8.js";
 import {
   getResponseMetadata2
-} from "./file-retention-g4wezp1m.js";
+} from "./state-g4wezp1m.js";
 import {
   mapOpenAICompatibleFinishReason2
-} from "./file-retention-x61499pn.js";
+} from "./state-x61499pn.js";
 import {
   openaiCompatibleProviderOptions2
-} from "./file-retention-af5trqkr.js";
+} from "./state-af5trqkr.js";
 import {
   defaultOpenAICompatibleErrorStructure2
-} from "./file-retention-afrmfg78.js";
+} from "./state-afrmfg78.js";
 import {
   prepareTools2
-} from "./file-retention-x0ckcb58.js";
+} from "./state-x0ckcb58.js";
 
 // src/github-copilot/chat/openai-compatible-chat-language-model.ts
 import {

package/dist/chunks/{file-retention-0b4f6mp2.js → state-2prd3etb.js}

@@ -1,57 +1,57 @@
 import {
   Service81
-} from "./file-retention-924ykxna.js";
+} from "./state-sxmda080.js";
 import {
   Service80
-} from "./file-retention-pmc74pb4.js";
+} from "./state-zmhc1ceh.js";
 import {
-  Service60
-} from "./file-retention-4m2pmvxz.js";
+  Service31
+} from "./state-s90d8d6b.js";
 import {
   userNotification2
-} from "./file-retention-fxbjtjnd.js";
+} from "./state-fxbjtjnd.js";
 import {
   SessionMessage2
-} from "./file-retention-gftt206x.js";
+} from "./state-gftt206x.js";
 import {
-  NotFoundError9,
+  NotFoundError6,
   PromptConflictError2,
   SyntheticConflictError2,
   CompactionConflictError2,
   BusyError2,
   InboxConflictError2
-} from "./file-retention-wxffcvth.js";
+} from "./state-bjmdedkt.js";
 import {
   SessionEvent2
-} from "./file-retention-ec1grn59.js";
+} from "./state-ec1grn59.js";
 import {
-  Service67
-} from "./file-retention-nnmab3m5.js";
+  Service45
+} from "./state-3shj2rdg.js";
 import {
   Delivery2,
   SyntheticPayload2,
-  Service58
-} from "./file-retention-kgtbg51g.js";
+  Service30
+} from "./state-c74rwkq8.js";
 import {
-  Service56
-} from "./file-retention-trdbzp7q.js";
+  Service27
+} from "./state-kp6q4vfw.js";
 import {
   prepare2
-} from "./file-retention-sx8f04je.js";
+} from "./state-fm5c3zy8.js";
 import {
   stage2,
   clear2,
   commit2
-} from "./file-retention-y3pw9whf.js";
+} from "./state-py24y5k5.js";
 import {
   start2
-} from "./file-retention-tph3grx4.js";
+} from "./state-t4c6n1n4.js";
 import {
   get4
-} from "./file-retention-bdhd9qj0.js";
+} from "./state-w21hr1ag.js";
 import {
   __export
-} from "./file-retention-9rqn6x4v.js";
+} from "./state-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* Service80;
   const database = yield* Service81;
-  const store = yield* Service67;
-  const instances = yield* Service60;
-  const execution = yield* Service56;
-  const admission = yield* Service58;
+  const store = yield* Service45;
+  const instances = yield* Service31;
+  const execution = yield* Service27;
+  const admission = yield* Service30;
   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 NotFoundError9({ sessionID });
+      return yield* new NotFoundError6({ 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(Service60, instances), Effect.provideService(FSUtil.Service, fs)));
+      const item = yield* restore(prepare2({ session, messageID, input }).pipe(Effect.provideService(Service31, 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(Service60, instances), Effect.tapError((error) => synthetic(sessionID, {
+      const started = yield* start2({ session, command: input.command }).pipe(Effect.provideService(Service31, 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(Service60, instances));
+    const skill = yield* get4({ session, skill: input.skill }).pipe(Effect.provideService(Service31, 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(Service60, instances), Effect.provideService(Service81, database), Effect.provideService(Service80, bus));
+    return yield* stage2({ session, messageID: input.messageID, files: input.files }).pipe(Effect.provideService(Service31, instances), Effect.provideService(Service81, database), Effect.provideService(Service80, 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(Service60, instances), Effect.provideService(Service80, bus));
+    yield* clear2(session).pipe(Effect.provideService(Service31, instances), Effect.provideService(Service80, bus));
     return yield* execution.wake(sessionID);
   });
   const commit = Effect.fn("Session.revert.commit")(function* (sessionID) {