@opencode/core 0.0.0-dev-20471 → 0.0.0-dev-20472

package/dist/chunks/{instruction-discovery-yp2x3t23.js → tool-1acjjqhc.js}

@@ -1,15 +1,15 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/session/run-coordinator.ts
 var exports_run_coordinator = {};
 __export(exports_run_coordinator, {
   SessionRunCoordinator: () => exports_run_coordinator,
-  make: () => make16
+  make: () => make17
 });
 import { Deferred, Effect, Fiber, FiberSet } from "effect";
-var make16 = (options) => Effect.gen(function* () {
+var make17 = (options) => Effect.gen(function* () {
   const executions = new Map;
   const fork = yield* FiberSet.makeRuntime();
   const loop = (key, execution, force) => Effect.suspend(() => options.drain(key, force, execution.scope)).pipe(Effect.andThen(Effect.suspend(() => {
@@ -89,4 +89,4 @@ var make16 = (options) => Effect.gen(function* () {
   };
 });
 
-export { make16, exports_run_coordinator };
+export { make17, exports_run_coordinator };

package/dist/chunks/{instruction-discovery-1dazxqgg.js → tool-1dazxqgg.js}

@@ -2,10 +2,10 @@ import {
   NotFound2,
   WrongKind2,
   Failed2
-} from "./instruction-discovery-2a5m3afh.js";
+} from "./tool-2a5m3afh.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/environment/exec-defaults.ts
 var exports_exec_defaults = {};

package/dist/chunks/{instruction-discovery-84h8c373.js → tool-1dvck2a7.js}

@@ -1,9 +1,9 @@
 import {
   absoluteColumn2
-} from "./instruction-discovery-qnc92qwc.js";
+} from "./tool-qnc92qwc.js";
 import {
   ProjectTable2
-} from "./instruction-discovery-3cegwx68.js";
+} from "./tool-h2b79v29.js";
 
 // src/worktree/sql.ts
 import { integer, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{instruction-discovery-ktwxsybc.js → tool-1egym0t3.js}

@@ -1,47 +1,47 @@
 import {
   AbsolutePath2
-} from "./instruction-discovery-z5v4ffb3.js";
+} from "./tool-z5v4ffb3.js";
 import {
   WorktreeError2
-} from "./instruction-discovery-mjqndqed.js";
+} from "./tool-7wnkabmt.js";
 import {
   Slug2
-} from "./instruction-discovery-gebd4c9n.js";
+} from "./tool-gebd4c9n.js";
 import {
   Service84,
   node88
-} from "./instruction-discovery-f1w2j8y8.js";
+} from "./tool-jad3eb5n.js";
 import {
   Service83,
   node87
-} from "./instruction-discovery-6f0av2j1.js";
+} from "./tool-5rrd0wgj.js";
 import {
   ProjectTable2
-} from "./instruction-discovery-3cegwx68.js";
+} from "./tool-h2b79v29.js";
 import {
   WorktreeTable2
-} from "./instruction-discovery-84h8c373.js";
+} from "./tool-1dvck2a7.js";
 import {
-  ID17,
-  NotFoundError11
-} from "./instruction-discovery-01rwjjcz.js";
+  ID14,
+  NotFoundError9
+} from "./tool-xvfphvy7.js";
 import {
-  Ref4
-} from "./instruction-discovery-4fecg1gp.js";
+  Ref3
+} from "./tool-dxjv2ykb.js";
 import {
-  Service78,
-  node82
-} from "./instruction-discovery-6pdejbrj.js";
+  Service73,
+  node77
+} from "./tool-59376ey9.js";
 import {
   DirectoryUnavailableError2,
   canonical2
-} from "./instruction-discovery-0vbcp93d.js";
+} from "./tool-0vbcp93d.js";
 import {
-  Service77
-} from "./instruction-discovery-tyw2rt9s.js";
+  Service20
+} from "./tool-g9xjst3r.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/worktree.ts
 var exports_worktree2 = {};
