@opencode/core 0.0.0-dev-19764 → 0.0.0-dev-19765

package/dist/chunks/{snapshot-5nyprcjq.js → model-resolver-jvkfksvk.js}

@@ -1,96 +1,96 @@
 import {
   AmazonBedrockPlugin2
-} from "./snapshot-vs0kt9qj.js";
+} from "./model-resolver-esqycg01.js";
 import {
   AzurePlugin2
-} from "./snapshot-xnt05fp8.js";
+} from "./model-resolver-v2n4cb87.js";
 import {
   CerebrasPlugin2
-} from "./snapshot-wc3fc9cn.js";
+} from "./model-resolver-wc3fc9cn.js";
 import {
   CloudflareAIGatewayPlugin2
-} from "./snapshot-jbqp0ndx.js";
+} from "./model-resolver-nn1j8xnc.js";
 import {
   CloudflareWorkersAIPlugin2
-} from "./snapshot-hmgezczx.js";
+} from "./model-resolver-y1bnvh01.js";
 import {
   CoherePlugin2
-} from "./snapshot-z0bkrqjs.js";
+} from "./model-resolver-z0bkrqjs.js";
 import {
   DigitalOceanPlugin2
-} from "./snapshot-v2vtsgem.js";
+} from "./model-resolver-yrs7mjrn.js";
 import {
   DynamicProviderPlugin2
-} from "./snapshot-vzcthcp8.js";
+} from "./model-resolver-vzcthcp8.js";
 import {
   GatewayPlugin2
-} from "./snapshot-669tq793.js";
+} from "./model-resolver-669tq793.js";
 import {
   GithubCopilotPlugin2
-} from "./snapshot-d1vmr0nd.js";
+} from "./model-resolver-bwxdk6mq.js";
 import {
   GitLabPlugin2
-} from "./snapshot-yam5k1bw.js";
+} from "./model-resolver-ebahhykd.js";
 import {
   GoogleVertexPlugin2
-} from "./snapshot-tw8f8nrh.js";
+} from "./model-resolver-xjtg51km.js";
 import {
   KiloPlugin2
-} from "./snapshot-qg3g05ea.js";
+} from "./model-resolver-qg3g05ea.js";
 import {
   LLMGatewayPlugin2
-} from "./snapshot-939y1bpb.js";
+} from "./model-resolver-gf0x0cm7.js";
 import {
   LMStudioPlugin2
-} from "./snapshot-vjjfm3h2.js";
+} from "./model-resolver-82wf71gc.js";
 import {
   ModalPlugin2
-} from "./snapshot-mmpv6r03.js";
+} from "./model-resolver-6145a6ex.js";
 import {
   NvidiaPlugin2
-} from "./snapshot-24dcb14g.js";
+} from "./model-resolver-24dcb14g.js";
 import {
   OllamaPlugin2
-} from "./snapshot-wbmqe53j.js";
+} from "./model-resolver-90k1qenw.js";
 import {
   OpenAIPlugin3
-} from "./snapshot-kd1ce5f7.js";
+} from "./model-resolver-mqsw6bz5.js";
 import {
   SnowflakeCortexPlugin2
-} from "./snapshot-31vvj4c3.js";
+} from "./model-resolver-85ebze8p.js";
 import {
   OpencodePlugin2
-} from "./snapshot-b4hx36v0.js";
+} from "./model-resolver-j2rec9x8.js";
 import {
   OpenRouterPlugin2
-} from "./snapshot-rssfmsaf.js";
+} from "./model-resolver-jy86jdgr.js";
 import {
   PerplexityPlugin2
-} from "./snapshot-veqvce7d.js";
+} from "./model-resolver-veqvce7d.js";
 import {
   PoePlugin2
-} from "./snapshot-75pyeabn.js";
+} from "./model-resolver-zm7wj8n5.js";
 import {
   PromptCacheKeyPlugin2
-} from "./snapshot-p4mnxf58.js";
+} from "./model-resolver-g8wj080z.js";
 import {
   SapAICorePlugin2
-} from "./snapshot-rcf757kd.js";
+} from "./model-resolver-ksn24y69.js";
 import {
   VercelPlugin2
-} from "./snapshot-xk6xaacw.js";
+} from "./model-resolver-y9nxj4p3.js";
 import {
   VenicePlugin2
-} from "./snapshot-yrhqyw5v.js";
+} from "./model-resolver-yrhqyw5v.js";
 import {
   VLLMPlugin2
-} from "./snapshot-brywjafr.js";
+} from "./model-resolver-xvjcz7er.js";
 import {
   XAIPlugin2
-} from "./snapshot-bfapsvch.js";
+} from "./model-resolver-fybg9cv5.js";
 import {
   ZenmuxPlugin2
-} from "./snapshot-jjkms2e6.js";
+} from "./model-resolver-jjkms2e6.js";
 
 // src/plugin/provider.ts
 var ProviderPlugins2 = [

package/dist/chunks/{snapshot-rssfmsaf.js → model-resolver-jy86jdgr.js}

@@ -1,6 +1,6 @@
 import {
-  ID11
-} from "./snapshot-dt7sf2t2.js";
+  ID8
+} from "./model-resolver-00gg1b3e.js";
 
 // src/plugin/provider/openrouter.ts
 import { Effect } from "effect";
@@ -21,7 +21,7 @@ var OpenRouterPlugin2 = define({
       for (const item of models.provider.list()) {
         if (item.provider.package !== "@opencode/ai/providers/openrouter")
           continue;
-        for (const modelID of [ID11.make("gpt-5-chat-latest"), ID11.make("openai/gpt-5-chat")]) {
+        for (const modelID of [ID8.make("gpt-5-chat-latest"), ID8.make("openai/gpt-5-chat")]) {
           if (!models.get(item.provider.id, modelID))
             continue;
           models.update(item.provider.id, modelID, (model) => {

package/dist/chunks/{snapshot-ftb7f8ac.js → model-resolver-k2t9brnj.js}

@@ -1,12 +1,12 @@
 import {
   migrations2
-} from "./snapshot-ft919fq2.js";
+} from "./model-resolver-22zy5p6a.js";
 import {
   schema_gen_default
-} from "./snapshot-twg0f83k.js";
+} from "./model-resolver-twg0f83k.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/database/migration.ts
 var exports_migration = {};

package/dist/chunks/{snapshot-nfpfdzzq.js → model-resolver-k307gc3k.js}

@@ -1,15 +1,15 @@
 import {
   cleanup3
-} from "./snapshot-gd4qta3r.js";
+} from "./model-resolver-gd4qta3r.js";
 import {
   ascending2
-} from "./snapshot-tvtrv512.js";
+} from "./model-resolver-tvtrv512.js";
 import {
   create3
-} from "./snapshot-rdw6cm16.js";
+} from "./model-resolver-rdw6cm16.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/tool-output.ts
 var exports_tool_output2 = {};
@@ -18,9 +18,9 @@ __export(exports_tool_output2, {
   MAX_BYTES: () => MAX_BYTES2,
   MAX_LINES: () => MAX_LINES2,
   RETENTION: () => RETENTION3,
-  Service: () => Service58,
+  Service: () => Service79,
   ToolOutput: () => exports_tool_output2,
-  node: () => node60
+  node: () => node83
 });
 import path from "path";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";
@@ -32,13 +32,13 @@ var MAX_BYTES2 = 50 * 1024;
 var RETENTION3 = Duration.days(7);
 var DIRECTORY3 = "tool-output";
 
-class Service58 extends Context.Service()("@opencode/ToolOutput") {
+class Service79 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(Service58, Effect.gen(function* () {
+var layer = Layer.effect(Service79, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const directory = path.join(global.data, DIRECTORY3);
@@ -122,7 +122,7 @@ var layer = Layer.effect(Service58, Effect.gen(function* () {
       metadata: { ...result.metadata, truncated: true, outputPath: file }
     };
   });
-  return Service58.of({
+  return Service79.of({
     transform: state.transform,
     reload: state.reload,
     truncate,
@@ -139,10 +139,10 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var node60 = makeLocationNode({
-  service: Service58,
+var node83 = makeLocationNode({
+  service: Service79,
   layer,
   deps: [FSUtil.node, Global.node, cleanupNode]
 });
 
-export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service58, node60, exports_tool_output2 };
+export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service79, node83, exports_tool_output2 };

package/dist/chunks/{snapshot-fc3hj1hz.js → model-resolver-k69qv5g3.js}

@@ -1,22 +1,22 @@
 import {
   PATCH_CONTEXT_LINES2
-} from "./snapshot-tazgh4e4.js";
+} from "./model-resolver-tazgh4e4.js";
 import {
-  ID9,
-  Service64
-} from "./snapshot-9g9mfadh.js";
+  ID4,
+  Service35
+} from "./model-resolver-m7s4xjns.js";
 import {
   SessionSchema2
-} from "./snapshot-ppw6hb80.js";
+} from "./model-resolver-q3t37ft6.js";
 import {
   MessageNotFoundError2
-} from "./snapshot-res40x03.js";
+} from "./model-resolver-3ktbe3hf.js";
 import {
   SessionMessageTable2
-} from "./snapshot-a1bz86dw.js";
+} from "./model-resolver-5c4hm403.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/session/diff.ts
 var exports_diff = {};
@@ -81,14 +81,14 @@ var turn2 = Effect.fn("SessionDiff.turn")(function* (db, locations, input) {
   const location = before ? decodeLocation(before) : after ? decodeLocation(after) : input.session.location;
   const recorded = steps.findLast((step) => step.end)?.end;
   return yield* Effect.gen(function* () {
-    const snapshot = yield* Service64;
+    const snapshot = yield* Service35;
     const running = input.active && final.completed === null;
     const to = running ? (yield* snapshot.capture()) ?? recorded : recorded;
     if (!to)
       return [];
     return yield* snapshot.diff({
-      from: ID9.make(from),
-      to: ID9.make(to),
+      from: ID4.make(from),
+      to: ID4.make(to),
       context: input.context ?? PATCH_CONTEXT_LINES2
     });
   }).pipe(Effect.provide(locations.get(location)));

package/dist/chunks/{snapshot-v0mhzyhk.js → model-resolver-kb0crpaj.js}

@@ -1,20 +1,20 @@
 import {
   AbsolutePath2
-} from "./snapshot-922hggd3.js";
+} from "./model-resolver-922hggd3.js";
 import {
   root2
-} from "./snapshot-k64xx7v0.js";
+} from "./model-resolver-mbhsxkjz.js";
 import {
-  Service79,
-  node83
-} from "./snapshot-pbq54n87.js";
+  Service76,
+  node80
+} from "./model-resolver-s4k6rbz4.js";
 import {
-  Service49,
-  node51
-} from "./snapshot-zv20b68g.js";
+  Service71,
+  node75
+} from "./model-resolver-hrfgvzx7.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/file-access.ts
 var exports_file_access = {};
@@ -22,9 +22,9 @@ __export(exports_file_access, {
   FileAccess: () => exports_file_access,
   Kind: () => Kind2,
   ResolveInput: () => ResolveInput2,
-  Service: () => Service48,
+  Service: () => Service55,
   externalDirectoryPermission: () => externalDirectoryPermission2,
-  node: () => node50,
+  node: () => node59,
   resolvePath: () => resolvePath2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -43,7 +43,7 @@ var externalDirectoryPermission2 = (input) => ({
   save: [input.save]
 });
 
-class Service48 extends Context.Service()("@opencode/FileAccess") {
+class Service55 extends Context.Service()("@opencode/FileAccess") {
 }
 var resolvePath2 = (directory, input, home = Global.Path.home) => {
   const normalized = FSUtil.windowsPath(input);
@@ -55,10 +55,10 @@ var invocation = (context) => ({
   agent: context.agent,
   source: { type: "tool", messageID: context.messageID, id: context.id }
 });
-var layer = Layer.effect(Service48, Effect.gen(function* () {
+var layer = Layer.effect(Service55, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service79;
-  const permission = yield* Service49;
+  const location = yield* Service76;
+  const permission = yield* Service71;
   const resolve = Effect.fn("FileAccess.resolve")(function* (input) {
     const absolute = AbsolutePath2.make(resolvePath2(location.directory, input.path));
     const worktree = path.resolve(location.project.directory);
@@ -107,8 +107,8 @@ var layer = Layer.effect(Service48, Effect.gen(function* () {
     });
     return target;
   });
-  return Service48.of({ resolve, authorizeExternal, authorizeRead });
+  return Service55.of({ resolve, authorizeExternal, authorizeRead });
 }));
-var node50 = makeLocationNode({ service: Service48, layer, deps: [FSUtil.node, node83, node51] });
+var node59 = makeLocationNode({ service: Service55, layer, deps: [FSUtil.node, node80, node75] });
 
-export { Kind2, ResolveInput2, externalDirectoryPermission2, Service48, resolvePath2, node50, exports_file_access };
+export { Kind2, ResolveInput2, externalDirectoryPermission2, Service55, resolvePath2, node59, exports_file_access };

package/dist/chunks/{snapshot-3c48t5r1.js → model-resolver-kcggd0et.js}

@@ -4,43 +4,43 @@ import {
   normalizeContent2,
   normalizedName2,
   effectiveName2
-} from "./snapshot-3w5fmr99.js";
+} from "./model-resolver-3w5fmr99.js";
 import {
   create2,
   catalog2
-} from "./snapshot-nzks3jc8.js";
+} from "./model-resolver-nzks3jc8.js";
 import {
   create3
-} from "./snapshot-rdw6cm16.js";
+} from "./model-resolver-rdw6cm16.js";
 import {
-  Service42,
-  node44
-} from "./snapshot-6pzw4973.js";
+  Service58,
+  node62
+} from "./model-resolver-bezhzanq.js";
 import {
-  Service59,
-  node61
-} from "./snapshot-jvnghvnw.js";
+  Service75,
+  node79
+} from "./model-resolver-166kng33.js";
 import {
   match2
-} from "./snapshot-y1fvbwt7.js";
+} from "./model-resolver-y1fvbwt7.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/tool.ts
 var exports_tool = {};
 __export(exports_tool, {
   CallID: () => CallID2,
-  Content: () => Content2,
-  Error: () => Error2,
+  Content: () => Content3,
+  Error: () => Error5,
   FileContent: () => FileContent3,
   RegistrationError: () => RegistrationError2,
-  Service: () => Service41,
+  Service: () => Service57,
   TextContent: () => TextContent2,
   Tool: () => exports_tool,
-  node: () => node43
+  node: () => node61
 });
-import { CallID as CallID2, Content as Content2, Error as Error2, FileContent as FileContent3, TextContent as TextContent2 } from "@opencode/schema/tool";
+import { CallID as CallID2, Content as Content3, Error as Error5, 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 Service41 extends Context.Service()("@opencode/Tool") {
+class Service57 extends Context.Service()("@opencode/Tool") {
 }
-var layer = Layer.effect(Service41, Effect.gen(function* () {
-  const hooks = yield* Service59;
-  const image = yield* Service42;
+var layer = Layer.effect(Service57, Effect.gen(function* () {
+  const hooks = yield* Service75;
+  const image = yield* Service58;
   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(Service41, Effect.gen(function* () {
       }), { discard: true });
     }
   });
-  return Service41.of({
+  return Service57.of({
     transform: state.transform,
     reload: state.reload,
     snapshot: Effect.fn("Tool.snapshot")((permissions) => Effect.sync(() => {
@@ -272,10 +272,10 @@ function namespaceError(name) {
     return;
   return new RegistrationError2({ name, message: `Invalid tool namespace: ${JSON.stringify(name)}` });
 }
-var node43 = makeLocationNode({
-  service: Service41,
+var node61 = makeLocationNode({
+  service: Service57,
   layer,
-  deps: [node61, node44]
+  deps: [node79, node62]
 });
 
-export { RegistrationError2, Service41, node43, exports_tool, CallID2, Content2, Error2, FileContent3, TextContent2 };
+export { RegistrationError2, Service57, node61, exports_tool, CallID2, Content3, Error5, FileContent3, TextContent2 };

package/dist/chunks/{snapshot-4pw3ma1d.js → model-resolver-kdg3wy8r.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./snapshot-y71avatq.js";
+} from "./model-resolver-y71avatq.js";
 import {
-  Service82,
-  node86
-} from "./snapshot-94c9dcy8.js";
+  Service78,
+  node82
+} from "./model-resolver-wfde3x95.js";
 import {
-  Event19,
-  Service73,
-  node76
-} from "./snapshot-1mtvnjxb.js";
+  Event17,
+  Service67,
+  node71
+} from "./model-resolver-1r39s92t.js";
 import {
-  Service79,
-  node83
-} from "./snapshot-pbq54n87.js";
-import {
-  Service77,
+  Service76,
   node80
-} from "./snapshot-w2rnr668.js";
+} from "./model-resolver-s4k6rbz4.js";
+import {
+  Service44,
+  node48
+} from "./model-resolver-1k45rzbh.js";
 import {
-  ID15,
-  Service74,
-  node77
-} from "./snapshot-dxwpfr55.js";
+  ID12,
+  Service70,
+  node74
+} from "./model-resolver-zhmbkdqz.js";
 import {
   reconcile2,
   create3
-} from "./snapshot-rdw6cm16.js";
+} from "./model-resolver-rdw6cm16.js";
 import {
-  ID13,
+  ID10,
   MethodID2,
-  Service72,
-  node75
-} from "./snapshot-jj7g1fgg.js";
+  Service66,
+  node70
+} from "./model-resolver-np9tbams.js";
 import {
   __export
-} from "./snapshot-9rqn6x4v.js";
+} from "./model-resolver-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
   NotFoundError: () => NotFoundError3,
-  Options: () => Options3,
+  Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service29,
+  Service: () => Service32,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured3,
-  layer: () => layer13,
-  node: () => node32
+  configured: () => configured4,
+  layer: () => layer15,
+  node: () => node35
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -93,21 +93,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service29 extends Context.Service()("@opencode/MCP") {
+class Service32 extends Context.Service()("@opencode/MCP") {
 }
-var Options3 = Schema.Struct({
+var Options4 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer13 = (options) => Layer.effect(Service29, Effect.gen(function* () {
-  const location = yield* Service79;
-  const environment = yield* Service77;
-  const bus = yield* Service82;
-  const forms = yield* Service74;
-  const integration = yield* Service72;
-  const credentials = yield* Service73;
+var layer15 = (options) => Layer.effect(Service32, Effect.gen(function* () {
+  const location = yield* Service76;
+  const environment = yield* Service44;
+  const bus = yield* Service78;
+  const forms = yield* Service70;
+  const integration = yield* Service66;
+  const credentials = yield* Service67;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -119,7 +119,7 @@ var layer13 = (options) => Layer.effect(Service29, 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 = ID13.make(suffix);
+    const integrationID = ID10.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -135,7 +135,7 @@ var layer13 = (options) => Layer.effect(Service29, 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(Service73, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service67, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -151,12 +151,12 @@ var layer13 = (options) => Layer.effect(Service29, 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(Service73, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service67, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID15.create();
+        const formID = ID12.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -240,7 +240,7 @@ var layer13 = (options) => Layer.effect(Service29, 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(Service77, 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(Service44, 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;
@@ -365,7 +365,7 @@ var layer13 = (options) => Layer.effect(Service29, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event17.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: () => ({
@@ -391,7 +391,7 @@ var layer13 = (options) => Layer.effect(Service29, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service29.of({
+  return Service32.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -510,14 +510,14 @@ var layer13 = (options) => Layer.effect(Service29, Effect.gen(function* () {
     })
   });
 }));
-function configured3(options) {
+function configured4(options) {
   return makeLocationNode({
-    service: Service29,
-    layer: layer13(options),
-    deps: [node83, node80, node86, node77, node75, node76]
+    service: Service32,
+    layer: layer15(options),
+    deps: [node80, node48, node82, node74, node70, node71]
   });
 }
-var node32 = configured3();
+var node35 = 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;
@@ -568,4 +568,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service29, Options3, layer13, configured3, node32, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service32, Options4, layer15, configured4, node35, exports_mcp4 };