@opencode/core 0.0.0-dev-19596 → 0.0.0-dev-19598

package/dist/chunks/{schema-jb92a43k.js → file-k2bnz6b5.js}

@@ -1,48 +1,48 @@
 import {
   makeUnsafe2
-} from "./schema-jwcy2c2z.js";
+} from "./file-y71avatq.js";
 import {
-  Service79,
-  node83
-} from "./schema-g5rn0d52.js";
+  Service80,
+  node85
+} from "./file-pajef2pp.js";
 import {
-  Event14,
-  Service63,
-  node66
-} from "./schema-gg2v66ak.js";
+  Event19,
+  Service72,
+  node77
+} from "./file-2jtppnb6.js";
 import {
-  Service70,
-  node74
-} from "./schema-skkcpn4x.js";
+  Service77,
+  node82
+} from "./file-de97ckz5.js";
 import {
-  Service68,
-  node71
-} from "./schema-9cdcqr3z.js";
-import {
-  ID10,
   Service61,
-  node64
-} from "./schema-9n9wwhvc.js";
+  node65
+} from "./file-vfgva3xk.js";
+import {
+  ID9,
+  Service65,
+  node70
+} from "./file-wdpdtye9.js";
 import {
   reconcile2,
   create3
-} from "./schema-kg06axw8.js";
+} from "./file-rdw6cm16.js";
 import {
-  ID9,
+  ID8,
   MethodID2,
-  Service60,
-  node63
-} from "./schema-7f0264at.js";
+  Service64,
+  node69
+} from "./file-919h57eb.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/mcp/index.ts
 var exports_mcp4 = {};
 __export(exports_mcp4, {
   Mcp: () => exports_mcp4,
-  NotFoundError: () => NotFoundError3,
-  Options: () => Options2,
+  NotFoundError: () => NotFoundError5,
+  Options: () => Options5,
   PromptsChanged: () => PromptsChanged2,
   Resource: () => Resource2,
   ResourceCatalog: () => ResourceCatalog2,
@@ -50,12 +50,12 @@ __export(exports_mcp4, {
   ResourceContentPart: () => ResourceContentPart2,
   ResourceTemplate: () => ResourceTemplate2,
   ServerName: () => ServerName2,
-  Service: () => Service28,
+  Service: () => Service36,
   Status: () => Status2,
   ToolCallError: () => ToolCallError2,
-  configured: () => configured2,
-  layer: () => layer12,
-  node: () => node32
+  configured: () => configured5,
+  layer: () => layer16,
+  node: () => node41
 });
 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 NotFoundError3 extends Schema.TaggedError()("MCP.NotFoundError", {
+class NotFoundError5 extends Schema.TaggedError()("MCP.NotFoundError", {
   server: ServerName2
 }) {
   get message() {
@@ -92,21 +92,21 @@ var GLOBAL_ELICITATION_SESSION_ID = "global";
 var URL_ELICITATION_FIELD_KEY = "elicitation";
 var cloneConfig = (config) => structuredClone(config);
 
-class Service28 extends Context.Service()("@opencode/MCP") {
+class Service36 extends Context.Service()("@opencode/MCP") {
 }
-var Options2 = Schema.Struct({
+var Options5 = Schema.Struct({
   clientInfo: Schema.optional(Schema.Struct({
     name: Schema.String,
     version: Schema.String
   }))
 });
-var layer12 = (options) => Layer.effect(Service28, Effect.gen(function* () {
-  const location = yield* Service70;
-  const environment = yield* Service68;
-  const bus = yield* Service79;
-  const forms = yield* Service61;
-  const integration = yield* Service60;
-  const credentials = yield* Service63;
+var layer16 = (options) => Layer.effect(Service36, Effect.gen(function* () {
+  const location = yield* Service77;
+  const environment = yield* Service61;
+  const bus = yield* Service80;
+  const forms = yield* Service65;
+  const integration = yield* Service64;
+  const credentials = yield* Service72;
   const root = yield* Effect.scope;
   const fork = yield* FiberSet.makeRuntime();
   const entries = new Map;
@@ -118,7 +118,7 @@ var layer12 = (options) => Layer.effect(Service28, 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 = ID8.make(suffix);
     entry.integrationID = integrationID;
     owned.add(integrationID);
     const methodID = MethodID2.make(suffix);
@@ -134,7 +134,7 @@ var layer12 = (options) => Layer.effect(Service28, 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(Service63, credentials));
+          return yield* McpOAuth.authorize({ name, config: remote, integrationID, methodID }).pipe(Effect.provideService(Service72, credentials));
         })
       });
     }).pipe(Scope.provide(scope));
@@ -143,19 +143,19 @@ var layer12 = (options) => Layer.effect(Service28, Effect.gen(function* () {
     const name = ServerName2.make(server);
     const entry = entries.get(name);
     if (!entry)
-      return yield* new NotFoundError3({ server: name });
+      return yield* new NotFoundError5({ 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(Service63, credentials));
+    return yield* McpOAuth.connectProvider({ config: entry.config, integrationID: entry.integrationID }).pipe(Effect.provideService(Service72, credentials));
   });
   const elicitation = {
     create: (input) => Effect.gen(function* () {
       if (input.params.mode === "url") {
-        const formID = ID10.create();
+        const formID = ID9.create();
         const elicitationID = input.params.elicitationId;
         const key = elicitationID === undefined ? undefined : input.server + "\x00" + elicitationID;
         if (key)
@@ -239,7 +239,7 @@ var layer12 = (options) => Layer.effect(Service28, Effect.gen(function* () {
     entry.scope = scope;
     const authProvider = yield* connectProvider(entry);
     const { McpClient } = yield* Effect.promise(() => import("../mcp/client.js"));
-    const result = yield* 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), Effect.exit);
+    const result = yield* McpClient.connect(name, entry.config, location.directory, authProvider, elicitation, options?.clientInfo).pipe(Effect.flatMap((connection) => connection.tools().pipe(Effect.map((tools) => ({ connection, tools })))), Effect.provideService(Service61, environment), Scope.provide(scope), Effect.exit);
     if (Exit.isSuccess(result)) {
       entry.client = result.value.connection;
       entry.tools = result.value.tools.map((tool) => toTool(name, entry, tool));
@@ -363,7 +363,7 @@ var layer12 = (options) => Layer.effect(Service28, Effect.gen(function* () {
       yield* startServer(name, entry);
     }).pipe(locks.withLock(name));
   });
-  fork(bus.subscribe(Event14.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
+  fork(bus.subscribe(Event19.Switched).pipe(Stream.filter((event) => owned.has(event.data.integrationID)), Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID))))));
   const state = create3({
     name: "mcp",
     initial: () => ({
@@ -389,7 +389,7 @@ var layer12 = (options) => Layer.effect(Service28, Effect.gen(function* () {
     }),
     notify: () => reconcile2(root, fork, () => reconcileLock.withPermit(reconcile()))
   });
-  return Service28.of({
+  return Service36.of({
     transform: state.transform,
     reload: state.reload,
     servers: Effect.fn("MCP.servers")(function* () {
@@ -508,14 +508,14 @@ var layer12 = (options) => Layer.effect(Service28, Effect.gen(function* () {
     })
   });
 }));
-function configured2(options) {
+function configured5(options) {
   return makeLocationNode({
-    service: Service28,
-    layer: layer12(options),
-    deps: [node74, node71, node83, node64, node63, node66]
+    service: Service36,
+    layer: layer16(options),
+    deps: [node82, node65, node85, node70, node69, node77]
   });
 }
-var node32 = configured2();
+var node41 = 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;
@@ -566,4 +566,4 @@ function toElicitationField(key, property, required) {
   }
 }
 
-export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError3, ToolCallError2, Service28, Options2, layer12, configured2, node32, exports_mcp4 };
+export { ServerName2, PromptsChanged2, Status2, Resource2, ResourceTemplate2, ResourceCatalog2, ResourceContentPart2, ResourceContent2, NotFoundError5, ToolCallError2, Service36, Options5, layer16, configured5, node41, exports_mcp4 };

package/dist/chunks/{schema-y5dj3dxk.js → file-k2s68ryd.js}

@@ -1,21 +1,21 @@
 import {
   convertToOpenAICompatibleChatMessages2
-} from "./schema-fxgpk5d8.js";
+} from "./file-fxgpk5d8.js";
 import {
   getResponseMetadata2
-} from "./schema-g4wezp1m.js";
+} from "./file-g4wezp1m.js";
 import {
   mapOpenAICompatibleFinishReason2
-} from "./schema-x61499pn.js";
+} from "./file-x61499pn.js";
 import {
   openaiCompatibleProviderOptions2
-} from "./schema-af5trqkr.js";
+} from "./file-af5trqkr.js";
 import {
   defaultOpenAICompatibleErrorStructure2
-} from "./schema-afrmfg78.js";
+} from "./file-afrmfg78.js";
 import {
   prepareTools2
-} from "./schema-x0ckcb58.js";
+} from "./file-x0ckcb58.js";
 
 // src/github-copilot/chat/openai-compatible-chat-language-model.ts
 import {

package/dist/chunks/{schema-6z8qh9hd.js → file-k6wrm9a0.js}

@@ -1,32 +1,32 @@
 import {
   mergeOverlay2,
   mergeHeaders2
-} from "./schema-33n3bzdy.js";
+} from "./file-pmh6tya1.js";
 import {
   latest2,
-  Service40
-} from "./schema-dm8kv9e9.js";
+  Service45
+} from "./file-dtnrh8vj.js";
 import {
   observe2
-} from "./schema-qsdy395h.js";
+} from "./file-qsdy395h.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/config/plugin/provider.ts
 var exports_provider = {};
 __export(exports_provider, {
   ConfigProviderPlugin: () => exports_provider,
-  Plugin: () => Plugin27
+  Plugin: () => Plugin18
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Money } from "@opencode/schema/money";
 import { Effect } from "effect";
-var Plugin27 = define({
+var Plugin18 = define({
   id: "opencode.config.provider",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service40;
-    const loaded = yield* observe2(config, ctx.event, ctx.integration.reload().pipe(Effect.andThen(ctx.catalog.reload())));
+    const config = yield* Service45;
+    const loaded = yield* observe2(config, ctx.event, ctx.integration.reload().pipe(Effect.andThen(ctx.provider.reload())));
     yield* ctx.integration.transform((integrations) => {
       for (const [id, provider] of configuredProviders(loaded.entries)) {
         const integrationID = id;
@@ -47,16 +47,18 @@ var Plugin27 = define({
         }
       }
     });
-    yield* ctx.catalog.transform((catalog) => {
-      const configuredDefault = latest2(loaded.entries, "model");
-      if (configuredDefault !== undefined)
-        catalog.model.default.set(configuredDefault.providerID, configuredDefault.model);
+    const sources = {
+      defaultModel: undefined,
+      models: new Map
+    };
+    yield* ctx.provider.transform((providers) => {
+      const next = new Map;
       for (const [id, item] of configuredProviders(loaded.entries)) {
         const providerID = id;
-        const current = catalog.provider.get(providerID);
-        const source = catalog.provider.get(item.canonical ?? current?.provider.canonical ?? providerID);
+        const current = providers.get(providerID);
+        const source = providers.get(item.canonical ?? current?.provider.canonical ?? providerID);
         const changed = item.canonical !== undefined && item.canonical !== current?.provider.canonical;
-        catalog.provider.update(providerID, (provider) => {
+        providers.update(providerID, (provider) => {
           if (changed && source && source.provider !== provider)
             Object.assign(provider, structuredClone(source.provider), {
               id: provider.id,
@@ -80,12 +82,39 @@ var Plugin27 = define({
           if (item.body !== undefined)
             provider.body = mergeOverlay2(provider.body, item.body);
         });
+        const definitions = new Map;
         for (const [id, config] of Object.entries(item.models ?? {})) {
           const base = source?.models.get(config.modelID ?? id) ?? source?.models.get(id);
-          const inherit = changed || !catalog.model.get(providerID, id);
-          catalog.model.update(providerID, id, (model) => {
-            if (inherit && base) {
+          const inherit = changed || !current?.models.has(id);
+          definitions.set(id, { inherit, base: base && structuredClone(base) });
+          if (!inherit)
+            continue;
+          providers.models.update(providerID, id, (model) => {
+            if (base)
               Object.assign(model, structuredClone(base));
+            if (item.package !== undefined)
+              model.package = undefined;
+            if (item.settings?.baseURL !== undefined && model.settings)
+              delete model.settings.baseURL;
+          });
+        }
+        next.set(item, { providerID, models: definitions });
+      }
+      sources.defaultModel = latest2(loaded.entries, "model");
+      sources.models = next;
+    });
+    yield* ctx.model.transform((models) => {
+      const configuredDefault = sources.defaultModel;
+      if (configuredDefault !== undefined)
+        models.default.set(configuredDefault.providerID, configuredDefault.model);
+      for (const [item, definition] of sources.models) {
+        const providerID = definition.providerID;
+        for (const [id, config] of Object.entries(item.models ?? {})) {
+          const source = definition.models.get(id);
+          const inherit = source?.inherit || !models.get(providerID, id);
+          models.update(providerID, id, (model) => {
+            if (inherit && source?.base) {
+              Object.assign(model, structuredClone(source.base));
               if (item.package !== undefined)
                 model.package = undefined;
               if (item.settings?.baseURL !== undefined && model.settings)
@@ -159,4 +188,4 @@ function configuredProviders(entries) {
   return entries.filter((entry) => entry.type === "document").flatMap((file) => Object.entries(file.info.providers ?? {}));
 }
 
-export { Plugin27, exports_provider };
+export { Plugin18, exports_provider };

package/dist/chunks/{schema-k5ahzgcr.js → file-kjpj2a9q.js}

@@ -1,56 +1,56 @@
 import {
-  Service79,
-  node83
-} from "./schema-g5rn0d52.js";
+  Service80,
+  node85
+} from "./file-pajef2pp.js";
 import {
-  parse4,
+  parse5,
   parseRemote2,
   validateBranch3,
   isRemote2,
   cachePath2
-} from "./schema-2402vzrj.js";
+} from "./file-6h73sxmp.js";
 import {
   AbsolutePath2
-} from "./schema-922hggd3.js";
+} from "./file-922hggd3.js";
 import {
-  Service74,
+  Service73,
   node78
-} from "./schema-88jrr0c1.js";
+} from "./file-26m8t0ek.js";
 import {
   create3
-} from "./schema-kg06axw8.js";
+} from "./file-rdw6cm16.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/reference.ts
 var exports_reference2 = {};
 __export(exports_reference2, {
-  Event: () => Event18,
+  Event: () => Event9,
   GitSource: () => GitSource2,
-  Info: () => Info31,
+  Info: () => Info8,
   LocalSource: () => LocalSource2,
   Reference: () => exports_reference2,
-  Service: () => Service73,
-  Source: () => Source5,
-  node: () => node77
+  Service: () => Service43,
+  Source: () => Source4,
+  node: () => node47
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Scope } from "effect";
 import { Reference } from "@opencode/schema/reference";
 import { Global } from "@opencode/util/global";
-import { Event as Event18 } from "@opencode/schema/reference";
+import { Event as Event9 } from "@opencode/schema/reference";
 var LocalSource2 = Reference.LocalSource;
 var GitSource2 = Reference.GitSource;
-var Source5 = Reference.Source;
-var Info31 = Reference.Info;
+var Source4 = Reference.Source;
+var Info8 = Reference.Info;
 
-class Service73 extends Context.Service()("@opencode/Reference") {
+class Service43 extends Context.Service()("@opencode/Reference") {
 }
-var layer = Layer.effect(Service73, Effect.gen(function* () {
+var layer = Layer.effect(Service43, Effect.gen(function* () {
   const global = yield* Global.Service;
-  const bus = yield* Service79;
-  const cache = yield* Service74;
+  const bus = yield* Service80;
+  const cache = yield* Service73;
   const scope = yield* Scope.Scope;
   const list = () => Array.from(state.get().sources).flatMap(([name, source]) => {
     const info = {
@@ -60,8 +60,8 @@ var layer = Layer.effect(Service73, Effect.gen(function* () {
       ...source.hidden === undefined ? {} : { hidden: source.hidden }
     };
     if (source.type === "local")
-      return [Info31.make({ ...info, path: source.path })];
-    const repository = parse4(source.repository);
+      return [Info8.make({ ...info, path: source.path })];
+    const repository = parse5(source.repository);
     if (!repository || !isRemote2(repository))
       return [];
     if (source.branch) {
@@ -72,7 +72,7 @@ var layer = Layer.effect(Service73, Effect.gen(function* () {
       }
     }
     return [
-      Info31.make({
+      Info8.make({
         ...info,
         path: AbsolutePath2.make(cachePath2(global.repos, repository, source.branch))
       })
@@ -104,7 +104,7 @@ var layer = Layer.effect(Service73, Effect.gen(function* () {
     })
   });
   yield* Effect.sleep("1 hour").pipe(Effect.andThen(refresh()), Effect.forever, Effect.forkScoped);
-  return Service73.of({
+  return Service43.of({
     transform: state.transform,
     reload: state.reload,
     list: Effect.fn("Reference.list")(function* () {
@@ -112,10 +112,10 @@ var layer = Layer.effect(Service73, Effect.gen(function* () {
     })
   });
 }));
-var node77 = makeLocationNode({
-  service: Service73,
+var node47 = makeLocationNode({
+  service: Service43,
   layer,
-  deps: [Global.node, node83, node78]
+  deps: [Global.node, node85, node78]
 });
 
-export { LocalSource2, GitSource2, Source5, Info31, Service73, node77, exports_reference2, Event18 };
+export { LocalSource2, GitSource2, Source4, Info8, Service43, node47, exports_reference2, Event9 };

package/dist/chunks/{schema-fay8vjw6.js → file-kzw69375.js}

@@ -1,12 +1,12 @@
 import {
-  Service61
-} from "./schema-9n9wwhvc.js";
+  Service65
+} from "./file-wdpdtye9.js";
 import {
-  Service52
-} from "./schema-na2rb754.js";
+  Service66
+} from "./file-pwpabjhk.js";
 import {
   __export
-} from "./schema-9rqn6x4v.js";
+} from "./file-9rqn6x4v.js";
 
 // src/tool/plugin/question.ts
 var exports_question = {};
@@ -17,13 +17,13 @@ __export(exports_question, {
   Plugin: () => Plugin47,
   QuestionTool: () => exports_question,
   description: () => description6,
-  name: () => name13,
+  name: () => name14,
   toModelContent: () => toModelContent7
 });
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
 import { Question } from "@opencode/schema/question";
-var name13 = "question";
+var name14 = "question";
 var description6 = `Use this tool when you need to ask the user questions during execution. This allows you to:
 1. Gather user preferences or requirements
 2. Clarify ambiguous instructions
@@ -53,10 +53,10 @@ var toModelContent7 = (questions, answers) => {
 var Plugin47 = {
   id: "opencode.tool.question",
   effect: Effect.fn("QuestionTool.Plugin")(function* (ctx) {
-    const forms = yield* Service61;
-    const permission = yield* Service52;
+    const forms = yield* Service65;
+    const permission = yield* Service66;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name13,
+      name: name14,
       options: { codemode: false },
       description: description6,
       input: Input13,
@@ -115,4 +115,4 @@ function toField(question, index) {
   };
 }
 
-export { name13, description6, Input13, Output9, CancelledError2, toModelContent7, Plugin47, exports_question };
+export { name14, description6, Input13, Output9, CancelledError2, toModelContent7, Plugin47, exports_question };