@opencode/core 0.0.0-dev-20583 → 0.0.0-dev-20587

package/dist/chunks/{file-mutation-pwk6y6g7.js → reference-h26940z0.js}

@@ -1,63 +1,63 @@
 import {
   Service84,
   node88
-} from "./file-mutation-94qxd8wt.js";
+} from "./reference-w36x1trb.js";
 import {
   Service83,
   node87
-} from "./file-mutation-s1gjyzhy.js";
+} from "./reference-b5hvc6g6.js";
 import {
   CredentialTable2
-} from "./file-mutation-pknna89w.js";
+} from "./reference-pknna89w.js";
 import {
   from2
-} from "./file-mutation-3zsf4n22.js";
+} from "./reference-3zsf4n22.js";
 import {
   __export
-} from "./file-mutation-9rqn6x4v.js";
+} from "./reference-9rqn6x4v.js";
 
 // src/credential.ts
 var exports_credential = {};
 __export(exports_credential, {
   Credential: () => exports_credential,
-  Event: () => Event17,
-  ID: () => ID9,
-  Info: () => Info20,
-  Key: () => Key3,
+  Event: () => Event19,
+  ID: () => ID15,
+  Info: () => Info25,
+  Key: () => Key4,
   OAuth: () => OAuth3,
-  Service: () => Service68,
+  Service: () => Service77,
   Value: () => Value2,
-  node: () => node71
+  node: () => node81
 });
 import { asc, desc, eq } from "drizzle-orm";
 import { Cause, Context, Effect, Layer, Schema } from "effect";
 import { Credential } from "@opencode/schema/credential";
 import { Integration } from "@opencode/schema/integration";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
-var ID9 = Credential.ID;
+var ID15 = Credential.ID;
 var OAuth3 = Credential.OAuth;
-var Key3 = Credential.Key;
+var Key4 = Credential.Key;
 var Value2 = Credential.Value;
-var Event17 = Credential.Event;
+var Event19 = Credential.Event;
 
