@opencode/core 2.0.22 → 2.0.23

package/dist/chunks/{instruction-discovery-d4k4eg4n.js → generate-yfxkm5w6.js}

@@ -1,60 +1,60 @@
 import {
   makeUnsafe2
-} from "./instruction-discovery-dpkg50ah.js";
+} from "./generate-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./instruction-discovery-mjv4tm51.js";
+} from "./generate-z8hrkqzq.js";
 import {
-  Event21,
-  Service82,
-  node86
-} from "./instruction-discovery-93pbq578.js";
+  Event19,
+  Service78,
+  node82
+} from "./generate-spja3q52.js";
 import {
-  Service77,
-  node81
-} from "./instruction-discovery-g6pt2ykv.js";
+  Service80,
+  node84
+} from "./generate-yhecr6n4.js";
 import {
-  Service68,
-  node71
-} from "./instruction-discovery-6wqmdryt.js";
+  Service66,
+  node69
+} from "./generate-5v5aasd4.js";
 import {
-  ID17,
-  Service81,
-  node85
-} from "./instruction-discovery-ysyp8d4a.js";
+  ID16,
+  Service79,
+  node83
+} from "./generate-z872cvkj.js";
 import {
   reconcile2,
   create3
-} from "./instruction-discovery-rdw6cm16.js";
+} from "./generate-rdw6cm16.js";
 import {
-  ID16,
+  ID14,
   MethodID2,
-  Service80,
-  node84
-} from "./instruction-discovery-768hztz0.js";
+  Service77,
+  node81
+} from "./generate-r7pm0y1x.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError5,
-  Options: () => Options5,
+  NotFoundError: () => NotFoundError3,
+  Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service40,
+  Service: () => Service30,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured5,
+  configured: () => configured4,
   layer: () => layer14,
