@opencode/core 0.0.0-dev-20109 → 0.0.0-dev-20111

package/dist/chunks/{ripgrep-kqcn9zd9.js → state-nf3zyzex.js}

@@ -2,17 +2,17 @@ import {
   NonNegativeInt2,
   PositiveInt2,
   RelativePath2
-} from "./ripgrep-922hggd3.js";
+} from "./state-922hggd3.js";
 import {
-  Service55,
-  node58
-} from "./ripgrep-cd5r1gbk.js";
+  Service64,
+  node67
+} from "./state-4mbzwrkh.js";
 import {
   RipgrepBinary2
-} from "./ripgrep-8d7r5vzw.js";
+} from "./state-8d7r5vzw.js";
 import {
   __export
-} from "./ripgrep-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/ripgrep.ts
 var exports_ripgrep = {};
@@ -20,8 +20,8 @@ __export(exports_ripgrep, {
   Error: () => Error4,
   InvalidPatternError: () => InvalidPatternError2,
   Ripgrep: () => exports_ripgrep,
-  Service: () => Service54,
-  node: () => node57
+  Service: () => Service61,
+  node: () => node64
 });
 import { Context, Effect, Fiber, Layer, Schema, Stream } from "effect";
 import { ChildProcess } from "effect/unstable/process";
@@ -58,13 +58,13 @@ class InvalidPatternError2 extends Schema.TaggedError()("Ripgrep.InvalidPatternE
 }) {
 }
 
