@opencode/core 2.0.21 → 2.0.22

package/dist/chunks/{job-bype3acy.js → instruction-discovery-cyk1kg6z.js}

@@ -1,53 +1,53 @@
 import {
   Service83,
   node87
-} from "./job-vdqv4tww.js";
+} from "./instruction-discovery-mjv4tm51.js";
 import {
   node56
-} from "./job-fnsgkk5v.js";
+} from "./instruction-discovery-fqzyqcjh.js";
 import {
-  Service3,
-  node4
-} from "./job-0wjxfcep.js";
+  Service11,
+  node13
+} from "./instruction-discovery-21201d4m.js";
 import {
-  Service28
-} from "./job-ht5y0zrb.js";
+  Service36
+} from "./instruction-discovery-jqh9b0xq.js";
 import {
-  node16,
-  ID2
-} from "./job-7h2raa0m.js";
+  node24,
+  ID3
+} from "./instruction-discovery-h3rm5wyc.js";
 import {
-  Service6,
-  node7
-} from "./job-czfptnv9.js";
+  Service3,
+  node5
+} from "./instruction-discovery-dv1qgsyq.js";
 import {
   requirements2,
   guarded2,
   list2
-} from "./job-jv8zx4t6.js";
+} from "./instruction-discovery-wb3qhx4w.js";
 import {
-  make6,
+  make4,
   LoadError2
-} from "./job-kmyvrf53.js";
+} from "./instruction-discovery-wbx60fzd.js";
 import {
   Updated2,
-  Service5,
+  Service4,
   node6
-} from "./job-ydesmw24.js";
+} from "./instruction-discovery-mqw81mrh.js";
 import {
-  Service7,
-  node8
-} from "./job-kp8q1t60.js";
+  Service5,
+  node7
+} from "./instruction-discovery-y56ehv6b.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/plugin/supervisor.ts
 var exports_supervisor = {};
 __export(exports_supervisor, {
   PluginSupervisor: () => exports_supervisor,
-  layer: () => layer3,
-  node: () => node3
+  layer: () => layer4,
+  node: () => node4
 });
 import { Event } from "@opencode/schema/config";
 import { Cause, Effect, Layer, Queue, Stream } from "effect";
@@ -116,7 +116,7 @@ var resolve = Effect.fn("PluginSupervisor.resolve")(function* (modules, pre, pos
     failures: [
       ...failures.values(),
       ...ordered.filter(duplicate).map((plugin) => ({
-        id: ID2.make(plugin.id),
+        id: ID3.make(plugin.id),
         source: plugin.source ?? { type: "builtin" },
         state: { status: "failed", error: `Duplicate plugin ID: ${plugin.id}` },
         features: { server: true, ...plugin.features }
@@ -125,14 +125,14 @@ var resolve = Effect.fn("PluginSupervisor.resolve")(function* (modules, pre, pos
     pending: [...pending]
   };
 });
-var layer3 = Layer.effectDiscard(Effect.gen(function* () {
-  const registry = yield* Service28;
-  const sdk = yield* Service5;
-  const instance = yield* Service6;
-  const sources = yield* Service3;
-  const modules = yield* make6();
+var layer4 = Layer.effectDiscard(Effect.gen(function* () {
+  const registry = yield* Service36;
+  const sdk = yield* Service4;
+  const instance = yield* Service3;
+  const sources = yield* Service11;
+  const modules = yield* make4();
   const bus = yield* Service83;
-  const updates = yield* Service7;
+  const updates = yield* Service5;
   const internal = yield* list2();
   let release = yield* registry.hold();
   yield* Effect.addFinalizer(() => release ?? Effect.void);
@@ -207,11 +207,11 @@ var layer3 = Layer.effectDiscard(Effect.gen(function* () {
   })), Effect.forkScoped({ startImmediately: true }));
 }));
 var nodeDeps = [
-  node16,
+  node24,
   node6,
+  node5,
+  node13,
   node7,
-  node4,
-  node8,
   node87,
   Npm.node,
   node56,
@@ -222,6 +222,6 @@ function pluginSource(target) {
     return { type: "local", path: target };
   return { type: "package", target };
 }
-var node3 = makeLocationNode({ name: "plugin-supervisor", layer: layer3, deps: nodeDeps });
+var node4 = makeLocationNode({ name: "plugin-supervisor", layer: layer4, deps: nodeDeps });
 
-export { layer3, node3, exports_supervisor };
+export { layer4, node4, exports_supervisor };

package/dist/chunks/{job-txbrvd03.js → instruction-discovery-d4k4eg4n.js}

@@ -1,41 +1,41 @@
 import {
   makeUnsafe2
-} from "./job-y71avatq.js";
+} from "./instruction-discovery-dpkg50ah.js";
 import {
   Service83,
   node87
-} from "./job-vdqv4tww.js";
+} from "./instruction-discovery-mjv4tm51.js";
 import {
-  Event20,
-  Service76,
-  node80
-} from "./job-tbtg7k2g.js";
+  Event21,
+  Service82,
+  node86
+} from "./instruction-discovery-93pbq578.js";
 import {
-  Service80,
-  node84
-} from "./job-frdvpnjn.js";
+  Service77,
+  node81
+} from "./instruction-discovery-g6pt2ykv.js";
 import {
-  Service54,
-  node58
-} from "./job-3vy408b5.js";
+  Service68,
+  node71
+} from "./instruction-discovery-6wqmdryt.js";
 import {
-  ID14,
-  Service75,
-  node79
-} from "./job-x01dckpp.js";
+  ID17,
+  Service81,
+  node85
+} from "./instruction-discovery-ysyp8d4a.js";
 import {
   reconcile2,
   create3
-} from "./job-rdw6cm16.js";
+} from "./instruction-discovery-rdw6cm16.js";
 import {
-  ID13,
+  ID16,
   MethodID2,
-  Service74,
-  node78
-} from "./job-x5y9z3y2.js";
+  Service80,
+  node84
+} from "./instruction-discovery-768hztz0.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
@@ -49,12 +49,12 @@ __export(exports_mcp4, {
   ResourceContent: () => ResourceContent2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service36,
+  Service: () => Service40,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
   configured: () => configured5,
-  layer: () => layer16,
-  node: () => node39
+  layer: () => layer14,
+  node: () => node43
 });
 import { Mcp } from "@opencode/schema/mcp";
 import { McpEvent } from "@opencode/schema/mcp-event";
