@opencode/core 2.0.15 → 2.0.16

package/dist/chunks/{location-3rbdcc49.js → event-logger-ddtyr2hh.js}

@@ -1,29 +1,29 @@
 import {
   useragent2
-} from "./location-apd0xxcy.js";
+} from "./event-logger-k36bwha9.js";
 import {
-  Service81
-} from "./location-2ys44scz.js";
+  Service83
+} from "./event-logger-4rzfcrmm.js";
 import {
   OAuth3,
-  Event19
-} from "./location-t880hhr6.js";
+  Event21
+} from "./event-logger-4nsq4evv.js";
 import {
-  ID13,
+  ID14,
   MethodID2
-} from "./location-gbece2fh.js";
+} from "./event-logger-0p8kebmq.js";
 import {
   which2
-} from "./location-qaymkmh1.js";
+} from "./event-logger-qaymkmh1.js";
 import {
-  ID12
-} from "./location-z1cdyrqr.js";
+  ID13
+} from "./event-logger-c99wwxqk.js";
 import {
   iife2
-} from "./location-1kg9ymc8.js";
+} from "./event-logger-1kg9ymc8.js";
 import {
   configuredSettings2
-} from "./location-hcg5gfqa.js";
+} from "./event-logger-816m4crp.js";
 
 // src/plugin/provider/azure.ts
 import { Clock, Effect, Schema, Semaphore, Stream } from "effect";