-class Service54 extends Context.Service()("@opencode/Ripgrep") {
+class Service61 extends Context.Service()("@opencode/Ripgrep") {
 }
 var failure = (message, cause) => new Error4({ message, cause });
 var normalizePath = (value) => value.replace(/^(?:\.[\\/])+/u, "").replace(/^[\\/]+/u, "").replaceAll("\\", "/");
 var isInvalidPattern = (stderr) => stderr.includes("regex parse error") || stderr.includes("error parsing regex");
-var layer = Layer.effect(Service54, Effect.gen(function* () {
-  const environment = yield* Service55;
+var layer = Layer.effect(Service61, Effect.gen(function* () {
+  const environment = yield* Service64;
   const binary = yield* RipgrepBinary2.Service;
   const run = (input) => {
     const program = Effect.scoped(Effect.gen(function* () {
@@ -92,7 +92,7 @@ var layer = Layer.effect(Service54, Effect.gen(function* () {
     const abortable = input.signal ? program.pipe(Effect.raceFirst(waitForAbort(input.signal))) : program;
     return abortable.pipe(Effect.mapError((cause) => cause instanceof Error4 || cause instanceof InvalidPatternError2 ? cause : failure("ripgrep execution failed", cause)));
   };
-  return Service54.of({
+  return Service61.of({
     glob: (input) => run({
       cwd: input.cwd,
       limit: input.limit,
@@ -175,6 +175,6 @@ var layer = Layer.effect(Service54, Effect.gen(function* () {
     }))))
   });
 }));
-var node57 = makeLocationNode({ service: Service54, layer, deps: [node58, RipgrepBinary2.node] });
+var node64 = makeLocationNode({ service: Service61, layer, deps: [node67, RipgrepBinary2.node] });
 
-export { Error4, InvalidPatternError2, Service54, node57, exports_ripgrep };
+export { Error4, InvalidPatternError2, Service61, node64, exports_ripgrep };

package/dist/chunks/{ripgrep-tce32nx9.js → state-nggt3w8z.js}

@@ -2,16 +2,16 @@ import {
   managesTransactionsNatively2,
   EffectSQLiteSession2,
   EffectSQLiteTransaction2
-} from "./ripgrep-vyf9ssr3.js";
+} from "./state-47dkewx0.js";
 import {
   EffectSQLiteDatabase2,
   DefaultServices2,
-  make22,
+  make23,
   makeWithDefaults2
-} from "./ripgrep-rbwfq5hj.js";
+} from "./state-9fgjxmjq.js";
 import {
   __export
-} from "./ripgrep-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/database/drizzle/index.ts
 var exports_drizzle = {};
@@ -22,7 +22,7 @@ __export(exports_drizzle, {
   EffectSQLiteDatabase: () => EffectSQLiteDatabase2,
   EffectSQLiteSession: () => EffectSQLiteSession2,
   EffectSQLiteTransaction: () => EffectSQLiteTransaction2,
-  make: () => make22,
+  make: () => make23,
   makeWithDefaults: () => makeWithDefaults2,
   managesTransactionsNatively: () => managesTransactionsNatively2
 });

package/dist/chunks/{ripgrep-btwdw4e2.js → state-ngynwwae.js}

@@ -1,12 +1,12 @@
 import {
   makeWithDefaults2
-} from "./ripgrep-rbwfq5hj.js";
+} from "./state-9fgjxmjq.js";
 import {
   apply3
-} from "./ripgrep-c3cz5zdw.js";
+} from "./state-3kbtcg3v.js";
 import {
   __export
-} from "./ripgrep-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/database/database.ts
 var exports_database = {};

package/dist/chunks/{ripgrep-vzd7v1mf.js → state-ny1ad2m1.js}

@@ -1,23 +1,23 @@
 import {
-  Service76,
-  node80,
+  Service56,
+  node59,
   canonical3
-} from "./ripgrep-q0q0ghtn.js";
+} from "./state-bygnyd31.js";
 import {
-  Service62,
-  node66
-} from "./ripgrep-bw9zjykr.js";
+  Service54,
+  node57
+} from "./state-d0k1g5nx.js";
 import {
-  Service18
-} from "./ripgrep-h3ezdy3d.js";
+  Service37
+} from "./state-7etgy47j.js";
 import {
   layer2
-} from "./ripgrep-z4rsfxys.js";
+} from "./state-dntw82rz.js";
 
 // src/location-services.ts
 import { Context, Duration, Effect, Exit, Layer, LayerMap, MutableHashMap, Option } from "effect";
 function buildLocationServiceMap2(replacements = []) {
-  return Layer.effect(Service76, Effect.gen(function* () {
+  return Layer.effect(Service56, Effect.gen(function* () {
     const owner = yield* Effect.scope;
     const builds = MutableHashMap.empty();
     const inner = yield* LayerMap.make((ref) => {
@@ -27,7 +27,7 @@ function buildLocationServiceMap2(replacements = []) {
         const finish = Effect.suspend(() => {
           if (Exit.isSuccess(exit)) {
             return Effect.gen(function* () {
-              const lifecycle = Context.get(exit.value, Service18);
+              const lifecycle = Context.get(exit.value, Service37);
               if (Option.getOrUndefined(MutableHashMap.get(builds, ref)) !== build)
                 return yield* lifecycle.shutdown;
               build.close = lifecycle.shutdown;
@@ -54,11 +54,11 @@ function buildLocationServiceMap2(replacements = []) {
       }).pipe(Effect.uninterruptible)
     };
     const bindings = [
-      node66.replace(Layer.succeed(Service62, {
+      node57.replace(Layer.succeed(Service54, {
         provide: (session) => Effect.provide(map.get(session.location))
       })),
       ...replacements,
-      node80.replace(Layer.succeed(Service76, map))
+      node59.replace(Layer.succeed(Service56, map))
     ];
     return map;
   }));

package/dist/chunks/{ripgrep-qkbj1a6c.js → state-p2yhhyr5.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./ripgrep-dpkg50ah.js";
+} from "./state-jwcy2c2z.js";
 import {
-  Service83,
-  node87
-} from "./ripgrep-53gs95a7.js";
+  Service81,
+  node85
+} from "./state-93k0x0x6.js";
 import {
-  Event18,
-  Service75,
-  node79
-} from "./ripgrep-mr1mqs0h.js";
+  Event17,
+  Service70,
+  node74
+} from "./state-5vcxbet6.js";
 import {
-  Service77,
-  node81
-} from "./ripgrep-h008dk5n.js";
+  Service78,
+  node82
+} from "./state-ahmyyct8.js";
 import {
-  Service55,
-  node58
-} from "./ripgrep-cd5r1gbk.js";
+  Service64,
+  node67
+} from "./state-4mbzwrkh.js";
 import {
-  ID18,
-  Service82,
-  node86
-} from "./ripgrep-dsnt0r96.js";
+  ID12,
+  Service71,
+  node75
+} from "./state-53cvw98s.js";
 import {
   reconcile2,
   create3
-} from "./ripgrep-rdw6cm16.js";
+} from "./state-rdw6cm16.js";
 import {
-  ID14,
+  ID10,
   MethodID2,
-  Service74,
-  node78
-} from "./ripgrep-t78r90eq.js";
+  Service69,
+  node73
+} from "./state-grep4bve.js";
 import {
   __export
-} from "./ripgrep-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError5,
-  Options: () => Options4,
+  NotFoundError: () => NotFoundError3,
+  Options: () => Options3,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service32,
+  Service: () => Service26,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured4,
-  layer: () => layer12,
-  node: () => node35
+  configured: () => configured3,
+  layer: () => layer13,
+  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 NotFoundError5 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -93,21 +93,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service32 extends Context.Service()("@opencode/MCP") {
+class Service26 extends Context.Service()("@opencode/MCP") {
 }
-var Options4 = Schema.Struct({
+var Options3 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer12 = (options) => Layer.effect(Service32, Effect.gen(function* () {
-  const location = yield* Service77;
-  const environment = yield* Service55;
-  const bus = yield* Service83;
-  const forms = yield* Service82;
-  const integration = yield* Service74;
-  const credentials = yield* Service75;
+var layer13 = (options) => Layer.effect(Service26, Effect.gen(function* () {
+  const location = yield* Service78;
+  const environment = yield* Service64;
+  const bus = yield* Service81;
+  const forms = yield* Service71;
+  const integration = yield* Service69;
+  const credentials = yield* Service70;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -119,7 +119,7 @@ var layer12 = (options) => Layer.effect(Service32, 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 = ID10.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -135,7 +135,7 @@ var layer12 = (options) => Layer.effect(Service32, 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(Service70, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -144,19 +144,19 @@ var layer12 = (options) => Layer.effect(Service32, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError5({ server: name });
+      return yield* new NotFoundError3({ 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(Service70, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID18.create();
+        const formID = ID12.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -259,7 +259,7 @@ var layer12 = (options) => Layer.effect(Service32, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const load = 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(Service55, environment), Scope.provide(scope));
+    const load = 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(Service64, environment), Scope.provide(scope));
     const result = yield* (entry.config.type === "remote" ? endpointLoads.withLock(entry.config.url)(load) : load).pipe(Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
@@ -384,7 +384,7 @@ var layer12 = (options) => Layer.effect(Service32, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event18.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event17.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: () => ({
@@ -410,7 +410,7 @@ var layer12 = (options) => Layer.effect(Service32, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service32.of({
+  return Service26.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -516,14 +516,14 @@ function mergeCatalogs(catalogs) {
     templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
   });
 }
-function configured4(options) {
+function configured3(options) {
   return makeLocationNode({
-    service: Service32,
-    layer: layer12(options),
-    deps: [node81, node58, node87, node86, node78, node79]
+    service: Service26,
+    layer: layer13(options),
+    deps: [node82, node67, node85, node75, node73, node74]
   });
 }
-var node35 = configured4();
+var node30 = configured3();
 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;
@@ -574,4 +574,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service32, Options4, layer12, configured4, node35, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service26, Options3, layer13, configured3, node30, exports_mcp4 };

package/dist/chunks/{ripgrep-fsm3tqf3.js → state-p8r8ve68.js}

@@ -1,29 +1,29 @@
 import {
   AbsolutePath2
-} from "./ripgrep-922hggd3.js";
+} from "./state-922hggd3.js";
 import {
-  node83
-} from "./ripgrep-2vkv0cnq.js";
+  node84
+} from "./state-m45ax9sm.js";
 import {
-  Service77,
-  node81
-} from "./ripgrep-h008dk5n.js";
+  Service78,
+  node82
+} from "./state-ahmyyct8.js";
 import {
   create3
-} from "./ripgrep-rdw6cm16.js";
+} from "./state-rdw6cm16.js";
 import {
-  make15
-} from "./ripgrep-xvkfwp2k.js";
+  make16
+} from "./state-fabg376z.js";
 import {
   __export
-} from "./ripgrep-9rqn6x4v.js";
+} from "./state-9rqn6x4v.js";
 
 // src/worktree/strategies.ts
 var exports_strategies = {};
 __export(exports_strategies, {
-  Service: () => Service40,
+  Service: () => Service46,
   WorktreeStrategies: () => exports_strategies,
-  node: () => node43
+  node: () => node50
 });
 import { Context, Effect, Layer } from "effect";
 import path from "path";
@@ -31,12 +31,12 @@ import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Global } from "@opencode/util/global";
 import { FSUtil } from "@opencode/util/fs-util";
 
-class Service40 extends Context.Service()("@opencode/WorktreeStrategies") {
+class Service46 extends Context.Service()("@opencode/WorktreeStrategies") {
 }
-var layer = Layer.effect(Service40, Effect.gen(function* () {
-  const location = yield* Service77;
+var layer = Layer.effect(Service46, Effect.gen(function* () {
+  const location = yield* Service78;
   const global = yield* Global.Service;
-  const git = yield* make15;
+  const git = yield* make16;
   const state = create3({
     name: "worktree",
     initial: () => ({
@@ -55,12 +55,12 @@ var layer = Layer.effect(Service40, Effect.gen(function* () {
       }
     })
   });
-  return Service40.of({ ...state, directory: location.directory });
+  return Service46.of({ ...state, directory: location.directory });
 }));
-var node43 = makeLocationNode({
-  service: Service40,
+var node50 = makeLocationNode({
+  service: Service46,
   layer,
-  deps: [node81, Global.node, node83, FSUtil.node]
+  deps: [node82, Global.node, node84, FSUtil.node]
 });
 
-export { Service40, node43, exports_strategies };
+export { Service46, node50, exports_strategies };

package/dist/chunks/{ripgrep-dw287zgh.js → state-p9avp9ca.js}

@@ -1,30 +1,30 @@
 import {
   PositiveInt2
-} from "./ripgrep-922hggd3.js";
+} from "./state-922hggd3.js";
 import {
   Action2
-} from "./ripgrep-g190xswt.js";
+} from "./state-a8bn8zg0.js";
 import {
-  Info14
-} from "./ripgrep-16cax9zb.js";
+  Info8
+} from "./state-k5kkqdex.js";
 import {
-  Info18
-} from "./ripgrep-2f0bjgcj.js";
+  Info13
+} from "./state-evbgk2k8.js";
 import {
-  Info17
-} from "./ripgrep-fm2qvscf.js";
+  Info10
+} from "./state-edrmdtr5.js";
 import {
-  Info19
-} from "./ripgrep-7gvwkz6m.js";
+  Info7
+} from "./state-4phm5153.js";
 import {
   Spec2
-} from "./ripgrep-7dqw4kz8.js";
+} from "./state-607tc6va.js";
 import {
-  Info13
-} from "./ripgrep-e6hmchc5.js";
+  Info14
+} from "./state-0r7yqxbf.js";
 import {
-  Info10
-} from "./ripgrep-fjryxzsp.js";
+  Info6
+} from "./state-s66pfndk.js";
 import {
   migrate2,
   normalizeAction2,
@@ -33,10 +33,10 @@ import {
   migrateMcp2,
   migrateProvider2,
   providerID2
-} from "./ripgrep-am0je15b.js";
+} from "./state-gs2vyb2s.js";
 import {
   __export
-} from "./ripgrep-9rqn6x4v.js";
+} from "./state-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(Info10.fields.autoupdate, input.autoupdate, ["autoupdate"], diagnostics) : undefined;
+  const legacyUpdate = own(input, "autoupdate") ? decodeValue(Info6.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(Info13, 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, Info17, ["command"], diagnostics, decodeValue);
+  const legacyCommands = decodeMap(input.command, Info10, ["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, Info14, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
+  const legacyAgents = mapValues(decodeMap(input.agent, Info8, ["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, Info14, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
+  const modeAgents = mapValues(decodeMap(input.mode, Info8, ["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(Info7, 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(Info13, raw, path, diagnostics);
+    const provider = decodeValue(Info14, raw, path, diagnostics);
     if (provider === undefined)
       return [];
     const destination = providerID2(name);