@opencode/core 0.0.0-dev-20460 → 0.0.0-dev-20464

package/dist/chunks/{event-logger-qneh565c.js → image-7jkt0fxj.js}

@@ -1,62 +1,62 @@
 import {
   NonNegativeInt2
-} from "./event-logger-z5v4ffb3.js";
+} from "./image-z5v4ffb3.js";
 import {
   latest2,
-  Service47
-} from "./event-logger-1qafx05f.js";
+  Service40
+} from "./image-jp9apkzt.js";
 import {
   typeFollowing2
-} from "./event-logger-2a5m3afh.js";
+} from "./image-2a5m3afh.js";
 import {
-  Service45
-} from "./event-logger-b0bdxm7z.js";
+  Service59
+} from "./image-zzfd9are.js";
 import {
-  Service41
-} from "./event-logger-h9dh1478.js";
+  Service52
+} from "./image-jafr5hga.js";
 import {
-  Service72
-} from "./event-logger-kk2xwyyy.js";
+  Service65
+} from "./image-4eehw1ga.js";
 import {
-  Service18,
+  Service15,
   resolvePath2
-} from "./event-logger-8zzn0zxn.js";
+} from "./image-pdysjfwk.js";
 import {
   output2,
   notice2,
   metadata2,
   notification2
-} from "./event-logger-vzs5sf6e.js";
+} from "./image-vzs5sf6e.js";
 import {
-  Service69,
+  Service54,
   name15
-} from "./event-logger-yze6d0jy.js";
+} from "./image-rnr5nq63.js";
 import {
-  NotFoundError4,
-  Service34
-} from "./event-logger-zn20fg5e.js";
+  NotFoundError5,
+  Service38
+} from "./image-hkxn87db.js";
 import {
-  Service21
-} from "./event-logger-wdnx4v1c.js";
+  Service24
+} from "./image-d13vq5ht.js";
 import {
   scan2
-} from "./event-logger-qx5yhpy2.js";
+} from "./image-aa1twyr9.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/tool/plugin/shell.ts
 var exports_shell = {};
 __export(exports_shell, {
   DEFAULT_TIMEOUT_MS: () => DEFAULT_TIMEOUT_MS2,
-  Input: () => Input11,
-  Plugin: () => Plugin12,
+  Input: () => Input4,
+  Plugin: () => Plugin20,
   ShellTool: () => exports_shell,
-  name: () => name11
+  name: () => name4
 });
 import { ToolFailure } from "@opencode/ai";
 import { Deferred, Effect, Schema, Scope } from "effect";
-var name11 = "shell";
+var name4 = "shell";
 var DEFAULT_TIMEOUT_MS2 = 2 * 60 * 1000;
 var BACKGROUND_INSTRUCTION = "You will be notified automatically when the command finishes. The notification will include the command's output. Unless the user explicitly asks otherwise, DO NOT poll for completion, even if you need the final result to continue. Repeatedly sleeping and reading or searching the output file is polling, not useful work. You may read the current output if it lets you do useful work now, but do not repeatedly check it while waiting for the command to finish. Keep working on anything that does not depend on the result. If you have nothing else to do, end your response; you will be resumed automatically when the command finishes.";
 var OS = process.platform === "darwin" ? "macOS" : process.platform === "win32" ? "Windows" : process.platform === "linux" ? "Linux" : process.platform;
@@ -70,7 +70,7 @@ var description = (shell) => [
   "Commands accept an optional timeout, background commands have no timeout by default.",
   "Background commands return immediately, and you will be notified when they complete."
 ].join(" ");
