@opencode/core 2.0.30 → 2.0.31

package/dist/chunks/{instance-rcxh9wm8.js → location-wcgwrd3j.js}

@@ -1,36 +1,37 @@
 import {
   PositiveInt2
-} from "./instance-z5v4ffb3.js";
+} from "./location-z5v4ffb3.js";
 import {
   Action2
-} from "./instance-rkg4v3e5.js";
+} from "./location-txm3e8qz.js";
 import {
-  Info14
-} from "./instance-vtqafnzr.js";
+  Info11
+} from "./location-hcv80w8f.js";
 import {
-  Info17
-} from "./instance-fm2qvscf.js";
+  Info10
+} from "./location-edrmdtr5.js";
 import {
-  Info18
-} from "./instance-tk14y25j.js";
+  Info13
+} from "./location-4xpgt2w9.js";
 import {
   Spec2
-} from "./instance-7dqw4kz8.js";
+} from "./location-fcrkznn8.js";
 import {
-  Info16
-} from "./instance-n8vdnqrc.js";
+  Info9
+} from "./location-ygdna4kr.js";
 import {
   normalizeAction2,
   migrateAgent2,
   migrateCommand2,
   modelSelection2,
+  migrateMcpTimeout2,
   migrateMcp2,
   migrateProvider2,
   providerID2
-} from "./instance-y1fe2wt7.js";
+} from "./location-dwtdh34y.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/config/normalize.ts
 var exports_normalize = {};
