@opencode/core 0.0.0-dev-19648 → 0.0.0-dev-19649

package/dist/chunks/{reference-sxmp26qp.js → generate-qz2q0455.js}

@@ -1,20 +1,20 @@
 import {
   makeUnsafe2
-} from "./reference-y71avatq.js";
+} from "./generate-y71avatq.js";
 import {
-  Service58,
-  node61
-} from "./reference-4r69v978.js";
+  Service53,
+  node57
+} from "./generate-e4s68ytv.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/file-mutation.ts
 var exports_file_mutation = {};
 __export(exports_file_mutation, {
   FileMutation: () => exports_file_mutation,
-  Service: () => Service39,
-  node: () => node41,
+  Service: () => Service16,
+  node: () => node18,
   readText: () => readText2,
   syncTextBom: () => syncTextBom2
 });
@@ -22,7 +22,7 @@ import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer } from "effect";
 import { FSUtil } from "@opencode/util/fs-util";
 import { Bom } from "@opencode/util/bom";
-class Service39 extends Context.Service()("@opencode/FileMutation") {
+class Service16 extends Context.Service()("@opencode/FileMutation") {
 }
 var readText2 = Effect.fn("FileMutation.readText")(function* (files, target) {
   return Bom.decodeBytes((yield* files.read(target)).bytes);
@@ -34,8 +34,8 @@ var syncTextBom2 = Effect.fn("FileMutation.syncTextBom")(function* (files, targe
   return synced.text;
 });
 var transactionLocks = makeUnsafe2();
-var layer = Layer.effect(Service39, Effect.gen(function* () {
-  const environment = yield* Service58;
+var layer = Layer.effect(Service16, Effect.gen(function* () {
+  const environment = yield* Service53;
   const locks = makeUnsafe2();
   const withLock = (targets) => (effect) => [...new Set(targets.map(FSUtil.resolve))].sort().reduceRight((result, target) => transactionLocks.withLock(target)(result), effect);
   const withTargetLock = (target) => (effect) => locks.withLock(target.absolute)(Effect.uninterruptible(effect));
@@ -56,8 +56,8 @@ var layer = Layer.effect(Service39, Effect.gen(function* () {
     yield* environment.files.write(input.target.absolute, new TextEncoder().encode(Bom.join(next.text, Boolean(current && Bom.has(current)) || next.bom)));
     return writeResult(input.target, current !== undefined);
   })));
-  return Service39.of({ withLock, write, writeTextPreservingBom });
+  return Service16.of({ withLock, write, writeTextPreservingBom });
 }));
-var node41 = makeLocationNode({ service: Service39, layer, deps: [node61] });
+var node18 = makeLocationNode({ service: Service16, layer, deps: [node57] });
 
-export { Service39, readText2, syncTextBom2, node41, exports_file_mutation };
+export { Service16, readText2, syncTextBom2, node18, exports_file_mutation };

package/dist/chunks/{reference-kmnkk0k6.js → generate-r1cen77p.js}

@@ -1,17 +1,17 @@
 import {
   mergeOverlay2,
-  Service55
-} from "./reference-7f3re3ee.js";
+  Service74
+} from "./generate-epr1a2tz.js";
 import {
-  Service52
-} from "./reference-h8bmxzy2.js";
+  Service47
+} from "./generate-q2drh1py.js";
 
 // src/plugin/provider/configured.ts
 import { Effect, Option } from "effect";
 var configuredSettings2 = Effect.fn("ProviderPlugin.configuredSettings")(function* (id) {
-  const providers = yield* Service55;
+  const providers = yield* Service74;
   const current = (yield* providers.get(id))?.settings;
-  const service = yield* Effect.serviceOption(Service52);
+  const service = yield* Effect.serviceOption(Service47);
   const entries = Option.isSome(service) ? yield* service.value.entries() : [];
   return foldSettings2(entries, id, current);
 });

package/dist/chunks/{reference-e9djx9ep.js → generate-r5rzmb14.js}

@@ -1,32 +1,32 @@
 import {
   Service82,
   node86
-} from "./reference-fpw6v5x5.js";
+} from "./generate-cpqe642d.js";
 import {
   PermissionTable2
-} from "./reference-f828m53h.js";
+} from "./generate-f828m53h.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/permission/saved.ts
 var exports_saved = {};
 __export(exports_saved, {
   AddInput: () => AddInput2,
-  ID: () => ID13,
-  Info: () => Info27,
+  ID: () => ID9,
+  Info: () => Info22,
   ListInput: () => ListInput4,
   PermissionSaved: () => exports_saved,
-  Service: () => Service71,
-  node: () => node75
+  Service: () => Service64,
+  node: () => node68
 });
 import { eq } from "drizzle-orm";
 import { Context, Effect, Layer, Schema } from "effect";
 import { Project } from "@opencode/schema/project";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
 import { PermissionSaved } from "@opencode/schema/permission-saved";
-var ID13 = PermissionSaved.ID;
-var Info27 = PermissionSaved.Info;
+var ID9 = PermissionSaved.ID;
+var Info22 = PermissionSaved.Info;
 var ListInput4 = Schema.Struct({
   projectID: Project.ID.pipe(Schema.optional)
 }).annotate({ identifier: "PermissionSaved.ListInput" });
@@ -36,9 +36,9 @@ var AddInput2 = Schema.Struct({
   resources: Schema.Array(Schema.String)
 }).annotate({ identifier: "PermissionSaved.AddInput" });
 
-class Service71 extends Context.Service()("@opencode/PermissionSaved") {
+class Service64 extends Context.Service()("@opencode/PermissionSaved") {
 }
-var layer = Layer.effect(Service71, Effect.gen(function* () {
+var layer = Layer.effect(Service64, Effect.gen(function* () {
   const db = (yield* Service82).db;
   const list = Effect.fnUntraced(function* (input) {
     const rows = yield* db.select().from(PermissionTable2).where(input?.projectID ? eq(PermissionTable2.project_id, input.projectID) : undefined).all().pipe(Effect.orDie);
@@ -53,7 +53,7 @@ var layer = Layer.effect(Service71, Effect.gen(function* () {
     if (!input.resources.length)
       return;
     yield* db.insert(PermissionTable2).values(input.resources.map((resource) => ({
-      id: ID13.create(),
+      id: ID9.create(),
       project_id: input.projectID,
       action: input.action,
       resource
@@ -62,8 +62,8 @@ var layer = Layer.effect(Service71, Effect.gen(function* () {
   const remove = Effect.fn("PermissionSaved.remove")(function* (id) {
     yield* db.delete(PermissionTable2).where(eq(PermissionTable2.id, id)).run().pipe(Effect.orDie);
   });
-  return Service71.of({ list, add, remove });
+  return Service64.of({ list, add, remove });
 }));
-var node75 = makeGlobalNode({ service: Service71, layer, deps: [node86] });
+var node68 = makeGlobalNode({ service: Service64, layer, deps: [node86] });
 
-export { ID13, Info27, ListInput4, AddInput2, Service71, node75, exports_saved };
+export { ID9, Info22, ListInput4, AddInput2, Service64, node68, exports_saved };

package/dist/chunks/{reference-yp2x3t23.js → generate-r8xr0va3.js}

@@ -1,15 +1,15 @@
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/run-coordinator.ts
 var exports_run_coordinator = {};
 __export(exports_run_coordinator, {
   SessionRunCoordinator: () => exports_run_coordinator,
-  make: () => make16
+  make: () => make18
 });
 import { Deferred, Effect, Fiber, FiberSet } from "effect";
-var make16 = (options) => Effect.gen(function* () {
+var make18 = (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 make16 = (options) => Effect.gen(function* () {
   };
 });
 
-export { make16, exports_run_coordinator };
+export { make18, exports_run_coordinator };

package/dist/chunks/{reference-r9mregkx.js → generate-r9mregkx.js}

@@ -1,10 +1,10 @@
 import {
   definition2,
   normalizedName2
-} from "./reference-3w5fmr99.js";
+} from "./generate-3w5fmr99.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/codemode/tool.ts
 var exports_tool2 = {};

package/dist/chunks/{reference-xwn03wp9.js → generate-rchkgt8f.js}

@@ -1,24 +1,24 @@
 import {
   useragent2
-} from "./reference-xye9w2dv.js";
+} from "./generate-tegxt6vj.js";
 import {
   call2
-} from "./reference-mfqp6xfm.js";
+} from "./generate-56gdpj1q.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/plugin/websearch/firecrawl.ts
 var exports_firecrawl = {};
 __export(exports_firecrawl, {
-  Plugin: () => Plugin21,
+  Plugin: () => Plugin34,
   WebSearchFirecrawl: () => exports_firecrawl,
-  endpoint: () => endpoint3
+  endpoint: () => endpoint4
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect, Option, Schema } from "effect";
 import { HttpClient } from "effect/unstable/http";
-var endpoint3 = "https://mcp.firecrawl.dev/v2/mcp";
+var endpoint4 = "https://mcp.firecrawl.dev/v2/mcp";
 var McpInput = Schema.Struct({
   query: Schema.String,
   limit: Schema.Number.pipe(Schema.optional)
@@ -37,7 +37,7 @@ var SearchResponse = Schema.fromJsonString(Schema.Struct({
   })
 }));
 var decodeSearchResponse = Schema.decodeUnknownOption(SearchResponse);
-var Plugin21 = define({
+var Plugin34 = define({
   id: "opencode.websearch.firecrawl",
   effect: Effect.fn("WebSearchFirecrawl.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -59,7 +59,7 @@ var Plugin21 = define({
         execute: (input) => Effect.gen(function* () {
           const connection = yield* ctx.integration.connection.active("firecrawl");
           const credential = connection ? yield* ctx.integration.connection.resolve(connection) : undefined;
-          const result = yield* call2(http, endpoint3, "firecrawl_search", { input: McpInput, output: McpOutput }, { query: input.query, limit: 8 }, {
+          const result = yield* call2(http, endpoint4, "firecrawl_search", { input: McpInput, output: McpOutput }, { query: input.query, limit: 8 }, {
             "User-Agent": useragent2(ctx.app),
             ...credential?.type === "key" ? { Authorization: `Bearer ${credential.key}` } : {}
           });
@@ -77,4 +77,4 @@ var Plugin21 = define({
   })
 });
 
-export { endpoint3, Plugin21, exports_firecrawl };
+export { endpoint4, Plugin34, exports_firecrawl };

package/dist/chunks/{reference-sbn35ts9.js → generate-rdksyszg.js}

@@ -1,45 +1,45 @@
 import {
   Service82,
   node86
-} from "./reference-fpw6v5x5.js";
+} from "./generate-cpqe642d.js";
 import {
   latestSequence2,
   Service81,
   node85
-} from "./reference-fcymrbm6.js";
+} from "./generate-jfy0dxk0.js";
 import {
   llmClient2
-} from "./reference-5t3nmthw.js";
+} from "./generate-5t3nmthw.js";
 import {
   SessionEvent2
-} from "./reference-ec1grn59.js";
+} from "./generate-ec1grn59.js";
 import {
   firstUserMessage2
-} from "./reference-xcm12kff.js";
+} from "./generate-z7z0ddsh.js";
 import {
-  Service72,
-  node76
-} from "./reference-e3r06aex.js";
+  Service65,
+  node69
+} from "./generate-gsxd1kvq.js";
 import {
-  Service14,
-  node17
-} from "./reference-rv9pf5qx.js";
+  Service31,
+  node34
+} from "./generate-d0jkt3ak.js";
 import {
   record2,
   add2
-} from "./reference-tdstcens.js";
+} from "./generate-tdstcens.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/title.ts
 var exports_title = {};
 __export(exports_title, {
-  Service: () => Service9,
+  Service: () => Service11,
   SessionTitle: () => exports_title,
   isUntitled: () => isUntitled2,
   layer: () => layer6,
-  node: () => node11
+  node: () => node13
 });
 import { isDeepStrictEqual } from "node:util";
 import { LLMClient, LLMEvent, Message, SystemPart } from "@opencode/ai";
@@ -51,18 +51,18 @@ var MAX_CONTEXT_LENGTH = 8000;
 var MAX_FIRST_MESSAGE_LENGTH = 2000;
 var titleChanged = Symbol("Session title changed");
 
-class Service9 extends Context.Service()("@opencode/SessionTitle") {
+class Service11 extends Context.Service()("@opencode/SessionTitle") {
 }
 var truncate = (value) => value.length <= MAX_LENGTH ? value : `${value.slice(0, MAX_LENGTH - 3)}...`;
 var isUntitled2 = (session) => isExactRootFallback({
   title: session.title,
   time: { created: DateTime.toEpochMillis(session.time.created) }
 });
-var layer6 = Layer.effect(Service9, Effect.gen(function* () {
+var layer6 = Layer.effect(Service11, Effect.gen(function* () {
   const bus = yield* Service81;
   const llm = yield* LLMClient.Service;
-  const context = yield* Service14;
-  const store = yield* Service72;
+  const context = yield* Service31;
+  const store = yield* Service65;
   const db = (yield* Service82).db;
   const attempt = Effect.fn("SessionTitle.attempt")(function* (input) {
     const chunks = [];
@@ -145,12 +145,12 @@ Recent conversation:
       title: truncate(title)
     }, { commit: (sequence) => sequence === expectedSequence ? Effect.void : Effect.die(titleChanged) }).pipe(Effect.catchDefect((defect) => defect === titleChanged ? Effect.void : Effect.die(defect)));
   });
-  return Service9.of({ generate });
+  return Service11.of({ generate });
 }));
-var node11 = makeLocationNode({
-  service: Service9,
+var node13 = makeLocationNode({
+  service: Service11,
   layer: layer6,
-  deps: [node85, llmClient2, node17, node76, node86]
+  deps: [node85, llmClient2, node34, node69, node86]
 });
 
-export { Service9, isUntitled2, layer6, node11, exports_title };
+export { Service11, isUntitled2, layer6, node13, exports_title };

package/dist/chunks/{reference-rdw6cm16.js → generate-rdw6cm16.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/state.ts
 var exports_state = {};

package/dist/chunks/{reference-865g0eh4.js → generate-rfcrhdzq.js}

@@ -1,16 +1,16 @@
 import {
-  Service40
-} from "./reference-chzjgv92.js";
+  Service67
+} from "./generate-a0k24qk8.js";
 import {
-  Service13
-} from "./reference-51qrhgsb.js";
+  Service28
+} from "./generate-55d9j7z7.js";
 import {
   text2,
   deliver2
-} from "./reference-x1ezjp6w.js";
+} from "./generate-x1ezjp6w.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/subagent-job.ts
 var exports_subagent_job = {};
@@ -20,8 +20,8 @@ __export(exports_subagent_job, {
 });
 import { Effect, Scope } from "effect";
 var make10 = Effect.gen(function* () {
-  const sessions = yield* Service13;
-  const jobs = yield* Service40;
+  const sessions = yield* Service28;
+  const jobs = yield* Service67;
   const scope = yield* Scope.Scope;
   const notifications = new Set;
   const notify = Effect.fn("SubagentJob.notify")(function* (recovery, startedAt) {

package/dist/chunks/{reference-s8d7rejh.js → generate-rhjbct0v.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/instructions/index.ts
 var exports_instructions6 = {};
@@ -18,7 +18,7 @@ __export(exports_instructions6, {
   diffByKey: () => diffByKey2,
   empty: () => empty3,
   hash: () => hash2,
-  make: () => make21,
+  make: () => make20,
   read: () => read3,
   removed: () => removed2,
   renderInitial: () => renderInitial2,
@@ -50,7 +50,7 @@ class DuplicateKeyError2 extends Schema.TaggedError()("Instructions.DuplicateKey
   }
 }
 var empty3 = [];
-function make21(source) {
+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));
@@ -193,4 +193,4 @@ function requireText(key, kind, text) {
   return text;
 }
 
-export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make21, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };
+export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make20, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };

package/dist/chunks/{reference-c1fv4dkx.js → generate-rj2fqsky.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./reference-y71avatq.js";
+} from "./generate-y71avatq.js";
 import {
   Service81,
   node85
-} from "./reference-fcymrbm6.js";
+} from "./generate-jfy0dxk0.js";
 import {
-  Event21,
-  Service80,
-  node84
-} from "./reference-14mggxhb.js";
+  Event19,
+  Service76,
+  node80
+} from "./generate-ej5a261y.js";
 import {
-  Service75,
-  node79
-} from "./reference-8t7r2jb8.js";
+  Service78,
+  node82
+} from "./generate-p863egc7.js";
 import {
-  Service58,
-  node61
-} from "./reference-4r69v978.js";
+  Service53,
+  node57
+} from "./generate-e4s68ytv.js";
 import {
-  ID10,
-  Service61,
-  node65
-} from "./reference-36gw4j2m.js";
+  ID16,
+  Service77,
+  node81
+} from "./generate-1q0k1gze.js";
 import {
   reconcile2,
   create3
-} from "./reference-rdw6cm16.js";
+} from "./generate-rdw6cm16.js";
 import {
-  ID9,
+  ID14,
   MethodID2,
-  Service60,
-  node64
-} from "./reference-44faxhpp.js";
+  Service75,
+  node79
+} from "./generate-ha6yg8nx.js";
 import {
   __export
-} from "./reference-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError2,
-  Options: () => Options2,
+  NotFoundError: () => NotFoundError5,
+  Options: () => Options5,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service17,
+  Service: () => Service36,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured2,
-  layer: () => layer10,
-  node: () => node20
+  configured: () => configured5,
+  layer: () => layer14,
+  node: () => node39
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -74,7 +74,7 @@ var ResourceCatalog2 = Mcp.ResourceCatalog;
 var ResourceContentPart2 = Mcp.ResourceContentPart;
 var ResourceContent2 = Mcp.ResourceContent;
 
-class NotFoundError2 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError5 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -92,21 +92,21 @@ var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
 var cloneConfig = (config) => structuredClone(config);
 
-class Service17 extends Context.Service()("@opencode/MCP") {
+class Service36 extends Context.Service()("@opencode/MCP") {
 }
-var Options2 = Schema.Struct({
+var Options5 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer10 = (options) => Layer.effect(Service17, Effect.gen(function* () {
-  const location = yield* Service75;
-  const environment = yield* Service58;
+var layer14 = (options) => Layer.effect(Service36, Effect.gen(function* () {
+  const location = yield* Service78;
+  const environment = yield* Service53;
   const bus = yield* Service81;
-  const forms = yield* Service61;
-  const integration = yield* Service60;
-  const credentials = yield* Service80;
+  const forms = yield* Service77;
+  const integration = yield* Service75;
+  const credentials = yield* Service76;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -118,7 +118,7 @@ var layer10 = (options) => Layer.effect(Service17, 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 = ID9.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -134,7 +134,7 @@ var layer10 = (options) => Layer.effect(Service17, 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(Service80, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service76, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -143,19 +143,19 @@ var layer10 = (options) => Layer.effect(Service17, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError2({ server: name });
+      return yield* new NotFoundError5({ 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(Service80, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service76, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID10.create();
+        const formID = ID16.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -239,7 +239,7 @@ var layer10 = (options) => Layer.effect(Service17, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const result = yield* 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(Service58, environment), Scope.provide(scope), Effect.exit);
+    const result = yield* 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(Service53, environment), Scope.provide(scope), Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
       entry.tools = result.value.tools.map((tool) => toTool(name, entry, tool));
@@ -363,7 +363,7 @@ var layer10 = (options) => Layer.effect(Service17, 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: () => ({
@@ -389,7 +389,7 @@ var layer10 = (options) => Layer.effect(Service17, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service17.of({
+  return Service36.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -508,14 +508,14 @@ var layer10 = (options) => Layer.effect(Service17, Effect.gen(function* () {
     })
   });
 }));
-function configured2(options) {
+function configured5(options) {
   return makeLocationNode({
-    service: Service17,
-    layer: layer10(options),
-    deps: [node79, node61, node85, node65, node64, node84]
+    service: Service36,
+    layer: layer14(options),
+    deps: [node82, node57, node85, node81, node79, node80]
   });
 }
-var node20 = configured2();
+var node39 = configured5();
 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;
@@ -566,4 +566,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError2, ToolCallError2, Service17, Options2, layer10, configured2, node20, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service36, Options5, layer14, configured5, node39, exports_mcp4 };