@opencode/core 0.0.0-dev-20450 → 0.0.0-dev-20451

package/dist/chunks/{location-services-5kw0n2ma.js → model-resolver-vkt5fbj2.js}

@@ -1,14 +1,14 @@
 import {
   call2
-} from "./location-services-33w4ejhs.js";
+} from "./model-resolver-1ygqh575.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/plugin/websearch/exa.ts
 var exports_exa = {};
 __export(exports_exa, {
-  Plugin: () => Plugin16,
+  Plugin: () => Plugin4,
   WebSearchExa: () => exports_exa,
   endpoint: () => endpoint2
 });
@@ -27,7 +27,7 @@ var McpOutput = Schema.Struct({
     _meta: Schema.Struct({ searchTime: Schema.Number }).pipe(Schema.optional)
   }))
 });
-var Plugin16 = define({
+var Plugin4 = define({
   id: "opencode.websearch.exa",
   effect: Effect.fn("WebSearchExa.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -80,4 +80,4 @@ function parseResults(text) {
   });
 }
 
-export { endpoint2, Plugin16, exports_exa };
+export { endpoint2, Plugin4, exports_exa };

package/dist/chunks/{location-services-tw8eapz5.js → model-resolver-vwfaknzj.js}

@@ -1,47 +1,47 @@
 import {
   makeUnsafe2
-} from "./location-services-dpkg50ah.js";
+} from "./model-resolver-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./location-services-k5qgma61.js";
+} from "./model-resolver-70jrxnh2.js";
 import {
-  Event19,
-  Service78,
-  node82
-} from "./location-services-stp9s0k1.js";
+  Event17,
+  Service72,
+  node76
+} from "./model-resolver-91933pa3.js";
 import {
   Service80,
   node84
-} from "./location-services-h6xkfdk1.js";
+} from "./model-resolver-xvyvc58w.js";
 import {
-  Service57,
-  node60
-} from "./location-services-j34cs6sj.js";
+  Service45,
+  node47
+} from "./model-resolver-taxap598.js";
 import {
-  ID16,
-  Service79,
-  node83
-} from "./location-services-j46s9538.js";
+  ID12,
+  Service73,
+  node77
+} from "./model-resolver-qv8n8zgy.js";
 import {
   reconcile2,
   create3
-} from "./location-services-rdw6cm16.js";
+} from "./model-resolver-rdw6cm16.js";
 import {
-  ID14,
+  ID10,
   MethodID2,
-  Service77,
-  node81
-} from "./location-services-hybaecqw.js";
+  Service71,
+  node75
+} from "./model-resolver-q639q6k1.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError2,
+  NotFoundError: () => NotFoundError3,
   Options: () => Options2,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
@@ -49,12 +49,12 @@ __export(exports_mcp4, {
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service24,
+  Service: () => Service21,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
   configured: () => configured2,
   layer: () => layer10,
-  node: () => node27
+  node: () => node24
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -72,7 +72,7 @@ var ResourceTemplate2 = Mcp.ResourceTemplate;
 var ResourceCatalog2 = Mcp.ResourceCatalog;
 var ResourceContent2 = Mcp.ResourceContent;
 
-class NotFoundError2 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -103,7 +103,7 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service24 extends Context.Service()("@opencode/MCP") {
+class Service21 extends Context.Service()("@opencode/MCP") {
 }
 var Options2 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
@@ -111,13 +111,13 @@ var Options2 = Schema.Struct({
     version: Schema.String
   }))
 });