@@ -97,12 +98,12 @@ function normalize2(input) {
   const legacyReferences = decodeMap(input.reference, ConfigReference.Entry, ["reference"], diagnostics, decodeEncoded);
   const nativeReferences = decodeMap(input.references, ConfigReference.Entry, ["references"], diagnostics, decodeEncoded);
   mergeMap(encoded, "references", legacyReferences, nativeReferences, isRecord(input.reference) || isRecord(input.references), diagnostics);
-  const legacyCommands = decodeMap(input.command, Info17, ["command"], diagnostics, decodeValue);
+  const legacyCommands = decodeMap(input.command, Info10, ["command"], diagnostics, decodeValue);
   diagnoseSelectionMap(input.command, ["command"], diagnostics);
   const migratedCommands = mapValues(legacyCommands, (value) => canonical(ConfigCommand.Info, migrateCommand2(value)));
   const nativeCommands = decodeMap(input.commands, ConfigCommand.Info, ["commands"], diagnostics, decodeEncoded);
   mergeMap(encoded, "commands", migratedCommands, nativeCommands, isRecord(input.command) || isRecord(input.commands), diagnostics);
-  const legacyAgents = mapValues(decodeMap(input.agent, Info14, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
+  const legacyAgents = mapValues(decodeMap(input.agent, Info11, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
   const legacySmallModel = own(input, "small_model") ? decodeValue(Schema.String, input.small_model, ["small_model"], diagnostics) : undefined;
   const migratedSmallModel = modelSelection2(legacySmallModel);
   if (legacySmallModel && !migratedSmallModel)
@@ -116,7 +117,7 @@ function normalize2(input) {
       model: migratedSmallModel,
       ...legacyAgents.title
     };
-  const modeAgents = mapValues(decodeMap(input.mode, Info14, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
+  const modeAgents = mapValues(decodeMap(input.mode, Info11, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
   const migratedAgents = mergeMaps(legacyAgents, modeAgents, ["agents"], diagnostics);
   const nativeAgents = decodeMap(input.agents, ConfigAgent.Info, ["agents"], diagnostics, decodeEncoded);
   diagnoseAgentUnsupported(input.agent, ["agent"], diagnostics);
@@ -211,14 +212,14 @@ function normalizeMcp(input, encoded, diagnostics) {
           return;
         }
         if (name === "servers" && !isDirectLegacyMcp(value)) {
-          Object.entries(decodeMap(value, ConfigMCP.Server, path, diagnostics, decodeEncoded)).forEach(([key, server]) => setOwn(nativeServers, key, server));
+          Object.entries(decodeMap(expandServerTimeouts(value), ConfigMCP.Server, path, diagnostics, decodeEncoded)).forEach(([key, server]) => setOwn(nativeServers, key, server));
           return;
         }
         if (name === "timeout" && !isDirectLegacyMcp(value)) {
-          normalizeMcpTimeout(value, timeout, path, diagnostics);
+          normalizeMcpTimeout(typeof value === "number" ? migrateMcpTimeout2(value) : value, timeout, path, diagnostics);
           return;
         }
-        const server = decodeValue(Info18, value, path, diagnostics);
+        const server = decodeValue(Info13, value, path, diagnostics);
         if (server !== undefined)
           setOwn(legacyServers, name, canonical(ConfigMCP.Server, migrateMcp2(server)));
       });
@@ -235,6 +236,14 @@ function normalizeMcp(input, encoded, diagnostics) {
     ...Object.keys(servers).length ? { servers } : {}
   };
 }
+function expandServerTimeouts(value) {
+  if (!isRecord(value))
+    return value;
+  return Object.fromEntries(Object.entries(value).map(([name, server]) => [
+    name,
+    isRecord(server) && typeof server.timeout === "number" ? { ...server, timeout: migrateMcpTimeout2(server.timeout) } : server
+  ]));
+}
 function normalizeMcpTimeout(value, timeout, path, diagnostics) {
   if (!isRecord(value)) {
     invalid(path, diagnostics);
@@ -416,7 +425,7 @@ function migrateProviders(value, diagnostics) {
     diagnoseProviderUnsupported(raw, path, diagnostics);
     if (invalidProviderOverlays(raw, path, diagnostics))
       return [];
-    const provider = decodeValue(Info16, raw, path, diagnostics);
+    const provider = decodeValue(Info9, raw, path, diagnostics);
     if (provider === undefined)
       return [];
     const destination = providerID2(name);

package/dist/chunks/{instance-wd87259q.js → location-wd87259q.js}

@@ -1,7 +1,7 @@
 import {
   getViewSelectedFieldsRuntime2,
   orderSelectedFields2
-} from "./instance-emrn6kk6.js";
+} from "./location-emrn6kk6.js";
 
 // src/database/drizzle/sqlite-core/effect/select.ts
 import { applyEffectWrapper } from "drizzle-orm/effect-core/query-effect";

package/dist/chunks/{instance-82rf0sny.js → location-wdwn1xw9.js}

@@ -1,39 +1,39 @@
 import {
   AbsolutePath2
-} from "./instance-z5v4ffb3.js";
+} from "./location-z5v4ffb3.js";
 import {
-  Service78
-} from "./instance-nxf3zzt8.js";
+  Service76
+} from "./location-a3kydf8v.js";
 import {
-  Service68
-} from "./instance-ysgxa1w9.js";
+  Service62
+} from "./location-ptva3pym.js";
 import {
-  Service15
-} from "./instance-qve4m158.js";
+  Service43
+} from "./location-4826d3mm.js";
 import {
   observe2
-} from "./instance-qsdy395h.js";
+} from "./location-qsdy395h.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/config/plugin/worktree.ts
 var exports_worktree = {};
 __export(exports_worktree, {
   ConfigWorktreePlugin: () => exports_worktree,
-  Plugin: () => Plugin2
+  Plugin: () => Plugin36
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
 import path from "path";
 import { Global } from "@opencode/util/global";
-var Plugin2 = define({
+var Plugin36 = define({
   id: "opencode.config.worktree",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service68;
-    const location = yield* Service78;
+    const config = yield* Service62;
+    const location = yield* Service76;
     const global = yield* Global.Service;
-    const worktrees = yield* Service15;
+    const worktrees = yield* Service43;
     const loaded = yield* observe2(config, ctx.event, worktrees.reload());
     yield* worktrees.transform((editor) => {
       for (const entry of loaded.entries) {
@@ -48,4 +48,4 @@ var Plugin2 = define({
   })
 });
 
-export { Plugin2, exports_worktree };
+export { Plugin36, exports_worktree };

package/dist/chunks/{instance-eyhnzkb4.js → location-wgkt74tw.js}

@@ -1,26 +1,26 @@
 import {
-  Service80
-} from "./instance-81fjg4yx.js";
+  Service78
+} from "./location-wpw4fxj8.js";
 import {
   DirectoryUnavailableError2,
   canonical2
-} from "./instance-0vbcp93d.js";
+} from "./location-0vbcp93d.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/worktree/git.ts
 var exports_git2 = {};
 __export(exports_git2, {
   WorktreeGit: () => exports_git2,
-  make: () => make12
+  make: () => make15
 });
 import { Effect } from "effect";
 import { Worktree } from "@opencode/schema/worktree";
 import { FSUtil } from "@opencode/util/fs-util";
-var make12 = Effect.gen(function* () {
+var make15 = Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const git = yield* Service80;
+  const git = yield* Service78;
   return {
     id: Worktree.StrategyID.make("git"),
     create: Effect.fn("Worktree.Git.create")(function* (input) {
@@ -46,4 +46,4 @@ var make12 = Effect.gen(function* () {
   };
 });
 
-export { make12, exports_git2 };
+export { make15, exports_git2 };

package/dist/chunks/{instance-9vk391re.js → location-wmx2yec4.js}

@@ -1,40 +1,40 @@
 import {
   Service84,
   node88
-} from "./instance-9f6w07v2.js";
+} from "./location-wapmwjpk.js";
 import {
   create3
-} from "./instance-rdw6cm16.js";
+} from "./location-rdw6cm16.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/agent.ts
-var exports_agent3 = {};
-__export(exports_agent3, {
-  Agent: () => exports_agent3,
+var exports_agent4 = {};
+__export(exports_agent4, {
+  Agent: () => exports_agent4,
   Color: () => Color2,
-  Event: () => Event12,
-  ID: () => ID9,
-  Info: () => Info13,
+  Event: () => Event20,
+  ID: () => ID17,
+  Info: () => Info29,
   Name: () => Name3,
-  Service: () => Service63,
+  Service: () => Service81,
   defaultID: () => defaultID2,
-  node: () => node65
+  node: () => node85
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Array, Context, Effect, Layer } from "effect";
 import { Agent } from "@opencode/schema/agent";
-import { Event as Event12 } from "@opencode/schema/agent";
-var ID9 = Agent.ID;
+import { Event as Event20 } from "@opencode/schema/agent";
+var ID17 = Agent.ID;
 var Name3 = Agent.Name;
-var defaultID2 = ID9.make("build");
+var defaultID2 = ID17.make("build");
 var Color2 = Agent.Color;
-var Info13 = Agent.Info;
+var Info29 = Agent.Info;
 
-class Service63 extends Context.Service()("@opencode/Agent") {
+class Service81 extends Context.Service()("@opencode/Agent") {
 }
-var layer = Layer.effect(Service63, Effect.gen(function* () {
+var layer = Layer.effect(Service81, Effect.gen(function* () {
   const bus = yield* Service84;
   const state = create3({
     name: "agent",
@@ -46,7 +46,7 @@ var layer = Layer.effect(Service63, Effect.gen(function* () {
         editor.default = id;
       },
       update: (id, fn) => {
-        const current = editor.agents.get(id) ?? Info13.default(id);
+        const current = editor.agents.get(id) ?? Info29.default(id);
         if (!editor.agents.has(id))
           editor.agents.set(id, current);
         fn(current);
@@ -64,7 +64,7 @@ var layer = Layer.effect(Service63, Effect.gen(function* () {
     const configured = data.default ? selectable(data.agents.get(data.default)) : undefined;
     if (configured)
       return configured;
-    const build = selectable(data.agents.get(ID9.make("build")));
+    const build = selectable(data.agents.get(ID17.make("build")));
     if (build)
       return build;
     for (const agent of data.agents.values()) {
@@ -73,7 +73,7 @@ var layer = Layer.effect(Service63, Effect.gen(function* () {
         return fallback;
     }
   };
-  return Service63.of({
+  return Service81.of({
     transform: state.transform,
     reload: state.reload,
     get: Effect.fn("Agent.get")(function* (id) {
@@ -81,12 +81,12 @@ var layer = Layer.effect(Service63, Effect.gen(function* () {
     }),
     resolve: Effect.fnUntraced(function* (id) {
       if (id !== undefined)
-        return state.get().agents.get(ID9.make(id));
+        return state.get().agents.get(ID17.make(id));
       return selectedDefault();
     }),
     select: Effect.fn("Agent.select")(function* (id) {
       if (id !== undefined) {
-        const selected = ID9.make(id);
+        const selected = ID17.make(id);
         return { id: selected, info: state.get().agents.get(selected) };
       }
       const info = selectedDefault();
@@ -101,6 +101,6 @@ var layer = Layer.effect(Service63, Effect.gen(function* () {
     })
   });
 }));
-var node65 = makeLocationNode({ service: Service63, layer, deps: [node88] });
+var node85 = makeLocationNode({ service: Service81, layer, deps: [node88] });
 
-export { ID9, Name3, defaultID2, Color2, Info13, Service63, node65, exports_agent3, Event12 };
+export { ID17, Name3, defaultID2, Color2, Info29, Service81, node85, exports_agent4, Event20 };

package/dist/chunks/{instance-bh593mvy.js → location-wnqm0cgw.js}

@@ -1,13 +1,13 @@
 import {
   Service84
-} from "./instance-9f6w07v2.js";
+} from "./location-wapmwjpk.js";
 import {
   supportsText2
-} from "./instance-vvgk372g.js";
+} from "./location-b476w8hy.js";
 import {
-  Service74,
-  Event15
-} from "./instance-w93dz47x.js";
+  Service45,
+  Event7
+} from "./location-e3h2tv5m.js";
 
 // src/plugin/models-dev.ts
 import { define } from "@opencode/plugin/effect/plugin";
@@ -19,6 +19,7 @@ var BEDROCK_PROFILE_ONLY_IDS = [
   "anthropic.claude-fable-5",
   "anthropic.claude-fable-5-1",
   "anthropic.claude-haiku-4-5-20251001-v1:0",
+  "anthropic.claude-haiku-5-5",
   "anthropic.claude-opus-4-1-20250805-v1:0",
   "anthropic.claude-opus-4-5-20251101-v1:0",
   "anthropic.claude-opus-4-7",
@@ -26,13 +27,18 @@ var BEDROCK_PROFILE_ONLY_IDS = [
   "anthropic.claude-opus-5",
   "anthropic.claude-sonnet-4-5-20250929-v1:0",
   "anthropic.claude-sonnet-5",
+  "anthropic.claude-sonnet-5-5",
   "deepseek.r1-v1:0",
-  "mistral.pixtral-large-2502-v1:0"
+  "meta.llama4-maverick-17b-instruct-v1:0",
+  "meta.llama4-scout-17b-instruct-v1:0",
+  "mistral.pixtral-large-2502-v1:0",
+  "writer.palmyra-x4-v1:0",
+  "writer.palmyra-x5-v1:0"
 ];
 var ModelsDevPlugin2 = define({
   id: "opencode.models.dev",
   effect: Effect.fn(function* (ctx) {
-    const modelsDev = yield* Service74;
+    const modelsDev = yield* Service45;
     const bus = yield* Service84;
     const loaded = { data: snapshots(yield* modelsDev.get()) };
     yield* ctx.integration.transform((integrations) => {
@@ -66,7 +72,7 @@ var ModelsDevPlugin2 = define({
       loaded.data = snapshots(data);
       return ctx.integration.reload().pipe(Effect.andThen(ctx.provider.reload()));
     };
-    yield* bus.subscribe(Event15.Refreshed).pipe(Stream.runForEach(() => modelsDev.get().pipe(Effect.flatMap(apply))), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event7.Refreshed).pipe(Stream.runForEach(() => modelsDev.get().pipe(Effect.flatMap(apply))), Effect.forkScoped({ startImmediately: true }));
     const latest = yield* modelsDev.get();
     if (snapshots(latest) !== loaded.data)
       yield* apply(latest);

package/dist/chunks/{instance-81fjg4yx.js → location-wpw4fxj8.js}

@@ -1,21 +1,21 @@
 import {
   AbsolutePath2,
   RelativePath2
-} from "./instance-z5v4ffb3.js";
+} from "./location-z5v4ffb3.js";
 import {
   makeUnsafe2
-} from "./instance-dpkg50ah.js";
+} from "./location-y71avatq.js";
 import {
   MAX_TOTAL_PATCH_BYTES2,
   emptyPatch2,
   chunksByFile2
-} from "./instance-tazgh4e4.js";
+} from "./location-tazgh4e4.js";
 import {
   gitExecutable2
-} from "./instance-ef5x83kb.js";
+} from "./location-ef5x83kb.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/git.ts
 var exports_git3 = {};
@@ -23,11 +23,11 @@ __export(exports_git3, {
   Git: () => exports_git3,
   OperationError: () => OperationError3,
   Repository: () => Repository2,
-  Service: () => Service80,
+  Service: () => Service78,
   TreeID: () => TreeID2,
   Worktree: () => Worktree2,
   WorktreeError: () => WorktreeError2,
-  node: () => node84
+  node: () => node81
 });
 import path from "path";
 import { Cause, Context, Effect, Exit, Layer, Option, Schedule, Schema } from "effect";
@@ -100,9 +100,9 @@ class WorktreeError2 extends Schema.TaggedError()("Git.WorktreeError", {
 }) {
 }
 
-class Service80 extends Context.Service()("@opencode/Git") {
+class Service78 extends Context.Service()("@opencode/Git") {
 }
-var layer = Layer.effect(Service80, Effect.gen(function* () {
+var layer = Layer.effect(Service78, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const proc = yield* AppProcess.Service;
   const locks = makeUnsafe2();
@@ -717,7 +717,7 @@ var layer = Layer.effect(Service80, Effect.gen(function* () {
       kind: index === 0 ? "main" : "linked"
     }));
   });
-  return Service80.of({
+  return Service78.of({
     repo: { discover, clone, create },
     remote: { get: remote },
     history: { head, branch, defaultRemoteBranch: remoteHead, rootCommits: roots },
@@ -734,7 +734,7 @@ var layer = Layer.effect(Service80, Effect.gen(function* () {
     objects: { pack: packObjects }
   });
 }));
-var node84 = makeGlobalNode({ service: Service80, layer, deps: [FSUtil.node, AppProcess.node] });
+var node81 = makeGlobalNode({ service: Service78, layer, deps: [FSUtil.node, AppProcess.node] });
 function run(cwd, proc, args) {
   return execute(cwd, proc, args).pipe(Effect.orElseSucceed(() => ({ exitCode: 1, text: "", stderr: "" })));
 }
@@ -801,4 +801,4 @@ function resolvePath(cwd, value) {
   return path.resolve(cwd, normalized);
 }
 
-export { Repository2, TreeID2, OperationError3, Worktree2, WorktreeError2, Service80, node84, exports_git3 };
+export { Repository2, TreeID2, OperationError3, Worktree2, WorktreeError2, Service78, node81, exports_git3 };

package/dist/chunks/{instance-93pem10m.js → location-x4zxggeh.js}

@@ -1,80 +1,80 @@
 import {
   Service85
-} from "./instance-7vr1nntc.js";
+} from "./location-pyv4m8ny.js";
 import {
   Service84
-} from "./instance-9f6w07v2.js";
+} from "./location-wapmwjpk.js";
 import {
-  Service49
-} from "./instance-c8bydgjz.js";
+  Service54
+} from "./location-d0k1g5nx.js";
 import {
   userNotification2
-} from "./instance-vzs5sf6e.js";
+} from "./location-vzs5sf6e.js";
 import {
   SessionMessage2
-} from "./instance-gftt206x.js";
+} from "./location-gftt206x.js";
 import {
-  NotFoundError8,
+  NotFoundError9,
   PromptConflictError2,
   SyntheticConflictError2,
   CompactionConflictError2,
   BusyError2,
   InboxConflictError2
-} from "./instance-89za3yyg.js";
+} from "./location-kje2jy7e.js";
 import {
   SessionEvent2
-} from "./instance-ec1grn59.js";
+} from "./location-ec1grn59.js";
 import {
-  Service57
-} from "./instance-v73z6nkx.js";
+  Service72
+} from "./location-v23zj4w8.js";
 import {
   Delivery2,
   SyntheticPayload2,
-  Service47
-} from "./instance-9d9vbnr3.js";
+  Service53
+} from "./location-4pqc6r0s.js";
 import {
-  Service45
-} from "./instance-gs0zmrt4.js";
+  Service51
+} from "./location-f4pp2f84.js";
 import {
   prepare2
-} from "./instance-6y11rvqm.js";
+} from "./location-4vkzjfz1.js";
 import {
   stage2,
   clear2,
   commit2
-} from "./instance-xtrd0rcy.js";
+} from "./location-qkefedax.js";
 import {
   start2
-} from "./instance-vmvrq3v0.js";
+} from "./location-2k9gth8v.js";
 import {
-  get5
-} from "./instance-1jnacwd4.js";
+  get4
+} from "./location-xdyvfy69.js";
 import {
   __export
-} from "./instance-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/session/session.ts
 var exports_session2 = {};
 __export(exports_session2, {
   Session: () => exports_session2,
-  make: () => make13
+  make: () => make12
 });
 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 make12 = Effect.fn("Session.make")(function* () {
   const bus = yield* Service84;
   const database = yield* Service85;
-  const store = yield* Service57;
-  const instances = yield* Service49;
-  const execution = yield* Service45;
-  const admission = yield* Service47;
+  const store = yield* Service72;
+  const instances = yield* Service54;
+  const execution = yield* Service51;
+  const admission = yield* Service53;
   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) {
@@ -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(Service54, 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(Service54, 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* get5({ session, skill: input.skill }).pipe(Effect.provideService(Service49, instances));
+    const skill = yield* get4({ session, skill: input.skill }).pipe(Effect.provideService(Service54, 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(Service85, database), Effect.provideService(Service84, bus));
+    return yield* stage2({ session, messageID: input.messageID, files: input.files }).pipe(Effect.provideService(Service54, instances), Effect.provideService(Service85, database), Effect.provideService(Service84, 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(Service84, bus));
+    yield* clear2(session).pipe(Effect.provideService(Service54, instances), Effect.provideService(Service84, 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 { make12, exports_session2 };