-class Info20 extends Schema.Class("Credential.Info")({
-  id: ID9,
+class Info25 extends Schema.Class("Credential.Info")({
+  id: ID15,
   integrationID: Integration.ID,
   label: Schema.String,
   value: Value2
 }) {
 }
 
-class Service68 extends Context.Service()("@opencode/Credential") {
+class Service77 extends Context.Service()("@opencode/Credential") {
 }
-var layer = Layer.effect(Service68, Effect.gen(function* () {
+var layer = Layer.effect(Service77, Effect.gen(function* () {
   const db = (yield* Service84).db;
   const bus = yield* Service83;
   const decode = Schema.decodeUnknownSync(Value2);
   const stored = (row) => {
     if (!row.integration_id)
       return;
-    return new Info20({
+    return new Info25({
       id: row.id,
       integrationID: row.integration_id,
       label: row.label,
@@ -68,7 +68,7 @@ var layer = Layer.effect(Service68, Effect.gen(function* () {
     const credential = stored(row);
     return credential ? [credential] : [];
   });
-  return Service68.of({
+  return Service77.of({
     all: Effect.fn("Credential.all")(() => db.select().from(CredentialTable2).orderBy(asc(CredentialTable2.active), asc(CredentialTable2.time_created), asc(CredentialTable2.id)).all().pipe(Effect.orDie, Effect.map(storedRows))),
     list: Effect.fn("Credential.list")((integrationID) => db.select().from(CredentialTable2).where(eq(CredentialTable2.integration_id, integrationID)).orderBy(asc(CredentialTable2.active), asc(CredentialTable2.time_created), asc(CredentialTable2.id)).all().pipe(Effect.orDie, Effect.map(storedRows))),
     get: Effect.fn("Credential.get")(function* (id) {
@@ -76,8 +76,8 @@ var layer = Layer.effect(Service68, Effect.gen(function* () {
       return row ? stored(row) : undefined;
     }),
     create: Effect.fn("Credential.create")(function* (input) {
-      const credential = new Info20({
-        id: input.id ?? ID9.create(),
+      const credential = new Info25({
+        id: input.id ?? ID15.create(),
         integrationID: input.integrationID,
         label: input.label ?? "default",
         value: input.value
@@ -108,9 +108,9 @@ var layer = Layer.effect(Service68, Effect.gen(function* () {
         type: credential.value.type,
         active: activated
       });
-      yield* bus.publish(Event17.Updated, {}, { global: true });
+      yield* bus.publish(Event19.Updated, {}, { global: true });
       if (activated)
-        yield* bus.publish(Event17.Switched, { integrationID: credential.integrationID, credentialID: credential.id }, { global: true });
+        yield* bus.publish(Event19.Switched, { integrationID: credential.integrationID, credentialID: credential.id }, { global: true });
       return credential;
     }),
     activate: Effect.fn("Credential.activate")(function* (id) {
@@ -130,7 +130,7 @@ var layer = Layer.effect(Service68, Effect.gen(function* () {
       })), Effect.orDie);
       if (integrationID) {
         yield* Effect.logInfo("credential activated", { integrationID, credentialID: id });
-        yield* bus.publish(Event17.Switched, { integrationID, credentialID: id }, { global: true });
+        yield* bus.publish(Event19.Switched, { integrationID, credentialID: id }, { global: true });
       }
     }),
     update: Effect.fn("Credential.update")(function* (id, updates) {
@@ -162,7 +162,7 @@ var layer = Layer.effect(Service68, Effect.gen(function* () {
         labelChanged: updates.label !== undefined && updates.label !== credential.label
       });
       if (updates.label !== undefined && updates.label !== credential.label)
-        yield* bus.publish(Event17.Updated, {}, { global: true });
+        yield* bus.publish(Event19.Updated, {}, { global: true });
     }),
     remove: Effect.fn("Credential.remove")(function* (id) {
       const removed = yield* db.transaction((tx) => Effect.gen(function* () {
@@ -195,12 +195,12 @@ var layer = Layer.effect(Service68, Effect.gen(function* () {
         active: removed.switched,
         ...removed.switched ? { replacementID: removed.credentialID } : {}
       });
-      yield* bus.publish(Event17.Updated, {}, { global: true });
+      yield* bus.publish(Event19.Updated, {}, { global: true });
       if (removed.switched)
-        yield* bus.publish(Event17.Switched, { integrationID: removed.integrationID, credentialID: removed.credentialID }, { global: true });
+        yield* bus.publish(Event19.Switched, { integrationID: removed.integrationID, credentialID: removed.credentialID }, { global: true });
     })
   });
 }));
-var node71 = makeGlobalNode({ service: Service68, layer, deps: [node88, node87] });
+var node81 = makeGlobalNode({ service: Service77, layer, deps: [node88, node87] });
 
-export { ID9, OAuth3, Key3, Value2, Event17, Info20, Service68, node71, exports_credential };
+export { ID15, OAuth3, Key4, Value2, Event19, Info25, Service77, node81, exports_credential };

package/dist/chunks/{file-mutation-h2b79v29.js → reference-h2b79v29.js}

@@ -1,10 +1,10 @@
 import {
   absoluteColumn2,
   absoluteArrayColumn2
-} from "./file-mutation-qnc92qwc.js";
+} from "./reference-qnc92qwc.js";
 import {
   Timestamps2
-} from "./file-mutation-qfa1cgps.js";
+} from "./reference-qfa1cgps.js";
 
 // src/project/sql.ts
 import { isNotNull, isNull, ne, or } from "drizzle-orm";

package/dist/chunks/{file-mutation-h0tn9bp1.js → reference-h2tzc275.js}

@@ -1,26 +1,26 @@
 import {
   Service83,
   node87
-} from "./file-mutation-s1gjyzhy.js";
+} from "./reference-b5hvc6g6.js";
 import {
   PATCH_CONTEXT_LINES2,
   MAX_TOTAL_PATCH_BYTES2,
   emptyPatch2
-} from "./file-mutation-tazgh4e4.js";
+} from "./reference-tazgh4e4.js";
 import {
   root2
-} from "./file-mutation-bygr0fca.js";
+} from "./reference-hryntbm6.js";
 import {
-  Service80,
-  node84
-} from "./file-mutation-jcvj30yp.js";
+  Service79,
+  node83
+} from "./reference-tbv9z12t.js";
 import {
   reconcile2,
   create3
-} from "./file-mutation-rdw6cm16.js";
+} from "./reference-rdw6cm16.js";
 import {
   __export
-} from "./file-mutation-9rqn6x4v.js";
+} from "./reference-9rqn6x4v.js";
 
 // src/vcs.ts
 var exports_vcs = {};
@@ -29,18 +29,18 @@ __export(exports_vcs, {
   BranchList: () => BranchList2,
   DiffError: () => DiffError2,
   FileStatus: () => FileStatus2,
-  Info: () => Info13,
+  Info: () => Info9,
   InitializeError: () => InitializeError2,
   Mode: () => Mode2,
-  Service: () => Service48,
+  Service: () => Service55,
   Vcs: () => exports_vcs,
-  node: () => node51
+  node: () => node58
 });
 import path from "path";
 import { Cause, Context, Effect, FiberSet, Layer, Schema, Semaphore, Stream } from "effect";
 import { FileDiff } from "@opencode/schema/file-diff";
 import { FileSystem } from "@opencode/schema/filesystem";
-import { Base as Base2, BranchList as BranchList2, FileStatus as FileStatus2, Info as Info13, Mode as Mode2 } from "@opencode/schema/vcs";
+import { Base as Base2, BranchList as BranchList2, FileStatus as FileStatus2, Info as Info9, Mode as Mode2 } from "@opencode/schema/vcs";
 import { VcsEvent } from "@opencode/schema/vcs-event";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { FSUtil } from "@opencode/util/fs-util";
@@ -54,11 +54,11 @@ class InitializeError2 extends Schema.TaggedError()("Vcs.InitializeError", {
 }) {
 }
 
-class Service48 extends Context.Service()("@opencode/Vcs") {
+class Service55 extends Context.Service()("@opencode/Vcs") {
 }
-var layer = Layer.effect(Service48, Effect.gen(function* () {
+var layer = Layer.effect(Service55, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service80;
+  const location = yield* Service79;
   const bus = yield* Service83;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
@@ -71,7 +71,7 @@ var layer = Layer.effect(Service48, Effect.gen(function* () {
     canonical: location.project.canonical,
     ...vcs ? { store: vcs.store } : {}
   };
-  const decodeInfo = Schema.decodeUnknownEffect(Schema.toType(Info13));
+  const decodeInfo = Schema.decodeUnknownEffect(Schema.toType(Info9));
   const decodeBase = Schema.decodeUnknownEffect(Schema.NullOr(Base2));
   const decodeBranches = Schema.decodeUnknownEffect(BranchList2);
   const decodeStatus = Schema.decodeUnknownEffect(Schema.Array(FileStatus2));
@@ -129,7 +129,7 @@ var layer = Layer.effect(Service48, Effect.gen(function* () {
     const isBranchMetadata = vcs.type === "git" ? (file) => path.basename(file) === "HEAD" && FSUtil.contains(store, file) : (file) => path.resolve(file) === path.join(store, "branch");
     yield* bus.subscribe(FileSystem.Event.Changed).pipe(Stream.filter((event) => isBranchMetadata(event.data.file)), Stream.runForEach((event) => refresh().pipe(Effect.catchCauseIf((cause) => !Cause.hasInterrupts(cause), (cause) => Effect.logWarning("vcs refresh failed", { file: event.data.file, cause })), Effect.withSpan("Vcs.refreshBranch", { attributes: { file: event.data.file } }))), Effect.forkScoped({ startImmediately: true }));
   }
-  return Service48.of({
+  return Service55.of({
     transform: state.transform,
     reload: state.reload,
     initialize: Effect.fn("Vcs.initialize")(function* (providerID) {
@@ -187,10 +187,10 @@ var layer = Layer.effect(Service48, Effect.gen(function* () {
     })
   });
 }));
-var node51 = makeLocationNode({
-  service: Service48,
+var node58 = makeLocationNode({
+  service: Service55,
   layer,
-  deps: [FSUtil.node, node84, node87]
+  deps: [FSUtil.node, node83, node87]
 });
 
-export { Base2, BranchList2, FileStatus2, Info13, Mode2, DiffError2, InitializeError2, Service48, node51, exports_vcs };
+export { Base2, BranchList2, FileStatus2, Info9, Mode2, DiffError2, InitializeError2, Service55, node58, exports_vcs };

package/dist/chunks/{file-mutation-cdy1429m.js → reference-h4pjr44c.js}

@@ -1,36 +1,36 @@
 import {
   Service83
-} from "./file-mutation-s1gjyzhy.js";
+} from "./reference-b5hvc6g6.js";
 import {
-  Service79
-} from "./file-mutation-7jvbf81s.js";
+  Service38
+} from "./reference-p5wc048m.js";
 import {
-  Error3
-} from "./file-mutation-nkh7czpt.js";
+  Error4
+} from "./reference-h9353qrc.js";
 import {
-  Service46
-} from "./file-mutation-7zkbhs7g.js";
+  Service47
+} from "./reference-q9099wq0.js";
 import {
   StepFailedError2
-} from "./file-mutation-9kr929zm.js";
+} from "./reference-brt5an88.js";
 import {
   SessionEvent2
-} from "./file-mutation-ec1grn59.js";
+} from "./reference-ec1grn59.js";
 import {
   toSessionError2
-} from "./file-mutation-g8srsgrp.js";
+} from "./reference-msxdz3am.js";
 import {
   calculateCost2
-} from "./file-mutation-tdstcens.js";
+} from "./reference-tdstcens.js";
 import {
   createLLMEventPublisher2
-} from "./file-mutation-ceze7etz.js";
+} from "./reference-gnw3t1dc.js";
 import {
   isRetryable2
-} from "./file-mutation-wecqtg5s.js";
+} from "./reference-zyk1yjk8.js";
 import {
   __export
-} from "./file-mutation-9rqn6x4v.js";
+} from "./reference-9rqn6x4v.js";
 
 // src/session/runner/step.ts
 var exports_step = {};
@@ -54,8 +54,8 @@ var RESULT_MISSING = { type: "tool.result-missing", message: "Provider did not r
 var make3 = Effect.gen(function* () {
   const bus = yield* Service83;
   const llm = yield* LLMClient.Service;
-  const snapshots = yield* Service79;
-  const toolOutput = yield* Service46;
+  const snapshots = yield* Service38;
+  const toolOutput = yield* Service47;
   const attempt = Effect.fn("SessionStep.attempt")(function* (input) {
     const startSnapshot = yield* snapshots.capture();
     const publisher = createLLMEventPublisher2(bus, {
@@ -71,7 +71,7 @@ var make3 = 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 Error3({ message: "Tools are disabled after the maximum agent steps" });
+        return new Error4({ message: "Tools are disabled after the maximum agent steps" });
       return input.prepared.executeTool({
         sessionID: input.sessionID,
         agent: input.agent,

package/dist/chunks/{file-mutation-h6vf3j39.js → reference-h6vf3j39.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./file-mutation-9rqn6x4v.js";
+} from "./reference-9rqn6x4v.js";
 
 // src/util/token.ts
 var exports_token = {};

package/dist/chunks/{file-mutation-nkh7czpt.js → reference-h9353qrc.js}

@@ -4,43 +4,43 @@ import {
   normalizeContent2,
   normalizedName2,
   effectiveName2
-} from "./file-mutation-3w5fmr99.js";
+} from "./reference-3w5fmr99.js";
 import {
   create2,
   catalog2
-} from "./file-mutation-qxjc9qry.js";
+} from "./reference-xyafkbt0.js";
 import {
   create3
-} from "./file-mutation-rdw6cm16.js";
+} from "./reference-rdw6cm16.js";
 import {
-  Service51,
-  node55
-} from "./file-mutation-px76j0pk.js";
+  Service68,
+  node71
+} from "./reference-csmvz898.js";
 import {
-  Service75,
-  node79
-} from "./file-mutation-166kng33.js";
+  Service60,
+  node63
+} from "./reference-8mbscqky.js";
 import {
   match2
-} from "./file-mutation-y1fvbwt7.js";
+} from "./reference-y1fvbwt7.js";
 import {
   __export
-} from "./file-mutation-9rqn6x4v.js";
+} from "./reference-9rqn6x4v.js";
 
 // src/tool.ts
 var exports_tool = {};
 __export(exports_tool, {
   CallID: () => CallID2,
   Content: () => Content3,
-  Error: () => Error3,
+  Error: () => Error4,
   FileContent: () => FileContent3,
   RegistrationError: () => RegistrationError2,
-  Service: () => Service37,
+  Service: () => Service49,
   TextContent: () => TextContent2,
   Tool: () => exports_tool,
-  node: () => node40
+  node: () => node51
 });
-import { CallID as CallID2, Content as Content3, Error as Error3, FileContent as FileContent3, TextContent as TextContent2 } from "@opencode/schema/tool";
+import { CallID as CallID2, Content as Content3, Error as Error4, FileContent as FileContent3, TextContent as TextContent2 } from "@opencode/schema/tool";
 import { ToolDefinition } from "@opencode/ai";
 import { Tool } from "@opencode/schema/tool";
 import { Context, Effect, Layer, Result, Schema, SchemaIssue } from "effect";
@@ -51,11 +51,11 @@ class RegistrationError2 extends Schema.TaggedError()("Tool.RegistrationError",
 }) {
 }
 
-class Service37 extends Context.Service()("@opencode/Tool") {
+class Service49 extends Context.Service()("@opencode/Tool") {
 }
-var layer = Layer.effect(Service37, Effect.gen(function* () {
-  const hooks = yield* Service75;
-  const image = yield* Service51;
+var layer = Layer.effect(Service49, Effect.gen(function* () {
+  const hooks = yield* Service60;
+  const image = yield* Service68;
   const normalizeImages = Effect.fnUntraced(function* (content) {
     const normalized = yield* Effect.forEach(content, (item) => {
       if (item.type !== "file" || !item.mime.startsWith("image/"))
@@ -184,7 +184,7 @@ var layer = Layer.effect(Service37, Effect.gen(function* () {
       }), { discard: true });
     }
   });
-  return Service37.of({
+  return Service49.of({
     transform: state.transform,
     reload: state.reload,
     list: () => Effect.sync(() => Array.from(state.get().tools.values())),
@@ -273,10 +273,10 @@ function namespaceError(name) {
     return;
   return new RegistrationError2({ name, message: `Invalid tool namespace: ${JSON.stringify(name)}` });
 }
-var node40 = makeLocationNode({
-  service: Service37,
+var node51 = makeLocationNode({
+  service: Service49,
   layer,
-  deps: [node79, node55]
+  deps: [node63, node71]
 });
 
-export { RegistrationError2, Service37, node40, exports_tool, CallID2, Content3, Error3, FileContent3, TextContent2 };
+export { RegistrationError2, Service49, node51, exports_tool, CallID2, Content3, Error4, FileContent3, TextContent2 };

package/dist/chunks/{file-mutation-f56msdte.js → reference-hasf9nkd.js}

@@ -1,60 +1,60 @@
 import {
   makeUnsafe2
-} from "./file-mutation-nxm207yx.js";
+} from "./reference-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./file-mutation-s1gjyzhy.js";
+} from "./reference-b5hvc6g6.js";
 import {
-  Event17,
-  Service68,
-  node71
-} from "./file-mutation-pwk6y6g7.js";
+  Event19,
+  Service77,
+  node81
+} from "./reference-h26940z0.js";
 import {
-  Service80,
-  node84
-} from "./file-mutation-jcvj30yp.js";
+  Service79,
+  node83
+} from "./reference-tbv9z12t.js";
 import {
-  Service54,
-  node58
-} from "./file-mutation-fbck328a.js";
+  Service50,
+  node52
+} from "./reference-0a424z4m.js";
 import {
-  ID15,
-  Service78,
-  node82
-} from "./file-mutation-j3qw8rc6.js";
+  ID18,
+  Service82,
+  node86
+} from "./reference-vaws9nke.js";
 import {
   reconcile2,
   create3
-} from "./file-mutation-rdw6cm16.js";
+} from "./reference-rdw6cm16.js";
 import {
-  ID8,
+  ID14,
   MethodID2,
-  Service67,
-  node70
-} from "./file-mutation-j8k9xj39.js";
+  Service76,
+  node80
+} from "./reference-r9zdjfxd.js";
 import {
   __export
-} from "./file-mutation-9rqn6x4v.js";
+} from "./reference-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
   NotFoundError: () => NotFoundError5,
-  Options: () => Options5,
+  Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service36,
+  Service: () => Service35,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured5,
-  layer: () => layer15,
-  node: () => node39
+  configured: () => configured4,
+  layer: () => layer14,
+  node: () => node38
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -103,21 +103,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service36 extends Context.Service()("@opencode/MCP") {
+class Service35 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 layer15 = (options) => Layer.effect(Service36, Effect.gen(function* () {
-  const location = yield* Service80;
-  const environment = yield* Service54;
+var layer14 = (options) => Layer.effect(Service35, Effect.gen(function* () {
+  const location = yield* Service79;
+  const environment = yield* Service50;
   const bus = yield* Service83;
-  const forms = yield* Service78;
-  const integration = yield* Service67;
-  const credentials = yield* Service68;
+  const forms = yield* Service82;
+  const integration = yield* Service76;
+  const credentials = yield* Service77;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -129,7 +129,7 @@ var layer15 = (options) => Layer.effect(Service36, 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 = ID8.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -145,7 +145,7 @@ var layer15 = (options) => Layer.effect(Service36, 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(Service68, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service77, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -161,12 +161,12 @@ var layer15 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     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(Service68, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service77, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID15.create();
+        const formID = ID18.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -269,7 +269,7 @@ var layer15 = (options) => Layer.effect(Service36, 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(Service54, 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(Service50, 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 layer15 = (options) => Layer.effect(Service36, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event17.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 layer15 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service36.of({
+  return Service35.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: Service36,
-    layer: layer15(options),
-    deps: [node84, node58, node87, node82, node70, node71]
+    service: Service35,
+    layer: layer14(options),
+    deps: [node83, node52, node87, node86, node80, node81]
   });
 }
-var node39 = configured5();
+var node38 = 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, Service36, Options5, layer15, configured5, node39, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError5, ToolCallError2, Service35, Options4, layer14, configured4, node38, exports_mcp4 };