-var Input11 = Schema.Struct({
+var Input4 = Schema.Struct({
   command: Schema.String.annotate({ description: "Shell command string to execute" }),
   workdir: Schema.optionalKey(Schema.String).annotate({
     description: "Working directory to execute the command in. Defaults to the current working directory. When possible, avoid changing directories in the command and set the working directory here instead."
@@ -116,19 +116,19 @@ Output is streaming to: ${file}`,
   truncated: false,
   status: "running"
 });
-var Plugin12 = {
+var Plugin20 = {
   id: "opencode.tool.shell",
   effect: Effect.fn("ShellTool.Plugin")(function* (ctx) {
-    const sessions = yield* Service21;
-    const jobs = yield* Service41;
+    const sessions = yield* Service24;
+    const jobs = yield* Service52;
     const scope = yield* Scope.Scope;
-    const environment = yield* Service45;
-    const access = yield* Service18;
-    const shell = yield* Service34;
-    const shellSelect = yield* Service69;
+    const environment = yield* Service59;
+    const access = yield* Service15;
+    const shell = yield* Service38;
+    const shellSelect = yield* Service54;
     const compatibleShell = shellSelect.resolve({ priority: "compat" });
-    const permission = yield* Service72;
-    const config = yield* Service47;
+    const permission = yield* Service65;
+    const config = yield* Service40;
     const prepare = Effect.fn("ShellTool.prepare")(function* (invocation, context) {
       const source = {
         type: "tool",
@@ -147,7 +147,7 @@ var Plugin12 = {
       yield* access.authorizeExternal([target, ...directories], context);
       if (parsed.commands.length > 0)
         yield* permission.assert({
-          action: name11,
+          action: name4,
           resources: parsed.commands.map((command) => command.resource),
           save: parsed.commands.map((command) => command.save),
           sessionID: context.sessionID,
@@ -184,10 +184,10 @@ var Plugin12 = {
         yield* jobs.completeBackground(info.notificationID);
     }, Effect.forkIn(scope, { startImmediately: true }));
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name11,
+      name: name4,
       options: { codemode: false },
       description: description(),
-      input: Input11,
+      input: Input4,
       output: Output,
       execute: (input, context) => Effect.gen(function* () {
         const timeout = input.background === true ? input.timeout ?? 0 : input.timeout ?? DEFAULT_TIMEOUT_MS2;
@@ -210,7 +210,7 @@ var Plugin12 = {
         const run = Effect.gen(function* () {
           const result = yield* shell.result(info);
           if (!result.capture)
-            return yield* new NotFoundError4({ id: info.id });
+            return yield* new NotFoundError5({ id: info.id });
           const output = output2(result);
           return {
             ...output,
@@ -224,7 +224,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
 `)), Effect.onInterrupt(() => shell.remove(info.id).pipe(Effect.ignore)));
         const job = yield* jobs.start({
           id: info.id,
-          type: name11,
+          type: name4,
           title: info.command,
           metadata: { sessionID: context.sessionID, shellID: info.id },
           recovery: {
@@ -254,7 +254,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
       }).pipe(Effect.map(toolResult), Effect.mapError((error) => new ToolFailure({ message: `Unable to execute command: ${input.command}`, error })))
     })).pipe(Effect.orDie);
     const hook = (event) => Effect.gen(function* () {
-      const tool = event.tools[name11];
+      const tool = event.tools[name4];
       if (!tool)
         return;
       tool.description = description(name15(yield* compatibleShell));
@@ -265,4 +265,4 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
   })
 };
 
-export { name11, DEFAULT_TIMEOUT_MS2, Input11, Plugin12, exports_shell };
+export { name4, DEFAULT_TIMEOUT_MS2, Input4, Plugin20, exports_shell };

package/dist/chunks/{event-logger-d4vmqwkg.js → image-7qzq4r78.js}

@@ -1,17 +1,17 @@
 import {
-  ID8,
+  ID13,
   aisdk2,
   mergeOverlay2
-} from "./event-logger-c0asftn8.js";
+} from "./image-2j8mnjbv.js";
 import {
-  ID6,
+  ID12,
   VariantID2,
   Family2,
-  Info20
-} from "./event-logger-x9y5pk9m.js";
+  Info26
+} from "./image-1xsshfr0.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/github-copilot/models.ts
 var exports_models = {};
@@ -94,7 +94,7 @@ function derive2(baseURL, remote, existing) {
     result.set(id, build(id, current, baseURL, model));
   }
   for (const [id, model] of remote) {
-    const key = ID6.make(id);
+    const key = ID12.make(id);
     if (result.has(key))
       continue;
     result.set(key, build(key, model, baseURL));
@@ -118,11 +118,11 @@ function build(id, remote, baseURL, previous) {
   const usdPerMillion = prices && prices.batch_size > 0 ? 1e4 / prices.batch_size : 0;
   const version = remote.version.startsWith(`${remote.id}-`) ? remote.version.slice(remote.id.length + 1) : remote.version;
   const released = previous?.time.released || Date.parse(version);
-  return Info20.make({
-    ...Info20.default(ID8.githubCopilot, id),
+  return Info26.make({
+    ...Info26.default(ID13.githubCopilot, id),
     id,
-    modelID: ID6.make(remote.id),
-    providerID: ID8.githubCopilot,
+    modelID: ID12.make(remote.id),
+    providerID: ID13.githubCopilot,
     family: previous?.family ?? Family2.make(remote.capabilities.family),
     name: previous?.name ?? remote.name,
     package: messages ? "@opencode/ai/providers/anthropic" : aisdk2("@ai-sdk/github-copilot"),

package/dist/chunks/{event-logger-8w0ceqmz.js → image-7rdvab6p.js}

@@ -1,56 +1,56 @@
 import {
   Service84,
   node88
-} from "./event-logger-1ks7z7r5.js";
+} from "./image-a6ty810w.js";
 import {
   Service83,
   node87
-} from "./event-logger-17tggw8r.js";
+} from "./image-zchy057q.js";
 import {
-  Service41,
-  node43
-} from "./event-logger-h9dh1478.js";
+  Service52,
+  node55
+} from "./image-jafr5hga.js";
 import {
-  Service40,
-  node42
-} from "./event-logger-3ppptnan.js";
+  Service46,
+  node48
+} from "./image-909p1r3q.js";
 import {
   SessionEvent2
-} from "./event-logger-ec1grn59.js";
+} from "./image-ec1grn59.js";
 import {
-  make16
-} from "./event-logger-yp2x3t23.js";
+  make17
+} from "./image-1acjjqhc.js";
 import {
   DrainResult2,
-  Service37
-} from "./event-logger-gst7axd9.js";
+  Service44
+} from "./image-zvt5dnpc.js";
 import {
-  Service73,
-  node76
-} from "./event-logger-3hbysgm9.js";
+  Service67,
+  node71
+} from "./image-5ht2nh62.js";
 import {
   toSessionError2
-} from "./event-logger-vbdkk6m4.js";
+} from "./image-wtxvck1s.js";
 import {
   nextPromotable2
-} from "./event-logger-11hvmqr1.js";
+} from "./image-s3sykjag.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/session/execution.ts
 var exports_execution = {};
 __export(exports_execution, {
-  Service: () => Service36,
+  Service: () => Service43,
   SessionExecution: () => exports_execution,
-  layer: () => layer15,
-  node: () => node39,
+  layer: () => layer18,
+  node: () => node46,
   noopLayer: () => noopLayer2,
   terminal: () => terminal2
 });
 import { Cause, Context, Effect, Exit, Layer } from "effect";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