@@ -43,9 +43,9 @@ var decodeToken = Schema.decodeUnknownEffect(Schema.Struct({
 var AzurePlugin2 = define({
   id: "opencode.provider.azure",
   effect: Effect.fn(function* (ctx) {
-    const configured = yield* configuredSettings2(ID12.azure);
+    const configured = yield* configuredSettings2(ID13.azure);
     const processes = yield* AppProcess.Service;
-    const bus = yield* Service81;
+    const bus = yield* Service83;
     const tokens = new Map;
     const loading = Semaphore.makeUnsafe(1);
     const loaded = {};
@@ -79,13 +79,13 @@ var AzurePlugin2 = define({
     });
     yield* ctx.integration.transform((editor) => {
       editor.method.update({
-        integrationID: ID12.azure,
+        integrationID: ID13.azure,
         method: { type: "key", label: "API key", form: form() }
       });
       if (!available)
         return;
       editor.method.update({
-        integrationID: ID12.azure,
+        integrationID: ID13.azure,
         method: {
           id: methodID,
           type: "oauth",
@@ -117,7 +117,7 @@ var AzurePlugin2 = define({
       });
     });
     const load = Effect.fn("AzurePlugin.load")(function* () {
-      const connection = yield* ctx.integration.connection.active(ID12.azure);
+      const connection = yield* ctx.integration.connection.active(ID13.azure);
       const credential = connection ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.orElseSucceed(() => {
         return;
       })) : undefined;
@@ -131,7 +131,7 @@ var AzurePlugin2 = define({
     yield* load();
     yield* ctx.provider.transform((evt) => {
       for (const item of evt.list()) {
-        if (item.provider.id !== ID12.azure && !item.provider.package.startsWith("@opencode/ai/providers/azure/"))
+        if (item.provider.id !== ID13.azure && !item.provider.package.startsWith("@opencode/ai/providers/azure/"))
           continue;
         const resourceName = resolveResourceName(item.provider.settings, loaded.resource);
         const websocket = responsesWebSocketCapable(item.provider);
@@ -149,7 +149,7 @@ var AzurePlugin2 = define({
     });
     yield* ctx.model.transform((models) => {
       for (const item of models.provider.list()) {
-        if (item.provider.id !== ID12.azure && !item.provider.package.startsWith("@opencode/ai/providers/azure/"))
+        if (item.provider.id !== ID13.azure && !item.provider.package.startsWith("@opencode/ai/providers/azure/"))
           continue;
         const resourceName = resolveResourceName(item.provider.settings, loaded.resource);
         for (const model of models.list(item.provider.id)) {
@@ -161,9 +161,9 @@ var AzurePlugin2 = define({
       }
     });
     const reload = () => loading.withPermit(load().pipe(Effect.andThen(ctx.provider.reload())));
-    yield* bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID13.make("azure")), Stream.runForEach(reload), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event21.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID14.make("azure")), Stream.runForEach(reload), Effect.forkScoped({ startImmediately: true }));
     const bearer = Effect.fn("AzurePlugin.bearer")(function* (url) {
-      const connection = yield* ctx.integration.connection.active(ID12.azure);
+      const connection = yield* ctx.integration.connection.active(ID13.azure);
       const credential = connection ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.orElseSucceed(() => {
         return;
       })) : undefined;
@@ -175,7 +175,7 @@ var AzurePlugin2 = define({
       return `Bearer ${current.access}`;
     });
     yield* ctx.session.hook("http.request", (evt) => Effect.gen(function* () {
-      if (evt.model.providerID !== ID12.azure)
+      if (evt.model.providerID !== ID13.azure)
         return;
       const authorization = yield* bearer(evt.request.url);
       if (!authorization)
@@ -184,9 +184,9 @@ var AzurePlugin2 = define({
       evt.request.headers.delete("x-api-key");
       evt.request.headers.set("authorization", authorization);
       evt.request.headers.set("user-agent", useragent2(ctx.app));
-    }), { providerID: ID12.azure });
+    }), { providerID: ID13.azure });
     yield* ctx.session.hook("experimental.ws.handshake", (evt) => Effect.gen(function* () {
-      if (evt.model.providerID !== ID12.azure)
+      if (evt.model.providerID !== ID13.azure)
         return;
       const authorization = yield* bearer(evt.url);
       if (!authorization)
@@ -195,7 +195,7 @@ var AzurePlugin2 = define({
       delete evt.headers["x-api-key"];
       evt.headers.authorization = authorization;
       evt.headers["user-agent"] = useragent2(ctx.app);
-    }), { providerID: ID12.azure });
+    }), { providerID: ID13.azure });
   })
 });
 function resolveResourceName(settings, fallback) {

package/dist/chunks/{location-pvat10bb.js → event-logger-deqzrk0a.js}

@@ -1,30 +1,30 @@
 import {
   latest2,
-  Service70
-} from "./location-c6rpq5f1.js";
+  Service51
+} from "./event-logger-f27dyjrk.js";
 import {
-  Service60
-} from "./location-8kc8r484.js";
+  Service43
+} from "./event-logger-6tdwvj9c.js";
 import {
   observe2
-} from "./location-qsdy395h.js";
+} from "./event-logger-qsdy395h.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/config/plugin/snapshot.ts
 var exports_snapshot = {};
 __export(exports_snapshot, {
   ConfigSnapshotPlugin: () => exports_snapshot,
-  Plugin: () => Plugin48
+  Plugin: () => Plugin18
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin48 = define({
+var Plugin18 = define({
   id: "opencode.config.snapshot",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service70;
-    const snapshot = yield* Service60;
+    const config = yield* Service51;
+    const snapshot = yield* Service43;
     const loaded = yield* observe2(config, ctx.event, snapshot.reload());
     yield* snapshot.transform((editor) => {
       const configured = latest2(loaded.entries, "snapshots");
@@ -35,4 +35,4 @@ var Plugin48 = define({
   })
 });
 
-export { Plugin48, exports_snapshot };
+export { Plugin18, exports_snapshot };

package/dist/chunks/{location-18s9r5gn.js → event-logger-dg2cj1yd.js}

@@ -1,11 +1,11 @@
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/session/provider-context.ts
 var exports_provider_context = {};
 __export(exports_provider_context, {
-  Info: () => Info13,
+  Info: () => Info22,
   SessionProviderContext: () => exports_provider_context,
   compatible: () => compatible2,
   decode: () => decode2,
@@ -19,7 +19,7 @@ import { SessionProviderContext } from "@opencode/schema/session-provider-contex
 import { Schema } from "effect";
 import { isDeepStrictEqual } from "node:util";
 import { Hash } from "@opencode/util/hash";
-var Info13 = SessionProviderContext.Info;
+var Info22 = SessionProviderContext.Info;
 var messages = Schema.toCodecJson(Schema.Array(Message));
 function provenance2(resolved) {
   const model = resolved.model;
@@ -49,4 +49,4 @@ var encode2 = (provenance, replacement) => ({
 var decode2 = (context) => Schema.decodeUnknownSync(messages)(context.messages);
 var validate2 = (context) => Schema.decodeUnknownEffect(messages)(context.messages);
 
-export { Info13, provenance2, compatible2, isCheckpoint2, encode2, decode2, validate2, exports_provider_context };
+export { Info22, provenance2, compatible2, isCheckpoint2, encode2, decode2, validate2, exports_provider_context };

package/dist/chunks/{location-x2z8ar3h.js → event-logger-dntn16f7.js}

@@ -1,30 +1,33 @@
 import {
-  Service81
-} from "./location-2ys44scz.js";
+  useragent2
+} from "./event-logger-k36bwha9.js";
+import {
+  Service83
+} from "./event-logger-4rzfcrmm.js";
 import {
   OAuth3,
-  Event19
-} from "./location-t880hhr6.js";
+  Event21
+} from "./event-logger-4nsq4evv.js";
 import {
-  ID13,
+  ID14,
   MethodID2
-} from "./location-gbece2fh.js";
+} from "./event-logger-0p8kebmq.js";
 import {
   key2
-} from "./location-4dgbcxzg.js";
+} from "./event-logger-h6r3nrb9.js";
 import {
-  Service21
-} from "./location-1dangqhw.js";
+  Service12
+} from "./event-logger-eneefzjq.js";
 import {
-  ID12,
+  ID13,
   mergeOverlay2,
   mergeHeaders2
-} from "./location-z1cdyrqr.js";
+} from "./event-logger-c99wwxqk.js";
 import {
-  ID4,
+  ID3,
   Input13,
   Response2
-} from "./location-xfjpae9m.js";
+} from "./event-logger-z7ctwqf8.js";
 
 // src/plugin/provider/opencode.ts
 import { Duration, Effect, Equal, Schema, Semaphore, Stream } from "effect";
@@ -39,7 +42,7 @@ var methodID = MethodID2.make("device");
 var RemoteResponse = Schema.Struct({
   providers: Schema.Record(Schema.String, ConfigProvider.Info),
   websearch: Schema.Struct({
-    providerID: ID4
+    providerID: ID3
   }).pipe(Schema.optional),
   experimental: Schema.Struct({
     policies: Schema.Array(ConfigPolicy.Info).pipe(Schema.optional)
@@ -64,7 +67,7 @@ var User = Schema.Struct({ id: Schema.String, email: Schema.String });
 var Org = Schema.Struct({ id: Schema.String, name: Schema.String });
 function oauth(http) {
   return {
-    integrationID: ID13.make("opencode"),
+    integrationID: ID14.make("opencode"),
     method: {
       id: methodID,
       type: "oauth",
@@ -118,9 +121,10 @@ function oauth(http) {
 var OpencodePlugin2 = define({
   id: "opencode.provider.opencode",
   effect: Effect.fn(function* (ctx) {
-    const bus = yield* Service81;
-    const http = yield* HttpClient.HttpClient;
-    const managed = yield* Service21;
+    const bus = yield* Service83;
+    const client = yield* HttpClient.HttpClient;
+    const http = HttpClient.mapRequest(client, HttpClientRequest.setHeader("User-Agent", useragent2(ctx.app)));
+    const managed = yield* Service12;
     const loading = Semaphore.makeUnsafe(1);
     let snapshot = { config: undefined, connection: undefined, organization: undefined };
     const load = Effect.fn("OpencodePlugin.load")(function* () {
@@ -153,7 +157,7 @@ var OpencodePlugin2 = define({
         providers.update(providerID, (provider) => {
           if (source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), { id: provider.id });
-          provider.integrationID = ID13.make("opencode");
+          provider.integrationID = ID14.make("opencode");
           if (item.canonical !== undefined)
             provider.canonical = item.canonical;
           if (item.name !== undefined)
@@ -223,7 +227,7 @@ var OpencodePlugin2 = define({
             sourceConnection: snapshot.connection
           });
       }
-      const item = providers.get(ID12.opencode);
+      const item = providers.get(ID13.opencode);
       if (!item)
         return;
       const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey);
@@ -235,7 +239,7 @@ var OpencodePlugin2 = define({
       });
     });
     yield* ctx.model.transform((models) => {
-      const item = models.provider.get(ID12.opencode);
+      const item = models.provider.get(ID13.opencode);
       if (!item)
         return;
       const hasKey = Boolean(process.env.OPENCODE_API_KEY || snapshot.connection || item.provider.settings?.apiKey && item.provider.settings.apiKey !== "public");
@@ -291,7 +295,7 @@ var OpencodePlugin2 = define({
       yield* Effect.all([ctx.provider.reload(), ctx.websearch.reload()], { concurrency: 2, discard: true });
     });
     const refresh = () => loading.withPermit(load().pipe(Effect.andThen(apply)));
-    yield* bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID13.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event21.Switched).pipe(Stream.filter((event) => event.data.integrationID === ID14.make("opencode")), Stream.runForEach(refresh), Effect.forkScoped({ startImmediately: true }));
     yield* Effect.sleep(Duration.minutes(1)).pipe(Effect.andThen(loading.withPermit(load().pipe(Effect.flatMap((next) => Equal.equals(snapshot, next) ? Effect.void : apply(next))))), Effect.forever, Effect.forkScoped);
   })
 });

package/dist/chunks/{location-jwcy2c2z.js → event-logger-dpkg50ah.js}

@@ -1,12 +1,12 @@
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/effect/keyed-mutex.ts
 var exports_keyed_mutex = {};
 __export(exports_keyed_mutex, {
   KeyedMutex: () => exports_keyed_mutex,
-  make: () => make21,
+  make: () => make23,
   makeUnsafe: () => makeUnsafe2
 });
 import { Effect, Semaphore } from "effect";
@@ -26,6 +26,6 @@ var makeUnsafe2 = () => {
   });
   return { size: Effect.sync(() => locks.size), withLock };
 };
-var make21 = () => Effect.sync(makeUnsafe2);
+var make23 = () => Effect.sync(makeUnsafe2);
 
-export { makeUnsafe2, make21, exports_keyed_mutex };
+export { makeUnsafe2, make23, exports_keyed_mutex };

package/dist/chunks/{location-xq3yw8dy.js → event-logger-dsvbxzrp.js}

@@ -1,41 +1,41 @@
 import {
   makeUnsafe2
-} from "./location-jwcy2c2z.js";
+} from "./event-logger-dpkg50ah.js";
 import {
-  Service81,
-  node85
-} from "./location-2ys44scz.js";
+  Service83,
+  node87
+} from "./event-logger-4rzfcrmm.js";
 import {
-  Event19,
-  Service76,
-  node80
-} from "./location-t880hhr6.js";
+  Event21,
+  Service82,
+  node86
+} from "./event-logger-4nsq4evv.js";
 import {
-  Service78,
-  node82
-} from "./location-8s04dv6n.js";
+  Service79,
+  node83
+} from "./event-logger-fv5sjpfb.js";
 import {
-  Service57,
-  node59
-} from "./location-r99pq75w.js";
+  Service55,
+  node58
+} from "./event-logger-najthaah.js";
 import {
   ID15,
-  Service77,
-  node81
-} from "./location-8v97fgxy.js";
+  Service78,
+  node82
+} from "./event-logger-1bry463v.js";
 import {
   reconcile2,
   create3
-} from "./location-rdw6cm16.js";
+} from "./event-logger-rdw6cm16.js";
 import {
-  ID13,
+  ID14,
   MethodID2,
-  Service75,
-  node79
-} from "./location-gbece2fh.js";
+  Service77,
+  node81
+} from "./event-logger-0p8kebmq.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./event-logger-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service34,
+  Service: () => Service42,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
   configured: () => configured5,
-  layer: () => layer14,
-  node: () => node38
+  layer: () => layer16,
+  node: () => node45
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -93,7 +93,7 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service34 extends Context.Service()("@opencode/MCP") {
+class Service42 extends Context.Service()("@opencode/MCP") {
 }
 var Options5 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
@@ -101,13 +101,13 @@ var Options5 = Schema.Struct({
     version: Schema.String
   }))
 });
-var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
-  const location = yield* Service78;
-  const environment = yield* Service57;
-  const bus = yield* Service81;
-  const forms = yield* Service77;
-  const integration = yield* Service75;
-  const credentials = yield* Service76;
+var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
+  const location = yield* Service79;
+  const environment = yield* Service55;
+  const bus = yield* Service83;
+  const forms = yield* Service78;
+  const integration = yield* Service77;
+  const credentials = yield* Service82;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -119,7 +119,7 @@ var layer14 = (options) => Layer.effect(Service34, 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 = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -135,7 +135,7 @@ var layer14 = (options) => Layer.effect(Service34, 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(Service76, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service82, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -151,7 +151,7 @@ var layer14 = (options) => Layer.effect(Service34, 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(Service76, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service82, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
@@ -221,6 +221,25 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     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 loadCatalog = (name, entry, connection) => recovering(name, entry, connection, (connection) => Effect.all({
+    resources: connection.resources(),
+    templates: connection.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
+  }, { concurrency: "unbounded" })).pipe(Effect.map((catalog) => ResourceCatalog2.make({
+    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
+    }))
+  })));
   const watch = (name, entry, connection) => {
     const live = whenLive(name, entry, connection);
     connection.onClose(() => live(Effect.gen(function* () {
@@ -240,7 +259,7 @@ var layer14 = (options) => Layer.effect(Service34, 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(Service57, 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(Service55, 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 +384,7 @@ var layer14 = (options) => Layer.effect(Service34, 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(Event21.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 +410,7 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service34.of({
+  return Service42.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -464,42 +483,23 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
       return { ...result, server: target.name, name: input.name };
     }),
     resourceCatalog: Effect.fn("MCP.resourceCatalog")(function* () {
-      const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => {
-        if (!entry.client)
-          return Effect.succeed({ resources: [], templates: [] });
-        return Effect.all({
-          resources: entry.client.resources().pipe(Effect.orElseSucceed(() => [])),
-          templates: entry.client.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
-        }, { concurrency: "unbounded" }).pipe(Effect.map((catalog) => ({
-          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({
-        resources: catalogs.flatMap((catalog) => catalog.resources).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uri.localeCompare(b.uri)),
-        templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
-      });
+      const empty = ResourceCatalog2.make({ resources: [], templates: [] });
+      const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => entry.client ? loadCatalog(name, entry, entry.client).pipe(Effect.orElseSucceed(() => empty)) : Effect.succeed(empty), { concurrency: "unbounded" });
+      return mergeCatalogs(catalogs);
+    }),
+    resources: Effect.fn("MCP.resources")(function* (input) {
+      const target = yield* requireServer(input.server);
+      yield* target.entry.startup.await;
+      if (!target.entry.client)
+        return ResourceCatalog2.make({ resources: [], templates: [] });
+      return mergeCatalogs([yield* loadCatalog(target.name, target.entry, target.entry.client)]);
     }),
     readResource: Effect.fn("MCP.readResource")(function* (input) {
       const target = yield* requireServer(input.server);
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri })).pipe(Effect.orElseSucceed(() => {
-        return;
-      }));
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri }));
       if (!result)
         return;
       return ResourceContent2.make({
@@ -510,14 +510,20 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     })
   });
 }));
+function mergeCatalogs(catalogs) {
+  return ResourceCatalog2.make({
+    resources: catalogs.flatMap((catalog) => catalog.resources).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uri.localeCompare(b.uri)),
+    templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
+  });
+}
 function configured5(options) {
   return makeLocationNode({
-    service: Service34,
-    layer: layer14(options),
-    deps: [node82, node59, node85, node81, node79, node80]
+    service: Service42,
+    layer: layer16(options),
+    deps: [node83, node58, node87, node82, node81, node86]
   });
 }
-var node38 = configured5();
+var node45 = 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;
@@ -568,4 +574,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service34, Options5, layer14, configured5, node38, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service42, Options5, layer16, configured5, node45, exports_mcp4 };