@opencode-ai/core 0.0.0-beta-19187 → 0.0.0-beta-19215

package/dist/chunks/{snapshot-d6n0x6yy.js → vcs-ysfe1p8c.js}

@@ -1,49 +1,49 @@
 import {
   AbsolutePath2
-} from "./snapshot-p8qxwesx.js";
+} from "./vcs-p8qxwesx.js";
 import {
   Service80,
   node85
-} from "./snapshot-p8tabr57.js";
+} from "./vcs-xy79x8r5.js";
 import {
-  Service78,
-  node83
-} from "./snapshot-gmj1gppr.js";
+  Service77,
+  node82
+} from "./vcs-neq27s6s.js";
 import {
-  Service79,
-  node84
-} from "./snapshot-mycvpxn8.js";
+  Service76,
+  node81
+} from "./vcs-yhdr8f5j.js";
 import {
-  ID18,
+  ID17,
   Current3,
-  Info32,
+  Info31,
   UpdateInput4,
   Event20,
   Vcs3
-} from "./snapshot-tppvcy65.js";
+} from "./vcs-v60ecprk.js";
 import {
   ProjectTable2,
   upsertProject2
-} from "./snapshot-9qm9egsn.js";
+} from "./vcs-9qm9egsn.js";
 import {
   WorktreeTable2
-} from "./snapshot-ajtjthsy.js";
+} from "./vcs-ajtjthsy.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./vcs-9rqn6x4v.js";
 
 // src/project.ts
 var exports_project = {};
 __export(exports_project, {
   Current: () => Current2,
-  ID: () => ID17,
-  Info: () => Info31,
+  ID: () => ID16,
+  Info: () => Info30,
   NotFoundError: () => NotFoundError10,
   Project: () => exports_project,
-  Service: () => Service77,
+  Service: () => Service75,
   UpdateInput: () => UpdateInput3,
   Vcs: () => Vcs2,
-  node: () => node82,
+  node: () => node80,
   root: () => root2
 });
 import { Context, Effect, Layer, Schema } from "effect";
@@ -55,14 +55,14 @@ import { FSUtil } from "@opencode-ai/util/fs-util";
 import { AppProcess } from "@opencode-ai/util/process";
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
 import { Hash } from "@opencode-ai/util/hash";
-var ID17 = ID18;
+var ID16 = ID17;
 var Vcs2 = Vcs3;
 var Current2 = Current3;
-var Info31 = Info32;
+var Info30 = Info31;
 var UpdateInput3 = UpdateInput4;
 
 class NotFoundError10 extends Schema.TaggedError()("Project.NotFoundError", {
-  projectID: ID17
+  projectID: ID16
 }) {
 }
 var root2 = Effect.fn("Project.root")(function* (fs, input, markers = [".git", ".hg"]) {
@@ -71,7 +71,7 @@ var root2 = Effect.fn("Project.root")(function* (fs, input, markers = [".git", "
   }));
 });
 
