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

package/dist/chunks/{snapshot-4d2pz62c.js → image-7x53jcvj.js}

@@ -1,13 +1,13 @@
 import {
   llmClient2
-} from "./snapshot-0e0xafbb.js";
+} from "./image-0e0xafbb.js";
 import {
-  Service50,
-  node54
-} from "./snapshot-q8vzjd10.js";
+  Service66,
+  node69
+} from "./image-5zx8vqtq.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/generate.ts
 var exports_generate = {};
@@ -37,7 +37,7 @@ class Service19 extends Context.Service()("@opencode/Generate") {
 }
 var layer10 = Layer.effect(Service19, Effect.gen(function* () {
   const llm = yield* LLMClient.Service;
-  const resolver = yield* Service50;
+  const resolver = yield* Service66;
   const runText = Effect.fn("Generate.text")(function* (input) {
     const resolved = yield* resolver.resolve(input.model).pipe(Effect.catchTag([
       "SessionRunnerModel.VariantUnavailableError",
@@ -65,7 +65,7 @@ var layer10 = Layer.effect(Service19, Effect.gen(function* () {
 var node23 = makeLocationNode({
   service: Service19,
   layer: layer10,
-  deps: [node54, llmClient2]
+  deps: [node69, llmClient2]
 });
 
 export { ModelSelectionError2, UnavailableError2, Service19, layer10, node23, exports_generate };

package/dist/chunks/{snapshot-ganjyh73.js → image-80c43yza.js}

@@ -1,22 +1,22 @@
 import {
   useragent2
-} from "./snapshot-s3f6t33f.js";
+} from "./image-ae8v5dmx.js";
 import {
-  ID16
-} from "./snapshot-rvb2zp0m.js";
+  ID14
+} from "./image-zfdtt056.js";
 import {
   iife2
-} from "./snapshot-1kg9ymc8.js";
+} from "./image-1kg9ymc8.js";
 import {
   configuredSettings2
-} from "./snapshot-gafyc7gz.js";
+} from "./image-5a0p3v26.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-ka43tmws.js → image-8n0gk8bj.js}

@@ -1,23 +1,23 @@
 import {
-  Service78,
-  node83
-} from "./snapshot-gmj1gppr.js";
+  Service79,
+  node84
+} from "./image-pvjg77yk.js";
 import {
-  Service73,
-  node78
-} from "./snapshot-kvqvfjxg.js";
+  Service64,
+  node67
+} from "./image-srexs3pv.js";
 import {
   create3
-} from "./snapshot-kg06axw8.js";
+} from "./image-kg06axw8.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/websearch.ts
 var exports_websearch3 = {};
 __export(exports_websearch3, {
   DisabledError: () => DisabledError2,
-  Event: () => Event7,
+  Event: () => Event6,
   ID: () => ID4,
   Input: () => Input13,
   Provider: () => Provider2,
@@ -35,7 +35,7 @@ __export(exports_websearch3, {
 import { WebSearch } from "@opencode-ai/schema/websearch";
 import { Context, Effect, Layer, Option, Schema } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
-import { Event as Event7 } from "@opencode-ai/schema/websearch";
+import { Event as Event6 } from "@opencode-ai/schema/websearch";
 var ID4 = WebSearch.ID;
 var Provider2 = WebSearch.Provider;
 var Input13 = WebSearch.Input;
@@ -64,8 +64,8 @@ class RequestError2 extends Schema.TaggedError()("WebSearch.Request", {
 class Service24 extends Context.Service()("@opencode/WebSearch") {
 }
 var layer = Layer.effect(Service24, Effect.gen(function* () {
-  const bus = yield* Service78;
-  const kv = yield* Service73;
+  const bus = yield* Service79;
+  const kv = yield* Service64;
   const decodeResults = Schema.decodeUnknownEffect(Schema.Array(Result2));
   const state = create3({
     initial: () => ({ providers: new Map }),
@@ -132,7 +132,7 @@ var layer = Layer.effect(Service24, Effect.gen(function* () {
 var node28 = makeLocationNode({
   service: Service24,
   layer,
-  deps: [node83, node78]
+  deps: [node84, node67]
 });
 
-export { ID4, Provider2, Input13, Result2, Response2, ProviderKey2, Selection2, ProviderRequiredError2, ProviderNotFoundError2, DisabledError2, RequestError2, Service24, node28, exports_websearch3, Event7 };
+export { ID4, Provider2, Input13, Result2, Response2, ProviderKey2, Selection2, ProviderRequiredError2, ProviderNotFoundError2, DisabledError2, RequestError2, Service24, node28, exports_websearch3, Event6 };

package/dist/chunks/{snapshot-1apakymg.js → image-8weygxvf.js}

@@ -1,56 +1,56 @@
 import {
-  Service78,
-  node83
-} from "./snapshot-gmj1gppr.js";
+  Service79,
+  node84
+} from "./image-pvjg77yk.js";
 import {
-  Event17,
-  Service63,
-  node67
-} from "./snapshot-5725naen.js";
+  Event18,
+  Service71,
+  node74
+} from "./image-75bx6y3z.js";
 import {
-  Service61,
-  node65
-} from "./snapshot-38dpc6qc.js";
+  Service48,
+  node51
+} from "./image-xr5by3j4.js";
 import {
   AbsolutePath2
-} from "./snapshot-p8qxwesx.js";
+} from "./image-p8qxwesx.js";
 import {
-  Service76,
-  node81
-} from "./snapshot-9vsg5cp7.js";
+  Service75,
+  node80
+} from "./image-xyxexyrh.js";
 import {
   substitute2
-} from "./snapshot-hw4pv20g.js";
+} from "./image-hw4pv20g.js";
 import {
   normalize2
-} from "./snapshot-ht2crakh.js";
+} from "./image-jpmhptrj.js";
 import {
   names4,
   discover3
-} from "./snapshot-hzymbmey.js";
+} from "./image-meyfevqx.js";
 import {
   plan2
-} from "./snapshot-0s9ayhjt.js";
+} from "./image-0s9ayhjt.js";
 import {
-  Service62,
-  Event16,
-  node66
-} from "./snapshot-6wsw2by1.js";
+  Service50,
+  Event10,
+  node53
+} from "./image-4d04p2vw.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/config.ts
 var exports_config = {};
 __export(exports_config, {
   Config: () => exports_config,
-  Options: () => Options8,
-  Service: () => Service60,
+  Options: () => Options6,
+  Service: () => Service47,
   Test: () => Test2,
-  configured: () => configured9,
+  configured: () => configured6,
   latest: () => latest2,
-  layer: () => layer24,
-  node: () => node64,
+  layer: () => layer19,
+  node: () => node50,
   testLayer: () => testLayer2
 });
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
@@ -71,14 +71,14 @@ import { Global } from "@opencode-ai/util/global";
 function latest2(entries, key) {
   return entries.findLast((entry) => entry.type === "document" && entry.info[key] !== undefined)?.info[key];
 }
-var Options8 = Schema.Struct({
+var Options6 = Schema.Struct({
   project: Schema.optional(Schema.Boolean),
   global: Schema.optional(Schema.Boolean),
   file: Schema.optional(Schema.String),
   content: Schema.optional(Schema.String)
 });
 
-class Service60 extends Context.Service()("@opencode/Config") {
+class Service47 extends Context.Service()("@opencode/Config") {
 }
 
 class Test2 extends Context.Service()("@opencode/Config/Test") {
@@ -92,15 +92,15 @@ var testLayer2 = (initial = []) => Layer.effectContext(Effect.gen(function* () {
     setEntries: (next) => Ref.set(entries, next),
     emitChange: (update) => PubSub.publish(updates, update).pipe(Effect.asVoid)
   });
-  return Context.empty().pipe(Context.add(Service60, service), Context.add(Test2, service));
+  return Context.empty().pipe(Context.add(Service47, service), Context.add(Test2, service));
 }));
-var layer24 = (options) => Layer.effect(Service60, Effect.gen(function* () {
+var layer19 = (options) => Layer.effect(Service47, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service76;
-  const watcher = yield* Service61;
-  const bus = yield* Service78;
-  const credentials = yield* Service63;
-  const wellknown = yield* Service62;
+  const location = yield* Service75;
+  const watcher = yield* Service48;
+  const bus = yield* Service79;
+  const credentials = yield* Service71;
+  const wellknown = yield* Service50;
   const reloadLock = Semaphore.makeUnsafe(1);
   const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" };
   const decodeInfo = Schema.decodeUnknownOption(Info, decodeOptions);
@@ -223,8 +223,8 @@ var layer24 = (options) => Layer.effect(Service60, Effect.gen(function* () {
   }, (effect) => reloadLock.withPermit(effect));
   const pendingReloads = yield* PubSub.subscribe(reloads);
   yield* Stream.fromSubscription(pendingReloads).pipe(Stream.debounce("100 millis"), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { cause })))), Effect.forkScoped({ startImmediately: true }));
-  yield* bus.subscribe(Event17.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
-  yield* bus.subscribe(Event16.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* bus.subscribe(Event18.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* bus.subscribe(Event10.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* Effect.sleep("10 minutes").pipe(Effect.andThen(Effect.suspend(() => {
     if (!wellknown.snapshot().length)
       return Effect.void;
@@ -235,20 +235,20 @@ var layer24 = (options) => Layer.effect(Service60, Effect.gen(function* () {
     }).pipe(Effect.catchCause((cause) => Effect.logWarning("failed to refresh wellknown config", { cause })));
   })), Effect.forever, Effect.forkScoped({ startImmediately: true }));
   yield* reloadLock.withPermit(reconcile(initial));
-  return Service60.of({
+  return Service47.of({
     entries: Effect.fnUntraced(function* () {
       return configs;
     }),
     changes: () => Stream.fromPubSub(updates)
   });
 }));
-function configured9(options) {
+function configured6(options) {
   return makeLocationNode({
-    service: Service60,
-    layer: layer24(options),
-    deps: [node65, node83, FSUtil.node, Global.node, node81, node67, node66]
+    service: Service47,
+    layer: layer19(options),
+    deps: [node51, node84, FSUtil.node, Global.node, node80, node74, node53]
   });
 }
-var node64 = configured9();
+var node50 = configured6();
 
-export { latest2, Options8, Service60, Test2, testLayer2, layer24, configured9, node64, exports_config };
+export { latest2, Options6, Service47, Test2, testLayer2, layer19, configured6, node50, exports_config };

package/dist/chunks/{snapshot-93a8yfjt.js → image-93a8yfjt.js}

@@ -1,9 +1,9 @@
 import {
   AbsolutePath2
-} from "./snapshot-p8qxwesx.js";
+} from "./image-p8qxwesx.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/worktree/directory.ts
 var exports_directory = {};

package/dist/chunks/{snapshot-b4dzx2gd.js → image-9dknczgv.js}

@@ -1,17 +1,17 @@
 import {
   useragent2
-} from "./snapshot-s3f6t33f.js";
+} from "./image-ae8v5dmx.js";
 import {
   OAuth3,
-  Service63
-} from "./snapshot-5725naen.js";
+  Service71
+} from "./image-75bx6y3z.js";
 import {
-  ID6,
+  ID11,
   MethodID2
-} from "./snapshot-5pbfg4es.js";
+} from "./image-hgrms83d.js";
 import {
-  ID16
-} from "./snapshot-rvb2zp0m.js";
+  ID14
+} from "./image-zfdtt056.js";
 
 // src/plugin/provider/xai.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";
@@ -23,7 +23,7 @@ var scope = "openid profile email offline_access grok-cli:access api:access";
 var pollingSafetyMargin = 3000;
 var browserMethodID = MethodID2.make("browser");
 var deviceMethodID = MethodID2.make("device");
-var providerID = ID16.make("xai");
+var providerID = ID14.make("xai");
 var Token = Schema.Struct({
   access_token: Schema.String,
   refresh_token: Schema.optional(Schema.String),
@@ -43,7 +43,7 @@ var DeviceError = Schema.Struct({
 });
 var decodeDeviceError = Schema.decodeUnknownOption(Schema.fromJsonString(DeviceError));
 var device = (app) => ({
-  integrationID: ID6.make("xai"),
+  integrationID: ID11.make("xai"),
   method: {
     id: deviceMethodID,
     type: "oauth",
@@ -68,8 +68,8 @@ var device = (app) => ({
 var XAIPlugin2 = define({
   id: "opencode.provider.xai",
   effect: Effect.fn(function* (ctx) {
-    const credentials = yield* Service63;
-    yield* Effect.forEach(yield* credentials.list(ID6.make("xai")), (credential) => {
+    const credentials = yield* Service71;
+    yield* Effect.forEach(yield* credentials.list(ID11.make("xai")), (credential) => {
       if (credential.value.type !== "oauth" || credential.value.methodID !== browserMethodID)
         return Effect.void;
       return credentials.update(credential.id, {

package/dist/chunks/{snapshot-b3vyfvjr.js → image-9e975f95.js}

@@ -1,19 +1,19 @@
 import {
   fromPromise2
-} from "./snapshot-b9wsbatv.js";
+} from "./image-b9wsbatv.js";
 import {
-  Service61
-} from "./snapshot-38dpc6qc.js";
+  Service48
+} from "./image-xr5by3j4.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/plugin/module.ts
 var exports_module = {};
 __export(exports_module, {
   LoadError: () => LoadError2,
   PluginModule: () => exports_module,
-  make: () => make4
+  make: () => make7
 });
 import { Host } from "@opencode-ai/plugin/host";
 import { createPluginSources } from "@opencode-ai/plugin/source";
@@ -22,8 +22,8 @@ import { Deferred, Effect, FiberSet, PubSub, Schema, Stream } from "effect";
 import path from "path";
 import { stat } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "url";
-var make4 = Effect.fn("PluginModule.make")(function* () {
-  const watcher = yield* Service61;
+var make7 = Effect.fn("PluginModule.make")(function* () {
+  const watcher = yield* Service48;
   const scope = yield* Effect.scope;
   const runPromise = yield* FiberSet.makeRuntimePromise();
   const changes = yield* PubSub.unbounded();
@@ -102,4 +102,4 @@ var load = Effect.fn("PluginModule.load")(function* (operation, sources, options
   };
 });
 
-export { make4, LoadError2, exports_module };
+export { make7, LoadError2, exports_module };

package/dist/chunks/{snapshot-909grfy1.js → image-9ka0zpp0.js}

@@ -1,24 +1,24 @@
 import {
   Service80
-} from "./snapshot-p8tabr57.js";
+} from "./image-k68abf46.js";
 import {
-  Service42
-} from "./snapshot-enw72f67.js";
+  Service34
+} from "./image-kpe4sfyz.js";
 import {
   awaitActivation2
-} from "./snapshot-dxj72tfx.js";
+} from "./image-wqqnj2ff.js";
 import {
   preview2
-} from "./snapshot-yenvjmh1.js";
+} from "./image-qv4r87jq.js";
 import {
   baseTranscript2
-} from "./snapshot-zhn53cwh.js";
+} from "./image-v5rgjsm5.js";
 import {
-  Service32
-} from "./snapshot-jd3azxa6.js";
+  Service28
+} from "./image-1226r2df.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/session/generate.ts
 var exports_generate2 = {};
@@ -29,12 +29,12 @@ __export(exports_generate2, {
 import { LLMClient, Message } from "@opencode-ai/ai";
 import { Effect } from "effect";
 var generate3 = Effect.fn("SessionGenerate.generate")(function* (input) {
-  const instances = yield* Service42;
+  const instances = yield* Service34;
   const database = yield* Service80;
   const llm = yield* LLMClient.Service;
   return yield* Effect.gen(function* () {
     yield* awaitActivation2;
-    const context = yield* Service32;
+    const context = yield* Service28;
     const selection = yield* context.select(input.session.id);
     const model = yield* context.resolveModel(selection.session);
     const history = yield* preview2(database.db, selection.session.id, selection.instructions);

package/dist/chunks/{snapshot-21kgjbv4.js → image-9nrx719g.js}

@@ -1,10 +1,10 @@
 import {
-  Service78
-} from "./snapshot-gmj1gppr.js";
+  Service79
+} from "./image-pvjg77yk.js";
 import {
-  Service13,
-  Event2
-} from "./snapshot-bgn4bef1.js";
+  Service16,
+  Event4
+} from "./image-fvqftnr7.js";
 
 // src/plugin/models-dev.ts
 import { define } from "@opencode-ai/plugin/effect/plugin";
@@ -14,8 +14,8 @@ import { Effect, Stream } from "effect";
 var ModelsDevPlugin2 = define({
   id: "opencode.models.dev",
   effect: Effect.fn(function* (ctx) {
-    const modelsDev = yield* Service13;
-    const bus = yield* Service78;
+    const modelsDev = yield* Service16;
+    const bus = yield* Service79;
     const loaded = { data: snapshots(yield* modelsDev.get()) };
     yield* ctx.integration.transform((integrations) => {
       for (const provider of loaded.data) {
@@ -49,7 +49,7 @@ var ModelsDevPlugin2 = define({
         }
       }
     });
-    yield* bus.subscribe(Event2.Refreshed).pipe(Stream.runForEach(() => modelsDev.get().pipe(Effect.tap((data) => Effect.sync(() => loaded.data = snapshots(data))), Effect.andThen(ctx.integration.reload()), Effect.andThen(ctx.catalog.reload()))), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event4.Refreshed).pipe(Stream.runForEach(() => modelsDev.get().pipe(Effect.tap((data) => Effect.sync(() => loaded.data = snapshots(data))), Effect.andThen(ctx.integration.reload()), Effect.andThen(ctx.catalog.reload()))), Effect.forkScoped({ startImmediately: true }));
   })
 });
 function environmentNames(provider) {

package/dist/chunks/{snapshot-zazfhf2t.js → image-9pdz2n87.js}

@@ -1,10 +1,10 @@
 import {
-  Service78,
-  node83
-} from "./snapshot-gmj1gppr.js";
+  Service79,
+  node84
+} from "./image-pvjg77yk.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/form.ts
 var exports_form = {};
@@ -12,40 +12,40 @@ __export(exports_form, {
   AlreadyExistsError: () => AlreadyExistsError2,
   AlreadySettledError: () => AlreadySettledError2,
   Answer: () => Answer2,
-  Event: () => Event13,
+  Event: () => Event17,
   Field: () => Field2,
   Fields: () => Fields2,
   Form: () => exports_form,
-  ID: () => ID7,
-  Info: () => Info11,
+  ID: () => ID12,
+  Info: () => Info25,
   InvalidAnswerError: () => InvalidAnswerError2,
   InvalidFormError: () => InvalidFormError2,
-  NotFoundError: () => NotFoundError6,
-  Reply: () => Reply2,
-  Service: () => Service54,
+  NotFoundError: () => NotFoundError9,
+  Reply: () => Reply3,
+  Service: () => Service70,
   State: () => State3,
   When: () => When2,
   layer: () => layer23,
-  node: () => node58,
+  node: () => node73,
   validateAnswer: () => validateAnswer2,
   validateFields: () => validateFields2
 });
 import { Form } from "@opencode-ai/schema/form";
 import { Cache, Context, Deferred, Duration, Effect, Exit, Layer, Option, Schema } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
-import { Event as Event13 } from "@opencode-ai/schema/form";
+import { Event as Event17 } from "@opencode-ai/schema/form";
 var RETENTION = Duration.minutes(10);
-var ID7 = Form.ID;
-var Info11 = Form.Info;
+var ID12 = Form.ID;
+var Info25 = Form.Info;
 var Field2 = Form.Field;
 var Fields2 = Form.Fields;
 var When2 = Form.When;
 var State3 = Form.State;
 var Answer2 = Form.Answer;
-var Reply2 = Form.Reply;
+var Reply3 = Form.Reply;
 
-class NotFoundError6 extends Schema.TaggedError()("Form.NotFoundError", {
-  id: ID7
+class NotFoundError9 extends Schema.TaggedError()("Form.NotFoundError", {
+  id: ID12
 }) {
   get message() {
     return `Form not found: ${this.id}`;
@@ -53,7 +53,7 @@ class NotFoundError6 extends Schema.TaggedError()("Form.NotFoundError", {
 }
 
 class AlreadySettledError2 extends Schema.TaggedError()("Form.AlreadySettledError", {
-  id: ID7
+  id: ID12
 }) {
   get message() {
     return `Form already settled: ${this.id}`;
@@ -61,7 +61,7 @@ class AlreadySettledError2 extends Schema.TaggedError()("Form.AlreadySettledErro
 }
 
 class AlreadyExistsError2 extends Schema.TaggedError()("Form.AlreadyExistsError", {
-  id: ID7
+  id: ID12
 }) {
   get message() {
     return `Form already exists: ${this.id}`;
@@ -69,7 +69,7 @@ class AlreadyExistsError2 extends Schema.TaggedError()("Form.AlreadyExistsError"
 }
 
 class InvalidAnswerError2 extends Schema.TaggedError()("Form.InvalidAnswerError", {
-  id: ID7,
+  id: ID12,
   message: Schema.String
 }) {
 }
@@ -79,17 +79,17 @@ class InvalidFormError2 extends Schema.TaggedError()("Form.InvalidFormError", {
 }) {
 }
 
-class Service54 extends Context.Service()("@opencode/Form") {
+class Service70 extends Context.Service()("@opencode/Form") {
 }
-var layer23 = Layer.effect(Service54, Effect.gen(function* () {
-  const bus = yield* Service78;
+var layer23 = Layer.effect(Service70, Effect.gen(function* () {
+  const bus = yield* Service79;
   const forms = yield* Cache.makeWith(() => Effect.die(new Error("Form cache must be used via set/getSuccess, never get")), {
     capacity: Number.MAX_SAFE_INTEGER,
     timeToLive: (exit) => Exit.isSuccess(exit) && exit.value.state.status === "pending" ? Duration.infinity : RETENTION
   });
-  const requireEntry = Effect.fn("Form.requireEntry")((id) => Cache.getSuccess(forms, id).pipe(Effect.flatMap((entry) => Effect.fromOption(entry, () => new NotFoundError6({ id })))));
+  const requireEntry = Effect.fn("Form.requireEntry")((id) => Cache.getSuccess(forms, id).pipe(Effect.flatMap((entry) => Effect.fromOption(entry, () => new NotFoundError9({ id })))));
   const create = Effect.fn("Form.create")((input) => Effect.uninterruptible(Effect.gen(function* () {
-    const id = input.id ?? ID7.create();
+    const id = input.id ?? ID12.create();
     const existing = yield* Cache.getSuccess(forms, id);
     if (Option.isSome(existing))
       return yield* new AlreadyExistsError2({ id });
@@ -153,9 +153,9 @@ var layer23 = Layer.effect(Service54, Effect.gen(function* () {
     yield* Deferred.succeed(entry.deferred, next);
   })));
   yield* Effect.addFinalizer(() => Cache.values(forms).pipe(Effect.flatMap((entries) => Effect.forEach(Array.from(entries).filter((entry) => entry.state.status === "pending"), (entry) => cancel(entry.form.id).pipe(Effect.ignore), { discard: true }))));
-  return Service54.of({ create, ask, get, list, state, reply, cancel });
+  return Service70.of({ create, ask, get, list, state, reply, cancel });
 }));
-var node58 = makeLocationNode({ service: Service54, layer: layer23, deps: [node83] });
+var node73 = makeLocationNode({ service: Service70, layer: layer23, deps: [node84] });
 function validateAnswer2(form, answer) {
   const fields = new Map(form.map((field) => [field.key, field]));
   for (const key of Object.keys(answer)) {
@@ -307,4 +307,4 @@ function isDateTime(value) {
   return !Number.isNaN(new Date(value).getTime());
 }
 
-export { ID7, Info11, Field2, Fields2, When2, State3, Answer2, Reply2, NotFoundError6, AlreadySettledError2, AlreadyExistsError2, InvalidAnswerError2, InvalidFormError2, Service54, layer23, node58, validateAnswer2, validateFields2, exports_form, Event13 };
+export { ID12, Info25, Field2, Fields2, When2, State3, Answer2, Reply3, NotFoundError9, AlreadySettledError2, AlreadyExistsError2, InvalidAnswerError2, InvalidFormError2, Service70, layer23, node73, validateAnswer2, validateFields2, exports_form, Event17 };