@@ -49,19 +49,19 @@ __export(exports_worktree2, {
   CreateInput: () => CreateInput3,
   DestinationExistsError: () => DestinationExistsError2,
   DirectoryUnavailableError: () => DirectoryUnavailableError2,
-  Event: () => Event20,
-  Info: () => Info30,
+  Event: () => Event4,
+  Info: () => Info5,
   InvalidDirectoryError: () => InvalidDirectoryError2,
   List: () => List2,
   ListEntry: () => ListEntry3,
   OperationError: () => OperationError2,
   RemoveInput: () => RemoveInput2,
-  Service: () => Service76,
+  Service: () => Service19,
   SourceDirectoryNotFoundError: () => SourceDirectoryNotFoundError2,
   StrategyID: () => StrategyID2,
   StrategyUnavailableError: () => StrategyUnavailableError2,
   Worktree: () => exports_worktree2,
-  node: () => node80
+  node: () => node22
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { and, asc, desc, eq, isNull, sql } from "drizzle-orm";
@@ -75,11 +75,11 @@ import { OperationError as OperationError2 } from "@opencode/schema/worktree";
 var StrategyID2 = Worktree.StrategyID;
 var CreateInput3 = Worktree.CreateInput;
 var RemoveInput2 = Worktree.RemoveInput;
-var Info30 = Worktree.Info;
+var Info5 = Worktree.Info;
 var List2 = Worktree.List;
 var ListEntry3 = Worktree.ListEntry;
 
-class SourceDirectoryNotFoundError2 extends Schema.TaggedError()("Worktree.SourceDirectoryNotFoundError", { projectID: ID17, directory: Schema.optional(AbsolutePath2) }) {
+class SourceDirectoryNotFoundError2 extends Schema.TaggedError()("Worktree.SourceDirectoryNotFoundError", { projectID: ID14, directory: Schema.optional(AbsolutePath2) }) {
 }
 
 class DestinationExistsError2 extends Schema.TaggedError()("Worktree.DestinationExistsError", { directory: AbsolutePath2 }) {
@@ -90,21 +90,21 @@ class InvalidDirectoryError2 extends Schema.TaggedError()("Worktree.InvalidDirec
 
 class StrategyUnavailableError2 extends Schema.TaggedError()("Worktree.StrategyUnavailableError", { strategy: StrategyID2 }) {
 }
-var Event20 = Worktree.Event;
+var Event4 = Worktree.Event;
 
-class Service76 extends Context.Service()("@opencode/Worktree") {
+class Service19 extends Context.Service()("@opencode/Worktree") {
 }
-var layer = Layer.effect(Service76, Effect.gen(function* () {
+var layer = Layer.effect(Service19, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const database = yield* Service84;
   const db = database.db;
   const bus = yield* Service83;
   const processService = yield* AppProcess.Service;
-  const locations = yield* Service78;
+  const locations = yield* Service73;
   const project = Effect.fnUntraced(function* (projectID) {
     const row = yield* db.select().from(ProjectTable2).where(eq(ProjectTable2.id, projectID)).get().pipe(Effect.orDie);
     if (!row)
-      return yield* new NotFoundError11({ projectID });
+      return yield* new NotFoundError9({ projectID });
     return row;
   });
   const load = Effect.fnUntraced(function* (directory, current) {
@@ -113,13 +113,13 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     if (current?.directory === directory)
       return current.get();
     const { Plugin } = yield* Effect.promise(() => import("../plugin.js"));
-    const context = yield* locations.contextEffect(Ref4.make({ directory }));
+    const context = yield* locations.contextEffect(Ref3.make({ directory }));
     yield* Context.get(context, Plugin.Service).awaitActivation;
-    return Context.get(context, Service77).get();
+    return Context.get(context, Service20).get();
   });
   const changed = Effect.fnUntraced(function* (projectID, update) {
     if (update)
-      yield* bus.publish(Event20.Updated, { projectID });
+      yield* bus.publish(Event4.Updated, { projectID });
   });
   const ops = {
     list: Effect.fnUntraced(function* (projectID) {
@@ -246,7 +246,7 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     })).pipe(Effect.orDie);
     yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0);
   }, Effect.scoped);
-  return Service76.of({
+  return Service19.of({
     list: Effect.fn("Worktree.list")(function* (input) {
       yield* project(input.projectID);
       return yield* ops.list(input.projectID);
@@ -256,10 +256,10 @@ var layer = Layer.effect(Service76, Effect.gen(function* () {
     refresh
   });
 }));
-var node80 = Node.makeGlobalNode({
-  service: Service76,
+var node22 = Node.makeGlobalNode({
+  service: Service19,
   layer,
-  deps: [FSUtil.node, node87, node88, AppProcess.node, node82]
+  deps: [FSUtil.node, node87, node88, AppProcess.node, node77]
 });
 function operationError(strategy, operation, error) {
   if (error instanceof WorktreeError2 || error instanceof DirectoryUnavailableError2 || error instanceof Worktree.OperationError)
@@ -269,4 +269,4 @@ function operationError(strategy, operation, error) {
   });
 }
 
-export { StrategyID2, CreateInput3, RemoveInput2, Info30, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event20, Service76, node80, exports_worktree2, OperationError2 };
+export { StrategyID2, CreateInput3, RemoveInput2, Info5, List2, ListEntry3, SourceDirectoryNotFoundError2, DestinationExistsError2, InvalidDirectoryError2, StrategyUnavailableError2, Event4, Service19, node22, exports_worktree2, OperationError2 };

package/dist/chunks/{instruction-discovery-2aa0xkz7.js → tool-1m5kq2rb.js}

@@ -1,10 +1,10 @@
 import {
   Service83
-} from "./instruction-discovery-6f0av2j1.js";
+} from "./tool-5rrd0wgj.js";
 import {
-  Service16,
-  Event2
-} from "./instruction-discovery-q3mvh4gg.js";
+  Service63,
+  Event13
+} from "./tool-d6x8wjh2.js";
 
 // src/plugin/models-dev.ts
 import { define } from "@opencode/plugin/effect/plugin";
@@ -29,7 +29,7 @@ var BEDROCK_PROFILE_ONLY_IDS = [
 var ModelsDevPlugin2 = define({
   id: "opencode.models.dev",
   effect: Effect.fn(function* (ctx) {
-    const modelsDev = yield* Service16;
+    const modelsDev = yield* Service63;
     const bus = yield* Service83;
     const loaded = { data: snapshots(yield* modelsDev.get()) };
     yield* ctx.integration.transform((integrations) => {
@@ -63,7 +63,7 @@ var ModelsDevPlugin2 = define({
       loaded.data = snapshots(data);
       return ctx.integration.reload().pipe(Effect.andThen(ctx.provider.reload()));
     };
-    yield* bus.subscribe(Event2.Refreshed).pipe(Stream.runForEach(() => modelsDev.get().pipe(Effect.flatMap(apply))), Effect.forkScoped({ startImmediately: true }));
+    yield* bus.subscribe(Event13.Refreshed).pipe(Stream.runForEach(() => modelsDev.get().pipe(Effect.flatMap(apply))), Effect.forkScoped({ startImmediately: true }));
     const latest = yield* modelsDev.get();
     if (snapshots(latest) !== loaded.data)
       yield* apply(latest);

package/dist/chunks/{instruction-discovery-21r38tys.js → tool-21r38tys.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/v1/config/layout.ts
 var exports_layout = {};

package/dist/chunks/{instruction-discovery-2a5m3afh.js → tool-2a5m3afh.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/environment/files.ts
 var exports_files = {};

package/dist/chunks/{instruction-discovery-x18va5sk.js → tool-2rwb967c.js}

@@ -2,44 +2,44 @@ import {
   NotFound2,
   WrongKind2,
   Failed2
-} from "./instruction-discovery-2a5m3afh.js";
+} from "./tool-2a5m3afh.js";
 import {
-  Service80
-} from "./instruction-discovery-4fecg1gp.js";
+  Service75
+} from "./tool-dxjv2ykb.js";
 import {
-  Service74
-} from "./instruction-discovery-9zppm9tj.js";
+  Service59
+} from "./tool-mydkh4yr.js";
 import {
-  Service14
-} from "./instruction-discovery-vd50vaq5.js";
+  Service13
+} from "./tool-xw2p2fks.js";
 import {
-  Service51,
+  Service25,
   readText2,
   syncTextBom2
-} from "./instruction-discovery-31cn1m4w.js";
+} from "./tool-4xh45ynr.js";
 import {
-  Service65
-} from "./instruction-discovery-vt1ndr5w.js";
+  Service69
+} from "./tool-h85krvk7.js";
 import {
   Service15,
   resolvePath2
-} from "./instruction-discovery-6y2nrvpb.js";
+} from "./tool-55n934x1.js";
 import {
   fileDiff2
-} from "./instruction-discovery-6prwharc.js";
+} from "./tool-6prwharc.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/tool/plugin/patch.ts
 var exports_patch = {};
 __export(exports_patch, {
   Applied: () => Applied2,
-  Input: () => Input10,
-  Output: () => Output7,
+  Input: () => Input7,
+  Output: () => Output6,
   PatchTool: () => exports_patch,
-  Plugin: () => Plugin46,
-  name: () => name10,
+  Plugin: () => Plugin8,
+  name: () => name7,
   toModelContent: () => toModelContent5
 });
 import { ToolFailure } from "@opencode/ai";
@@ -85,8 +85,8 @@ It is important to remember:
 `;
 
 // src/tool/plugin/patch.ts
-var name10 = "patch";
-var Input10 = Schema.Struct({
+var name7 = "patch";
+var Input7 = Schema.Struct({
   patchText: Schema.String.annotate({
     description: "The full patch text describing add, update, and delete operations"
   })
@@ -96,7 +96,7 @@ var Applied2 = Schema.Struct({
   resource: Schema.String,
   target: Schema.String
 });
-var Output7 = Schema.Struct({
+var Output6 = Schema.Struct({
   applied: Schema.Array(Applied2),
   files: Schema.Array(FileDiff.Info)
 });
@@ -105,21 +105,21 @@ var toModelContent5 = (output) => [
   ...output.applied.map((item) => `${item.type === "add" ? "A" : item.type === "delete" ? "D" : "M"} ${item.resource}`)
 ].join(`
 `);
-var Plugin46 = {
+var Plugin8 = {
   id: "opencode.tool.patch",
   effect: Effect.fn("PatchTool.Plugin")(function* (ctx) {
-    const environment = yield* Service74;
+    const environment = yield* Service59;
     const access = yield* Service15;
-    const fileMutation = yield* Service51;
-    const formatter = yield* Service14;
-    const location = yield* Service80;
-    const permission = yield* Service65;
+    const fileMutation = yield* Service25;
+    const formatter = yield* Service13;
+    const location = yield* Service75;
+    const permission = yield* Service69;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name10,
+      name: name7,
       options: { codemode: false, permission: "edit" },
       description: patch_default,
-      input: Input10,
-      output: Output7,
+      input: Input7,
+      output: Output6,
       execute: (input, context) => {
         const applied = [];
         const parsed = Patch.parse(input.patchText);
@@ -326,4 +326,4 @@ function trimDiff(diff) {
 `);
 }
 
-export { name10, Input10, Applied2, Output7, toModelContent5, Plugin46, exports_patch };
+export { name7, Input7, Applied2, Output6, toModelContent5, Plugin8, exports_patch };

package/dist/chunks/{instruction-discovery-smpatqxy.js → tool-2t0ky1d2.js}

@@ -1,23 +1,23 @@
 import {
-  Service78,
-  node82,
+  Service73,
+  node77,
   canonical3
-} from "./instruction-discovery-6pdejbrj.js";
+} from "./tool-59376ey9.js";
 import {
-  Service33,
-  node35
-} from "./instruction-discovery-2myva995.js";
+  Service43,
+  node45
+} from "./tool-4mwpykj0.js";
 import {
-  Service63
-} from "./instruction-discovery-g5e9pd1v.js";
+  Service67
+} from "./tool-tzhbwgz4.js";
 import {
   layer2
-} from "./instruction-discovery-10b5w8nt.js";
+} from "./tool-zm2m1bym.js";
 
 // src/location-services.ts
 import { Context, Duration, Effect, Exit, Layer, LayerMap, MutableHashMap, Option } from "effect";
 function buildLocationServiceMap2(replacements = []) {
-  return Layer.effect(Service78, Effect.gen(function* () {
+  return Layer.effect(Service73, Effect.gen(function* () {
     const owner = yield* Effect.scope;
     const builds = MutableHashMap.empty();
     const inner = yield* LayerMap.make((ref) => {
@@ -27,7 +27,7 @@ function buildLocationServiceMap2(replacements = []) {
         const finish = Effect.suspend(() => {
           if (Exit.isSuccess(exit)) {
             return Effect.gen(function* () {
-              const lifecycle = Context.get(exit.value, Service63);
+              const lifecycle = Context.get(exit.value, Service67);
               if (Option.getOrUndefined(MutableHashMap.get(builds, ref)) !== build)
                 return yield* lifecycle.shutdown;
               build.close = lifecycle.shutdown;
@@ -54,11 +54,11 @@ function buildLocationServiceMap2(replacements = []) {
       }).pipe(Effect.uninterruptible)
     };
     const bindings = [
-      node35.replace(Layer.succeed(Service33, {
+      node45.replace(Layer.succeed(Service43, {
         provide: (session) => Effect.provide(map.get(session.location))
       })),
       ...replacements,
-      node82.replace(Layer.succeed(Service78, map))
+      node77.replace(Layer.succeed(Service73, map))
     ];
     return map;
   }));

package/dist/chunks/{instruction-discovery-qpsckf0j.js → tool-2tmdj2y2.js}

@@ -1,47 +1,47 @@
 import {
   makeUnsafe2
-} from "./instruction-discovery-dpkg50ah.js";
+} from "./tool-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./instruction-discovery-6f0av2j1.js";
+} from "./tool-5rrd0wgj.js";
 import {
-  Event14,
-  Service61,
-  node64
-} from "./instruction-discovery-vwb48jve.js";
+  Event20,
+  Service81,
+  node85
+} from "./tool-4gtnaf1q.js";
 import {
-  Service80,
-  node84
-} from "./instruction-discovery-4fecg1gp.js";
+  Service75,
+  node79
+} from "./tool-dxjv2ykb.js";
 import {
-  Service74,
-  node77
-} from "./instruction-discovery-9zppm9tj.js";
+  Service59,
+  node61
+} from "./tool-mydkh4yr.js";
 import {
-  ID15,
-  Service70,
-  node73
-} from "./instruction-discovery-s87m1rh1.js";
+  ID18,
+  Service82,
+  node86
+} from "./tool-6f1n1136.js";
 import {
   reconcile2,
   create3
-} from "./instruction-discovery-rdw6cm16.js";
+} from "./tool-rdw6cm16.js";
 import {
-  ID9,
+  ID16,
   MethodID2,
-  Service60,
-  node63
-} from "./instruction-discovery-mmha7pa6.js";
+  Service80,
+  node84
+} from "./tool-cxhqznm4.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./tool-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError2,
+  NotFoundError: () => NotFoundError4,
   Options: () => Options3,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
@@ -49,12 +49,12 @@ __export(exports_mcp4, {
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service29,
+  Service: () => Service37,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
   configured: () => configured3,
   layer: () => layer14,
-  node: () => node32
+  node: () => node40
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -72,7 +72,7 @@ var ResourceTemplate2 = Mcp.ResourceTemplate;
 var ResourceCatalog2 = Mcp.ResourceCatalog;
 var ResourceContent2 = Mcp.ResourceContent;
 
-class NotFoundError2 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError4 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -103,7 +103,7 @@ var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service29 extends Context.Service()("@opencode/MCP") {
+class Service37 extends Context.Service()("@opencode/MCP") {
 }
 var Options3 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
@@ -111,13 +111,13 @@ var Options3 = Schema.Struct({
     version: Schema.String
   }))
 });
-var layer14 = (options) => Layer.effect(Service29, Effect.gen(function* () {
-  const location = yield* Service80;
-  const environment = yield* Service74;
+var layer14 = (options) => Layer.effect(Service37, Effect.gen(function* () {
+  const location = yield* Service75;
+  const environment = yield* Service59;
   const bus = yield* Service83;
-  const forms = yield* Service70;
-  const integration = yield* Service60;
-  const credentials = yield* Service61;
+  const forms = yield* Service82;
+  const integration = yield* Service80;
+  const credentials = yield* Service81;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -129,7 +129,7 @@ var layer14 = (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 = ID9.make(suffix);
+    const integrationID = ID16.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -145,7 +145,7 @@ var layer14 = (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(Service61, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service81, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -154,19 +154,19 @@ var layer14 = (options) => Layer.effect(Service29, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError2({ 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(Service61, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service81, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID15.create();
+        const formID = ID18.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -269,7 +269,7 @@ var layer14 = (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(Service74, 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(Service59, 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;
@@ -394,7 +394,7 @@ var layer14 = (options) => Layer.effect(Service29, 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(Event20.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: () => ({
@@ -420,7 +420,7 @@ var layer14 = (options) => Layer.effect(Service29, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service29.of({
+  return Service37.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -532,12 +532,12 @@ function mergeCatalogs(catalogs) {
 }
 function configured3(options) {
   return makeLocationNode({
-    service: Service29,
+    service: Service37,
     layer: layer14(options),
-    deps: [node84, node77, node87, node73, node63, node64]
+    deps: [node79, node61, node87, node86, node84, node85]
   });
 }
-var node32 = configured3();
+var node40 = 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;
@@ -588,4 +588,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError2, ToolCallError2, Service29, Options3, layer14, configured3, node32, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError4, ToolCallError2, Service37, Options3, layer14, configured3, node40, exports_mcp4 };