-  node: () => node43
+  node: () => node33
 });
 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 NotFoundError5 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -103,21 +103,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service40 extends Context.Service()("@opencode/MCP") {
+class Service30 extends Context.Service()("@opencode/MCP") {
 }
-var Options5 = Schema.Struct({
+var Options4 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer14 = (options) => Layer.effect(Service40, Effect.gen(function* () {
-  const location = yield* Service77;
-  const environment = yield* Service68;
+var layer14 = (options) => Layer.effect(Service30, Effect.gen(function* () {
+  const location = yield* Service80;
+  const environment = yield* Service66;
   const bus = yield* Service83;
-  const forms = yield* Service81;
-  const integration = yield* Service80;
-  const credentials = yield* Service82;
+  const forms = yield* Service79;
+  const integration = yield* Service77;
+  const credentials = yield* Service78;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -129,7 +129,7 @@ var layer14 = (options) => Layer.effect(Service40, 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 = ID16.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -145,7 +145,7 @@ var layer14 = (options) => Layer.effect(Service40, 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(Service82, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service78, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -154,19 +154,19 @@ var layer14 = (options) => Layer.effect(Service40, 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(Service82, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service78, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID17.create();
+        const formID = ID16.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -269,7 +269,7 @@ var layer14 = (options) => Layer.effect(Service40, 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(Service68, 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(Service66, 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 layer14 = (options) => Layer.effect(Service40, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event21.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event19.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 layer14 = (options) => Layer.effect(Service40, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service40.of({
+  return Service30.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -530,14 +530,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 configured5(options) {
+function configured4(options) {
   return makeLocationNode({
-    service: Service40,
+    service: Service30,
     layer: layer14(options),
-    deps: [node81, node71, node87, node85, node84, node86]
+    deps: [node84, node69, node87, node83, node81, node82]
   });
 }
-var node43 = configured5();
+var node33 = configured4();
 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, NotFoundError5, ToolCallError2, Service40, Options5, layer14, configured5, node43, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError3, ToolCallError2, Service30, Options4, layer14, configured4, node33, exports_mcp4 };

package/dist/chunks/{instruction-discovery-g6pt2ykv.js → generate-yhecr6n4.js}

@@ -1,33 +1,33 @@
 import {
-  Service78,
-  node82
-} from "./instruction-discovery-x8pk0y4v.js";
+  Service81,
+  node85
+} from "./generate-ntev6yqw.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/location.ts
 var exports_location = {};
 __export(exports_location, {
-  Info: () => Info28,
+  Info: () => Info27,
   Location: () => exports_location,
-  Ref: () => Ref3,
-  Service: () => Service77,
+  Ref: () => Ref4,
+  Service: () => Service80,
   boundNode: () => boundNode2,
-  node: () => node81,
+  node: () => node84,
   response: () => response2
 });
 import { Context, Effect, Layer } from "effect";
-import { Info as Info28, Ref as Ref3, response as response2 } from "@opencode/schema/location";
+import { Info as Info27, Ref as Ref4, response as response2 } from "@opencode/schema/location";
 import { LayerNode } from "@opencode/util/effect/layer-node";
 import { makeLocationNode, tags } from "@opencode/util/effect/app-node";
-class Service77 extends Context.Service()("@opencode/Location") {
+class Service80 extends Context.Service()("@opencode/Location") {
 }
-var node81 = LayerNode.unbound(Service77, tags.values.location);
-var layer = (ref) => Layer.effect(Service77, Effect.gen(function* () {
-  const project = yield* Service78;
+var node84 = LayerNode.unbound(Service80, tags.values.location);
+var layer = (ref) => Layer.effect(Service80, Effect.gen(function* () {
+  const project = yield* Service81;
   const resolved = yield* project.resolve(ref.directory);
-  return Service77.of({
+  return Service80.of({
     directory: ref.directory,
     workspaceID: ref.workspaceID,
     project: { id: resolved.id, directory: resolved.directory, canonical: resolved.canonical },
@@ -35,9 +35,9 @@ var layer = (ref) => Layer.effect(Service77, Effect.gen(function* () {
   });
 }));
 var boundNode2 = (ref) => makeLocationNode({
-  service: Service77,
+  service: Service80,
   layer: layer(ref),
-  deps: [node82]
+  deps: [node85]
 });
 
-export { Info28, Ref3, response2, Service77, node81, boundNode2, exports_location };
+export { Info27, Ref4, response2, Service80, node84, boundNode2, exports_location };

package/dist/chunks/{instruction-discovery-rhraev7y.js → generate-yp2x3t23.js}

@@ -1,15 +1,15 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/run-coordinator.ts
 var exports_run_coordinator = {};
 __export(exports_run_coordinator, {
   SessionRunCoordinator: () => exports_run_coordinator,
-  make: () => make19
+  make: () => make16
 });
 import { Deferred, Effect, Fiber, FiberSet } from "effect";
-var make19 = (options) => Effect.gen(function* () {
+var make16 = (options) => Effect.gen(function* () {
   const executions = new Map;
   const fork = yield* FiberSet.makeRuntime();
   const loop = (key, execution, force) => Effect.suspend(() => options.drain(key, force, execution.scope)).pipe(Effect.andThen(Effect.suspend(() => {
@@ -89,4 +89,4 @@ var make19 = (options) => Effect.gen(function* () {
   };
 });
 
-export { make19, exports_run_coordinator };
+export { make16, exports_run_coordinator };

package/dist/chunks/{instruction-discovery-qtkea077.js → generate-ywacswhv.js}

@@ -1,32 +1,32 @@
 import {
-  Service52
-} from "./instruction-discovery-fqzyqcjh.js";
+  Service64
+} from "./generate-9pvxkkw3.js";
 import {
-  Service51
-} from "./instruction-discovery-s48x4bgh.js";
+  Service63
+} from "./generate-t3cgces8.js";
 import {
   parse2
-} from "./instruction-discovery-b65pgdb7.js";
+} from "./generate-pvkpwa2b.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/config/plugin/compatibility.ts
 var exports_compatibility = {};
 __export(exports_compatibility, {
   ConfigCompatibilityPlugin: () => exports_compatibility,
-  Plugin: () => Plugin46
+  Plugin: () => Plugin34
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { FSUtil } from "@opencode/util/fs-util";
 import path from "path";
 import { Effect, FiberMap, PubSub, Semaphore, Stream } from "effect";
-var Plugin46 = define({
+var Plugin34 = define({
   id: "opencode.config.compatibility",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service51;
+    const config = yield* Service63;
     const fs = yield* FSUtil.Service;
-    const watcher = yield* Service52;
+    const watcher = yield* Service64;
     const watches = yield* FiberMap.make();
     const changes = yield* PubSub.sliding(1);
     const lock = Semaphore.makeUnsafe(1);
@@ -73,4 +73,4 @@ var Plugin46 = define({
   })
 });
 
-export { Plugin46, exports_compatibility };
+export { Plugin34, exports_compatibility };

package/dist/chunks/{instruction-discovery-z0bkrqjs.js → generate-z0bkrqjs.js}

@@ -1,6 +1,6 @@
 import {
   createProviderPlugin2
-} from "./instruction-discovery-ym463w8f.js";
+} from "./generate-ym463w8f.js";
 
 // src/plugin/provider/cohere.ts
 var CoherePlugin2 = createProviderPlugin2({

package/dist/chunks/{instruction-discovery-62s7jehk.js → generate-z15fp2pm.js}

@@ -1,18 +1,18 @@
 import {
-  ID9
-} from "./instruction-discovery-5sv8fqdt.js";
+  ID13
+} from "./generate-3edgjjmd.js";
 import {
   iife2
-} from "./instruction-discovery-1kg9ymc8.js";
+} from "./generate-1kg9ymc8.js";
 import {
   configuredSettings2
-} from "./instruction-discovery-qdyk8phn.js";
+} from "./generate-0at0q6bk.js";
 
 // src/plugin/provider/cloudflare-workers-ai.ts
 import { Effect } from "effect";
 import { define } from "@opencode/plugin/effect/plugin";
 import { Form } from "@opencode/schema/form";
-var providerID = ID9.make("cloudflare-workers-ai");
+var providerID = ID13.make("cloudflare-workers-ai");
 var CloudflareWorkersAIPlugin2 = define({
   id: "opencode.provider.cloudflare.workers.ai",
   effect: Effect.fn(function* (ctx) {

package/dist/chunks/{instruction-discovery-b1f75b2t.js → generate-z32f8zps.js}

@@ -1,18 +1,18 @@
 import {
-  Service57
-} from "./instruction-discovery-eqkxs06z.js";
+  Service35
+} from "./generate-cdm0dq9n.js";
 import {
   awaitActivation2
-} from "./instruction-discovery-jqh9b0xq.js";
+} from "./generate-phz3h32g.js";
 import {
   SkillNotFoundError2
-} from "./instruction-discovery-kn7rctz9.js";
+} from "./generate-1z18ck0n.js";
 import {
-  Service47
-} from "./instruction-discovery-gb65a7a1.js";
+  Service56
+} from "./generate-bkrwt1n9.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-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* Service57;
-  const skills = yield* awaitActivation2.pipe(Effect.andThen(Service47), instances.provide(input.session));
+  const instances = yield* Service35;
+  const skills = yield* awaitActivation2.pipe(Effect.andThen(Service56), instances.provide(input.session));
   const skill = yield* skills.get(input.skill);
   if (!skill)
     return yield* new SkillNotFoundError2({ skill: input.skill });

package/dist/chunks/{instruction-discovery-76jv6ta8.js → generate-z3507kbh.js}

@@ -1,15 +1,12 @@
 import {
   cleanup3
-} from "./instruction-discovery-gd4qta3r.js";
-import {
-  ascending2
-} from "./instruction-discovery-tvtrv512.js";
+} from "./generate-gd4qta3r.js";
 import {
   create3
-} from "./instruction-discovery-rdw6cm16.js";
+} from "./generate-rdw6cm16.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/tool-output.ts
 var exports_tool_output2 = {};
@@ -18,27 +15,30 @@ __export(exports_tool_output2, {
   MAX_BYTES: () => MAX_BYTES2,
   MAX_LINES: () => MAX_LINES2,
   RETENTION: () => RETENTION3,
-  Service: () => Service71,
+  Service: () => Service67,
   ToolOutput: () => exports_tool_output2,
-  node: () => node75
+  fileName: () => fileName2,
+  node: () => node70
 });
 import path from "path";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";
 import { makeGlobalNode, makeLocationNode } from "@opencode/util/effect/app-node";
 import { FSUtil } from "@opencode/util/fs-util";
 import { Global } from "@opencode/util/global";
+import { Identifier } from "@opencode/schema/identifier";
 var MAX_LINES2 = 2000;
 var MAX_BYTES2 = 50 * 1024;
 var RETENTION3 = Duration.days(7);
 var DIRECTORY3 = "tool-output";
+var fileName2 = (timestamp) => "tool_" + Identifier.create(false, timestamp);
 
-class Service71 extends Context.Service()("@opencode/ToolOutput") {
+class Service67 extends Context.Service()("@opencode/ToolOutput") {
 }
 var cleanup = Effect.fn("ToolOutput.cleanup")(function* (fs, directory) {
   const entries = yield* fs.readDirectory(directory).pipe(Effect.map((entries) => entries.filter((entry) => /^tool_[0-9a-f]{12}/.test(entry))), Effect.orElseSucceed(() => []));
   yield* cleanup3(fs, entries.map((entry) => path.join(directory, entry)), RETENTION3);
 });
-var layer = Layer.effect(Service71, Effect.gen(function* () {
+var layer = Layer.effect(Service67, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const directory = path.join(global.data, DIRECTORY3);
@@ -78,7 +78,7 @@ var layer = Layer.effect(Service71, Effect.gen(function* () {
       kept.push(line);
       bytes += size;
     }
-    const file = path.join(directory, ascending2("tool"));
+    const file = path.join(directory, fileName2());
     yield* fs.ensureDir(directory).pipe(Effect.orDie);
     yield* fs.writeFileString(file, text).pipe(Effect.orDie);
     const shown = kept.length > 0 ? `lines 1-${kept.length}` : "0 lines";
@@ -116,7 +116,7 @@ var layer = Layer.effect(Service71, Effect.gen(function* () {
       metadata: { ...result.metadata, truncated: true, outputPath: file }
     };
   });
-  return Service71.of({
+  return Service67.of({
     transform: state.transform,
     reload: state.reload,
     truncate,
@@ -133,10 +133,10 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var node75 = makeLocationNode({
-  service: Service71,
+var node70 = makeLocationNode({
+  service: Service67,
   layer,
   deps: [FSUtil.node, Global.node, cleanupNode]
 });
 
-export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service71, node75, exports_tool_output2 };
+export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, fileName2, Service67, node70, exports_tool_output2 };

package/dist/chunks/{instruction-discovery-0xcdhwc5.js → generate-z3ra53tp.js}

@@ -1,12 +1,12 @@
 import {
   migrations2
-} from "./instruction-discovery-geswxttb.js";
+} from "./generate-2pcsyv91.js";
 import {
   schema_gen_default
-} from "./instruction-discovery-34c7v6d4.js";
+} from "./generate-34c7v6d4.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/database/migration.ts
 var exports_migration = {};

package/dist/chunks/{instruction-discovery-ysyp8d4a.js → generate-z872cvkj.js}

@@ -1,10 +1,10 @@
 import {
   Service83,
   node87
-} from "./instruction-discovery-mjv4tm51.js";
+} from "./generate-z8hrkqzq.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/form.ts
 var exports_form = {};
@@ -16,17 +16,17 @@ __export(exports_form, {
   Field: () => Field2,
   Fields: () => Fields2,
   Form: () => exports_form,
-  ID: () => ID17,
-  Info: () => Info33,
+  ID: () => ID16,
+  Info: () => Info26,
   InvalidAnswerError: () => InvalidAnswerError2,
   InvalidFormError: () => InvalidFormError2,
-  NotFoundError: () => NotFoundError11,
+  NotFoundError: () => NotFoundError10,
   Reply: () => Reply3,
-  Service: () => Service81,
+  Service: () => Service79,
   State: () => State3,
   When: () => When2,
   layer: () => layer25,
-  node: () => node85,
+  node: () => node83,
   validateAnswer: () => validateAnswer2,
   validateFields: () => validateFields2
 });
@@ -35,8 +35,8 @@ import { Cache, Context, Deferred, Duration, Effect, Exit, Layer, Option, Schema
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Event as Event20 } from "@opencode/schema/form";
 var RETENTION = Duration.minutes(10);
-var ID17 = Form.ID;
-var Info33 = Form.Info;
+var ID16 = Form.ID;
+var Info26 = Form.Info;
 var Field2 = Form.Field;
 var Fields2 = Form.Fields;
 var When2 = Form.When;
@@ -44,8 +44,8 @@ var State3 = Form.State;
 var Answer2 = Form.Answer;
 var Reply3 = Form.Reply;
 
-class NotFoundError11 extends Schema.TaggedError()("Form.NotFoundError", {
-  id: ID17
+class NotFoundError10 extends Schema.TaggedError()("Form.NotFoundError", {
+  id: ID16
 }) {
   get message() {
     return `Form not found: ${this.id}`;
@@ -53,7 +53,7 @@ class NotFoundError11 extends Schema.TaggedError()("Form.NotFoundError", {
 }
 
 class AlreadySettledError2 extends Schema.TaggedError()("Form.AlreadySettledError", {
-  id: ID17
+  id: ID16
 }) {
   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: ID17
+  id: ID16
 }) {
   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: ID17,
+  id: ID16,
   message: Schema.String
 }) {
 }
@@ -79,18 +79,18 @@ class InvalidFormError2 extends Schema.TaggedError()("Form.InvalidFormError", {
 }) {
 }
 
-class Service81 extends Context.Service()("@opencode/Form") {
+class Service79 extends Context.Service()("@opencode/Form") {
 }
-var layer25 = Layer.effect(Service81, Effect.gen(function* () {
+var layer25 = Layer.effect(Service79, Effect.gen(function* () {
   const bus = yield* Service83;
   let closed = false;
   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 NotFoundError11({ id })))));
+  const requireEntry = Effect.fn("Form.requireEntry")((id) => Cache.getSuccess(forms, id).pipe(Effect.flatMap((entry) => Effect.fromOption(entry, () => new NotFoundError10({ id })))));
   const create = Effect.fn("Form.create")((input) => Effect.uninterruptible(Effect.gen(function* () {
-    const id = input.id ?? ID17.create();
+    const id = input.id ?? ID16.create();
     const existing = yield* Cache.getSuccess(forms, id);
     if (Option.isSome(existing))
       return yield* new AlreadyExistsError2({ id });
@@ -162,9 +162,9 @@ var layer25 = Layer.effect(Service81, Effect.gen(function* () {
     closed = true;
   }).pipe(Effect.andThen(Cache.values(forms)), Effect.flatMap((entries) => Effect.forEach(Array.from(entries).filter((entry) => entry.state.status === "pending"), (entry) => cancel(entry.form.id).pipe(Effect.ignore), { discard: true })));
   yield* Effect.addFinalizer(() => close);
-  return Service81.of({ create, ask, get, list, state, reply, cancel, close });
+  return Service79.of({ create, ask, get, list, state, reply, cancel, close });
 }));
-var node85 = makeLocationNode({ service: Service81, layer: layer25, deps: [node87] });
+var node83 = makeLocationNode({ service: Service79, layer: layer25, deps: [node87] });
 function validateAnswer2(form, answer) {
   const fields = new Map(form.map((field) => [field.key, field]));
   for (const key of Object.keys(answer)) {
@@ -316,4 +316,4 @@ function isDateTime(value) {
   return !Number.isNaN(new Date(value).getTime());
 }
 
-export { ID17, Info33, Field2, Fields2, When2, State3, Answer2, Reply3, NotFoundError11, AlreadySettledError2, AlreadyExistsError2, InvalidAnswerError2, InvalidFormError2, Service81, layer25, node85, validateAnswer2, validateFields2, exports_form, Event20 };
+export { ID16, Info26, Field2, Fields2, When2, State3, Answer2, Reply3, NotFoundError10, AlreadySettledError2, AlreadyExistsError2, InvalidAnswerError2, InvalidFormError2, Service79, layer25, node83, validateAnswer2, validateFields2, exports_form, Event20 };