@@ -86,12 +86,24 @@ class ToolCallError2 extends Schema.TaggedError()("MCP.ToolCallError", {
   message: Schema.String
 }) {
 }
+var unavailable = (server, status) => {
+  switch (status.status) {
+    case "failed":
+      return `MCP server "${server}" is not connected: ${status.error}. Reconnect it from /mcps.`;
+    case "needs_auth":
+      return `MCP server "${server}" needs authentication: ${status.error}. Sign in from /mcps.`;
+    case "disabled":
+      return `MCP server "${server}" is disabled.`;
+    default:
+      return `MCP server "${server}" is not connected.`;
+  }
+};
 var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
 var endpointLoads = makeUnsafe2();
 var cloneConfig = (config) => structuredClone(config);
 
-class Service36 extends Context.Service()("@opencode/MCP") {
+class Service40 extends Context.Service()("@opencode/MCP") {
 }
 var Options5 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
@@ -99,13 +111,13 @@ var Options5 = Schema.Struct({
     version: Schema.String
   }))
 });
-var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
-  const location = yield* Service80;
-  const environment = yield* Service54;
+var layer14 = (options) => Layer.effect(Service40, Effect.gen(function* () {
+  const location = yield* Service77;
+  const environment = yield* Service68;
   const bus = yield* Service83;
-  const forms = yield* Service75;
-  const integration = yield* Service74;
-  const credentials = yield* Service76;
+  const forms = yield* Service81;
+  const integration = yield* Service80;
+  const credentials = yield* Service82;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -117,7 +129,7 @@ var layer16 = (options) => Layer.effect(Service36, 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 = ID16.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -133,7 +145,7 @@ var layer16 = (options) => Layer.effect(Service36, 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));
@@ -149,12 +161,12 @@ var layer16 = (options) => Layer.effect(Service36, 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* () {
       if (input.params.mode === "url") {
-        const formID = ID14.create();
+        const formID = ID17.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -240,8 +252,8 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
   })));
   const watch = (name, entry, connection) => {
     const live = whenLive(name, entry, connection);
-    connection.onClose(() => live(Effect.gen(function* () {
-      entry.status = { status: "failed", error: "Connection closed" };
+    connection.onClose((reason) => live(Effect.gen(function* () {
+      entry.status = { status: "failed", error: reason };
       yield* stopServer(name, entry);
       yield* bus.publish(McpEvent.StatusChanged, { server: name });
     })));
@@ -257,7 +269,7 @@ var layer16 = (options) => Layer.effect(Service36, 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(Service54, 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(Service68, 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;
@@ -382,7 +394,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event20.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: () => ({
@@ -408,7 +420,7 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service36.of({
+  return Service40.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -452,9 +464,13 @@ var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
         return yield* new ToolCallError2({
           server: target.name,
           tool: input.name,
-          message: "MCP server is not connected"
+          message: unavailable(target.name, target.entry.status)
         });
-      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.callTool({ name: input.name, args: input.args, sessionID: input.sessionID })).pipe(Effect.mapError((error) => new ToolCallError2({ server: target.name, tool: input.name, message: error.message })));
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.callTool({ name: input.name, args: input.args, sessionID: input.sessionID })).pipe(Effect.mapError((error) => new ToolCallError2({
+        server: target.name,
+        tool: input.name,
+        message: `MCP tool "${input.name}" on server "${target.name}" failed: ${error.message}`
+      })));
       return { ...result, server: target.name, tool: input.name };
     }),
     instructions: Effect.fn("MCP.instructions")(function* () {
@@ -516,12 +532,12 @@ function mergeCatalogs(catalogs) {
 }
 function configured5(options) {
   return makeLocationNode({
-    service: Service36,
-    layer: layer16(options),
-    deps: [node84, node58, node87, node79, node78, node80]
+    service: Service40,
+    layer: layer14(options),
+    deps: [node81, node71, node87, node85, node84, node86]
   });
 }
-var node39 = configured5();
+var node43 = 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;
@@ -572,4 +588,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError5, ToolCallError2, Service36, Options5, layer16, configured5, node39, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContent2, NotFoundError5, ToolCallError2, Service40, Options5, layer14, configured5, node43, exports_mcp4 };

package/dist/chunks/{job-0tmgye68.js → instruction-discovery-d737nyfv.js}

@@ -1,9 +1,9 @@
 import {
   create3
-} from "./job-rdw6cm16.js";
+} from "./instruction-discovery-rdw6cm16.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/image.ts
 var exports_image2 = {};
@@ -11,9 +11,9 @@ __export(exports_image2, {
   DecodeError: () => DecodeError2,
   Image: () => exports_image2,
   ResizerUnavailableError: () => ResizerUnavailableError2,
-  Service: () => Service46,
+  Service: () => Service66,
   SizeError: () => SizeError2,
-  node: () => node50
+  node: () => node69
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -42,9 +42,9 @@ class SizeError2 extends Schema.TaggedError()("Image.SizeError", {
   }
 }
 
-class Service46 extends Context.Service()("@opencode/Image") {
+class Service66 extends Context.Service()("@opencode/Image") {
 }
-var layer = Layer.effect(Service46, Effect.gen(function* () {
+var layer = Layer.effect(Service66, Effect.gen(function* () {
   const state = create3({
     name: "image",
     initial: () => ({
@@ -74,8 +74,8 @@ var layer = Layer.effect(Service46, Effect.gen(function* () {
     const normalize = yield* loadAdapter;
     return yield* normalize(resource, content, state.get());
   });
-  return Service46.of({ transform: state.transform, reload: state.reload, normalize });
+  return Service66.of({ transform: state.transform, reload: state.reload, normalize });
 }));
-var node50 = makeLocationNode({ service: Service46, layer, deps: [] });
+var node69 = makeLocationNode({ service: Service66, layer, deps: [] });
 
-export { ResizerUnavailableError2, DecodeError2, SizeError2, Service46, node50, exports_image2 };
+export { ResizerUnavailableError2, DecodeError2, SizeError2, Service66, node69, exports_image2 };

package/dist/chunks/{job-wtj8vade.js → instruction-discovery-dn5164wf.js}

@@ -1,6 +1,6 @@
 import {
-  ID12
-} from "./job-5svcwqmc.js";
+  ID9
+} from "./instruction-discovery-5sv8fqdt.js";
 
 // src/plugin/provider/prompt-cache-key.ts
 import { Effect } from "effect";
@@ -24,7 +24,7 @@ var PromptCacheKeyPlugin2 = define({
   effect: Effect.fn(function* (ctx) {
     yield* ctx.model.transform((models) => {
       for (const id of providerIDs) {
-        const providerID = ID12.make(id);
+        const providerID = ID9.make(id);
         for (const model of models.list(providerID)) {
           models.update(model.providerID, model.id, (draft) => {
             draft.compatibility = { ...draft.compatibility, supportsPromptCacheKey: true };

package/dist/chunks/{job-y71avatq.js → instruction-discovery-dpkg50ah.js}

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

package/dist/chunks/{job-czfptnv9.js → instruction-discovery-dv1qgsyq.js}

@@ -1,22 +1,22 @@
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/plugin/instance.ts
 var exports_instance2 = {};
 __export(exports_instance2, {
   InstancePlugins: () => exports_instance2,
-  Service: () => Service6,
+  Service: () => Service3,
   bound: () => bound2,
-  node: () => node7
+  node: () => node5
 });
 import { Context, Layer } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 
-class Service6 extends Context.Service()("@opencode/InstancePlugins") {
+class Service3 extends Context.Service()("@opencode/InstancePlugins") {
 }
-var node7 = makeLocationNode({
-  service: Service6,
+var node5 = makeLocationNode({
+  service: Service3,
   layer: bound2([]),
   deps: []
 });
@@ -26,7 +26,7 @@ function bound2(plugins) {
     throw new Error(`duplicate instance plugin ids: ${duplicates.map((plugin) => plugin.id).join(", ")}`);
   }
   const stamped = plugins.map((plugin) => ({ ...plugin, revision: "instance", source: { type: "sdk" } }));
-  return Layer.succeed(Service6, Service6.of({ all: () => stamped }));
+  return Layer.succeed(Service3, Service3.of({ all: () => stamped }));
 }
 
-export { Service6, node7, bound2, exports_instance2 };
+export { Service3, node5, bound2, exports_instance2 };

package/dist/chunks/{job-2sf5vtpp.js → instruction-discovery-e2jmw6zx.js}

@@ -1,31 +1,31 @@
 import {
   SessionMessage2
-} from "./job-gftt206x.js";
+} from "./instruction-discovery-gftt206x.js";
 import {
   SessionSchema2
-} from "./job-5cmxdwv8.js";
+} from "./instruction-discovery-93hpb89x.js";
 import {
   MessageDecodeError2
-} from "./job-w6ebfasv.js";
+} from "./instruction-discovery-kn7rctz9.js";
 import {
   InitializationBlocked2,
   read3
-} from "./job-rhjbct0v.js";
+} from "./instruction-discovery-9t7a50xb.js";
 import {
   SessionMessageTable2
-} from "./job-z07pqspn.js";
+} from "./instruction-discovery-9e5bzkjp.js";
 import {
   initial2,
   preview3
-} from "./job-mvksx64m.js";
+} from "./instruction-discovery-vn72gsba.js";
 import {
   compatible2,
   isCheckpoint2,
   validate2
-} from "./job-f29mbr7f.js";
+} from "./instruction-discovery-gw7cjrad.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/session/history.ts
 var exports_history = {};

package/dist/chunks/{job-j543e7zy.js → instruction-discovery-e3bkmxas.js}

@@ -1,30 +1,30 @@
 import {
   latest2,
   Service51
-} from "./job-f09mb087.js";
+} from "./instruction-discovery-s48x4bgh.js";
 import {
-  Service50
-} from "./job-95f1p06x.js";
+  Service46
+} from "./instruction-discovery-vc32h82s.js";
 import {
   observe2
-} from "./job-qsdy395h.js";
+} from "./instruction-discovery-qsdy395h.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./instruction-discovery-9rqn6x4v.js";
 
 // src/config/plugin/shell.ts
-var exports_shell = {};
-__export(exports_shell, {
-  ConfigShellPlugin: () => exports_shell,
-  Plugin: () => Plugin19
+var exports_shell2 = {};
+__export(exports_shell2, {
+  ConfigShellPlugin: () => exports_shell2,
+  Plugin: () => Plugin41
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect } from "effect";
-var Plugin19 = define({
+var Plugin41 = define({
   id: "opencode.config.shell",
   effect: Effect.fn(function* (ctx) {
     const config = yield* Service51;
-    const shell = yield* Service50;
+    const shell = yield* Service46;
     const loaded = yield* observe2(config, ctx.event, shell.reload());
     yield* shell.transform((editor) => {
       const configured = latest2(loaded.entries, "shell");
@@ -34,4 +34,4 @@ var Plugin19 = define({
   })
 });
 
-export { Plugin19, exports_shell };
+export { Plugin41, exports_shell2 };