@opencode-ai/core 0.0.0-beta-19086 → 0.0.0-beta-19124

package/dist/chunks/{schema-h08da7w8.js → event-logger-1n0se4en.js}

@@ -1,43 +1,43 @@
 import {
-  createLLMEventPublisher
-} from "./schema-4xf915ct.js";
+  Service79
+} from "./event-logger-jbmjz4v3.js";
 import {
-  exports_retry
-} from "./schema-aseryw3y.js";
+  Service45
+} from "./event-logger-ah7grg4z.js";
 import {
-  exports_usage
-} from "./schema-nn16cgj7.js";
+  Error3
+} from "./event-logger-b84bthst.js";
 import {
-  toSessionError
-} from "./schema-d6pj50wp.js";
+  Service54
+} from "./event-logger-ecjyhxv0.js";
 import {
-  exports_snapshot
-} from "./schema-egn23jh0.js";
+  StepFailedError2
+} from "./event-logger-n6wnzfnt.js";
 import {
-  exports_tool
-} from "./schema-y71jz153.js";
+  SessionEvent2
+} from "./event-logger-mntxs535.js";
 import {
-  StepFailedError
-} from "./schema-2sqw2jjm.js";
+  toSessionError2
+} from "./event-logger-d3qtrs71.js";
 import {
-  SessionEvent
-} from "./schema-a83yvq99.js";
+  calculateCost2
+} from "./event-logger-tjykrgmx.js";
 import {
-  exports_tool_output
-} from "./schema-6b7ybj1y.js";
+  createLLMEventPublisher2
+} from "./event-logger-3qzbfqsy.js";
 import {
-  exports_bus
-} from "./schema-fjb24bmd.js";
+  isRetryable2
+} from "./event-logger-bphmvjfp.js";
 import {
   __export
-} from "./schema-vpjkya7h.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/session/runner/step.ts
 var exports_step = {};
 __export(exports_step, {
-  Outcome: () => Outcome,
+  Outcome: () => Outcome2,
   SessionStep: () => exports_step,
-  make: () => make
+  make: () => make3
 });
 import {
   AIError,
@@ -47,18 +47,18 @@ import {
   isContextOverflowFailure
 } from "@opencode-ai/ai";
 import { Cause, Data, Effect, Exit, Fiber, Option, Stream } from "effect";
-var Outcome = Data.taggedEnum();
+var Outcome2 = Data.taggedEnum();
 var TOOLS_INTERRUPTED = { type: "aborted", message: "Tool execution interrupted" };
 var STEP_INTERRUPTED = { type: "aborted", message: "Step interrupted" };
 var RESULT_MISSING = { type: "tool.result-missing", message: "Provider did not return a tool result" };
-var make = Effect.gen(function* () {
-  const bus = yield* exports_bus.Service;
+var make3 = Effect.gen(function* () {
+  const bus = yield* Service79;
   const llm = yield* LLMClient.Service;
-  const snapshots = yield* exports_snapshot.Service;
-  const toolOutput = yield* exports_tool_output.Service;
+  const snapshots = yield* Service45;
+  const toolOutput = yield* Service54;
   const attempt = Effect.fn("SessionStep.attempt")(function* (input) {
     const startSnapshot = yield* snapshots.capture();
-    const publisher = createLLMEventPublisher(bus, {
+    const publisher = createLLMEventPublisher2(bus, {
       sessionID: input.sessionID,
       assistantMessageID: input.assistantMessageID,
       agent: input.agent,
@@ -70,7 +70,7 @@ var make = Effect.gen(function* () {
     const interruptTools = Effect.suspend(() => Fiber.interruptAll(toolRuns.map((run) => run.fiber)));
     const executeTool = (call) => {
       if (input.prepared.request.toolChoice?.type === "none")
-        return new exports_tool.Error({ message: "Tools are disabled after the maximum agent steps" });
+        return new Error3({ message: "Tools are disabled after the maximum agent steps" });
       return input.prepared.executeTool({
         sessionID: input.sessionID,
         agent: input.agent,
@@ -92,7 +92,7 @@ var make = Effect.gen(function* () {
         return;
       toolRuns.push({
         call: event,
-        fiber: yield* Effect.uninterruptibleMask((restore) => restore(executeTool(event)).pipe(Effect.flatMap(toolOutput.truncate), Effect.flatMap((outcome) => publisher.toolExecution(event.id, event.name, outcome)), Effect.catchTag("Tool.Error", (error) => publisher.failTool(event.id, toSessionError(error), error.metadata).pipe(Effect.asVoid)))).pipe(Effect.forkScoped)
+        fiber: yield* Effect.uninterruptibleMask((restore) => restore(executeTool(event)).pipe(Effect.flatMap(toolOutput.truncate), Effect.flatMap((outcome) => publisher.toolExecution(event.id, event.name, outcome)), Effect.catchTag("Tool.Error", (error) => publisher.failTool(event.id, toSessionError2(error), error.metadata).pipe(Effect.asVoid)))).pipe(Effect.forkScoped)
       });
     })), Effect.ensuring(publisher.flush()));
     return yield* Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
@@ -108,7 +108,7 @@ var make = Effect.gen(function* () {
         yield* interruptTools;
       const tools = classifyToolExits(joined, toolRuns);
       if (!publisher.record().outputStarted && isContextOverflowFailure(overflowFailure ?? streamFailure) && (yield* restore(input.recoverOverflow)))
-        return Outcome.Compacted();
+        return Outcome2.Compacted();
       if (overflowFailure)
         yield* publisher.publish(overflowFailure);
       const recorded = publisher.record();
@@ -119,13 +119,13 @@ var make = Effect.gen(function* () {
         })
       }) : undefined;
       const llmFailure = streamFailure instanceof AIError ? streamFailure : unknownFinish;
-      const llmError = llmFailure && !recorded.providerFailed ? toSessionError(llmFailure) : undefined;
+      const llmError = llmFailure && !recorded.providerFailed ? toSessionError2(llmFailure) : undefined;
       if (input.recoverContinuation && llmFailure?.reason._tag === "Transport" && (llmFailure.reason.recovery === "retry-full" || llmFailure.reason.recovery === "rotate-and-retry-full") && !recorded.outputStarted)
-        return Outcome.RecoverFull();
-      const retry = llmFailure && llmError && !isContextOverflowFailure(llmFailure) ? yield* restore(input.retry(llmFailure, llmError, exports_retry.isRetryable(llmFailure) || recorded.outputStarted && isInterruptedStream(llmFailure))) : undefined;
+        return Outcome2.RecoverFull();
+      const retry = llmFailure && llmError && !isContextOverflowFailure(llmFailure) ? yield* restore(input.retry(llmFailure, llmError, isRetryable2(llmFailure) || recorded.outputStarted && isInterruptedStream(llmFailure))) : undefined;
       if (llmFailure && llmError && retry?.retry && !recorded.outputStarted) {
         yield* publisher.startAssistant();
-        return Outcome.Retry({ error: llmError, decision: retry });
+        return Outcome2.Retry({ error: llmError, decision: retry });
       }
       if (llmError)
         yield* publisher.failAssistant(llmError);
@@ -135,7 +135,7 @@ var make = Effect.gen(function* () {
           message: decline.reason._tag === "QuestionTool.CancelledError" ? decline.reason.message : "The user declined this tool call"
         });
       const interrupted = tools.declines.length > 0 || streamInterrupted || tools.interrupted;
-      const toolFailure = interrupted ? TOOLS_INTERRUPTED : tools.failure !== undefined ? toSessionError(Cause.squash(tools.failure)) : recorded.providerFailed ? TOOLS_INTERRUPTED : undefined;
+      const toolFailure = interrupted ? TOOLS_INTERRUPTED : tools.failure !== undefined ? toSessionError2(Cause.squash(tools.failure)) : recorded.providerFailed ? TOOLS_INTERRUPTED : undefined;
       if (toolFailure)
         yield* publisher.failUnsettledTools(toolFailure);
       if (interrupted)
@@ -151,11 +151,11 @@ var make = Effect.gen(function* () {
         const files = startSnapshot && snapshot ? startSnapshot === snapshot ? [] : yield* snapshots.files({ from: startSnapshot, to: snapshot }).pipe(Effect.orElseSucceed(() => {
           return;
         })) : undefined;
-        const usage = record.finish ? { cost: exports_usage.calculateCost(input.model.cost, record.finish.tokens), tokens: record.finish.tokens } : undefined;
+        const usage = record.finish ? { cost: calculateCost2(input.model.cost, record.finish.tokens), tokens: record.finish.tokens } : undefined;
         if (record.failure)
           yield* publisher.publishStepFailure({ ...usage, snapshot, files });
         if (record.finish && usage && !record.failure)
-          yield* bus.publish(SessionEvent.Step.Ended, {
+          yield* bus.publish(SessionEvent2.Step.Ended, {
             sessionID: input.sessionID,
             assistantMessageID: yield* publisher.startAssistant(),
             finish: record.finish.finish,
@@ -167,7 +167,7 @@ var make = Effect.gen(function* () {
           });
       }
       if (llmFailure && llmError && retry?.retry && record.outputStarted && tools.declines.length === 0 && !tools.interrupted)
-        return Outcome.Continue({ error: llmError, decision: retry });
+        return Outcome2.Continue({ error: llmError, decision: retry });
       if (Exit.isFailure(stream))
         return yield* Effect.failCause(stream.cause);
       if (tools.declines.length > 0)
@@ -177,8 +177,8 @@ var make = Effect.gen(function* () {
       if (tools.interrupted && Exit.isFailure(joined))
         return yield* Effect.failCause(joined.cause);
       if (record.failure)
-        return yield* new StepFailedError({ error: record.failure });
-      return Outcome.Completed({
+        return yield* new StepFailedError2({ error: record.failure });
+      return Outcome2.Completed({
         needsContinuation: input.prepared.request.toolChoice?.type !== "none" && record.needsContinuation
       });
     }));
@@ -205,4 +205,4 @@ var classifyToolExits = (settled, runs) => {
   return { interrupted: causes.some(Cause.hasInterrupts), declines, failure };
 };
 
-export { Outcome, make, exports_step };
+export { Outcome2, make3, exports_step };

package/dist/chunks/{schema-dtm6fkaa.js → event-logger-1qw2s0et.js}

@@ -1,30 +1,30 @@
 import {
-  exports_keyed_mutex
-} from "./schema-66mds5ht.js";
+  makeUnsafe2
+} from "./event-logger-y71avatq.js";
 import {
   __export
-} from "./schema-vpjkya7h.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/plugin/update.ts
 var exports_update = {};
 __export(exports_update, {
   PluginUpdate: () => exports_update,
-  Service: () => Service,
-  node: () => node
+  Service: () => Service4,
+  node: () => node7
 });
 import { Clock, Context, Effect, Exit, Layer, Option, PubSub, Stream } from "effect";
 import { Npm } from "@opencode-ai/util/npm";
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
 var interval = 24 * 60 * 60 * 1000;
 
-class Service extends Context.Service()("@opencode/PluginUpdate") {
+class Service4 extends Context.Service()("@opencode/PluginUpdate") {
 }
-var layer = Layer.effect(Service, Effect.gen(function* () {
+var layer = Layer.effect(Service4, Effect.gen(function* () {
   const npm = yield* Npm.Service;
-  const locks = exports_keyed_mutex.makeUnsafe();
+  const locks = makeUnsafe2();
   const status = new Map;
   const changes = yield* PubSub.unbounded();
-  return Service.of({
+  return Service4.of({
     check: (target, options) => locks.withLock(target)(Effect.gen(function* () {
       const checkedAt = yield* Clock.currentTimeMillis;
       const current = status.get(target);
@@ -49,6 +49,6 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
     changes: () => Stream.fromPubSub(changes)
   });
 }));
-var node = makeGlobalNode({ service: Service, layer, deps: [Npm.node] });
+var node7 = makeGlobalNode({ service: Service4, layer, deps: [Npm.node] });
 
-export { Service, node, exports_update };
+export { Service4, node7, exports_update };

package/dist/chunks/event-logger-1vjz4200.js

@@ -0,0 +1,56 @@
+import {
+  Service80,
+  node85
+} from "./event-logger-4vtp7hga.js";
+import {
+  KVTable2
+} from "./event-logger-3hepkmqq.js";
+import {
+  __export
+} from "./event-logger-9rqn6x4v.js";
+
+// src/kv.ts
+var exports_kv = {};
+__export(exports_kv, {
+  KV: () => exports_kv,
+  Service: () => Service64,
+  node: () => node68
+});
+import { and, asc, eq, gt, gte, lt } from "drizzle-orm";
+import { Context, Effect, Layer } from "effect";
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
+class Service64 extends Context.Service()("@opencode/KV") {
+}
+var layer = Layer.effect(Service64, Effect.gen(function* () {
+  const db = (yield* Service80).db;
+  return Service64.of({
+    get: Effect.fn("KV.get")(function* (key) {
+      return (yield* db.select({ value: KVTable2.value }).from(KVTable2).where(eq(KVTable2.key, key)).get().pipe(Effect.orDie))?.value;
+    }),
+    set: Effect.fn("KV.set")(function* (key, value) {
+      yield* db.insert(KVTable2).values({ key, value }).onConflictDoUpdate({ target: KVTable2.key, set: { value, time_updated: Date.now() } }).run().pipe(Effect.orDie);
+    }),
+    remove: Effect.fn("KV.remove")(function* (key) {
+      yield* db.delete(KVTable2).where(eq(KVTable2.key, key)).run().pipe(Effect.orDie);
+    }),
+    scan: Effect.fn("KV.scan")(function* (options) {
+      const limit = Number.isNaN(options.limit) ? 100 : Math.min(Math.max(Math.floor(options.limit ?? 100), 1), 1000);
+      const end = prefixEnd(options.prefix);
+      const rows = yield* db.select({ key: KVTable2.key, value: KVTable2.value }).from(KVTable2).where(and(options.prefix === "" ? undefined : gte(KVTable2.key, options.prefix), end === undefined ? undefined : lt(KVTable2.key, end), options.after === undefined ? undefined : gt(KVTable2.key, options.after))).orderBy(asc(KVTable2.key)).limit(limit + 1).all().pipe(Effect.orDie);
+      const entries = rows.slice(0, limit);
+      if (rows.length <= limit)
+        return { entries };
+      return { entries, next: entries[entries.length - 1].key };
+    })
+  });
+}));
+function prefixEnd(prefix) {
+  const points = Array.from(prefix);
+  const index = points.findLastIndex((value) => value.codePointAt(0) < 1114111);
+  if (index < 0)
+    return;
+  return `${points.slice(0, index).join("")}${String.fromCodePoint(points[index].codePointAt(0) + 1)}`;
+}
+var node68 = makeGlobalNode({ service: Service64, layer, deps: [node85] });
+
+export { Service64, node68, exports_kv };

package/dist/chunks/{schema-57j2wsfm.js → event-logger-1xtv6dmm.js}

@@ -1,48 +1,50 @@
 import {
-  exports_skill_file
-} from "./schema-2c5k0n78.js";
+  Service49
+} from "./event-logger-jfbh8m2n.js";
 import {
-  exports_discovery
-} from "./schema-6hppa3xw.js";
+  AbsolutePath2
+} from "./event-logger-p8qxwesx.js";
 import {
-  exports_skill
-} from "./schema-tbzs2pmr.js";
+  Service75
+} from "./event-logger-00s3pqt3.js";
 import {
-  exports_config
-} from "./schema-jq0ga1pd.js";
+  Service48
+} from "./event-logger-47b3sbnz.js";
 import {
-  exports_watcher
-} from "./schema-v9qxqszp.js";
+  DirectorySource2,
+  UrlSource2,
+  Source3
+} from "./event-logger-28nhnrpr.js";
 import {
-  exports_location
-} from "./schema-9kt3hna5.js";
+  Service12
+} from "./event-logger-4x0nmcjx.js";
 import {
-  AbsolutePath
-} from "./schema-j07kk359.js";
+  parse2
+} from "./event-logger-7mx8k0q7.js";
 import {
   __export
-} from "./schema-vpjkya7h.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/config/plugin/skill.ts
-var exports_skill2 = {};
-__export(exports_skill2, {
-  ConfigSkillPlugin: () => exports_skill2,
-  Plugin: () => Plugin
+var exports_skill3 = {};
+__export(exports_skill3, {
+  ConfigSkillPlugin: () => exports_skill3,
+  Plugin: () => Plugin40
 });
 import { define } from "@opencode-ai/plugin/effect/plugin";
 import { FSUtil } from "@opencode-ai/util/fs-util";
 import { Global } from "@opencode-ai/util/global";
 import path from "path";
 import { Effect, FiberMap, PubSub, Semaphore, Stream } from "effect";
-var Plugin = define({
+var Plugin40 = define({
   id: "opencode.config.skill",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* exports_config.Service;
-    const discovery = yield* exports_discovery.Service;
+    const config = yield* Service48;
+    const discovery = yield* Service12;
     const fs = yield* FSUtil.Service;
     const global = yield* Global.Service;
-    const location = yield* exports_location.Service;
-    const watcher = yield* exports_watcher.Service;
+    const location = yield* Service75;
+    const watcher = yield* Service49;
     const loaded = {
       entries: yield* config.entries(),
       skills: []
@@ -52,8 +54,8 @@ var Plugin = define({
     const lock = Semaphore.makeUnsafe(1);
     const watch = Effect.fn("ConfigSkillPlugin.watch")(function* (directory, type) {
       const target = path.resolve(directory);
-      const updates2 = yield* watcher.subscribe({ path: target, type });
-      yield* FiberMap.run(watches, `${type}:${target}`, updates2.pipe(Stream.runForEach((update) => PubSub.publish(changes, update.path).pipe(Effect.asVoid))), { onlyIfMissing: true, startImmediately: true });
+      const updates = yield* watcher.subscribe({ path: target, type });
+      yield* FiberMap.run(watches, `${type}:${target}`, updates.pipe(Stream.runForEach((update) => PubSub.publish(changes, update.path).pipe(Effect.asVoid))), { onlyIfMissing: true, startImmediately: true });
     });
     function firstMissing(target) {
       const parent = path.dirname(target);
@@ -85,7 +87,7 @@ var Plugin = define({
     const sources = () => {
       const result = [];
       const add = (source) => {
-        if (result.some((item) => exports_skill.Source.equals(item, source)))
+        if (result.some((item) => Source3.equals(item, source)))
           return;
         result.push(source);
       };
@@ -94,28 +96,28 @@ var Plugin = define({
       const directories = loaded.entries.flatMap((entry) => entry.type === "directory" ? [entry.path] : []);
       const items = loaded.entries.flatMap((entry) => entry.type === "document" ? entry.info.skills ?? [] : []);
       for (const directory of [...claude, ...agents]) {
-        add(exports_skill.DirectorySource.make({ type: "directory", path: AbsolutePath.make(path.join(directory, "skills")) }));
+        add(DirectorySource2.make({ type: "directory", path: AbsolutePath2.make(path.join(directory, "skills")) }));
       }
       for (const directory of directories) {
-        add(exports_skill.DirectorySource.make({ type: "directory", path: AbsolutePath.make(path.join(directory, "skill")) }));
-        add(exports_skill.DirectorySource.make({ type: "directory", path: AbsolutePath.make(path.join(directory, "skills")) }));
+        add(DirectorySource2.make({ type: "directory", path: AbsolutePath2.make(path.join(directory, "skill")) }));
+        add(DirectorySource2.make({ type: "directory", path: AbsolutePath2.make(path.join(directory, "skills")) }));
       }
       for (const item of items) {
         if (URL.canParse(item) && /^(https?:)$/.test(new URL(item).protocol)) {
-          add(exports_skill.UrlSource.make({ type: "url", url: item }));
+          add(UrlSource2.make({ type: "url", url: item }));
           continue;
         }
         const expanded = item.startsWith("~/") ? path.join(global.home, item.slice(2)) : item;
-        add(exports_skill.DirectorySource.make({
+        add(DirectorySource2.make({
           type: "directory",
-          path: AbsolutePath.make(path.isAbsolute(expanded) ? expanded : path.join(location.directory, expanded))
+          path: AbsolutePath2.make(path.isAbsolute(expanded) ? expanded : path.join(location.directory, expanded))
         }));
       }
       return result;
     };
     const load = Effect.fn("ConfigSkillPlugin.load")(function* (source) {
       const directories = source.type === "directory" ? [source.path] : yield* discovery.pull(source.url).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to load skill source", {
-        source: exports_skill.Source.key(source),
+        source: Source3.key(source),
         cause
       }).pipe(Effect.as([]))));
       const roots = (yield* Effect.forEach(directories, watchDirectory)).flat();
@@ -131,7 +133,7 @@ var Plugin = define({
           }));
           if (!content)
             continue;
-          const parsed = exports_skill_file.parse(directory, filepath, content);
+          const parsed = parse2(directory, filepath, content);
           if (parsed._tag === "Skipped") {
             yield* Effect.logDebug("skill file skipped", {
               filepath,
@@ -144,7 +146,7 @@ var Plugin = define({
         }
       }
       yield* Effect.logDebug("skill source loaded", {
-        source: exports_skill.Source.key(source),
+        source: Source3.key(source),
         type: source.type,
         directories,
         skills: skills.map((skill) => skill.id)
@@ -163,7 +165,7 @@ var Plugin = define({
       if (file) {
         yield* Effect.logInfo("skills rescanned", {
           file,
-          sources: current.map(exports_skill.Source.key),
+          sources: current.map(Source3.key),
           skills: loaded.skills.map((skill) => skill.id)
         });
       }
@@ -179,4 +181,4 @@ var Plugin = define({
   })
 });
 
-export { Plugin, exports_skill2 as exports_skill };
+export { Plugin40, exports_skill3 };

package/dist/chunks/{schema-c54e84vp.js → event-logger-1z80kc63.js}

@@ -1,56 +1,56 @@
 import {
   __export
-} from "./schema-vpjkya7h.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/instructions/index.ts
-var exports_instructions = {};
-__export(exports_instructions, {
-  Delta: () => Delta,
-  DuplicateKeyError: () => DuplicateKeyError,
-  Hash: () => Hash,
-  InitializationBlocked: () => InitializationBlocked,
-  Instructions: () => exports_instructions,
-  Key: () => Key,
-  Values: () => Values,
-  applyHashDelta: () => applyHashDelta,
-  combine: () => combine,
-  diff: () => diff,
-  diffByKey: () => diffByKey,
-  empty: () => empty,
-  hash: () => hash,
-  make: () => make,
-  read: () => read,
-  removed: () => removed,
-  renderInitial: () => renderInitial,
-  renderUpdate: () => renderUpdate,
-  unavailable: () => unavailable
+var exports_instructions6 = {};
+__export(exports_instructions6, {
+  Delta: () => Delta2,
+  DuplicateKeyError: () => DuplicateKeyError2,
+  Hash: () => Hash2,
+  InitializationBlocked: () => InitializationBlocked2,
+  Instructions: () => exports_instructions6,
+  Key: () => Key4,
+  Values: () => Values2,
+  applyHashDelta: () => applyHashDelta2,
+  combine: () => combine2,
+  diff: () => diff2,
+  diffByKey: () => diffByKey2,
+  empty: () => empty3,
+  hash: () => hash2,
+  make: () => make20,
+  read: () => read3,
+  removed: () => removed2,
+  renderInitial: () => renderInitial2,
+  renderUpdate: () => renderUpdate2,
+  unavailable: () => unavailable3
 });
 import { createHash } from "crypto";
 import { Instruction } from "@opencode-ai/schema/instruction";
 import { Data, Effect, Option, Schema } from "effect";
-var Key = Instruction.Key;
-var Hash = Instruction.Hash;
-var Values = Instruction.Values;
-var Delta = Instruction.Delta;
+var Key4 = Instruction.Key;
+var Hash2 = Instruction.Hash;
+var Values2 = Instruction.Values;
+var Delta2 = Instruction.Delta;
 var NonValue = Data.taggedEnum();
-var unavailable = NonValue.Unavailable();
-var removed = NonValue.Removed();
+var unavailable3 = NonValue.Unavailable();
+var removed2 = NonValue.Removed();
 
-class InitializationBlocked extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key) }) {
+class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key4) }) {
   get message() {
     return `Instruction initialization blocked by unavailable sources: ${this.keys.join(", ")}`;
   }
 }
 
-class DuplicateKeyError extends Schema.TaggedError()("Instructions.DuplicateKeyError", {
-  key: Key
+class DuplicateKeyError2 extends Schema.TaggedError()("Instructions.DuplicateKeyError", {
+  key: Key4
 }) {
   get message() {
     return `Duplicate instruction key: ${this.key}`;
   }
 }
-var empty = [];
-function make(source) {
+var empty3 = [];
+function make20(source) {
   const decode = Schema.decodeUnknownOption(source.codec);
   const encode = Schema.encodeSync(source.codec);
   const initial = (value) => requireText(source.key, "initial", source.render.initial(value));
@@ -60,9 +60,9 @@ function make(source) {
       key: source.key,
       read: source.read.pipe(Effect.map((value) => {
         if (isUnavailable(value))
-          return unavailable;
+          return unavailable3;
         if (isRemoved(value))
-          return removed;
+          return removed2;
         return encode(value);
       })),
       initial: (value) => {
@@ -85,23 +85,23 @@ function make(source) {
     }
   ];
 }
-function combine(values) {
+function combine2(values) {
   const sources = values.flat();
   const keys = new Set;
   for (const source of sources) {
     if (keys.has(source.key))
-      throw new DuplicateKeyError({ key: source.key });
+      throw new DuplicateKeyError2({ key: source.key });
     keys.add(source.key);
   }
   return sources;
 }
-function read(value) {
+function read3(value) {
   return Effect.forEach(value, (source) => source.read.pipe(Effect.map((observed) => ({ key: source.key, value: observed }))), { concurrency: "unbounded" });
 }
-function diff(observed, previous) {
+function diff2(observed, previous) {
   const blocked = previous ? [] : observed.flatMap((entry) => isUnavailable(entry.value) ? [entry.key] : []);
   if (blocked.length > 0)
-    return Effect.fail(new InitializationBlocked({ keys: blocked }));
+    return Effect.fail(new InitializationBlocked2({ keys: blocked }));
   const delta = {};
   const blobs = {};
   for (const entry of observed) {
@@ -112,7 +112,7 @@ function diff(observed, previous) {
         delta[entry.key] = Instruction.removed;
       continue;
     }
-    const next = hash(entry.value);
+    const next = hash2(entry.value);
     if (previous?.[entry.key] === next)
       continue;
     delta[entry.key] = next;
@@ -120,7 +120,7 @@ function diff(observed, previous) {
   }
   return Effect.succeed({ delta, blobs });
 }
-function renderInitial(value, values) {
+function renderInitial2(value, values) {
   return render(value.flatMap((source) => {
     if (!Object.hasOwn(values, source.key))
       return [];
@@ -128,7 +128,7 @@ function renderInitial(value, values) {
     return text === undefined ? [] : [text];
   }));
 }
-function renderUpdate(value, previous, delta) {
+function renderUpdate2(value, previous, delta) {
   return render(value.flatMap((source) => {
     if (!Object.hasOwn(delta, source.key))
       return [];
@@ -136,18 +136,18 @@ function renderUpdate(value, previous, delta) {
     if (Option.isNone(current)) {
       if (!Object.hasOwn(previous, source.key))
         return [];
-      const text2 = source.removed(previous[source.key]);
-      return text2 === undefined ? [] : [text2];
+      const text = source.removed(previous[source.key]);
+      return text === undefined ? [] : [text];
     }
     const next = current.value;
     const text = Object.hasOwn(previous, source.key) ? source.changed(previous[source.key], next) : source.initial(next);
     return text === undefined ? [] : [text];
   }));
 }
-function hash(value) {
-  return Hash.make(createHash("sha256").update(canonical(value)).digest("hex"));
+function hash2(value) {
+  return Hash2.make(createHash("sha256").update(canonical(value)).digest("hex"));
 }
-function applyHashDelta(values, delta) {
+function applyHashDelta2(values, delta) {
   const result = { ...values };
   for (const [key, value] of Object.entries(delta)) {
     if (value === Instruction.removed)
@@ -157,7 +157,7 @@ function applyHashDelta(values, delta) {
   }
   return result;
 }
-function diffByKey(previous, current, key, changed) {
+function diffByKey2(previous, current, key, changed) {
   const currentKeys = new Set(current.map(key));
   const previousByKey = new Map(previous.map((value) => [key(value), value]));
   return {
@@ -175,10 +175,10 @@ function render(parts) {
 `);
 }
 function isUnavailable(value) {
-  return value === unavailable;
+  return value === unavailable3;
 }
 function isRemoved(value) {
-  return value === removed;
+  return value === removed2;
 }
 function canonical(value) {
   if (Array.isArray(value))
@@ -193,4 +193,4 @@ function requireText(key, kind, text) {
   return text;
 }
 
-export { Key, Hash, Values, Delta, unavailable, removed, InitializationBlocked, DuplicateKeyError, empty, make, combine, read, diff, renderInitial, renderUpdate, hash, applyHashDelta, diffByKey, exports_instructions };
+export { Key4, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make20, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };