@opencode/core 2.0.2 → 2.0.4

package/dist/chunks/{location-services-1m7gs3ah.js → location-5x09agpp.js}

@@ -1,70 +1,61 @@
 import {
   makeUnsafe2
-} from "./location-services-dpkg50ah.js";
+} from "./location-y71avatq.js";
 import {
-  Service79,
-  node84
-} from "./location-services-69j49pks.js";
-import {
-  Event15,
-  Service66,
-  node71
-} from "./location-services-nwd6ekzm.js";
+  Service78,
+  node82
+} from "./location-tsjh32me.js";
 import {
+  Event19,
   Service74,
-  node79
-} from "./location-services-k4e7wm7p.js";
+  node78
+} from "./location-aqxshtk7.js";
 import {
-  Service63,
-  node67
-} from "./location-services-b1h6aq5y.js";
+  Service76,
+  node80
+} from "./location-zyx4eyj3.js";
 import {
-  ID10,
-  Service67,
-  node72
-} from "./location-services-2gv9ss0t.js";
+  Service58,
+  node61
+} from "./location-ngacfpxr.js";
+import {
+  ID16,
+  Service75,
+  node79
+} from "./location-qx4vf964.js";
 import {
   reconcile2,
   create3
-} from "./location-services-kg06axw8.js";
+} from "./location-rdw6cm16.js";
 import {
-  ID8,
+  ID14,
   MethodID2,
-  Service65,
-  node70
-} from "./location-services-htcxsbd3.js";
+  Service73,
+  node77
+} from "./location-gbxnzk38.js";
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
   NotFoundError: () => NotFoundError4,
-  Options: () => Options4,
-  Prompt: () => Prompt2,
-  PromptArgument: () => PromptArgument2,
-  PromptMessage: () => PromptMessage2,
-  PromptResult: () => PromptResult2,
+  Options: () => Options3,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
   ResourceContent: () => ResourceContent2,
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
-  ServerInfo: () => ServerInfo2,
-  ServerInstructions: () => ServerInstructions2,
   ServerName: () => ServerName2,
-  Service: () => Service31,
+  Service: () => Service30,
   Status: () => Status2,
-  Tool: () => Tool3,
   ToolCallError: () => ToolCallError2,
-  ToolResult: () => ToolResult2,
-  ToolResultContent: () => ToolResultContent2,
-  configured: () => configured4,
+  configured: () => configured3,
   layer: () => layer12,
-  node: () => node35
+  node: () => node34
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -77,70 +68,6 @@ import { waitForAbort } from "@opencode/util/process";
 var ServerName2 = Schema.String.pipe(Schema.brand("MCP.ServerName"));
 var PromptsChanged2 = ephemeral({ type: "mcp.prompts.changed", schema: { server: Schema.String } });
 var Status2 = Mcp.Status;
-
-class ServerInfo2 extends Schema.Class("MCP.ServerInfo")({
-  name: ServerName2,
-  status: Status2,
-  integrationID: ID8.pipe(Schema.optional)
-}) {
-}
-
-class ServerInstructions2 extends Schema.Class("MCP.ServerInstructions")({
-  server: ServerName2,
-  instructions: Schema.String
-}) {
-}
-
-class Tool3 extends Schema.Class("MCP.Tool")({
-  server: ServerName2,
-  name: Schema.String,
-  codemode: Schema.Boolean.pipe(Schema.optional),
-  description: Schema.String.pipe(Schema.optional),
-  inputSchema: Schema.Unknown.pipe(Schema.optional),
-  outputSchema: Schema.Unknown.pipe(Schema.optional)
-}) {
-}
-var ToolResultContent2 = Schema.Union([
-  Schema.Struct({ type: Schema.Literal("text"), text: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("media"), data: Schema.String, mimeType: Schema.String })
-]).pipe(Schema.toTaggedUnion("type"));
-
-class ToolResult2 extends Schema.Class("MCP.ToolResult")({
-  server: ServerName2,
-  tool: Schema.String,
-  isError: Schema.Boolean,
-  structured: Schema.Unknown.pipe(Schema.optional),
-  content: Schema.Array(ToolResultContent2)
-}) {
-}
-
-class PromptArgument2 extends Schema.Class("MCP.PromptArgument")({
-  name: Schema.String,
-  description: Schema.String.pipe(Schema.optional),
-  required: Schema.Boolean.pipe(Schema.optional)
-}) {
-}
-
-class Prompt2 extends Schema.Class("MCP.Prompt")({
-  server: ServerName2,
-  name: Schema.String,
-  description: Schema.String.pipe(Schema.optional),
-  arguments: Schema.Array(PromptArgument2).pipe(Schema.optional)
-}) {
-}
-
-class PromptMessage2 extends Schema.Class("MCP.PromptMessage")({
-  role: Schema.String,
-  content: Schema.Unknown
-}) {
-}
-
-class PromptResult2 extends Schema.Class("MCP.PromptResult")({
-  server: ServerName2,
-  name: Schema.String,
-  messages: Schema.Array(PromptMessage2)
-}) {
-}
 var Resource2 = Mcp.Resource;
 var ResourceTemplate2 = Mcp.ResourceTemplate;
 var ResourceCatalog2 = Mcp.ResourceCatalog;
@@ -165,21 +92,21 @@ var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
 var cloneConfig = (config) => structuredClone(config);
 
-class Service31 extends Context.Service()("@opencode/MCP") {
+class Service30 extends Context.Service()("@opencode/MCP") {
 }
-var Options4 = Schema.Struct({
+var Options3 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
-  const location = yield* Service74;
-  const environment = yield* Service63;
-  const bus = yield* Service79;
-  const forms = yield* Service67;
-  const integration = yield* Service65;
-  const credentials = yield* Service66;
+var layer12 = (options) => Layer.effect(Service30, Effect.gen(function* () {
+  const location = yield* Service76;
+  const environment = yield* Service58;
+  const bus = yield* Service78;
+  const forms = yield* Service75;
+  const integration = yield* Service73;
+  const credentials = yield* Service74;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -191,7 +118,7 @@ var layer12 = (options) => Layer.effect(Service31, 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);
@@ -207,7 +134,7 @@ var layer12 = (options) => Layer.effect(Service31, 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, methodID });
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service74, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -223,101 +150,16 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
     if (entry.config.type !== "remote" || !entry.integrationID)
       return;
     const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-    const remote = entry.config;
-    const oauth = remote.oauth || undefined;
-    const run = Effect.runPromiseWith(yield* Effect.context());
-    const base = {
-      redirectUrl: oauth?.redirect_uri ?? "http://127.0.0.1/callback",
-      scope: oauth?.scope,
-      client: oauth?.client_id ? { id: oauth.client_id, secret: oauth.client_secret } : undefined,
-      onRedirect: () => run(Effect.logInfo("mcp oauth authorization required"))
-    };
-    const found = (yield* credentials.list(entry.integrationID)).at(-1);
-    if (!found || found.value.type !== "oauth") {
-      yield* Effect.logInfo("mcp oauth credential unavailable", {
-        integrationID: entry.integrationID,
-        reason: found ? "not_oauth" : "missing"
-      });
-      return McpOAuth.provider({ ...base, store: McpOAuth.memoryStore() });
-    }
-    const credentialID = found.id;
-    const methodID = found.value.methodID;
-    const fields = { credentialID, integrationID: entry.integrationID };
-    yield* Effect.logInfo("mcp oauth credential loaded", {
-      ...fields,
-      hasRefreshToken: Boolean(found.value.refresh),
-      hasClientInformation: Boolean(McpOAuth.clientFromCredential(found.value)),
-      expiresAt: found.value.expires,
-      expired: found.value.expires !== 0 && found.value.expires <= Date.now()
-    });
-    let presented = found.value.refresh;
-    const readOAuthCredential = async () => {
-      const stored = await run(credentials.get(credentialID));
-      return stored?.value.type === "oauth" ? stored.value : undefined;
-    };
-    return McpOAuth.provider({
-      ...base,
-      invalidate: async (scope) => {
-        if (scope === "verifier" || scope === "discovery") {
-          await run(Effect.logDebug("mcp oauth invalidation skipped", { ...fields, scope, reason: "not_credentials" }));
-          return;
-        }
-        const oauth = await readOAuthCredential();
-        if (!oauth || oauth.refresh !== presented) {
-          await run(Effect.logInfo("mcp oauth invalidation skipped", {
-            ...fields,
-            scope,
-            reason: oauth ? "token_rotated" : "credential_missing"
-          }));
-          return;
-        }
-        await run(Effect.logWarning("mcp oauth credential invalidation requested", { ...fields, scope }));
-        await run(credentials.remove(credentialID));
-      },
-      store: {
-        tokens: async () => {
-          const oauth = await readOAuthCredential();
-          if (!oauth)
-            return;
-          presented = oauth.refresh;
-          return McpOAuth.toTokens(oauth);
-        },
-        saveTokens: async (tokens) => {
-          const previous = await readOAuthCredential();
-          const value = McpOAuth.toCredential({
-            methodID,
-            serverUrl: remote.url,
-            tokens,
-            client: previous ? McpOAuth.clientFromCredential(previous) : undefined
-          });
-          presented = value.refresh;
-          await run(Effect.logInfo("mcp oauth tokens received", {
-            ...fields,
-            credentialPresent: Boolean(previous),
-            refreshRotated: Boolean(previous && previous.refresh !== value.refresh),
-            hasRefreshToken: Boolean(value.refresh),
-            expiresAt: value.expires
-          }));
-          await run(credentials.update(credentialID, { value }));
-        },
-        clientInformation: async () => {
-          const oauth = await readOAuthCredential();
-          return oauth ? McpOAuth.clientFromCredential(oauth) : undefined;
-        },
-        saveClientInformation: async () => {},
-        codeVerifier: async () => {
-          return;
-        },
-        saveCodeVerifier: async () => {}
-      }
-    });
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service74, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID10.create();
-        const key = input.server + "\x00" + input.params.elicitationId;
-        urlElicitations.set(key, formID);
+        const formID = ID16.create();
+        const elicitationID = input.params.elicitationId;
+        const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
+        if (key)
+          urlElicitations.set(key, formID);
         return yield* forms.ask({
           id: formID,
           sessionID: GLOBAL_ELICITATION_SESSION_ID,
@@ -325,11 +167,11 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
           metadata: {
             kind: "mcp-elicitation",
             server: input.server,
-            elicitationID: input.params.elicitationId,
+            ...elicitationID === undefined ? {} : { elicitationID },
             message: input.params.message
           },
           fields: [{ key: URL_ELICITATION_FIELD_KEY, type: "external", url: input.params.url }]
-        }).pipe(Effect.raceFirst(waitForAbort(input.signal)), Effect.ensuring(Effect.sync(() => urlElicitations.delete(key))), Effect.map((state) => ({
+        }).pipe(Effect.raceFirst(waitForAbort(input.signal)), Effect.ensuring(Effect.sync(() => key && urlElicitations.delete(key))), Effect.map((state) => ({
           action: state.status === "answered" ? "accept" : "cancel"
         })));
       }
@@ -358,45 +200,26 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       yield* forms.reply({ id: formID, answer: { [URL_ELICITATION_FIELD_KEY]: true } }).pipe(Effect.ignore);
     })
   };
-  const toTool = (server, entry, def) => new Tool3({
+  const toTool = (server, entry, tool) => ({
+    ...tool,
     server,
-    name: def.name,
-    codemode: entry.config.codemode,
-    description: def.description,
-    inputSchema: def.inputSchema,
-    outputSchema: def.outputSchema
+    ...entry.config.codemode === undefined ? {} : { codemode: entry.config.codemode }
   });
-  const toPrompt = (server, def) => new Prompt2({
-    server,
-    name: def.name,
-    description: def.description,
-    arguments: def.arguments?.map((argument) => new PromptArgument2({
-      name: argument.name,
-      description: argument.description,
-      required: argument.required
-    }))
-  });
-  const toResource = (server, def) => Resource2.make({
-    server,
-    name: def.name,
-    uri: def.uri,
-    description: def.description,
-    mimeType: def.mimeType
-  });
-  const toResourceTemplate = (server, def) => ResourceTemplate2.make({
-    server,
-    name: def.name,
-    uriTemplate: def.uriTemplate,
-    description: def.description,
-    mimeType: def.mimeType
-  });
-  const refreshTools = (name, entry, connection) => connection.tools().pipe(Effect.map((defs) => {
-    entry.tools = defs.map((def) => toTool(name, entry, def));
+  const refreshTools = (name, entry, connection) => connection.tools().pipe(Effect.map((tools) => {
+    entry.tools = tools.map((tool) => toTool(name, entry, tool));
   }));
-  const refreshPrompts = (name, entry, connection) => connection.prompts().pipe(Effect.orElseSucceed(() => []), Effect.map((defs) => {
-    entry.prompts = defs.map((def) => toPrompt(name, def));
+  const refreshPrompts = (name, entry, connection) => connection.prompts().pipe(Effect.orElseSucceed(() => []), Effect.map((prompts) => {
+    entry.prompts = prompts.map((prompt) => ({ ...prompt, server: name }));
   }), Effect.andThen(bus.publish(PromptsChanged2, { server: name })));
   const whenLive = (name, entry, connection) => (effect) => fork(Effect.suspend(() => entry.client === connection ? effect : Effect.void).pipe(locks.withLock(name), Effect.ignore));
+  const recover = (name, entry, connection) => Effect.gen(function* () {
+    if (entry.client !== connection)
+      return;
+    yield* Effect.logInfo("mcp session expired, reconnecting", { server: name });
+    yield* stopServer(name, entry);
+    yield* startServer(name, entry);
+  }).pipe(locks.withLock(name));
+  const recovering = (name, entry, connection, run) => run(connection).pipe(Effect.catchIf((error) => ("_tag" in error) && error._tag === "MCP.SessionExpiredError", (error) => recover(name, entry, connection).pipe(Effect.flatMap(() => entry.client ? run(entry.client) : Effect.fail(error)))));
   const watch = (name, entry, connection) => {
     const live = whenLive(name, entry, connection);
     connection.onClose(() => live(Effect.gen(function* () {
@@ -404,28 +227,11 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       yield* stopServer(name, entry);
       yield* bus.publish(McpEvent.StatusChanged, { server: name });
     })));
-    connection.onLog((message) => fork(serverLog(name, message)));
+    connection.onSessionExpired(() => fork(recover(name, entry, connection)));
     connection.onToolsChanged(() => live(refreshTools(name, entry, connection).pipe(Effect.andThen(bus.publish(McpEvent.ToolsChanged, { server: name })))));
     connection.onPromptsChanged(() => live(refreshPrompts(name, entry, connection)));
     connection.onResourcesChanged(() => live(bus.publish(McpEvent.ResourcesChanged, { server: name })));
   };
-  const serverLog = (server, message) => {
-    const fields = { server, logger: message.logger, level: message.level, data: message.data };
-    switch (message.level) {
-      case "debug":
-        return Effect.logDebug("MCP server log", fields);
-      case "info":
-      case "notice":
-        return Effect.logInfo("MCP server log", fields);
-      case "warning":
-        return Effect.logWarning("MCP server log", fields);
-      case "error":
-      case "critical":
-      case "alert":
-      case "emergency":
-        return Effect.logError("MCP server log", fields);
-    }
-  };
   const startServer = (name, entry) => Effect.gen(function* () {
     entry.status = { status: "pending" };
     yield* bus.publish(McpEvent.StatusChanged, { server: name });
@@ -433,10 +239,10 @@ var layer12 = (options) => Layer.effect(Service31, 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(Service63, 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(Service58, environment), Scope.provide(scope), Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
-      entry.tools = result.value.tools.map((def) => toTool(name, entry, def));
+      entry.tools = result.value.tools.map((tool) => toTool(name, entry, tool));
       entry.prompts = [];
       entry.status = { status: "connected" };
       watch(name, entry, result.value.connection);
@@ -450,7 +256,7 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
     yield* Scope.close(scope, Exit.void);
     entry.scope = undefined;
     const error = Cause.squash(result.cause);
-    entry.status = error instanceof McpClient.NeedsAuthError ? { status: "needs_auth" } : { status: "failed", error: error instanceof Error ? error.message : String(error) };
+    entry.status = error instanceof McpClient.NeedsAuthError ? { status: "needs_auth", error: error.message } : { status: "failed", error: error instanceof Error ? error.message : String(error) };
     yield* Effect.logWarning("mcp connect failed", { server: name, status: entry.status });
     yield* bus.publish(McpEvent.StatusChanged, { server: name });
   }).pipe(Effect.ensuring(entry.startup.open), Effect.annotateLogs({ server: name, directory: location.directory, connectionID: crypto.randomUUID() }));
@@ -557,7 +363,7 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event15.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: () => ({
@@ -583,15 +389,11 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  const whenAllReady = Effect.suspend(() => Effect.forEach(Array.from(entries.values()), (entry) => entry.startup.await, {
-    concurrency: "unbounded",
-    discard: true
-  }));
-  return Service31.of({
+  return Service30.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
-      return Array.from(entries).toSorted(([a], [b]) => a.localeCompare(b)).map(([name, entry]) => new ServerInfo2({ name, status: entry.status, integrationID: entry.integrationID }));
+      return Array.from(entries).toSorted(([a], [b]) => a.localeCompare(b)).map(([name, entry]) => ({ name, status: entry.status, integrationID: entry.integrationID }));
     }),
     add: Effect.fn("MCP.add")(function* (server, config) {
       const name = ServerName2.make(server);
@@ -622,7 +424,6 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       yield* state.reload();
     }),
     tools: Effect.fn("MCP.tools")(function* () {
-      yield* whenAllReady;
       return Array.from(entries.values()).flatMap((entry) => entry.tools ?? []).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name));
     }),
     callTool: Effect.fn("MCP.callTool")(function* (input) {
@@ -634,22 +435,15 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
           tool: input.name,
           message: "MCP server is not connected"
         });
-      const result = yield* target.entry.client.callTool({ name: input.name, args: input.args, sessionID: input.sessionID }).pipe(Effect.mapError((error) => new ToolCallError2({ server: target.name, tool: input.name, message: error.message })));
-      return new ToolResult2({
-        server: target.name,
-        tool: input.name,
-        isError: result.isError,
-        structured: result.structured,
-        content: result.content
-      });
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.callTool({ name: input.name, args: input.args, sessionID: input.sessionID })).pipe(Effect.mapError((error) => new ToolCallError2({ server: target.name, tool: input.name, message: error.message })));
+      return { ...result, server: target.name, tool: input.name };
     }),
     instructions: Effect.fn("MCP.instructions")(function* () {
-      yield* whenAllReady;
       return Array.from(entries).flatMap(([server, entry]) => {
         const instructions = entry.client?.instructions;
         if (!instructions)
           return [];
-        return [new ServerInstructions2({ server, instructions })];
+        return [{ server, instructions }];
       }).toSorted((a, b) => a.server.localeCompare(b.server));
     }),
     prompts: Effect.fn("MCP.prompts")(function* () {
@@ -660,19 +454,14 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* target.entry.client.prompt({ name: input.name, args: input.args }).pipe(Effect.orElseSucceed(() => {
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.prompt({ name: input.name, args: input.args })).pipe(Effect.orElseSucceed(() => {
         return;
       }));
       if (!result)
         return;
-      return new PromptResult2({
-        server: target.name,
-        name: input.name,
-        messages: result.messages.map((message) => new PromptMessage2({ role: message.role, content: message.content }))
-      });
+      return { ...result, server: target.name, name: input.name };
     }),
     resourceCatalog: Effect.fn("MCP.resourceCatalog")(function* () {
-      yield* whenAllReady;
       const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => {
         if (!entry.client)
           return Effect.succeed({ resources: [], templates: [] });
@@ -680,8 +469,20 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
           resources: entry.client.resources().pipe(Effect.orElseSucceed(() => [])),
           templates: entry.client.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
         }, { concurrency: "unbounded" }).pipe(Effect.map((catalog) => ({
-          resources: catalog.resources.map((def) => toResource(name, def)),
-          templates: catalog.templates.map((def) => toResourceTemplate(name, def))
+          resources: catalog.resources.map((resource) => Resource2.make({
+            server: name,
+            name: resource.name,
+            uri: resource.uri,
+            description: resource.description,
+            mimeType: resource.mimeType
+          })),
+          templates: catalog.templates.map((template) => ResourceTemplate2.make({
+            server: name,
+            name: template.name,
+            uriTemplate: template.uriTemplate,
+            description: template.description,
+            mimeType: template.mimeType
+          }))
         })));
       }, { concurrency: "unbounded" });
       return ResourceCatalog2.make({
@@ -694,7 +495,7 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* target.entry.client.readResource({ uri: input.uri }).pipe(Effect.orElseSucceed(() => {
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri })).pipe(Effect.orElseSucceed(() => {
         return;
       }));
       if (!result)
@@ -702,19 +503,19 @@ var layer12 = (options) => Layer.effect(Service31, Effect.gen(function* () {
       return ResourceContent2.make({
         server: target.name,
         uri: input.uri,
-        contents: result.contents
+        contents: result.contents.map((part) => ("text" in part) ? { type: "text", uri: part.uri, text: part.text, mimeType: part.mimeType } : { type: "blob", uri: part.uri, blob: part.blob, mimeType: part.mimeType })
       });
     })
   });
 }));
-function configured4(options) {
+function configured3(options) {
   return makeLocationNode({
-    service: Service31,
+    service: Service30,
     layer: layer12(options),
-    deps: [node79, node67, node84, node72, node70, node71]
+    deps: [node80, node61, node82, node79, node77, node78]
   });
 }
-var node35 = configured4();
+var node34 = configured3();
 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;
@@ -765,4 +566,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, ServerInfo2, ServerInstructions2, Tool3, ToolResultContent2, ToolResult2, PromptArgument2, Prompt2, PromptMessage2, PromptResult2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError4, ToolCallError2, Service31, Options4, layer12, configured4, node35, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError4, ToolCallError2, Service30, Options3, layer12, configured3, node34, exports_mcp4 };

package/dist/chunks/{location-services-0jwsre1p.js → location-607tc6va.js}

@@ -1,16 +1,16 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/v1/config/plugin.ts
 var exports_plugin3 = {};
 __export(exports_plugin3, {
   ConfigPluginV1: () => exports_plugin3,
-  Options: () => Options6,
+  Options: () => Options5,
   Spec: () => Spec2
 });
 import { Schema } from "effect";
-var Options6 = Schema.Record(Schema.String, Schema.Unknown);
-var Spec2 = Schema.Union([Schema.String, Schema.mutable(Schema.Tuple([Schema.String, Options6]))]);
+var Options5 = Schema.Record(Schema.String, Schema.Unknown);
+var Spec2 = Schema.Union([Schema.String, Schema.mutable(Schema.Tuple([Schema.String, Options5]))]);
 
-export { Options6, Spec2, exports_plugin3 };
+export { Options5, Spec2, exports_plugin3 };

package/dist/chunks/{location-services-669tq793.js → location-669tq793.js}

@@ -1,6 +1,6 @@
 import {
   createProviderPlugin2
-} from "./location-services-ym463w8f.js";
+} from "./location-ym463w8f.js";
 
 // src/plugin/provider/gateway.ts
 var GatewayPlugin2 = createProviderPlugin2({

package/dist/chunks/{location-services-6h73sxmp.js → location-6h73sxmp.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./location-services-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/repository.ts
 var exports_repository = {};

package/dist/chunks/{location-services-6msgmcgs.js → location-6msgmcgs.js}

@@ -1,6 +1,6 @@
 import {
   AbsolutePath2
-} from "./location-services-922hggd3.js";
+} from "./location-922hggd3.js";
 
 // src/database/path.ts
 import nodePath from "path";