-class Service77 extends Context.Service()("@opencode/Project") {
+class Service75 extends Context.Service()("@opencode/Project") {
 }
 function fromRow(row) {
   const icon = row.icon_url || row.icon_url_override || row.icon_color ? {
@@ -94,11 +94,11 @@ function fromRow(row) {
     sandboxes: row.sandboxes
   };
 }
-var layer = Layer.effect(Service77, Effect.gen(function* () {
+var layer = Layer.effect(Service75, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const git = yield* Service79;
+  const git = yield* Service76;
   const proc = yield* AppProcess.Service;
-  const bus = yield* Service78;
+  const bus = yield* Service77;
   const db = (yield* Service80).db;
   const announcing = new Set;
   const persist = Effect.fnUntraced(function* (project) {
@@ -144,7 +144,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
         yield* bus.publish(Worktree.Event.Resolved, {
           projectID: item.projectID,
           directory: item.directory,
-          previous: project.previous ?? ID17.global,
+          previous: project.previous ?? ID16.global,
           ...adopted.length ? { adopted: adopted.map((candidate) => candidate.id) } : {}
         }, {
           commit: () => db.insert(WorktreeTable2).values({ project_id: item.projectID, directory: item.directory, strategy: item.strategy }).onConflictDoNothing().run().pipe(Effect.orDie, Effect.asVoid)
@@ -159,6 +159,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
   });
   const update = Effect.fn("Project.update")(function* (input) {
     const row = yield* db.update(ProjectTable2).set({
+      worktree: input.canonical,
       name: input.name === undefined ? undefined : input.name || null,
       icon_url_override: input.icon?.override === undefined ? undefined : input.icon.override || null,
       icon_color: input.icon?.color === undefined ? undefined : input.icon.color || null,
@@ -172,7 +173,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
     return project;
   });
   const cached = Effect.fnUntraced(function* (dir) {
-    return yield* fs.readFileString(path.join(dir, "opencode")).pipe(Effect.map((value) => value.trim()), Effect.map((value) => value ? ID17.make(value) : undefined), Effect.orElseSucceed(() => {
+    return yield* fs.readFileString(path.join(dir, "opencode")).pipe(Effect.map((value) => value.trim()), Effect.map((value) => value ? ID16.make(value) : undefined), Effect.orElseSucceed(() => {
       return;
     }));
   });
@@ -183,7 +184,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
     const normalized = url(origin);
     if (!normalized)
       return;
-    return ID17.make(Hash.fast(`git-remote:${normalized}`));
+    return ID16.make(Hash.fast(`git-remote:${normalized}`));
   });
   function url(input) {
     const value = input.trim();
@@ -208,7 +209,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
   }
   const rootCommit = Effect.fnUntraced(function* (repo) {
     const root = (yield* git.history.rootCommits(repo))[0];
-    return root ? ID17.make(root) : undefined;
+    return root ? ID16.make(root) : undefined;
   });
   const hgRoot = Effect.fnUntraced(function* (worktree) {
     const result = yield* proc.run(ChildProcess.make("hg", ["log", "-r", "roots(all())", "-T", `{node}
@@ -224,7 +225,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
       return;
     const node = result.stdout.toString("utf8").split(`
 `).map((item) => item.trim()).filter(Boolean).toSorted()[0];
-    return node ? ID17.make(node) : undefined;
+    return node ? ID16.make(node) : undefined;
   });
   const hgDiscover = Effect.fnUntraced(function* (dotHg) {
     const worktree = AbsolutePath2.make(path.dirname(dotHg));
@@ -233,7 +234,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
     const id = previous ?? (yield* hgRoot(worktree));
     return {
       previous,
-      id: id ?? ID17.global,
+      id: id ?? ID16.global,
       directory: worktree,
       vcs: { type: "hg", store }
     };
@@ -250,7 +251,7 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
       const canonical = repo.gitDirectory === repo.commonDirectory ? repo.worktree : yield* git.worktree.list(repo).pipe(Effect.map((items) => items.find((item) => item.kind === "main")?.directory ?? repo.worktree), Effect.orElseSucceed(() => repo.worktree));
       return yield* persist({
         previous,
-        id: id ?? ID17.global,
+        id: id ?? ID16.global,
         directory: repo.worktree,
         canonical,
         vcs: { type: "git", store: repo.commonDirectory }
@@ -264,18 +265,18 @@ var layer = Layer.effect(Service77, Effect.gen(function* () {
       });
     }
     return yield* persist({
-      id: ID17.make(Hash.fast(`directory:${directory}`)),
+      id: ID16.make(Hash.fast(`directory:${directory}`)),
       directory,
       canonical: directory,
       vcs: undefined
     });
   });
-  return Service77.of({ list, update, resolve });
+  return Service75.of({ list, update, resolve });
 }));
-var node82 = makeGlobalNode({
-  service: Service77,
+var node80 = makeGlobalNode({
+  service: Service75,
   layer,
-  deps: [node83, node85, FSUtil.node, node84, AppProcess.node]
+  deps: [node82, node85, FSUtil.node, node81, AppProcess.node]
 });
 
-export { ID17, Vcs2, Current2, Info31, UpdateInput3, NotFoundError10, root2, Service77, node82, exports_project };
+export { ID16, Vcs2, Current2, Info30, UpdateInput3, NotFoundError10, root2, Service75, node80, exports_project };

package/dist/chunks/{snapshot-bpnz08mb.js → vcs-ystvjdgv.js}

@@ -1,10 +1,10 @@
 import {
   AbsolutePath2,
   RelativePath2
-} from "./snapshot-p8qxwesx.js";
+} from "./vcs-p8qxwesx.js";
 import {
   SessionSchema2
-} from "./snapshot-mq9r6drf.js";
+} from "./vcs-nvw3xbya.js";
 
 // src/session/info.ts
 import { DateTime, Schema } from "effect";

package/dist/chunks/{snapshot-ganjyh73.js → vcs-ytpvxjwh.js}

@@ -1,22 +1,22 @@
 import {
   useragent2
-} from "./snapshot-s3f6t33f.js";
+} from "./vcs-8txhwh3r.js";
 import {
-  ID16
-} from "./snapshot-rvb2zp0m.js";
+  ID14
+} from "./vcs-zfdtt056.js";
 import {
   iife2
-} from "./snapshot-1kg9ymc8.js";
+} from "./vcs-1kg9ymc8.js";
 import {
   configuredSettings2
-} from "./snapshot-gafyc7gz.js";
+} from "./vcs-5qepm9qc.js";
 
 // src/plugin/provider/cloudflare-ai-gateway.ts
 import os from "os";
 import { Effect, Option, Schema } from "effect";
 import { define } from "@opencode-ai/plugin/effect/plugin";
 import { Form } from "@opencode-ai/schema/form";
-var providerID = ID16.make("cloudflare-ai-gateway");
+var providerID = ID14.make("cloudflare-ai-gateway");
 var CloudflareAIGatewayPlugin2 = define({
   id: "opencode.provider.cloudflare.ai.gateway",
   effect: Effect.fn(function* (ctx) {

package/dist/chunks/{snapshot-kk60f5rs.js → vcs-ywbsfzeb.js}

@@ -1,16 +1,16 @@
 import {
   AbsolutePath2
-} from "./snapshot-p8qxwesx.js";
+} from "./vcs-p8qxwesx.js";
 import {
   root2
-} from "./snapshot-d6n0x6yy.js";
+} from "./vcs-ysfe1p8c.js";
 import {
-  Service76,
-  node81
-} from "./snapshot-9vsg5cp7.js";
+  Service74,
+  node79
+} from "./vcs-1msg2xhp.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./vcs-9rqn6x4v.js";
 
 // src/location-mutation.ts
 var exports_location_mutation = {};
@@ -18,9 +18,9 @@ __export(exports_location_mutation, {
   Kind: () => Kind2,
   LocationMutation: () => exports_location_mutation,
   ResolveInput: () => ResolveInput2,
-  Service: () => Service17,
+  Service: () => Service15,
   externalDirectoryPermission: () => externalDirectoryPermission2,
-  node: () => node20,
+  node: () => node19,
   resolvePath: () => resolvePath2
 });
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
@@ -43,12 +43,12 @@ var resolvePath2 = (directory, input, home = Global.Path.home) => {
   return path.resolve(directory, normalized === "~" ? home : normalized.startsWith("~/") || process.platform === "win32" && normalized.startsWith("~\\") ? path.join(home, normalized.slice(2)) : normalized);
 };
 
-class Service17 extends Context.Service()("@opencode/LocationMutation") {
+class Service15 extends Context.Service()("@opencode/LocationMutation") {
 }
 var slash = (value) => value.replaceAll("\\", "/");
-var layer = Layer.effect(Service17, Effect.gen(function* () {
+var layer = Layer.effect(Service15, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service76;
+  const location = yield* Service74;
   const resolve = Effect.fnUntraced(function* (input) {
     const absolute = resolvePath2(location.directory, input.path);
     const worktree = path.resolve(location.project.directory);
@@ -73,12 +73,12 @@ var layer = Layer.effect(Service17, Effect.gen(function* () {
       }
     };
   });
-  return Service17.of({ resolve });
+  return Service15.of({ resolve });
 }));
-var node20 = makeLocationNode({
-  service: Service17,
+var node19 = makeLocationNode({
+  service: Service15,
   layer,
-  deps: [FSUtil.node, node81]
+  deps: [FSUtil.node, node79]
 });
 
-export { Kind2, ResolveInput2, externalDirectoryPermission2, resolvePath2, Service17, node20, exports_location_mutation };
+export { Kind2, ResolveInput2, externalDirectoryPermission2, resolvePath2, Service15, node19, exports_location_mutation };

package/dist/chunks/{snapshot-jd3azxa6.js → vcs-ywyky1d5.js}

@@ -1,111 +1,111 @@
 import {
   Service80,
   node85
-} from "./snapshot-p8tabr57.js";
+} from "./vcs-xy79x8r5.js";
 import {
-  ID14,
-  Service70,
-  node75
-} from "./snapshot-9cm69fc1.js";
+  ID9,
+  Service48,
+  node52
+} from "./vcs-j4vfhh0d.js";
 import {
-  Service52,
-  node56
-} from "./snapshot-703t54qh.js";
+  Service50,
+  node54
+} from "./vcs-61vj14ds.js";
 import {
   combine2
-} from "./snapshot-75yf2d83.js";
+} from "./vcs-6e958v7x.js";
 import {
-  make16
-} from "./snapshot-30gfay9h.js";
+  make14
+} from "./vcs-fdy3c0jq.js";
 import {
-  Service44,
-  node47
-} from "./snapshot-40t5htn2.js";
+  Service49,
+  node53
+} from "./vcs-cjy7jgaz.js";
 import {
-  Service76,
-  node81
-} from "./snapshot-9vsg5cp7.js";
+  Service74,
+  node79
+} from "./vcs-1msg2xhp.js";
 import {
-  Service36,
-  node39
-} from "./snapshot-024d3rq7.js";
+  Service31,
+  node36
+} from "./vcs-6p379jz1.js";
 import {
   AgentNotFoundError2
-} from "./snapshot-n6wnzfnt.js";
+} from "./vcs-yjsg3rxy.js";
 import {
   entriesForRunner2
-} from "./snapshot-yenvjmh1.js";
+} from "./vcs-fnjz2ya7.js";
 import {
-  Service69,
-  node74
-} from "./snapshot-r38jmka9.js";
+  Service46,
+  node50
+} from "./vcs-b8kek278.js";
 import {
-  Service48,
-  node52
-} from "./snapshot-pawcwqnj.js";
+  Service42,
+  node45
+} from "./vcs-76crymj9.js";
 import {
-  Service40,
-  node43
-} from "./snapshot-e0h0gh3e.js";
+  Service29,
+  node34
+} from "./vcs-hpqmtsvh.js";
 import {
-  Service33,
-  node36
-} from "./snapshot-tnbsa9ys.js";
+  Service24,
+  node29
+} from "./vcs-0agkztpb.js";
 import {
-  Service43,
-  node46
-} from "./snapshot-haknmdce.js";
+  Service25,
+  node30
+} from "./vcs-dzekqm42.js";
 import {
-  Service35,
-  node38
-} from "./snapshot-pa6mt9gp.js";
+  Service30,
+  node35
+} from "./vcs-p9vq2f3r.js";
 import {
-  Service34,
-  node37
-} from "./snapshot-fc9k9wz0.js";
+  Service26,
+  node31
+} from "./vcs-3pa39xkc.js";
+import {
+  Service27,
+  node32
+} from "./vcs-y0n7gr4f.js";
 import {
   Service37,
   node40
-} from "./snapshot-zhn53cwh.js";
-import {
-  Service39,
-  node42
-} from "./snapshot-cb49kykp.js";
+} from "./vcs-1qq0n3fx.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./vcs-9rqn6x4v.js";
 
 // src/session/context.ts
 var exports_context = {};
 __export(exports_context, {
-  Service: () => Service32,
+  Service: () => Service23,
   SessionContext: () => exports_context,
-  node: () => node35
+  node: () => node28
 });
 import { Model } from "@opencode-ai/schema/model";
 import { Context, Effect, Layer } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
-class Service32 extends Context.Service()("@opencode/SessionContext") {
+class Service23 extends Context.Service()("@opencode/SessionContext") {
 }
-var layer = Layer.effect(Service32, Effect.gen(function* () {
-  const agents = yield* Service70;
-  const builtins = yield* Service36;
-  const catalog = yield* Service52;
+var layer = Layer.effect(Service23, Effect.gen(function* () {
+  const agents = yield* Service48;
+  const builtins = yield* Service31;
+  const catalog = yield* Service50;
   const db = (yield* Service80).db;
-  const discovery = yield* Service44;
-  const entries = yield* Service34;
-  const location = yield* Service76;
-  const mcpInstructions = yield* Service33;
-  const mcpTools = yield* Service40;
-  const models = yield* Service39;
-  const modelRequests = yield* Service37;
-  const referenceInstructions = yield* Service43;
-  const skillInstructions = yield* Service35;
-  const store = yield* Service69;
-  const registry = yield* Service48;
+  const discovery = yield* Service49;
+  const entries = yield* Service26;
+  const location = yield* Service74;
+  const mcpInstructions = yield* Service24;
+  const mcpTools = yield* Service29;
+  const models = yield* Service37;
+  const modelRequests = yield* Service27;
+  const referenceInstructions = yield* Service25;
+  const skillInstructions = yield* Service30;
+  const store = yield* Service46;
+  const registry = yield* Service42;
   const resolveModel = (session) => models.resolve(session, catalog.model.available);
   const selectTitle = Effect.fn("SessionContext.selectTitle")(function* (session) {
-    const agent = yield* agents.get(ID14.make("title"));
+    const agent = yield* agents.get(ID9.make("title"));
     if (!agent)
       return;
     const primary = yield* resolveModel(session).pipe(Effect.orElseSucceed(() => {
@@ -158,7 +158,7 @@ var layer = Layer.effect(Service32, Effect.gen(function* () {
       agent: { ...agent, info: agent.info },
       instructions: combine2([
         loaded.builtins,
-        make16(loaded.tools.codeModeCatalog),
+        make14(loaded.tools.codeModeCatalog),
         loaded.discovery,
         loaded.skills,
         loaded.references,
@@ -180,29 +180,29 @@ var layer = Layer.effect(Service32, Effect.gen(function* () {
       tools: selection.tools
     };
   });
-  return Service32.of({ select, load, resolveModel, selectTitle, prepare: modelRequests.prepare });
+  return Service23.of({ select, load, resolveModel, selectTitle, prepare: modelRequests.prepare });
 }));
 var MINIMAL_REASONING_VARIANTS = ["none", "minimal", "low"].map((id) => Model.VariantID.make(id));
-var node35 = makeLocationNode({
-  service: Service32,
+var node28 = makeLocationNode({
+  service: Service23,
   layer,
   deps: [
-    node75,
-    node56,
+    node52,
+    node54,
     node85,
-    node39,
-    node47,
-    node37,
-    node81,
     node36,
-    node43,
-    node46,
-    node42,
+    node53,
+    node31,
+    node79,
+    node29,
+    node34,
+    node30,
     node40,
-    node74,
-    node38,
-    node52
+    node32,
+    node50,
+    node35,
+    node45
   ]
 });
 
-export { Service32, node35, exports_context };
+export { Service23, node28, exports_context };

package/dist/chunks/{snapshot-ht2crakh.js → vcs-yzdb6kcq.js}

@@ -1,30 +1,30 @@
 import {
   PositiveInt2
-} from "./snapshot-p8qxwesx.js";
+} from "./vcs-p8qxwesx.js";
 import {
   Action2
-} from "./snapshot-wtm3m4mv.js";
+} from "./vcs-sbnvhk9g.js";
 import {
-  Info16
-} from "./snapshot-55snk687.js";
-import {
-  Info18
-} from "./snapshot-1ydgq2r4.js";
+  Info20
+} from "./vcs-af4svgqg.js";
 import {
-  Info15
-} from "./snapshot-ratrq7cm.js";
+  Info23
+} from "./vcs-0b89de78.js";
 import {
   Info19
-} from "./snapshot-awqyf91x.js";
+} from "./vcs-jfqtm2ew.js";
+import {
+  Info16
+} from "./vcs-w0k1he6w.js";
 import {
   Spec2
-} from "./snapshot-fcrkznn8.js";
+} from "./vcs-2k8khapm.js";
 import {
-  Info14
-} from "./snapshot-41mncz27.js";
+  Info18
+} from "./vcs-famd3pv6.js";
 import {
-  Info13
-} from "./snapshot-xzpf9br7.js";
+  Info15
+} from "./vcs-0j9tth8j.js";
 import {
   migrate2,
   normalizeAction2,
@@ -33,10 +33,10 @@ import {
   migrateMcp2,
   migrateProvider2,
   providerID2
-} from "./snapshot-y08fmh3j.js";
+} from "./vcs-gtcj13ca.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./vcs-9rqn6x4v.js";
 
 // src/config/normalize.ts
 var exports_normalize = {};
@@ -84,10 +84,10 @@ function normalize2(input) {
   const encoded = {};
   unsupportedTopLevel.forEach((key) => unsupportedIfPresent(input, key, [key], diagnostics));
   const legacySnapshots = own(input, "snapshot") ? decodeEncoded(Schema.Boolean, input.snapshot, ["snapshot"], diagnostics) : undefined;
-  const legacyUpdate = own(input, "autoupdate") ? decodeValue(Info13.fields.autoupdate, input.autoupdate, ["autoupdate"], diagnostics) : undefined;
+  const legacyUpdate = own(input, "autoupdate") ? decodeValue(Info15.fields.autoupdate, input.autoupdate, ["autoupdate"], diagnostics) : undefined;
   const nativeUpdate = own(input, "update") ? decodeEncoded(Info.fields.update, input.update, ["update"], diagnostics) : undefined;
   const legacyShare = own(input, "autoshare") ? decodeValue(Schema.Boolean, input.autoshare, ["autoshare"], diagnostics) === true ? "auto" : undefined : undefined;
-  const legacyMedia = own(input, "attachment") ? decodeValue(Info18, input.attachment, ["attachment"], diagnostics) : undefined;
+  const legacyMedia = own(input, "attachment") ? decodeValue(Info23, input.attachment, ["attachment"], diagnostics) : undefined;
   if (legacyMedia !== undefined) {
     const migrated = migrate2({ attachment: legacyMedia }).media;
     if (migrated !== undefined)
@@ -104,7 +104,7 @@ 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, Info15, ["command"], diagnostics, decodeValue);
+  const legacyCommands = decodeMap(input.command, Info19, ["command"], diagnostics, decodeValue);
   diagnoseSelectionMap(input.command, ["command"], diagnostics);
   const migratedCommands = mapValues(legacyCommands, (value) => {
     const migrated = commands2({ value })?.value;
@@ -112,7 +112,7 @@ function normalize2(input) {
   });
   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, Info16, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
+  const legacyAgents = mapValues(decodeMap(input.agent, Info20, ["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 = legacySmallModel ? migrate2({ small_model: legacySmallModel }).agents?.title?.model : undefined;
   if (legacySmallModel && !migratedSmallModel)
@@ -126,7 +126,7 @@ function normalize2(input) {
       model: migratedSmallModel,
       ...legacyAgents.title
     };
-  const modeAgents = mapValues(decodeMap(input.mode, Info16, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
+  const modeAgents = mapValues(decodeMap(input.mode, Info20, ["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);
@@ -225,7 +225,7 @@ function normalizeMcp(input, encoded, diagnostics) {
           normalizeMcpTimeout(value, timeout, path, diagnostics);
           return;
         }
-        const server = decodeValue(Info19, value, path, diagnostics);
+        const server = decodeValue(Info16, value, path, diagnostics);
         if (server !== undefined)
           setOwn(legacyServers, name, canonical(ConfigMCP.Server, migrateMcp2(server)));
       });
@@ -421,7 +421,7 @@ function migrateProviders(value, diagnostics) {
     diagnoseProviderUnsupported(raw, path, diagnostics);
     if (invalidProviderOverlays(raw, path, diagnostics))
       return [];
-    const provider = decodeValue(Info14, raw, path, diagnostics);
+    const provider = decodeValue(Info18, raw, path, diagnostics);
     if (provider === undefined)
       return [];
     const destination = providerID2(name);