@opencode/core 0.0.0-dev-20207 → 0.0.0-dev-20209

package/dist/chunks/{skill-0mc464d2.js → variant-wpy37268.js}

@@ -1,56 +1,56 @@
 import {
   Service83,
   node87
-} from "./skill-w4ja1ymy.js";
+} from "./variant-80dfhc41.js";
 import {
-  Event14,
-  Service68,
-  node72
-} from "./skill-3q06wn7v.js";
+  Event19,
+  Service77,
+  node81
+} from "./variant-scw7ae32.js";
 import {
-  Service51,
-  node54
-} from "./skill-h7k36nvq.js";
+  Service71,
+  node75
+} from "./variant-sqsf5w9p.js";
 import {
   AbsolutePath2
-} from "./skill-922hggd3.js";
+} from "./variant-922hggd3.js";
 import {
-  Service76,
-  node80
-} from "./skill-29etqs2x.js";
+  Service80,
+  node84
+} from "./variant-nr9qr2eb.js";
 import {
   substitute2
-} from "./skill-yrznvahk.js";
+} from "./variant-s4enseaf.js";
 import {
   normalize2
-} from "./skill-zyq8xwgz.js";
+} from "./variant-mwymfxjt.js";
 import {
   names4,
   discover3
-} from "./skill-0vxz8yyr.js";
+} from "./variant-322g38fb.js";
 import {
   plan2
-} from "./skill-j56e64zr.js";
+} from "./variant-j56e64zr.js";
 import {
-  Service80,
-  Event20,
-  node84
-} from "./skill-xjvzjxjz.js";
+  Service72,
+  Event15,
+  node76
+} from "./variant-0sdyee2g.js";
 import {
   __export
-} from "./skill-9rqn6x4v.js";
+} from "./variant-9rqn6x4v.js";
 
 // src/config.ts
 var exports_config = {};
 __export(exports_config, {
   Config: () => exports_config,
-  Options: () => Options7,
-  Service: () => Service50,
+  Options: () => Options8,
+  Service: () => Service70,
   Test: () => Test2,
-  configured: () => configured7,
+  configured: () => configured10,
   latest: () => latest2,
-  layer: () => layer18,
-  node: () => node53,
+  layer: () => layer23,
+  node: () => node74,
   testLayer: () => testLayer2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -64,14 +64,14 @@ import { Global } from "@opencode/util/global";
 function latest2(entries, key) {
   return entries.findLast((entry) => entry.type === "document" && entry.info[key] !== undefined)?.info[key];
 }
-var Options7 = Schema.Struct({
+var Options8 = Schema.Struct({
   project: Schema.optional(Schema.Boolean),
   global: Schema.optional(Schema.Boolean),
   file: Schema.optional(Schema.String),
   content: Schema.optional(Schema.String)
 });
 
-class Service50 extends Context.Service()("@opencode/Config") {
+class Service70 extends Context.Service()("@opencode/Config") {
 }
 
 class Test2 extends Context.Service()("@opencode/Config/Test") {
@@ -89,16 +89,16 @@ var testLayer2 = (initial = [], compatibility = {
     setEntries: (next) => Ref.set(entries, next),
     emitChange: (update) => PubSub.publish(updates, update).pipe(Effect.asVoid)
   });
-  return Context.empty().pipe(Context.add(Service50, service), Context.add(Test2, service));
+  return Context.empty().pipe(Context.add(Service70, service), Context.add(Test2, service));
 }));
-var layer18 = (options) => Layer.effect(Service50, Effect.gen(function* () {
+var layer23 = (options) => Layer.effect(Service70, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
-  const location = yield* Service76;
-  const watcher = yield* Service51;
+  const location = yield* Service80;
+  const watcher = yield* Service71;
   const bus = yield* Service83;
-  const credentials = yield* Service68;
+  const credentials = yield* Service77;
   const globalService = yield* Global.Service;
-  const wellknown = yield* Service80;
+  const wellknown = yield* Service72;
   const reloadLock = Semaphore.makeUnsafe(1);
   const updateLock = Semaphore.makeUnsafe(1);
   const decodeOptions = { errors: "all", onExcessProperty: "ignore", propertyOrder: "original" };
@@ -221,8 +221,8 @@ var layer18 = (options) => Layer.effect(Service50, Effect.gen(function* () {
   }, (effect) => reloadLock.withPermit(effect));
   const pendingReloads = yield* PubSub.subscribe(reloads);
   yield* Stream.fromSubscription(pendingReloads).pipe(Stream.debounce("100 millis"), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload config", { cause })))), Effect.forkScoped({ startImmediately: true }));
-  yield* bus.subscribe(Event14.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
-  yield* bus.subscribe(Event20.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* bus.subscribe(Event19.Switched).pipe(Stream.filterEffect((event) => wellknown.entries().pipe(Effect.map((entries) => entries.some((entry) => entry.integrationID === event.data.integrationID)), Effect.orElseSucceed(() => false))), Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown config", { cause })))), Effect.forkScoped({ startImmediately: true }));
+  yield* bus.subscribe(Event15.Updated).pipe(Stream.runForEach(() => reload().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload wellknown sources", { cause })))), Effect.forkScoped({ startImmediately: true }));
   yield* Effect.sleep("10 minutes").pipe(Effect.andThen(Effect.suspend(() => {
     if (!wellknown.snapshot().length)
       return Effect.void;
@@ -250,7 +250,7 @@ var layer18 = (options) => Layer.effect(Service50, Effect.gen(function* () {
 `);
     yield* requestReload;
   }, (effect) => updateLock.withPermit(effect));
-  return Service50.of({
+  return Service70.of({
     entries: Effect.fnUntraced(function* () {
       return configs;
     }),
@@ -262,13 +262,13 @@ var layer18 = (options) => Layer.effect(Service50, Effect.gen(function* () {
     update
   });
 }));
-function configured7(options) {
+function configured10(options) {
   return makeLocationNode({
-    service: Service50,
-    layer: layer18(options),
-    deps: [node54, node87, FSUtil.node, Global.node, node80, node72, node84]
+    service: Service70,
+    layer: layer23(options),
+    deps: [node75, node87, FSUtil.node, Global.node, node84, node81, node76]
   });
 }
-var node53 = configured7();
+var node74 = configured10();
 
-export { latest2, Options7, Service50, Test2, testLayer2, layer18, configured7, node53, exports_config };
+export { latest2, Options8, Service70, Test2, testLayer2, layer23, configured10, node74, exports_config };

package/dist/chunks/{skill-k1m56zwf.js → variant-wwcjmkyb.js}

@@ -1,68 +1,68 @@
 import {
   Service84,
   node88
-} from "./skill-f0q3zgp7.js";
+} from "./variant-j6j34g5j.js";
 import {
   Service83,
   node87
-} from "./skill-w4ja1ymy.js";
+} from "./variant-80dfhc41.js";
 import {
   llmClient2
-} from "./skill-5t3nmthw.js";
+} from "./variant-5t3nmthw.js";
 import {
   create3
-} from "./skill-rdw6cm16.js";
+} from "./variant-rdw6cm16.js";
 import {
   estimate2
-} from "./skill-h6vf3j39.js";
+} from "./variant-h6vf3j39.js";
 import {
   SessionEvent2
-} from "./skill-ec1grn59.js";
+} from "./variant-ec1grn59.js";
 import {
   provenance2,
   compatible2,
   isCheckpoint2,
   encode2
-} from "./skill-a81kfqvn.js";
+} from "./variant-5dkn69vz.js";
 import {
-  load5
-} from "./skill-tgak7z6d.js";
+  load4
+} from "./variant-hz7kx0ky.js";
 import {
   toLLMMessages2
-} from "./skill-gg3hnhsj.js";
+} from "./variant-h5w29vws.js";
 import {
   baseTranscript2,
   unsupportedParts2,
   boundImages2,
-  Service39,
-  node43
-} from "./skill-abmzmmfq.js";
+  Service36,
+  node39
+} from "./variant-ncqv441z.js";
 import {
   toSessionError2
-} from "./skill-d0k4a5wc.js";
+} from "./variant-1g8as6dj.js";
 import {
   isRetryable2,
   policy2
-} from "./skill-17jhsav0.js";
+} from "./variant-3h15n8ab.js";
 import {
   calculateCost2,
   record2,
   add2
-} from "./skill-tdstcens.js";
+} from "./variant-tdstcens.js";
 import {
   __export
-} from "./skill-9rqn6x4v.js";
+} from "./variant-9rqn6x4v.js";
 
 // src/session/compaction.ts
 var exports_compaction2 = {};
 __export(exports_compaction2, {
-  Service: () => Service9,
+  Service: () => Service11,
   SessionCompaction: () => exports_compaction2,
   buildPrompt: () => buildPrompt2,
   estimateContext: () => estimateContext2,
   estimatePrompt: () => estimatePrompt2,
   layer: () => layer7,
-  node: () => node11,
+  node: () => node13,
   recentUserMessages: () => recentUserMessages2
 });
 import {
@@ -78,7 +78,7 @@ import {
 } from "@opencode/ai";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Result, Stream } from "effect";
-class Service9 extends Context.Service()("@opencode/SessionCompaction") {
+class Service11 extends Context.Service()("@opencode/SessionCompaction") {
 }
 var NOTHING_TO_COMPACT = { error: { type: "compaction.unavailable", message: "Nothing to compact yet" } };
 var SHRINK_STEPS = [0.7, 0.5, 0.35];
@@ -157,11 +157,11 @@ var buildPrompt2 = (update, legacy = false) => {
 };
 var NUDGE = "The previous response did not fill in the required summary template. Do not call tools. Return the summary as text using the exact section headings from the template.";
 var LEGACY_HEADING = "## Additional Context";
-var layer7 = Layer.effect(Service9, Effect.gen(function* () {
+var layer7 = Layer.effect(Service11, Effect.gen(function* () {
   const bus = yield* Service83;
   const llm = yield* LLMClient.Service;
   const db = (yield* Service84).db;
-  const requests = yield* Service39;
+  const requests = yield* Service36;
   const state = create3({
     name: "session-compaction",
     initial: () => ({ auto: true, keep: 15000 }),
@@ -249,7 +249,7 @@ var layer7 = Layer.effect(Service9, Effect.gen(function* () {
     const send = (request) => {
       if (LLMClient.canCompact(request, { mechanism: "trigger" })) {
         return Effect.gen(function* () {
-          const history = yield* load5(db, context.session.id, "local").pipe(Effect.orDie);
+          const history = yield* load4(db, context.session.id, "local").pipe(Effect.orDie);
           const retained = recentUserMessages2(history, context.model, keep);
           const response = yield* llm.compact(request, { ...prepared.options, mechanism: "trigger" });
           return yield* toResult([...retained, Message.assistant(response.checkpoint)], response.usage);
@@ -452,16 +452,16 @@ ${text}`;
     }, { metadata: outcome.metadata });
     return { status: "completed" };
   });
-  return Service9.of({
+  return Service11.of({
     transform: state.transform,
     reload: state.reload,
     compact: (trigger) => compact(trigger).pipe(Effect.onInterrupt(() => trigger.reason === "manual" ? Effect.void : publish(trigger, { error: { type: "compaction.interrupted", message: "Compaction was interrupted" } })), Effect.ensuring(Effect.sync(() => spent.delete(trigger.context.session.id))))
   });
 }));
-var node11 = makeLocationNode({
-  service: Service9,
+var node13 = makeLocationNode({
+  service: Service11,
   layer: layer7,
-  deps: [node87, node88, llmClient2, node43]
+  deps: [node87, node88, llmClient2, node39]
 });
 var previousCompaction = (messages) => {
   const [first] = messages;
@@ -666,4 +666,4 @@ var estimateMedia = (mime) => {
   return 0;
 };
 
-export { Service9, buildPrompt2, layer7, node11, recentUserMessages2, estimateContext2, estimatePrompt2, exports_compaction2 };
+export { Service11, buildPrompt2, layer7, node13, recentUserMessages2, estimateContext2, estimatePrompt2, exports_compaction2 };

package/dist/chunks/{skill-1vy1vbr0.js → variant-wys0gfh1.js}

@@ -1,21 +1,21 @@
 import {
   useragent2
-} from "./skill-kxh1rwc9.js";
+} from "./variant-epk4gxbx.js";
 import {
   __export
-} from "./skill-9rqn6x4v.js";
+} from "./variant-9rqn6x4v.js";
 
 // src/plugin/websearch/tavily.ts
 var exports_tavily = {};
 __export(exports_tavily, {
-  Plugin: () => Plugin35,
+  Plugin: () => Plugin20,
   WebSearchTavily: () => exports_tavily,
-  endpoint: () => endpoint3
+  endpoint: () => endpoint4
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Duration, Effect, Schema } from "effect";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
-var endpoint3 = "https://api.tavily.com/search";
+var endpoint4 = "https://api.tavily.com/search";
 var SearchRequest = Schema.Struct({
   query: Schema.String,
   search_depth: Schema.Literal("basic"),
@@ -29,7 +29,7 @@ var SearchResponse = Schema.Struct({
     content: Schema.String
   }))
 });
-var Plugin35 = define({
+var Plugin20 = define({
   id: "opencode.websearch.tavily",
   effect: Effect.fn("WebSearchTavily.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -51,7 +51,7 @@ var Plugin35 = define({
         execute: (input) => Effect.gen(function* () {
           const connection = yield* ctx.integration.connection.active("tavily");
           const credential = connection ? yield* ctx.integration.connection.resolve(connection) : undefined;
-          const request = yield* HttpClientRequest.post(endpoint3).pipe(HttpClientRequest.acceptJson, HttpClientRequest.setHeaders({
+          const request = yield* HttpClientRequest.post(endpoint4).pipe(HttpClientRequest.acceptJson, HttpClientRequest.setHeaders({
             "User-Agent": useragent2(ctx.app),
             "X-Client-Name": "opencode2",
             ...credential?.type === "key" ? { Authorization: `Bearer ${credential.key}` } : { "X-Tavily-Access-Mode": "keyless" }
@@ -77,4 +77,4 @@ var Plugin35 = define({
   })
 });
 
-export { endpoint3, Plugin35, exports_tavily };
+export { endpoint4, Plugin20, exports_tavily };

package/dist/chunks/{skill-x1ezjp6w.js → variant-x1ezjp6w.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./skill-9rqn6x4v.js";
+} from "./variant-9rqn6x4v.js";
 
 // src/session/subagent-completion.ts
 var exports_subagent_completion = {};

package/dist/chunks/{skill-r4xhx5yy.js → variant-x3ec03mt.js}

@@ -1,15 +1,15 @@
 import {
   cleanup3
-} from "./skill-gd4qta3r.js";
+} from "./variant-gd4qta3r.js";
 import {
   ascending2
-} from "./skill-tvtrv512.js";
+} from "./variant-tvtrv512.js";
 import {
   create3
-} from "./skill-rdw6cm16.js";
+} from "./variant-rdw6cm16.js";
 import {
   __export
-} from "./skill-9rqn6x4v.js";
+} from "./variant-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: () => Service49,
+  Service: () => Service60,
   ToolOutput: () => exports_tool_output2,
-  node: () => node52
+  node: () => node63
 });
 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 Service49 extends Context.Service()("@opencode/ToolOutput") {
+class Service60 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(Service49, Effect.gen(function* () {
+var layer = Layer.effect(Service60, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const directory = path.join(global.data, DIRECTORY3);
@@ -116,7 +116,7 @@ var layer = Layer.effect(Service49, Effect.gen(function* () {
       metadata: { ...result.metadata, truncated: true, outputPath: file }
     };
   });
-  return Service49.of({
+  return Service60.of({
     transform: state.transform,
     reload: state.reload,
     truncate,
@@ -133,10 +133,10 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var node52 = makeLocationNode({
-  service: Service49,
+var node63 = makeLocationNode({
+  service: Service60,
   layer,
   deps: [FSUtil.node, Global.node, cleanupNode]
 });
 
-export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service49, node52, exports_tool_output2 };
+export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service60, node63, exports_tool_output2 };

package/dist/chunks/{skill-6typ8tap.js → variant-x5zt6h23.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./skill-y71avatq.js";
+} from "./variant-y71avatq.js";
 import {
   Service83,
   node87
-} from "./skill-w4ja1ymy.js";
+} from "./variant-80dfhc41.js";
 import {
-  Event14,
-  Service68,
-  node72
-} from "./skill-3q06wn7v.js";
+  Event19,
+  Service77,
+  node81
+} from "./variant-scw7ae32.js";
 import {
-  Service76,
-  node80
-} from "./skill-29etqs2x.js";
+  Service80,
+  node84
+} from "./variant-nr9qr2eb.js";
 import {
-  Service53,
-  node56
-} from "./skill-zbgbht68.js";
+  Service61,
+  node64
+} from "./variant-9f2rwe55.js";
 import {
-  ID10,
-  Service67,
-  node71
-} from "./skill-yywpcc9t.js";
+  ID16,
+  Service78,
+  node82
+} from "./variant-a6mhrw7d.js";
 import {
   reconcile2,
   create3
-} from "./skill-rdw6cm16.js";
+} from "./variant-rdw6cm16.js";
 import {
-  ID9,
+  ID14,
   MethodID2,
-  Service66,
-  node69
-} from "./skill-7y51vbvs.js";
+  Service76,
+  node80
+} from "./variant-bpvf8gea.js";
 import {
   __export
-} from "./skill-9rqn6x4v.js";
+} from "./variant-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError5,
-  Options: () => Options5,
+  NotFoundError: () => NotFoundError4,
+  Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service42,
+  Service: () => Service35,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured5,
-  layer: () => layer16,
-  node: () => node45
+  configured: () => configured4,
+  layer: () => layer13,
+  node: () => node38
 });
 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 NotFoundError5 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError4 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -93,21 +93,21 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service42 extends Context.Service()("@opencode/MCP") {
+class Service35 extends Context.Service()("@opencode/MCP") {
 }
-var Options5 = Schema.Struct({
+var Options4 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
-  const location = yield* Service76;
-  const environment = yield* Service53;
+var layer13 = (options) => Layer.effect(Service35, Effect.gen(function* () {
+  const location = yield* Service80;
+  const environment = yield* Service61;
   const bus = yield* Service83;
-  const forms = yield* Service67;
-  const integration = yield* Service66;
-  const credentials = yield* Service68;
+  const forms = yield* Service78;
+  const integration = yield* Service76;
+  const credentials = yield* Service77;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -119,7 +119,7 @@ var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
       return;
     const remote = entry.config;
     const suffix = "mcp_" + createHash("sha1").update(name + "\x00" + remote.url).digest("hex").slice(0, 16);
-    const integrationID = ID9.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -135,7 +135,7 @@ var layer16 = (options) => Layer.effect(Service42, 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(Service68, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service77, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -144,19 +144,19 @@ var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError5({ server: name });
+      return yield* new NotFoundError4({ 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(Service68, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service77, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID10.create();
+        const formID = ID16.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -259,7 +259,7 @@ var layer16 = (options) => Layer.effect(Service42, 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(Service53, 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(Service61, 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;
@@ -384,7 +384,7 @@ var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event14.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: () => ({
@@ -410,7 +410,7 @@ var layer16 = (options) => Layer.effect(Service42, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service42.of({
+  return Service35.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -516,14 +516,14 @@ function mergeCatalogs(catalogs) {
     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) {
+function configured4(options) {
   return makeLocationNode({
-    service: Service42,
-    layer: layer16(options),
-    deps: [node80, node56, node87, node71, node69, node72]
+    service: Service35,
+    layer: layer13(options),
+    deps: [node84, node64, node87, node82, node80, node81]
   });
 }
-var node45 = configured5();
+var node38 = 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;
@@ -574,4 +574,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service42, Options5, layer16, configured5, node45, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError4, ToolCallError2, Service35, Options4, layer13, configured4, node38, exports_mcp4 };