-class Service36 extends Context.Service()("@opencode/SessionExecution") {
+class Service43 extends Context.Service()("@opencode/SessionExecution") {
 }
 function terminal2(exit, reason) {
   if (Exit.isSuccess(exit))
@@ -59,11 +59,11 @@ function terminal2(exit, reason) {
     return { type: "interrupted", reason: reason ?? "shutdown" };
   return { type: "failed", error: toSessionError2(Cause.squash(exit.cause)) };
 }
-var layer15 = Layer.effect(Service36, Effect.gen(function* () {
-  const store = yield* Service73;
-  const instances = yield* Service40;
+var layer18 = Layer.effect(Service43, Effect.gen(function* () {
+  const store = yield* Service67;
+  const instances = yield* Service46;
   const bus = yield* Service83;
-  const jobs = yield* Service41;
+  const jobs = yield* Service52;
   const db = (yield* Service84).db;
   const reportLifecycle = (sessionID, effect) => effect.pipe(Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to publish Session execution lifecycle", cause).pipe(Effect.annotateLogs({ sessionID }))), Effect.asVoid);
   const claimOnCommit = (sessionID) => ({
@@ -76,14 +76,14 @@ var layer15 = Layer.effect(Service36, Effect.gen(function* () {
     const session = yield* store.get(sessionID);
     if (!session)
       return yield* Effect.die(new Error(`Session not found: ${sessionID}`));
-    const result = yield* Service37.use((runner) => runner.drain({ sessionID, force, continuation, promotable })).pipe(instances.provide(session), Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID }))));
+    const result = yield* Service44.use((runner) => runner.drain({ sessionID, force, continuation, promotable })).pipe(instances.provide(session), Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID }))));
     return yield* DrainResult2.$match(result, {
       Complete: () => Effect.void,
       Moved: (result) => drain(sessionID, false, result.continuation, promotable),
       Reloaded: (result) => drain(sessionID, result.force, result.continuation, promotable)
     });
   });
-  const coordinator = yield* make16({
+  const coordinator = yield* make17({
     started: (sessionID) => reportLifecycle(sessionID, bus.publish(SessionEvent2.Execution.Started, { sessionID }, claimOnCommit(sessionID))),
     drain: (sessionID, force, promotable) => drain(sessionID, force, undefined, promotable),
     settled: (sessionID, exit, reason) => reportLifecycle(sessionID, Effect.gen(function* () {
@@ -104,7 +104,7 @@ var layer15 = Layer.effect(Service36, Effect.gen(function* () {
       }, releaseOnCommit(sessionID));
     }))
   });
-  return Service36.of({
+  return Service43.of({
     active: coordinator.active,
     isActive: coordinator.isActive,
     interrupt: (sessionID, options) => Effect.gen(function* () {
@@ -123,12 +123,12 @@ var layer15 = Layer.effect(Service36, Effect.gen(function* () {
     awaitIdle: coordinator.awaitIdle
   });
 }));
-var node39 = makeGlobalNode({
-  service: Service36,
-  layer: layer15,
-  deps: [node76, node42, node87, node88, node43]
+var node46 = makeGlobalNode({
+  service: Service43,
+  layer: layer18,
+  deps: [node71, node48, node87, node88, node55]
 });
-var noopLayer2 = Layer.succeed(Service36, Service36.of({
+var noopLayer2 = Layer.succeed(Service43, Service43.of({
   active: Effect.succeed(new Set),
   isActive: () => Effect.succeed(false),
   resume: () => Effect.void,
@@ -137,4 +137,4 @@ var noopLayer2 = Layer.succeed(Service36, Service36.of({
   awaitIdle: () => Effect.void
 }));
 
-export { Service36, terminal2, layer15, node39, noopLayer2, exports_execution };
+export { Service43, terminal2, layer18, node46, noopLayer2, exports_execution };

package/dist/chunks/{event-logger-0d4rhnrt.js → image-7ssjw8ge.js}

@@ -1,26 +1,26 @@
 import {
   AbsolutePath2
-} from "./event-logger-z5v4ffb3.js";
+} from "./image-z5v4ffb3.js";
 import {
-  Info6,
-  ID4,
+  Info17,
+  ID5,
   Name2
-} from "./event-logger-pyyxhprs.js";
+} from "./image-mjrr4cxq.js";
 import {
-  Service47
-} from "./event-logger-1qafx05f.js";
+  Service40
+} from "./image-jp9apkzt.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/plugin/skill.ts
-var exports_skill3 = {};
-__export(exports_skill3, {
+var exports_skill = {};
+__export(exports_skill, {
   OpencodeContent: () => OpencodeContent2,
   OpencodeDescription: () => OpencodeDescription2,
-  Plugin: () => Plugin48,
+  Plugin: () => Plugin13,
   ReportContent: () => ReportContent2,
-  SkillPlugin: () => exports_skill3
+  SkillPlugin: () => exports_skill
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
@@ -425,20 +425,20 @@ var OpencodeContent2 = opencode_default;
 var ReportContent2 = report_default;
 var OpencodeDescription2 = "Use this skill for any question about OpenCode itself, including how OpenCode works, using or configuring it, migrating from V1 to V2, troubleshooting it, developing plugins or integrations, using the OpenCode SDK, clients, server, or API, and contributing to the OpenCode codebase. Also use it for OpenCode agents, commands, skills, tools, permissions, MCP servers, providers, models, themes, keybinds, formatters, the CLI, TUI, desktop app, and web app.";
 var REPORT_DESCRIPTION = "Use when the user wants to report an opencode issue or bug. Collect standard diagnostics, add user-specific reproduction context, and publish the issue with GitHub CLI.";
-var Plugin48 = define({
+var Plugin13 = define({
   id: "opencode.skill",
   effect: Effect.fn(function* (ctx) {
     const reportContent = yield* reportContentWithDiagnostics(ctx.app);
     yield* ctx.skill.transform((editor) => {
-      editor.add(Info6.make({
-        id: ID4.make("opencode"),
+      editor.add(Info17.make({
+        id: ID5.make("opencode"),
         name: Name2.make("OpenCode"),
         description: OpencodeDescription2,
         path: AbsolutePath2.make("/builtin/opencode.md"),
         content: OpencodeContent2
       }));
-      editor.add(Info6.make({
-        id: ID4.make("report"),
+      editor.add(Info17.make({
+        id: ID5.make("report"),
         name: Name2.make("Report"),
         description: REPORT_DESCRIPTION,
         path: AbsolutePath2.make("/builtin/report.md"),
@@ -466,7 +466,7 @@ var reportContentWithDiagnostics = Effect.fn("SkillPlugin.reportContentWithDiagn
 `);
 });
 var configuredPlugins = Effect.fn("SkillPlugin.configuredPlugins")(function* () {
-  const config = yield* Service47;
+  const config = yield* Service40;
   return (yield* config.entries()).filter((entry) => entry.type === "document").flatMap((entry) => entry.info.plugins ?? []).map((entry) => typeof entry === "string" ? entry : entry.package).toSorted();
 });
 function terminal() {
@@ -480,4 +480,4 @@ function shell() {
   return process.env.SHELL ?? process.env.ComSpec ?? process.env.COMSPEC ?? "Unavailable: shell environment variable is not set";
 }
 
-export { OpencodeContent2, ReportContent2, OpencodeDescription2, Plugin48, exports_skill3 };
+export { OpencodeContent2, ReportContent2, OpencodeDescription2, Plugin13, exports_skill };

package/dist/chunks/{event-logger-9cca0kx2.js → image-80xbwfe7.js}

@@ -1,47 +1,47 @@
 import {
   makeUnsafe2
-} from "./event-logger-dpkg50ah.js";
+} from "./image-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./event-logger-17tggw8r.js";
+} from "./image-zchy057q.js";
 import {
-  Event15,
-  Service67,
-  node70
-} from "./event-logger-s2ge5nex.js";
-import {
-  Service79,
+  Event19,
+  Service78,
   node82
-} from "./event-logger-8wtrw9n2.js";
+} from "./image-cc5gsnw6.js";
+import {
+  Service80,
+  node84
+} from "./image-pcj7ew95.js";
 import {
-  Service45,
-  node47
-} from "./event-logger-b0bdxm7z.js";
+  Service59,
+  node62
+} from "./image-zzfd9are.js";
 import {
   ID16,
-  Service78,
-  node81
-} from "./event-logger-y81nxdjg.js";
+  Service79,
+  node83
+} from "./image-n9j51zqt.js";
 import {
   reconcile2,
   create3
-} from "./event-logger-rdw6cm16.js";
+} from "./image-rdw6cm16.js";
 import {
-  ID9,
+  ID14,
   MethodID2,
-  Service66,
-  node69
-} from "./event-logger-sawaksr8.js";
+  Service77,
+  node81
+} from "./image-6eyqb1k2.js";
 import {
   __export
-} from "./event-logger-9rqn6x4v.js";
+} from "./image-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError3,
+  NotFoundError: () => NotFoundError4,
   Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
@@ -49,12 +49,12 @@ __export(exports_mcp4, {
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service32,
+  Service: () => Service36,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
   configured: () => configured4,
   layer: () => layer14,
-  node: () => node35
+  node: () => node39
 });
 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 NotFoundError3 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 Service32 extends Context.Service()("@opencode/MCP") {
+class Service36 extends Context.Service()("@opencode/MCP") {
 }
 var Options4 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
@@ -111,13 +111,13 @@ var Options4 = Schema.Struct({
     version: Schema.String
   }))
 });
-var layer14 = (options) => Layer.effect(Service32, Effect.gen(function* () {
-  const location = yield* Service79;
-  const environment = yield* Service45;
+var layer14 = (options) => Layer.effect(Service36, Effect.gen(function* () {
+  const location = yield* Service80;
+  const environment = yield* Service59;
   const bus = yield* Service83;
-  const forms = yield* Service78;
-  const integration = yield* Service66;
-  const credentials = yield* Service67;
+  const forms = yield* Service79;
+  const integration = yield* Service77;
+  const credentials = yield* Service78;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -129,7 +129,7 @@ var layer14 = (options) => Layer.effect(Service32, 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);
@@ -145,7 +145,7 @@ var layer14 = (options) => Layer.effect(Service32, 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(Service67, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service78, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -154,14 +154,14 @@ var layer14 = (options) => Layer.effect(Service32, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError3({ 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(Service67, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service78, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
@@ -269,7 +269,7 @@ var layer14 = (options) => Layer.effect(Service32, 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(Service45, 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(Service32, 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: () => ({
@@ -420,7 +420,7 @@ var layer14 = (options) => Layer.effect(Service32, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service32.of({
+  return Service36.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -532,12 +532,12 @@ function mergeCatalogs(catalogs) {
 }
 function configured4(options) {
   return makeLocationNode({
-    service: Service32,
+    service: Service36,
     layer: layer14(options),
-    deps: [node82, node47, node87, node81, node69, node70]
+    deps: [node84, node62, node87, node83, node81, node82]
   });
 }
-var node35 = configured4();
+var node39 = 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;
@@ -588,4 +588,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError3, ToolCallError2, Service32, Options4, layer14, configured4, node35, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError4, ToolCallError2, Service36, Options4, layer14, configured4, node39, exports_mcp4 };