@opencode/core 2.0.15 → 2.0.17

package/dist/chunks/{location-w747ydy6.js → schema-vgygemyp.js}

@@ -1,41 +1,41 @@
 import {
-  Service64
-} from "./location-cje11ec7.js";
+  Service65
+} from "./schema-drgwwxwg.js";
 import {
-  ID6,
+  ID5,
   Name2,
   toModelOutput3,
   prepare3,
-  Service59
-} from "./location-dgpq7z8n.js";
+  Service56
+} from "./schema-wx7ymqfy.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/tool/plugin/skill.ts
-var exports_skill = {};
-__export(exports_skill, {
-  Input: () => Input10,
-  Output: () => Output7,
-  Plugin: () => Plugin11,
-  SkillTool: () => exports_skill,
-  description: () => description5,
-  name: () => name10,
+var exports_skill3 = {};
+__export(exports_skill3, {
+  Input: () => Input5,
+  Output: () => Output2,
+  Plugin: () => Plugin41,
+  SkillTool: () => exports_skill3,
+  description: () => description3,
+  name: () => name5,
   toModelOutput: () => toModelOutput2
 });
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
 import { FSUtil } from "@opencode/util/fs-util";
-var name10 = "skill";
-var Input10 = Schema.Struct({
-  id: ID6.annotate({ description: "The ID of an available skill or a skill explicitly referenced by the user" })
+var name5 = "skill";
+var Input5 = Schema.Struct({
+  id: ID5.annotate({ description: "The ID of an available skill or a skill explicitly referenced by the user" })
 });
-var Output7 = Schema.Struct({
+var Output2 = Schema.Struct({
   name: Name2,
   directory: Schema.String,
   output: Schema.String
 });
-var description5 = [
+var description3 = [
   "Load a specialized skill's instructions and resources into the current conversation when the task at hand matches its description.",
   "",
   "The skill ID must match an available skill or a skill explicitly referenced by the user."
@@ -43,25 +43,25 @@ var description5 = [
 `);
 var toModelOutput2 = toModelOutput3;
 var unableToLoad = (name, error) => new ToolFailure({ message: `Unable to load skill ${name}`, error });
-var Plugin11 = {
+var Plugin41 = {
   id: "opencode.tool.skill",
   effect: Effect.fn("SkillTool.Plugin")(function* (ctx) {
     const fs = yield* FSUtil.Service;
-    const skills = yield* Service59;
-    const permission = yield* Service64;
+    const skills = yield* Service56;
+    const permission = yield* Service65;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name10,
+      name: name5,
       options: { codemode: false },
-      description: description5,
-      input: Input10,
-      output: Output7,
+      description: description3,
+      input: Input5,
+      output: Output2,
       execute: (input, context) => Effect.gen(function* () {
         const skill = yield* skills.get(input.id);
         if (!skill)
           return yield* unableToLoad(input.id);
         return yield* Effect.gen(function* () {
           yield* permission.assert({
-            action: name10,
+            action: name5,
             resources: [skill.id],
             save: [skill.id],
             sessionID: context.sessionID,
@@ -79,4 +79,4 @@ var Plugin11 = {
   })
 };
 
-export { name10, Input10, Output7, description5, toModelOutput2, Plugin11, exports_skill };
+export { name5, Input5, Output2, description3, toModelOutput2, Plugin41, exports_skill3 };

package/dist/chunks/{location-xq3yw8dy.js → schema-vmnfmpbz.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./location-jwcy2c2z.js";
+} from "./schema-y71avatq.js";
 import {
-  Service81,
-  node85
-} from "./location-2ys44scz.js";
+  Service82,
+  node86
+} from "./schema-cmsm0fmq.js";
 import {
   Event19,
-  Service76,
-  node80
-} from "./location-t880hhr6.js";
+  Service77,
+  node81
+} from "./schema-h3v3gq1k.js";
 import {
-  Service78,
-  node82
-} from "./location-8s04dv6n.js";
+  Service79,
+  node83
+} from "./schema-wxnc2egh.js";
 import {
-  Service57,
-  node59
-} from "./location-r99pq75w.js";
+  Service60,
+  node62
+} from "./schema-9cjj4wa1.js";
 import {
-  ID15,
-  Service77,
-  node81
-} from "./location-8v97fgxy.js";
+  ID16,
+  Service78,
+  node82
+} from "./schema-d4nbhrvv.js";
 import {
   reconcile2,
   create3
-} from "./location-rdw6cm16.js";
+} from "./schema-rdw6cm16.js";
 import {
-  ID13,
+  ID14,
   MethodID2,
-  Service75,
-  node79
-} from "./location-gbece2fh.js";
+  Service76,
+  node80
+} from "./schema-6xg4rx5y.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError5,
-  Options: () => Options5,
+  NotFoundError: () => NotFoundError3,
+  Options: () => Options4,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service34,
+  Service: () => Service27,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured5,
+  configured: () => configured4,
   layer: () => layer14,
-  node: () => node38
+  node: () => node30
 });
 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 NotFoundError3 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 Service34 extends Context.Service()("@opencode/MCP") {
+class Service27 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 layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
-  const location = yield* Service78;
-  const environment = yield* Service57;
-  const bus = yield* Service81;
-  const forms = yield* Service77;
-  const integration = yield* Service75;
-  const credentials = yield* Service76;
+var layer14 = (options) => Layer.effect(Service27, Effect.gen(function* () {
+  const location = yield* Service79;
+  const environment = yield* Service60;
+  const bus = yield* Service82;
+  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 layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
       return;
     const remote = entry.config;
     const suffix = "mcp_" + createHash("sha1").update(name + "\x00" + remote.url).digest("hex").slice(0, 16);
-    const integrationID = ID13.make(suffix);
+    const integrationID = ID14.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -135,7 +135,7 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
         method: { id: methodID, type: "oauth", label: name },
         authorize: () => Effect.gen(function* () {
           const { McpOAuth } = yield* Effect.promise(() => import("../mcp/oauth.js"));
-          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service76, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service77, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -144,19 +144,19 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError5({ server: name });
+      return yield* new NotFoundError3({ 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(Service76, 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 = ID15.create();
+        const formID = ID16.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -221,6 +221,25 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     yield* startServer(name, entry);
   }).pipe(locks.withLock(name));
   const recovering = (name, entry, connection, run) => run(connection).pipe(Effect.catchIf((error) => ("_tag" in error) && error._tag === "MCP.SessionExpiredError", (error) => recover(name, entry, connection).pipe(Effect.flatMap(() => entry.client ? run(entry.client) : Effect.fail(error)))));
+  const loadCatalog = (name, entry, connection) => recovering(name, entry, connection, (connection) => Effect.all({
+    resources: connection.resources(),
+    templates: connection.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
+  }, { concurrency: "unbounded" })).pipe(Effect.map((catalog) => ResourceCatalog2.make({
+    resources: catalog.resources.map((resource) => Resource2.make({
+      server: name,
+      name: resource.name,
+      uri: resource.uri,
+      description: resource.description,
+      mimeType: resource.mimeType
+    })),
+    templates: catalog.templates.map((template) => ResourceTemplate2.make({
+      server: name,
+      name: template.name,
+      uriTemplate: template.uriTemplate,
+      description: template.description,
+      mimeType: template.mimeType
+    }))
+  })));
   const watch = (name, entry, connection) => {
     const live = whenLive(name, entry, connection);
     connection.onClose(() => live(Effect.gen(function* () {
@@ -240,7 +259,7 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const load = McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service57, environment), Scope.provide(scope));
+    const load = McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service60, 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;
@@ -391,7 +410,7 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service34.of({
+  return Service27.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -464,42 +483,23 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
       return { ...result, server: target.name, name: input.name };
     }),
     resourceCatalog: Effect.fn("MCP.resourceCatalog")(function* () {
-      const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => {
-        if (!entry.client)
-          return Effect.succeed({ resources: [], templates: [] });
-        return Effect.all({
-          resources: entry.client.resources().pipe(Effect.orElseSucceed(() => [])),
-          templates: entry.client.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
-        }, { concurrency: "unbounded" }).pipe(Effect.map((catalog) => ({
-          resources: catalog.resources.map((resource) => Resource2.make({
-            server: name,
-            name: resource.name,
-            uri: resource.uri,
-            description: resource.description,
-            mimeType: resource.mimeType
-          })),
-          templates: catalog.templates.map((template) => ResourceTemplate2.make({
-            server: name,
-            name: template.name,
-            uriTemplate: template.uriTemplate,
-            description: template.description,
-            mimeType: template.mimeType
-          }))
-        })));
-      }, { concurrency: "unbounded" });
-      return ResourceCatalog2.make({
-        resources: catalogs.flatMap((catalog) => catalog.resources).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uri.localeCompare(b.uri)),
-        templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
-      });
+      const empty = ResourceCatalog2.make({ resources: [], templates: [] });
+      const catalogs = yield* Effect.forEach(Array.from(entries), ([name, entry]) => entry.client ? loadCatalog(name, entry, entry.client).pipe(Effect.orElseSucceed(() => empty)) : Effect.succeed(empty), { concurrency: "unbounded" });
+      return mergeCatalogs(catalogs);
+    }),
+    resources: Effect.fn("MCP.resources")(function* (input) {
+      const target = yield* requireServer(input.server);
+      yield* target.entry.startup.await;
+      if (!target.entry.client)
+        return ResourceCatalog2.make({ resources: [], templates: [] });
+      return mergeCatalogs([yield* loadCatalog(target.name, target.entry, target.entry.client)]);
     }),
     readResource: Effect.fn("MCP.readResource")(function* (input) {
       const target = yield* requireServer(input.server);
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri })).pipe(Effect.orElseSucceed(() => {
-        return;
-      }));
+      const result = yield* recovering(target.name, target.entry, target.entry.client, (connection) => connection.readResource({ uri: input.uri }));
       if (!result)
         return;
       return ResourceContent2.make({
@@ -510,14 +510,20 @@ var layer14 = (options) => Layer.effect(Service34, Effect.gen(function* () {
     })
   });
 }));
-function configured5(options) {
+function mergeCatalogs(catalogs) {
+  return ResourceCatalog2.make({
+    resources: catalogs.flatMap((catalog) => catalog.resources).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uri.localeCompare(b.uri)),
+    templates: catalogs.flatMap((catalog) => catalog.templates).toSorted((a, b) => a.server.localeCompare(b.server) || a.name.localeCompare(b.name) || a.uriTemplate.localeCompare(b.uriTemplate))
+  });
+}
+function configured4(options) {
   return makeLocationNode({
-    service: Service34,
+    service: Service27,
     layer: layer14(options),
-    deps: [node82, node59, node85, node81, node79, node80]
+    deps: [node83, node62, node86, node82, node80, node81]
   });
 }
-var node38 = configured5();
+var node30 = 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;
@@ -568,4 +574,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service34, Options5, layer14, configured5, node38, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service27, Options4, layer14, configured4, node30, exports_mcp4 };

package/dist/chunks/{location-c8bydgjz.js → schema-vqfzq50h.js}

@@ -1,20 +1,20 @@
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/instance/service.ts
 var exports_service2 = {};
 __export(exports_service2, {
   Instance: () => exports_service2,
-  Service: () => Service49,
-  node: () => node51
+  Service: () => Service41,
+  node: () => node43
 });
 import { Context } from "effect";
 import { Node } from "@opencode/util/effect/app-node";
 import { LayerNode } from "@opencode/util/effect/layer-node";
 
-class Service49 extends Context.Service()("@opencode/Instance") {
+class Service41 extends Context.Service()("@opencode/Instance") {
 }
-var node51 = LayerNode.unbound(Service49, Node.tags.values.global);
+var node43 = LayerNode.unbound(Service41, Node.tags.values.global);
 
-export { Service49, node51, exports_service2 };
+export { Service41, node43, exports_service2 };

package/dist/chunks/{location-3a58h9a4.js → schema-vr2z87y7.js}

@@ -1,120 +1,120 @@
 import {
-  Service84,
-  node88
-} from "./location-04mw5jg5.js";
+  Service83,
+  node87
+} from "./schema-qg2cf98c.js";
 import {
-  Service81,
-  node85
-} from "./location-2ys44scz.js";
+  Service82,
+  node86
+} from "./schema-cmsm0fmq.js";
 import {
   SessionMessage2
-} from "./location-gftt206x.js";
+} from "./schema-gftt206x.js";
 import {
   StepFailedError2
-} from "./location-ygg1f209.js";
+} from "./schema-0e81x99y.js";
 import {
   SessionEvent2
-} from "./location-ec1grn59.js";
+} from "./schema-ec1grn59.js";
 import {
   SessionMessageTable2
-} from "./location-z07pqspn.js";
+} from "./schema-z07pqspn.js";
 import {
   prepare4
-} from "./location-mvksx64m.js";
+} from "./schema-mvksx64m.js";
 import {
   provenance2
-} from "./location-18s9r5gn.js";
+} from "./schema-ssdqnhy0.js";
 import {
   decodeMessageRow2,
   preview2
-} from "./location-d6ex932k.js";
+} from "./schema-3ybey094.js";
 import {
-  Service66,
+  Service67,
   node70
-} from "./location-2f7sk49n.js";
+} from "./schema-5m1y3qk6.js";
 import {
-  Service61,
+  Service62,
   node65
-} from "./location-0tmnpbjy.js";
+} from "./schema-wzhdnf6z.js";
 import {
   llmClient2
-} from "./location-5t3nmthw.js";
+} from "./schema-5t3nmthw.js";
 import {
-  Service37,
-  node41
-} from "./location-k906dc9m.js";
+  Service22,
+  node25
+} from "./schema-mj50c66e.js";
 import {
   baseTranscript2
-} from "./location-vbz4mrgg.js";
+} from "./schema-jmanypz0.js";
 import {
   make9
-} from "./location-dpwed560.js";
+} from "./schema-x8bbrmd5.js";
 import {
-  Service9,
-  node11
-} from "./location-bdmzfegv.js";
+  Service10,
+  node12
+} from "./schema-mpjr2ekw.js";
 import {
-  Service29,
-  node33
-} from "./location-qfe26hq3.js";
+  Service18,
+  node21
+} from "./schema-tfvhzp6w.js";
 import {
   serialized2,
   nextPromotable2,
   promote2
-} from "./location-4qjz8wfv.js";
+} from "./schema-rwvzjkqg.js";
 import {
-  Service8,
+  Service11,
   isUntitled2,
-  node10
-} from "./location-qyagpvrp.js";
+  node13
+} from "./schema-bw1k523x.js";
 import {
   DrainResult2,
-  Service46
-} from "./location-dhmh7aw6.js";
+  Service38
+} from "./schema-hn57h045.js";
 import {
-  node64
-} from "./location-8kc8r484.js";
+  node35
+} from "./schema-n72gykqt.js";
 import {
-  node47
-} from "./location-h6awxmcx.js";
+  node39
+} from "./schema-9vhpts05.js";
 import {
   Outcome2,
   make8
-} from "./location-p9n0sz6q.js";
+} from "./schema-2627m7vs.js";
 import {
-  Service39
-} from "./location-n95b3jav.js";
+  Service24
+} from "./schema-v1faaxn9.js";
 import {
-  node18
-} from "./location-ny0mz096.js";
+  node17
+} from "./schema-8kn7kdrq.js";
 import {
   MAX_STEPS_PROMPT2
-} from "./location-y44na4kk.js";
+} from "./schema-y44na4kk.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/session/runner/llm.ts
 var exports_llm = {};
 __export(exports_llm, {
   SessionRunnerLLM: () => exports_llm,
-  node: () => node8
+  node: () => node11
 });
 import { Message } from "@opencode/ai";
 import { and, desc, eq, sql } from "drizzle-orm";
 import { Cause, Effect, Exit, FiberMap, Layer } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 var CONTINUE_AFTER_INCOMPLETE_STREAM = "The previous response was interrupted. Continue from where you left off without repeating completed content.";
-var layer = Layer.effect(Service46, Effect.gen(function* () {
-  const bus = yield* Service81;
-  const lifecycle = yield* Service61;
-  const store = yield* Service66;
-  const context = yield* Service29;
-  const modelTransport = yield* Service37;
-  const db = (yield* Service84).db;
-  const compaction = yield* Service9;
-  const plugins = yield* Service39;
-  const title = yield* Service8;
+var layer = Layer.effect(Service38, Effect.gen(function* () {
+  const bus = yield* Service82;
+  const lifecycle = yield* Service62;
+  const store = yield* Service67;
+  const context = yield* Service18;
+  const modelTransport = yield* Service22;
+  const db = (yield* Service83).db;
+  const compaction = yield* Service10;
+  const plugins = yield* Service24;
+  const title = yield* Service11;
   const steps = yield* make8;
   const titles = yield* FiberMap.make();
   const drain = Effect.fn("SessionRunner.drain")(function* (input) {
@@ -361,25 +361,25 @@ var layer = Layer.effect(Service46, Effect.gen(function* () {
       }
     }
   });
-  return Service46.of({ drain });
+  return Service38.of({ drain });
 }));
-var node8 = makeLocationNode({
-  service: Service46,
+var node11 = makeLocationNode({
+  service: Service38,
   layer,
   deps: [
-    node85,
+    node86,
     node65,
     llmClient2,
-    node33,
-    node41,
+    node21,
+    node25,
     node70,
-    node11,
-    node18,
-    node10,
-    node64,
-    node47,
-    node88
+    node12,
+    node17,
+    node13,
+    node35,
+    node39,
+    node87
   ]
 });
 
-export { node8, exports_llm };
+export { node11, exports_llm };