-var layer10 = (options) => Layer.effect(Service24, Effect.gen(function* () {
+var layer10 = (options) => Layer.effect(Service21, Effect.gen(function* () {
   const location = yield* Service80;
-  const environment = yield* Service57;
+  const environment = yield* Service45;
   const bus = yield* Service83;
-  const forms = yield* Service79;
-  const integration = yield* Service77;
-  const credentials = yield* Service78;
+  const forms = yield* Service73;
+  const integration = yield* Service71;
+  const credentials = yield* Service72;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -129,7 +129,7 @@ var layer10 = (options) => Layer.effect(Service24, 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);
@@ -145,7 +145,7 @@ var layer10 = (options) => Layer.effect(Service24, 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(Service78, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service72, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -154,19 +154,19 @@ var layer10 = (options) => Layer.effect(Service24, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError2({ 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(Service78, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service72, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID16.create();
+        const formID = ID12.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -269,7 +269,7 @@ var layer10 = (options) => Layer.effect(Service24, 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(Service57, 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(Service45, 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;
@@ -394,7 +394,7 @@ var layer10 = (options) => Layer.effect(Service24, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event19.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: () => ({
@@ -420,7 +420,7 @@ var layer10 = (options) => Layer.effect(Service24, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service24.of({
+  return Service21.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -532,12 +532,12 @@ function mergeCatalogs(catalogs) {
 }
 function configured2(options) {
   return makeLocationNode({
-    service: Service24,
+    service: Service21,
     layer: layer10(options),
-    deps: [node84, node60, node87, node83, node81, node82]
+    deps: [node84, node47, node87, node77, node75, node76]
   });
 }
-var node27 = configured2();
+var node24 = 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;
@@ -588,4 +588,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError2, ToolCallError2, Service24, Options2, layer10, configured2, node27, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError3, ToolCallError2, Service21, Options2, layer10, configured2, node24, exports_mcp4 };

package/dist/chunks/{location-services-57wdwfaz.js → model-resolver-vxtvrbna.js}

@@ -1,51 +1,51 @@
 import {
   AbsolutePath2
-} from "./location-services-z5v4ffb3.js";
+} from "./model-resolver-z5v4ffb3.js";
 import {
   WorktreeError2,
   node86
-} from "./location-services-mjqndqed.js";
+} from "./model-resolver-zc5g640q.js";
 import {
   Slug2
-} from "./location-services-gebd4c9n.js";
+} from "./model-resolver-gebd4c9n.js";
 import {
   Service84,
   node88
-} from "./location-services-3fb919v3.js";
+} from "./model-resolver-djk2jk4m.js";
 import {
   Service83,
   node87
-} from "./location-services-k5qgma61.js";
+} from "./model-resolver-70jrxnh2.js";
 import {
   ProjectTable2
-} from "./location-services-3cegwx68.js";
+} from "./model-resolver-h2b79v29.js";
 import {
   WorktreeTable2
-} from "./location-services-84h8c373.js";
+} from "./model-resolver-1dvck2a7.js";
 import {
   ID17,
   NotFoundError11
-} from "./location-services-sf9kj30k.js";
+} from "./model-resolver-3f3sb00w.js";
 import {
   Ref4
-} from "./location-services-h6xkfdk1.js";
+} from "./model-resolver-xvyvc58w.js";
 import {
-  Service63,
-  node67
-} from "./location-services-mmfgc0ta.js";
+  Service65,
+  node69
+} from "./model-resolver-8nsvf304.js";
 import {
   DirectoryUnavailableError2,
   canonical2
-} from "./location-services-0vbcp93d.js";
+} from "./model-resolver-0vbcp93d.js";
 import {
   make21
-} from "./location-services-w4gvx3xt.js";
+} from "./model-resolver-ztb5xmgg.js";
 import {
-  Service62
-} from "./location-services-67jv4443.js";
+  Service64
+} from "./model-resolver-ypnw9vt7.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/worktree.ts
 var exports_worktree2 = {};
@@ -53,19 +53,19 @@ __export(exports_worktree2, {
   CreateInput: () => CreateInput3,
   DestinationExistsError: () => DestinationExistsError2,
   DirectoryUnavailableError: () => DirectoryUnavailableError2,
-  Event: () => Event12,
+  Event: () => Event13,
   Info: () => Info21,
   InvalidDirectoryError: () => InvalidDirectoryError2,
   List: () => List2,
   ListEntry: () => ListEntry3,
   OperationError: () => OperationError2,
   RemoveInput: () => RemoveInput2,
-  Service: () => Service61,
+  Service: () => Service63,
   SourceDirectoryNotFoundError: () => SourceDirectoryNotFoundError2,
   StrategyID: () => StrategyID2,
   StrategyUnavailableError: () => StrategyUnavailableError2,
   Worktree: () => exports_worktree2,
-  node: () => node65
+  node: () => node67
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { and, asc, desc, eq, isNull, sql } from "drizzle-orm";
@@ -94,17 +94,17 @@ class InvalidDirectoryError2 extends Schema.TaggedError()("Worktree.InvalidDirec
 
 class StrategyUnavailableError2 extends Schema.TaggedError()("Worktree.StrategyUnavailableError", { strategy: StrategyID2 }) {
 }
-var Event12 = Worktree.Event;
+var Event13 = Worktree.Event;
 
-class Service61 extends Context.Service()("@opencode/Worktree") {
+class Service63 extends Context.Service()("@opencode/Worktree") {
 }
-var layer = Layer.effect(Service61, Effect.gen(function* () {
+var layer = Layer.effect(Service63, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const database = yield* Service84;
   const db = database.db;
   const bus = yield* Service83;
   const processService = yield* AppProcess.Service;
-  const locations = yield* Service63;
+  const locations = yield* Service65;
   const gitStrategy = yield* make21;
   const project = Effect.fnUntraced(function* (projectID) {
     const row = yield* db.select().from(ProjectTable2).where(eq(ProjectTable2.id, projectID)).get().pipe(Effect.orDie);
@@ -120,11 +120,11 @@ var layer = Layer.effect(Service61, Effect.gen(function* () {
     const { Plugin } = yield* Effect.promise(() => import("../plugin.js"));
     const context = yield* locations.contextEffect(Ref4.make({ directory }));
     yield* Context.get(context, Plugin.Service).awaitActivation;
-    return Context.get(context, Service62).get();
+    return Context.get(context, Service64).get();
   });
   const changed = Effect.fnUntraced(function* (projectID, update) {
     if (update)
-      yield* bus.publish(Event12.Updated, { projectID });
+      yield* bus.publish(Event13.Updated, { projectID });
   });
   const ops = {
     list: Effect.fnUntraced(function* (projectID) {
@@ -251,7 +251,7 @@ var layer = Layer.effect(Service61, Effect.gen(function* () {
     })).pipe(Effect.orDie);
     yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0);
   }, Effect.scoped);
-  return Service61.of({
+  return Service63.of({
     list: Effect.fn("Worktree.list")(function* (input) {
       yield* project(input.projectID);
       return yield* ops.list(input.projectID);
@@ -261,10 +261,10 @@ var layer = Layer.effect(Service61, Effect.gen(function* () {
     refresh
   });
 }));
-var node65 = Node.makeGlobalNode({
-  service: Service61,
+var node67 = Node.makeGlobalNode({
+  service: Service63,
   layer,
-  deps: [FSUtil.node, node86, node87, node88, AppProcess.node, node67]
+  deps: [FSUtil.node, node86, node87, node88, AppProcess.node, node69]
 });
 function operationError(strategy, operation, error) {
   if (error instanceof WorktreeError2 || error instanceof DirectoryUnavailableError2 || error instanceof Worktree.OperationError)
@@ -274,4 +274,4 @@ function operationError(strategy, operation, error) {
   });
 }
 
-export { StrategyID2, CreateInput3, RemoveInput2, Info21, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event12, Service61, node65, exports_worktree2, OperationError2 };
+export { StrategyID2, CreateInput3, RemoveInput2, Info21, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event13, Service63, node67, exports_worktree2, OperationError2 };

package/dist/chunks/{location-services-vzcthcp8.js → model-resolver-vzcthcp8.js}

@@ -1,6 +1,6 @@
 import {
   loadSDKFactory2
-} from "./location-services-hjbc5kem.js";
+} from "./model-resolver-hjbc5kem.js";
 
 // src/plugin/provider/dynamic.ts
 import { Effect } from "effect";

package/dist/chunks/{location-services-vzs5sf6e.js → model-resolver-vzs5sf6e.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/shell/result.ts
 var exports_result = {};

package/dist/chunks/{location-services-w3wsvvr9.js → model-resolver-w3wsvvr9.js}

@@ -1,7 +1,7 @@
 import {
   getTableColumnsRuntime2,
   orderSelectedFields2
-} from "./location-services-emrn6kk6.js";
+} from "./model-resolver-emrn6kk6.js";
 
 // src/database/drizzle/sqlite-core/effect/delete.ts
 import { applyEffectWrapper } from "drizzle-orm/effect-core/query-effect";

package/dist/chunks/{location-services-wd87259q.js → model-resolver-wd87259q.js}

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

package/dist/chunks/{location-services-ejctqn46.js → model-resolver-wegd5fp2.js}

@@ -1,18 +1,18 @@
 import {
-  Service43
-} from "./location-services-4mwpykj0.js";
+  Service40
+} from "./model-resolver-3ppptnan.js";
 import {
   awaitActivation2
-} from "./location-services-qdyb70sk.js";
+} from "./model-resolver-phz3h32g.js";
 import {
   SkillNotFoundError2
-} from "./location-services-vjjxy6yb.js";
+} from "./model-resolver-n3vygs5b.js";
 import {
-  Service32
-} from "./location-services-px41mg2v.js";
+  Service33
+} from "./model-resolver-eg948mnw.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/session/skill.ts
 var exports_skill4 = {};
@@ -22,8 +22,8 @@ __export(exports_skill4, {
 });
 import { Effect } from "effect";
 var get4 = Effect.fn("SessionSkill.get")(function* (input) {
-  const instances = yield* Service43;
-  const skills = yield* awaitActivation2.pipe(Effect.andThen(Service32), instances.provide(input.session));
+  const instances = yield* Service40;
+  const skills = yield* awaitActivation2.pipe(Effect.andThen(Service33), instances.provide(input.session));
   const skill = yield* skills.get(input.skill);
   if (!skill)
     return yield* new SkillNotFoundError2({ skill: input.skill });

package/dist/chunks/{location-services-zk6h76qn.js → model-resolver-wkr32rjm.js}

@@ -1,29 +1,29 @@
 import {
   Service84,
   node88
-} from "./location-services-3fb919v3.js";
+} from "./model-resolver-djk2jk4m.js";
 import {
   SessionTable2,
   SessionMessageTable2
-} from "./location-services-kb9j3d72.js";
+} from "./model-resolver-9e5bzkjp.js";
 import {
   decodeMessageRow2,
   load5
-} from "./location-services-p6e7n9ts.js";
+} from "./model-resolver-mv3tycdn.js";
 import {
   fromRow2
-} from "./location-services-0h4fw62m.js";
+} from "./model-resolver-hfm9a2d0.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/session/store.ts
 var exports_store = {};
 __export(exports_store, {
-  ListInput: () => ListInput4,
-  Service: () => Service71,
+  ListInput: () => ListInput5,
+  Service: () => Service77,
   SessionStore: () => exports_store,
-  node: () => node75
+  node: () => node81
 });
 import { and, asc, desc, eq, gt, isNotNull, isNull, like, lt, notInArray, or, sql } from "drizzle-orm";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -50,13 +50,13 @@ var ListProjectInput = Schema.Struct({
   subpath: RelativePath.pipe(Schema.optional)
 });
 var ListAllInput = Schema.Struct(ListInputBase);
-var ListInput4 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
+var ListInput5 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
 
-class Service71 extends Context.Service()("@opencode/SessionStore") {
+class Service77 extends Context.Service()("@opencode/SessionStore") {
 }
-var layer = Layer.effect(Service71, Effect.gen(function* () {
+var layer = Layer.effect(Service77, Effect.gen(function* () {
   const { db } = yield* Service84;
-  return Service71.of({
+  return Service77.of({
     get: Effect.fnUntraced(function* (sessionID) {
       const row = yield* db.select().from(SessionTable2).where(eq(SessionTable2.id, sessionID)).get().pipe(Effect.orDie);
       return row ? fromRow2(row) : undefined;
@@ -125,6 +125,6 @@ var layer = Layer.effect(Service71, Effect.gen(function* () {
     })
   });
 }));
-var node75 = makeGlobalNode({ service: Service71, layer, deps: [node88] });
+var node81 = makeGlobalNode({ service: Service77, layer, deps: [node88] });
 
-export { ListInput4, Service71, node75, exports_store };
+export { ListInput5, Service77, node81, exports_store };

package/dist/chunks/{location-services-9t7a50xb.js → model-resolver-wv396vej.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/instructions/index.ts
 var exports_instructions6 = {};
@@ -10,7 +10,7 @@ __export(exports_instructions6, {
   Hash: () => Hash2,
   InitializationBlocked: () => InitializationBlocked2,
   Instructions: () => exports_instructions6,
-  Key: () => Key3,
+  Key: () => Key4,
   Values: () => Values2,
   applyHashDelta: () => applyHashDelta2,
   combine: () => combine2,
@@ -28,7 +28,7 @@ __export(exports_instructions6, {
 import { createHash } from "crypto";
 import { Instruction } from "@opencode/schema/instruction";
 import { Data, Effect, Option, Schema } from "effect";
-var Key3 = Instruction.Key;
+var Key4 = Instruction.Key;
 var Hash2 = Instruction.Hash;
 var Values2 = Instruction.Values;
 var Delta2 = Instruction.Delta;
@@ -36,14 +36,14 @@ var NonValue = Data.taggedEnum();
 var unavailable3 = NonValue.Unavailable();
 var removed2 = NonValue.Removed();
 
-class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key3) }) {
+class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key4) }) {
   get message() {
     return `Instruction initialization blocked by unavailable sources: ${this.keys.join(", ")}`;
   }
 }
 
 class DuplicateKeyError2 extends Schema.TaggedError()("Instructions.DuplicateKeyError", {
-  key: Key3
+  key: Key4
 }) {
   get message() {
     return `Duplicate instruction key: ${this.key}`;
@@ -193,4 +193,4 @@ function requireText(key, kind, text) {
   return text;
 }
 
-export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make22, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };
+export { Key4, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make22, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };