@opencode/core 2.0.5 → 2.0.6

package/dist/chunks/{instruction-discovery-q581keqr.js → persistent-pty-x3h8tes1.js}

@@ -1,10 +1,10 @@
 import {
   resolveNullableObjectPaths2,
   mapResultRow2
-} from "./instruction-discovery-emrn6kk6.js";
+} from "./persistent-pty-emrn6kk6.js";
 import {
   SQLiteEffectDatabase2
-} from "./instruction-discovery-5rz2hsq0.js";
+} from "./persistent-pty-d3yjsxey.js";
 
 // src/database/drizzle/sqlite-core/effect/session.ts
 import * as Cause from "effect/Cause";

package/dist/chunks/{instruction-discovery-drwq78ky.js → persistent-pty-xfkkasph.js}

@@ -1,12 +1,12 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/session/system-prompt.ts
 var exports_system_prompt = {};
 __export(exports_system_prompt, {
   SessionSystemPrompt: () => exports_system_prompt,
-  make: () => make14,
+  make: () => make15,
   render: () => render3
 });
 
@@ -29,7 +29,7 @@ var system_default = `You are an AI agent running in OpenCode, a coding agent ha
 `;
 
 // src/session/system-prompt.ts
-function make14(tools) {
+function make15(tools) {
   return render3(system_default, tools);
 }
 function render3(prompt, tools) {
@@ -47,4 +47,4 @@ function render3(prompt, tools) {
 `));
 }
 
-export { make14, render3, exports_system_prompt };
+export { make15, render3, exports_system_prompt };

package/dist/chunks/{instruction-discovery-207ajt2h.js → persistent-pty-xh49vxj8.js}

@@ -1,18 +1,18 @@
 import {
   codeInterpreterArgsSchema2
-} from "./instruction-discovery-eh3zwz77.js";
+} from "./persistent-pty-eh3zwz77.js";
 import {
   fileSearchArgsSchema2
-} from "./instruction-discovery-e73j6tqm.js";
+} from "./persistent-pty-e73j6tqm.js";
 import {
   webSearchArgsSchema2
-} from "./instruction-discovery-3wcehsnq.js";
+} from "./persistent-pty-3wcehsnq.js";
 import {
   webSearchPreviewArgsSchema2
-} from "./instruction-discovery-dap0rakb.js";
+} from "./persistent-pty-dap0rakb.js";
 import {
   imageGenerationArgsSchema2
-} from "./instruction-discovery-4y7fprxs.js";
+} from "./persistent-pty-4y7fprxs.js";
 
 // src/github-copilot/responses/openai-responses-prepare-tools.ts
 import {

package/dist/chunks/{instruction-discovery-y35sf2j4.js → persistent-pty-xvrfmkdb.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/tool/plugin/opencode.ts
 var exports_opencode = {};
@@ -8,7 +8,7 @@ __export(exports_opencode, {
   ModelsInput: () => ModelsInput2,
   MoveInput: () => MoveInput2,
   OpenCodeTools: () => exports_opencode,
-  Plugin: () => Plugin3,
+  Plugin: () => Plugin34,
   RenameInput: () => RenameInput2
 });
 import { SystemPart, ToolFailure } from "@opencode/ai";
@@ -64,7 +64,7 @@ var ModelsOutput = Schema.Struct({
   total: Schema.Int.annotate({ description: "Number of matching models across all pages." }),
   next: Schema.NullOr(Schema.Int).annotate({ description: "Offset of the next page, or null on the last page." })
 });
-var Plugin3 = {
+var Plugin34 = {
   id: "opencode.tools",
   effect: Effect.fn("OpenCodeTools.Plugin")(function* (ctx) {
     const hook = (event) => Effect.sync(() => {
@@ -161,4 +161,4 @@ var Plugin3 = {
   })
 };
 
-export { RenameInput2, MoveInput2, ModelsInput2, Plugin3, exports_opencode };
+export { RenameInput2, MoveInput2, ModelsInput2, Plugin34, exports_opencode };

package/dist/chunks/{instruction-discovery-45zz8fdq.js → persistent-pty-xyxzmjjm.js}

@@ -1,20 +1,20 @@
 import {
   OAuth3
-} from "./instruction-discovery-444wcx0m.js";
+} from "./persistent-pty-ry98d82p.js";
 import {
-  ID10,
+  ID14,
   MethodID2
-} from "./instruction-discovery-v5w6sppg.js";
+} from "./persistent-pty-gbwj81ez.js";
 import {
   success2,
   error2
-} from "./instruction-discovery-pjvnvgmy.js";
+} from "./persistent-pty-pjvnvgmy.js";
 
 // src/plugin/provider/poe.ts
 import { define } from "@opencode/plugin/effect/plugin";
 import { Clock, Deferred, Effect, Option, Schema } from "effect";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
-var integrationID = ID10.make("poe");
+var integrationID = ID14.make("poe");
 var methodID = MethodID2.make("browser");
 var clientID = "client_728290227fc048cc9262091a1ea197ea";
 var issuer = "https://poe.com";

package/dist/chunks/{instruction-discovery-rwk055kb.js → persistent-pty-xz3t98gq.js}

@@ -1,6 +1,6 @@
 import {
-  ID9
-} from "./instruction-discovery-58ka6e3j.js";
+  ID13
+} from "./persistent-pty-j10zwm3w.js";
 
 // src/plugin/provider/amazon-bedrock.ts
 import { Effect } from "effect";
@@ -18,7 +18,7 @@ var AmazonBedrockPlugin2 = define({
   effect: Effect.fn(function* (ctx) {
     yield* ctx.integration.transform((editor) => {
       editor.method.update({
-        integrationID: ID9.amazonBedrock,
+        integrationID: ID13.amazonBedrock,
         method: { type: "env", names: ["AWS_BEARER_TOKEN_BEDROCK"] }
       });
     });

package/dist/chunks/{instruction-discovery-dwvzh0g2.js → persistent-pty-y10wk092.js}

@@ -1,13 +1,13 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/v1/config/formatter.ts
-var exports_formatter3 = {};
-__export(exports_formatter3, {
-  ConfigFormatterV1: () => exports_formatter3,
+var exports_formatter2 = {};
+__export(exports_formatter2, {
+  ConfigFormatterV1: () => exports_formatter2,
   Entry: () => Entry4,
-  Info: () => Info13
+  Info: () => Info23
 });
 import { Schema } from "effect";
 var Entry4 = Schema.Struct({
@@ -16,6 +16,6 @@ var Entry4 = Schema.Struct({
   environment: Schema.optional(Schema.Record(Schema.String, Schema.String)),
   extensions: Schema.optional(Schema.mutable(Schema.Array(Schema.String)))
 });
-var Info13 = Schema.Union([Schema.Boolean, Schema.Record(Schema.String, Entry4)]);
+var Info23 = Schema.Union([Schema.Boolean, Schema.Record(Schema.String, Entry4)]);
 
-export { Entry4, Info13, exports_formatter3 };
+export { Entry4, Info23, exports_formatter2 };

package/dist/chunks/{instruction-discovery-y1fvbwt7.js → persistent-pty-y1fvbwt7.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/util/wildcard.ts
 var exports_wildcard = {};

package/dist/chunks/{instruction-discovery-cvnk88jx.js → persistent-pty-y99sa8tk.js}

@@ -3,34 +3,34 @@ import {
   WrongKind2,
   Failed2,
   typeFollowing2
-} from "./instruction-discovery-2a5m3afh.js";
+} from "./persistent-pty-2a5m3afh.js";
 import {
   execDefaults2
-} from "./instruction-discovery-1dazxqgg.js";
+} from "./persistent-pty-1dazxqgg.js";
 import {
   makeLocalDriver2
-} from "./instruction-discovery-b6gygkdw.js";
+} from "./persistent-pty-b6gygkdw.js";
 import {
   makeMemoryDriver2
-} from "./instruction-discovery-aaet6srn.js";
+} from "./persistent-pty-aaet6srn.js";
 import {
-  Service76,
-  node80
-} from "./instruction-discovery-88dkmhka.js";
+  Service79,
+  node83
+} from "./persistent-pty-pqkcmren.js";
 import {
-  Service74,
-  node77
-} from "./instruction-discovery-x12gwff2.js";
+  Service55,
+  node58
+} from "./persistent-pty-gjvcn921.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/environment/environment.ts
 var exports_environment2 = {};
 __export(exports_environment2, {
   EnvironmentService: () => exports_environment2,
-  Service: () => Service73,
-  node: () => node76
+  Service: () => Service54,
+  node: () => node57
 });
 import { CrossSpawnSpawner } from "@opencode/util/cross-spawn-spawner";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -43,13 +43,13 @@ __export(exports_environment3, {
   Environment: () => exports_environment3,
   Failed: () => Failed2,
   NotFound: () => NotFound2,
-  Service: () => Service73,
+  Service: () => Service54,
   WrongKind: () => WrongKind2,
   execDefaults: () => execDefaults2,
   makeFiles: () => makeFiles2,
   makeLocalDriver: () => makeLocalDriver2,
   makeMemoryDriver: () => makeMemoryDriver2,
-  node: () => node76,
+  node: () => node57,
   typeFollowing: () => typeFollowing2
 });
 var makeFiles2 = (driver) => ({
@@ -58,19 +58,19 @@ var makeFiles2 = (driver) => ({
 });
 
 // src/environment/environment.ts
-class Service73 extends Context.Service()("@opencode/Environment") {
+class Service54 extends Context.Service()("@opencode/Environment") {
 }
-var layer = Layer.effect(Service73, Effect.gen(function* () {
+var layer = Layer.effect(Service54, Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner;
-  const location = yield* Service76;
-  const workspace = yield* Service74;
+  const location = yield* Service79;
+  const workspace = yield* Service55;
   const driver = location.workspaceID ? yield* workspace.connect(location.workspaceID).pipe(Effect.mapError((cause) => new Error(`Failed to bind Environment to workspace ${location.workspaceID}`, { cause })), Effect.orDie) : makeLocalDriver2(spawner);
-  return Service73.of({ files: makeFiles2(driver), spawner: driver.spawner });
+  return Service54.of({ files: makeFiles2(driver), spawner: driver.spawner });
 }));
-var node76 = makeLocationNode({
-  service: Service73,
+var node57 = makeLocationNode({
+  service: Service54,
   layer,
-  deps: [CrossSpawnSpawner.node, node80, node77]
+  deps: [CrossSpawnSpawner.node, node83, node58]
 });
 
-export { Service73, node76, exports_environment2, makeFiles2, exports_environment3 };
+export { Service54, node57, exports_environment2, makeFiles2, exports_environment3 };

package/dist/chunks/{instruction-discovery-yrhqyw5v.js → persistent-pty-yrhqyw5v.js}

@@ -1,6 +1,6 @@
 import {
   createProviderPlugin2
-} from "./instruction-discovery-ym463w8f.js";
+} from "./persistent-pty-ym463w8f.js";
 
 // src/plugin/provider/venice.ts
 var VenicePlugin2 = createProviderPlugin2({

package/dist/chunks/{instruction-discovery-3zj26zxs.js → persistent-pty-yyz8jpkn.js}

@@ -1,18 +1,18 @@
 import {
   webSocketConstructor2
-} from "./instruction-discovery-5t3nmthw.js";
+} from "./persistent-pty-5t3nmthw.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/session/model-transport.ts
 var exports_model_transport = {};
 __export(exports_model_transport, {
-  Service: () => Service32,
+  Service: () => Service23,
   SessionModelTransport: () => exports_model_transport,
-  layer: () => layer14,
+  layer: () => layer11,
   makeLayer: () => makeLayer2,
-  node: () => node35
+  node: () => node27
 });
 import {
   WebSocketTransport
@@ -33,7 +33,7 @@ var events = Metric.counter("opencode_session_websocket_events_total", {
 });
 var metric = (event, attributes = {}) => Metric.update(events.pipe(Metric.withAttributes({ event, ...attributes })), 1);
 
-class Service32 extends Context.Service()("@opencode/SessionModelTransport") {
+class Service23 extends Context.Service()("@opencode/SessionModelTransport") {
 }
 var transportError = (message, input) => new AIError({
   reason: new TransportError({ message, transport: "websocket", ...input })
@@ -57,7 +57,7 @@ var observationFrame = (observation) => {
   return Effect.fail(observation.error);
 };
 var observationTerminal = (observation) => observation.type !== "frame";
-var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* () {
+var makeLayer2 = (connector) => Layer.effect(Service23, Effect.gen(function* () {
   const scope = yield* Scope.Scope;
   const states = new Map;
   const state = (sessionID) => {
@@ -172,7 +172,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
     frames: exchange.fallback(),
     complete: Effect.void
   });
-  const start = Effect.fn("SessionModelTransport.start")(function* (owner, input, handshake) {
+  const start = Effect.fn("SessionModelTransport.start")(function* (owner, input, interceptor) {
     if (owner.closed)
       return yield* transportError("Session WebSocket owner is closed", {
         operation: "request",
@@ -182,7 +182,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
       });
     if (owner.httpFallback)
       return fallback(input);
-    const selected = handshake ? yield* handshake({ url: input.connect.url, headers: { ...input.connect.headers } }) : undefined;
+    const selected = interceptor?.handshake ? yield* interceptor.handshake({ url: input.connect.url, headers: { ...input.connect.headers } }) : undefined;
     const exchange = selected ? { ...input, connect: { ...input.connect, url: selected.url, headers: Headers.fromInput(selected.headers) } } : input;
     const key = affinity(exchange);
     const now = yield* Clock.currentTimeMillis;
@@ -226,6 +226,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
     const create = yield* exchange.driver.create(channel.checkpoint).pipe(Effect.tapError(() => closeChannel(owner, channel)), Effect.onInterrupt(() => closeChannel(owner, channel)));
     if (create.mode === "full")
       channel.checkpoint = undefined;
+    const message = interceptor?.send ? yield* interceptor.send(create.message).pipe(Effect.onInterrupt(() => closeChannel(owner, channel))) : create.message;
     yield* Effect.logDebug("session websocket sending", {
       sessionTransport: "websocket",
       phase: "send",
@@ -236,7 +237,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
       delivery: "send-attempted"
     };
     channel.active = active;
-    const sent = yield* channel.connection.sendText(create.message).pipe(Effect.withSpan("SessionModelTransport.send"), Effect.onInterrupt(() => closeChannel(owner, channel)), Effect.result);
+    const sent = yield* channel.connection.sendText(message).pipe(Effect.withSpan("SessionModelTransport.send"), Effect.onInterrupt(() => closeChannel(owner, channel)), Effect.result);
     if (sent._tag === "Failure") {
       const failure = new AIError({
         reason: AIErrorReason.make({
@@ -267,7 +268,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
         phase: "receive",
         delivery: active.delivery === "provider-observed" ? "accepted" : "ambiguous"
       }))
-    }), Stream.mapEffect((frame) => exchange.driver.observe(create, frame)), Stream.tap((observation) => Effect.sync(() => {
+    }), Stream.mapEffect((frame) => interceptor?.receive ? interceptor.receive(frame) : Effect.succeed(frame)), Stream.mapEffect((frame) => exchange.driver.observe(create, frame)), Stream.tap((observation) => Effect.sync(() => {
       if (!observationTerminal(observation))
         return;
       terminal = observation;
@@ -326,7 +327,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
     });
     return { frames, complete, http: channel.connection.http };
   });
-  const bind = (sessionID, handshake) => ({
+  const bind = (sessionID, interceptor) => ({
     execute: (exchange) => {
       const owner = state(sessionID);
       let execution;
@@ -334,7 +335,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
         get http() {
           return execution?.http;
         },
-        frames: Stream.unwrap(Effect.acquireRelease(owner.lock.take(1), () => owner.lock.release(1), { interruptible: true }).pipe(Effect.andThen(start(owner, exchange, handshake)), Effect.tap((started) => Effect.sync(() => {
+        frames: Stream.unwrap(Effect.acquireRelease(owner.lock.take(1), () => owner.lock.release(1), { interruptible: true }).pipe(Effect.andThen(start(owner, exchange, interceptor)), Effect.tap((started) => Effect.sync(() => {
           execution = started;
         })), Effect.map((started) => started.frames))),
         complete: Effect.suspend(() => execution?.complete ?? Effect.void)
@@ -359,11 +360,11 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
     }, { discard: true });
   });
   yield* Effect.addFinalizer(() => closeAll);
-  return Service32.of({ bind, close, closeAll });
+  return Service23.of({ bind, close, closeAll });
 }));
-var layer14 = Layer.unwrap(Effect.map(Socket.WebSocketConstructor, (constructor) => makeLayer2({
+var layer11 = Layer.unwrap(Effect.map(Socket.WebSocketConstructor, (constructor) => makeLayer2({
   open: (input) => WebSocketTransport.open(input).pipe(Effect.provideService(Socket.WebSocketConstructor, constructor))
 })));
-var node35 = makeGlobalNode({ service: Service32, layer: layer14, deps: [webSocketConstructor2] });
+var node27 = makeGlobalNode({ service: Service23, layer: layer11, deps: [webSocketConstructor2] });
 
-export { Service32, makeLayer2, layer14, node35, exports_model_transport };
+export { Service23, makeLayer2, layer11, node27, exports_model_transport };

package/dist/chunks/{instruction-discovery-q2bxhs6b.js → persistent-pty-yz26c8tn.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./instruction-discovery-dpkg50ah.js";
+} from "./persistent-pty-dpkg50ah.js";
 import {
-  Service81,
-  node85
-} from "./instruction-discovery-7kvy0jtg.js";
-import {
-  Event16,
-  Service64,
-  node67
-} from "./instruction-discovery-444wcx0m.js";
+  Service82,
+  node86
+} from "./persistent-pty-ze07024f.js";
 import {
+  Event19,
   Service76,
   node80
-} from "./instruction-discovery-88dkmhka.js";
+} from "./persistent-pty-ry98d82p.js";
+import {
+  Service79,
+  node83
+} from "./persistent-pty-pqkcmren.js";
 import {
-  Service73,
-  node76
-} from "./instruction-discovery-cvnk88jx.js";
+  Service54,
+  node57
+} from "./persistent-pty-y99sa8tk.js";
 import {
-  ID11,
-  Service63,
-  node66
-} from "./instruction-discovery-0a3qk1rf.js";
+  ID16,
+  Service77,
+  node81
+} from "./persistent-pty-h3jkmnye.js";
 import {
   reconcile2,
   create3
-} from "./instruction-discovery-rdw6cm16.js";
+} from "./persistent-pty-rdw6cm16.js";
 import {
-  ID10,
+  ID14,
   MethodID2,
-  Service62,
-  node65
-} from "./instruction-discovery-v5w6sppg.js";
+  Service75,
+  node79
+} from "./persistent-pty-gbwj81ez.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./persistent-pty-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError3,
-  Options: () => Options4,
+  NotFoundError: () => NotFoundError2,
+  Options: () => Options2,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service33,
+  Service: () => Service28,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured4,
-  layer: () => layer15,
-  node: () => node36
+  configured: () => configured2,
+  layer: () => layer13,
+  node: () => node31
 });
 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 NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError2 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -90,23 +90,24 @@ class ToolCallError2 extends Schema.TaggedError()("MCP.ToolCallError", {
 }
 var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
+var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service33 extends Context.Service()("@opencode/MCP") {
+class Service28 extends Context.Service()("@opencode/MCP") {
 }
-var Options4 = Schema.Struct({
+var Options2 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer15 = (options) => Layer.effect(Service33, Effect.gen(function* () {
-  const location = yield* Service76;
-  const environment = yield* Service73;
-  const bus = yield* Service81;
-  const forms = yield* Service63;
-  const integration = yield* Service62;
-  const credentials = yield* Service64;
+var layer13 = (options) => Layer.effect(Service28, Effect.gen(function* () {
+  const location = yield* Service79;
+  const environment = yield* Service54;
+  const bus = yield* Service82;
+  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 +119,7 @@ var layer15 = (options) => Layer.effect(Service33, 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 = ID10.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -134,7 +135,7 @@ var layer15 = (options) => Layer.effect(Service33, 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(Service64, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service76, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -143,19 +144,19 @@ var layer15 = (options) => Layer.effect(Service33, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError3({ server: name });
+      return yield* new NotFoundError2({ 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(Service64, 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 = ID11.create();
+        const formID = ID16.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -239,7 +240,8 @@ var layer15 = (options) => Layer.effect(Service33, 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(Service73, environment), Scope.provide(scope), Effect.exit);
+    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 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;
       entry.tools = result.value.tools.map((tool) => toTool(name, entry, tool));
@@ -363,7 +365,7 @@ var layer15 = (options) => Layer.effect(Service33, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event16.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 +391,7 @@ var layer15 = (options) => Layer.effect(Service33, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service33.of({
+  return Service28.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -508,14 +510,14 @@ var layer15 = (options) => Layer.effect(Service33, Effect.gen(function* () {
     })
   });
 }));
-function configured4(options) {
+function configured2(options) {
   return makeLocationNode({
-    service: Service33,
-    layer: layer15(options),
-    deps: [node80, node76, node85, node66, node65, node67]
+    service: Service28,
+    layer: layer13(options),
+    deps: [node83, node57, node86, node81, node79, node80]
   });
 }
-var node36 = configured4();
+var node31 = configured2();
 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 +568,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service33, Options4, layer15, configured4, node36, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError2, ToolCallError2, Service28, Options2, layer13, configured2, node31, exports_mcp4 };