@opencode-ai/core 0.0.0-beta-18721 → 0.0.0-beta-18866

package/dist/chunks/{workspace-vnze5mnn.js → reference-17fnrv0p.js}

@@ -1,34 +1,26 @@
-import {
-  exports_config
-} from "./workspace-cpdjx8r8.js";
-import {
-  exports_provider_options
-} from "./workspace-y0x38cee.js";
-import {
-  exports_model
-} from "./workspace-t683wdge.js";
-import {
-  exports_provider
-} from "./workspace-fex42j86.js";
 import {
   exports_integration
-} from "./workspace-96h2ckbg.js";
+} from "./reference-ak8kj9h3.js";
 import {
   exports_credential
-} from "./workspace-geyszmd1.js";
+} from "./reference-thngpag9.js";
+import {
+  exports_provider
+} from "./reference-zq5w46q0.js";
 import {
   exports_bus
-} from "./workspace-vkgwd1zr.js";
+} from "./reference-jghhn6h0.js";
 
 // src/plugin/provider/opencode.ts
 import { Duration, Effect, Schema, Semaphore, Stream } from "effect";
 import { define } from "@opencode-ai/plugin/effect/plugin";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
+import { ConfigProvider } from "@opencode-ai/schema/config/provider";
 import { Money } from "@opencode-ai/schema/money";
 var defaultServer = "https://opencode.ai/console";
 var clientID = "opencode-cli";
 var methodID = exports_integration.MethodID.make("device");
-var RemoteResponse = Schema.Struct({ config: exports_config.Info });
+var RemoteResponse = Schema.Struct({ providers: Schema.Record(Schema.String, ConfigProvider.Info) });
 var Device = Schema.Struct({
   device_code: Schema.String,
   user_code: Schema.String,
@@ -111,67 +103,70 @@ var OpencodePlugin = define({
     yield* load();
     yield* ctx.catalog.transform((catalog) => {
       for (const [providerID, item2] of Object.entries(providers ?? {})) {
+        const source = catalog.provider.get(item2.canonical ?? providerID);
         catalog.provider.update(providerID, (provider) => {
+          if (source && source.provider !== provider)
+            Object.assign(provider, structuredClone(source.provider), { id: provider.id });
           provider.integrationID = exports_integration.ID.make("opencode");
+          if (item2.canonical !== undefined)
+            provider.canonical = item2.canonical;
           if (item2.name !== undefined)
             provider.name = item2.name;
-          provider.package = item2.npm ? exports_provider.aisdk(item2.npm) : "";
-          provider.settings = {
-            ...provider.settings,
-            ...withoutCredentials(item2.options),
-            ...item2.api ? { baseURL: item2.api } : {}
-          };
-          provider.headers = { ...provider.headers, ...item2.options?.headers };
+          provider.package = item2.package ?? provider.package;
+          provider.settings = exports_provider.mergeOverlay(withoutCredentials(provider.settings), withoutCredentials(item2.settings));
+          provider.headers = exports_provider.mergeHeaders(provider.headers, item2.headers);
+          provider.body = exports_provider.mergeOverlay(provider.body, item2.body);
         });
         for (const [modelID, config] of Object.entries(item2.models ?? {})) {
+          const base = source?.models.get(config.modelID ?? modelID) ?? source?.models.get(modelID);
           catalog.model.update(providerID, modelID, (model) => {
+            Object.assign(model, structuredClone(base ?? model));
             if (config.family !== undefined)
-              model.family = exports_model.Family.make(config.family);
+              model.family = config.family;
             if (config.name !== undefined)
               model.name = config.name;
-            if (config.id !== undefined)
-              model.modelID = exports_model.ID.make(config.id);
-            model.compatibility = exports_model.compatibility(config.interleaved) ?? model.compatibility;
-            if (config.provider !== undefined) {
-              model.package = config.provider.npm ? exports_provider.aisdk(config.provider.npm) : undefined;
-              if (config.provider.api)
-                model.settings = { ...model.settings, baseURL: config.provider.api };
-            }
-            if (config.tool_call !== undefined)
-              model.capabilities.tools = config.tool_call;
-            if (config.modalities?.input !== undefined)
-              model.capabilities.input = [...config.modalities.input];
-            if (config.modalities?.output !== undefined)
-              model.capabilities.output = [...config.modalities.output];
-            model.headers = { ...model.headers, ...config.headers };
-            model.settings = { ...model.settings, ...exports_provider_options.model(withoutCredentials(config.options)) };
-            if (config.variants !== undefined) {
-              model.variants ??= [];
-              for (const [id, options] of Object.entries(config.variants)) {
-                const variantID = exports_model.VariantID.make(id);
-                let existing = model.variants.find((item3) => item3.id === variantID);
-                if (!existing) {
-                  existing = { id: variantID };
-                  model.variants.push(existing);
-                }
-                existing.headers = { ...existing.headers, ...options.headers };
-                existing.settings = {
-                  ...existing.settings,
-                  ...exports_provider_options.model(withoutCredentials(options))
-                };
+            if (config.modelID !== undefined)
+              model.modelID = config.modelID;
+            if (config.compatibility !== undefined)
+              model.compatibility = { ...model.compatibility, ...config.compatibility };
+            model.package = config.package ?? (item2.package !== undefined ? undefined : model.package);
+            if (item2.settings?.baseURL !== undefined && model.settings)
+              delete model.settings.baseURL;
+            if (config.capabilities !== undefined)
+              model.capabilities = {
+                ...config.capabilities,
+                input: [...config.capabilities.input],
+                output: [...config.capabilities.output]
+              };
+            model.settings = exports_provider.mergeOverlay(withoutCredentials(model.settings), withoutCredentials(config.settings));
+            model.headers = exports_provider.mergeHeaders(model.headers, config.headers);
+            model.body = exports_provider.mergeOverlay(model.body, config.body);
+            for (const variant of config.variants ?? []) {
+              let existing = model.variants.find((item3) => item3.id === variant.id);
+              if (!existing) {
+                existing = { id: variant.id };
+                model.variants.push(existing);
               }
+              if (variant.settings !== undefined)
+                existing.settings = exports_provider.mergeOverlay(existing.settings, withoutCredentials(variant.settings));
+              if (variant.headers !== undefined)
+                existing.headers = exports_provider.mergeHeaders(existing.headers, variant.headers);
+              if (variant.body !== undefined)
+                existing.body = exports_provider.mergeOverlay(existing.body, variantBody(variant.body, model.package ?? item2.package ?? source?.provider.package));
             }
-            if (config.release_date !== undefined) {
-              const released = Date.parse(config.release_date);
-              model.time.released = Number.isFinite(released) ? released : 0;
-            }
-            if (config.cost !== undefined) {
-              model.cost = remoteCost(config.cost);
-            }
-            model.status = config.status ?? "active";
-            model.enabled = config.status !== "deprecated";
+            if (config.cost !== undefined)
+              model.cost = (Array.isArray(config.cost) ? config.cost : [config.cost]).map((cost) => ({
+                tier: cost.tier && { ...cost.tier },
+                input: cost.input,
+                output: cost.output,
+                cache: {
+                  read: cost.cache?.read ?? Money.USDPerMillionTokens.zero,
+                  write: cost.cache?.write ?? Money.USDPerMillionTokens.zero
+                }
+              }));
+            model.enabled = !config.disabled;
             if (config.limit !== undefined)
-              model.limit = { ...config.limit };
+              model.limit = { ...model.limit, ...config.limit };
           });
         }
       }
@@ -204,14 +199,26 @@ function fetchProviders(http, value) {
   const server = typeof metadata?.server === "string" ? metadata.server : defaultServer;
   const orgID = typeof metadata?.orgID === "string" ? metadata.orgID : undefined;
   const token = value.type === "oauth" ? value.access : value.key;
-  return http.execute(HttpClientRequest.get(`${server}/api/config`).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(token), HttpClientRequest.setHeaders(orgID ? { "x-org-id": orgID } : {}))).pipe(Effect.flatMap((response) => {
+  return http.execute(HttpClientRequest.get(`${server}/api/v2/config`).pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(token), HttpClientRequest.setHeaders(orgID ? { "x-org-id": orgID } : {}))).pipe(Effect.flatMap((response) => {
     if (response.status === 404)
       return Effect.undefined;
-    return HttpClientResponse.filterStatusOk(response).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(RemoteResponse)), Effect.map((remote) => remote.config.provider));
+    return HttpClientResponse.filterStatusOk(response).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(RemoteResponse)), Effect.map((remote) => remote.providers));
   }));
 }
+function variantBody(body, packageName) {
+  if (packageName !== exports_provider.aisdk("@ai-sdk/openai"))
+    return body;
+  const { reasoningEffort, reasoningSummary, ...native } = body;
+  const reasoning = {
+    ...typeof reasoningEffort === "string" ? { effort: reasoningEffort } : {},
+    ...typeof reasoningSummary === "string" ? { summary: reasoningSummary } : {}
+  };
+  if (Object.keys(reasoning).length === 0)
+    return body;
+  return exports_provider.mergeOverlay({ reasoning }, native);
+}
 function withoutCredentials(body) {
-  return Object.fromEntries(Object.entries(body ?? {}).filter(([key]) => key !== "apiKey" && key !== "headers"));
+  return body && Object.fromEntries(Object.entries(body).filter(([key]) => !["apiKey", "authToken", "accessToken"].includes(key)));
 }
 function normalizeServer(input) {
   return Effect.try({
@@ -226,30 +233,6 @@ function normalizeServer(input) {
     catch: (cause) => new Error(`Invalid OpenCode server URL: ${cause instanceof Error ? cause.message : String(cause)}`)
   });
 }
-function remoteCost(input) {
-  const base = {
-    input: Money.USDPerMillionTokens.make(input.input),
-    output: Money.USDPerMillionTokens.make(input.output),
-    cache: {
-      read: Money.USDPerMillionTokens.make(input.cache_read ?? 0),
-      write: Money.USDPerMillionTokens.make(input.cache_write ?? 0)
-    }
-  };
-  if (!input.context_over_200k)
-    return [base];
-  return [
-    base,
-    {
-      tier: { type: "context", size: 200000 },
-      input: Money.USDPerMillionTokens.make(input.context_over_200k.input),
-      output: Money.USDPerMillionTokens.make(input.context_over_200k.output),
-      cache: {
-        read: Money.USDPerMillionTokens.make(input.context_over_200k.cache_read ?? 0),
-        write: Money.USDPerMillionTokens.make(input.context_over_200k.cache_write ?? 0)
-      }
-    }
-  ];
-}
 function poll(http, server, deviceCode, interval) {
   const loop = (wait) => Effect.gen(function* () {
     yield* Effect.sleep(wait);

package/dist/chunks/{workspace-e5hrgxm9.js → reference-1btf37k0.js}

@@ -1,17 +1,17 @@
 import {
   exports_model
-} from "./workspace-6yzphrxy.js";
+} from "./reference-ftjbsen0.js";
+import {
+  exports_integration
+} from "./reference-ak8kj9h3.js";
 import {
   exports_permission
-} from "./workspace-ekr1z8vx.js";
+} from "./reference-yt5sqzpx.js";
 import {
   AgentNotFoundError,
   StepFailedError,
   UserInterruptedError
-} from "./workspace-cgqn2mrm.js";
-import {
-  exports_integration
-} from "./workspace-96h2ckbg.js";
+} from "./reference-2sqw2jjm.js";
 
 // src/session/to-session-error.ts
 import { AIError, ToolFailure } from "@opencode-ai/ai";

package/dist/chunks/{workspace-z1qq43ae.js → reference-1e3g1ft9.js}

@@ -1,18 +1,18 @@
-import {
-  iife
-} from "./workspace-ehj9csmv.js";
 import {
   configuredSettings
-} from "./workspace-wg766mjt.js";
+} from "./reference-f821qzap.js";
+import {
+  iife
+} from "./reference-ehj9csmv.js";
 import {
   exports_app
-} from "./workspace-50jxp3hw.js";
+} from "./reference-hs51b0fc.js";
 import {
   exports_provider
-} from "./workspace-fex42j86.js";
+} from "./reference-zq5w46q0.js";
 import {
   __require
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/plugin/provider/cloudflare-ai-gateway.ts
 import os from "os";

package/dist/chunks/{workspace-264e1nfp.js → reference-264e1nfp.js}

@@ -1,10 +1,10 @@
 import {
   SessionSchema
-} from "./workspace-bjwj8hwv.js";
+} from "./reference-bjwj8hwv.js";
 import {
   AbsolutePath,
   RelativePath
-} from "./workspace-j07kk359.js";
+} from "./reference-j07kk359.js";
 
 // src/session/info.ts
 import { DateTime, Schema } from "effect";

package/dist/chunks/{workspace-0yf2afmn.js → reference-2cehtecm.js}

@@ -1,19 +1,19 @@
 import {
   exports_mcp
-} from "./workspace-6jw56qh4.js";
+} from "./reference-mxhs55xx.js";
 import {
   exports_config
-} from "./workspace-m4a2h2aa.js";
+} from "./reference-4v53bvyt.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/config/plugin/mcp.ts
 var exports_mcp2 = {};
 __export(exports_mcp2, {
-  register: () => register,
+  ConfigMcpPlugin: () => exports_mcp2,
   Plugin: () => Plugin,
-  ConfigMcpPlugin: () => exports_mcp2
+  register: () => register
 });
 import { define } from "@opencode-ai/plugin/effect/plugin";
 import { Effect, Stream } from "effect";

package/dist/chunks/{workspace-1rexamst.js → reference-2nszkqak.js}

@@ -1,21 +1,21 @@
 import {
   exports_location_watcher_policy
-} from "./workspace-6wkzvma0.js";
+} from "./reference-jqd42x9x.js";
 import {
   exports_entry_observer
-} from "./workspace-kp1t5rcy.js";
+} from "./reference-mnyszbxc.js";
 import {
   exports_config
-} from "./workspace-m4a2h2aa.js";
+} from "./reference-4v53bvyt.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/config/plugin/location-watcher.ts
 var exports_location_watcher = {};
 __export(exports_location_watcher, {
-  Plugin: () => Plugin,
-  ConfigLocationWatcherPlugin: () => exports_location_watcher
+  ConfigLocationWatcherPlugin: () => exports_location_watcher,
+  Plugin: () => Plugin
 });
 import { define } from "@opencode-ai/plugin/effect/plugin";
 import { Effect } from "effect";

package/dist/chunks/{workspace-cgqn2mrm.js → reference-2sqw2jjm.js}

@@ -1,34 +1,34 @@
 import {
   SessionMessage
-} from "./workspace-8rpfd2h6.js";
+} from "./reference-8rpfd2h6.js";
 import {
   SessionSchema
-} from "./workspace-bjwj8hwv.js";
+} from "./reference-bjwj8hwv.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/session/error.ts
 var exports_error = {};
 __export(exports_error, {
-  UserInterruptedError: () => UserInterruptedError,
-  SyntheticConflictError: () => SyntheticConflictError,
-  StepFailedError: () => StepFailedError,
-  SkillNotFoundError: () => SkillNotFoundError,
-  SessionErrors: () => exports_error,
-  PromptConflictError: () => PromptConflictError,
-  NotFoundError: () => NotFoundError,
-  MessageToolIncompleteError: () => MessageToolIncompleteError,
-  MessageNotFoundError: () => MessageNotFoundError,
-  MessageNotAssistantError: () => MessageNotAssistantError,
-  MessageIncompleteError: () => MessageIncompleteError,
-  MessageDecodeError: () => MessageDecodeError,
-  InboxConflictError: () => InboxConflictError,
-  ForkEmptyError: () => ForkEmptyError,
-  CompactionConflictError: () => CompactionConflictError,
-  BusyError: () => BusyError,
+  AgentNotFoundError: () => AgentNotFoundError,
   AttachmentError: () => AttachmentError,
-  AgentNotFoundError: () => AgentNotFoundError
+  BusyError: () => BusyError,
+  CompactionConflictError: () => CompactionConflictError,
+  ForkEmptyError: () => ForkEmptyError,
+  InboxConflictError: () => InboxConflictError,
+  MessageDecodeError: () => MessageDecodeError,
+  MessageIncompleteError: () => MessageIncompleteError,
+  MessageNotAssistantError: () => MessageNotAssistantError,
+  MessageNotFoundError: () => MessageNotFoundError,
+  MessageToolIncompleteError: () => MessageToolIncompleteError,
+  NotFoundError: () => NotFoundError,
+  PromptConflictError: () => PromptConflictError,
+  SessionErrors: () => exports_error,
+  SkillNotFoundError: () => SkillNotFoundError,
+  StepFailedError: () => StepFailedError,
+  SyntheticConflictError: () => SyntheticConflictError,
+  UserInterruptedError: () => UserInterruptedError
 });
 import { Schema } from "effect";
 import { Agent } from "@opencode-ai/schema/agent";

package/dist/chunks/{workspace-q2jbdv9f.js → reference-2syg46b4.js}

@@ -1,45 +1,42 @@
-import {
-  WorktreeTable
-} from "./workspace-gb1z7yet.js";
 import {
   exports_schema
-} from "./workspace-h94zdhz8.js";
+} from "./reference-m7jtgrng.js";
 import {
-  exports_markers
-} from "./workspace-jpw57t0x.js";
+  WorktreeTable
+} from "./reference-gb1z7yet.js";
 import {
   ProjectTable,
   upsertProject
-} from "./workspace-c8ya26sa.js";
+} from "./reference-c8ya26sa.js";
 import {
   exports_git
-} from "./workspace-dyj7wa6j.js";
+} from "./reference-qz5gwjr7.js";
 import {
   AbsolutePath
-} from "./workspace-j07kk359.js";
+} from "./reference-j07kk359.js";
 import {
   exports_bus
-} from "./workspace-vkgwd1zr.js";
+} from "./reference-jghhn6h0.js";
 import {
   exports_database
-} from "./workspace-gbf8gmfy.js";
+} from "./reference-xwpxh8hr.js";
 import {
   __export
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/project.ts
 var exports_project = {};
 __export(exports_project, {
-  root: () => root,
-  node: () => node,
-  Vcs: () => Vcs,
-  UpdateInput: () => UpdateInput,
-  Service: () => Service,
-  Project: () => exports_project,
-  NotFoundError: () => NotFoundError,
-  Info: () => Info,
+  Current: () => Current,
   ID: () => ID,
-  Current: () => Current
+  Info: () => Info,
+  NotFoundError: () => NotFoundError,
+  Project: () => exports_project,
+  Service: () => Service,
+  UpdateInput: () => UpdateInput,
+  Vcs: () => Vcs,
+  node: () => node,
+  root: () => root
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { ChildProcess } from "effect/unstable/process";
@@ -92,7 +89,6 @@ function fromRow(row) {
 var layer = Layer.effect(Service, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const git = yield* exports_git.Service;
-  const markers = yield* exports_markers.Service;
   const proc = yield* AppProcess.Service;
   const bus = yield* exports_bus.Service;
   const db = (yield* exports_database.Service).db;
@@ -132,7 +128,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
             return false;
           if (!FSUtil.contains(directory, candidate.directory))
             return false;
-          const found = yield* fs.up({ targets: [...markers.targets()], start: candidate.directory, stop: directory, mode: "first" }).pipe(Effect.orElseSucceed(() => []));
+          const found = yield* fs.up({ targets: [".git", ".hg"], start: candidate.directory, stop: directory, mode: "first" }).pipe(Effect.orElseSucceed(() => []));
           if (!found[0])
             return false;
           return (yield* fs.resolve(path.dirname(found[0]))) === directory;
@@ -234,14 +230,13 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       vcs: { type: "hg", store }
     };
   });
-  const resolve = Effect.fn("Project.resolve")(function* (input, options) {
+  const resolve = Effect.fn("Project.resolve")(function* (input, _options) {
     const directory = AbsolutePath.make(yield* fs.resolve(input));
-    const marker = yield* markers.discover(directory, options);
     const native = yield* fs.up({ targets: [".git", ".hg"], start: directory, mode: "first" }).pipe(Effect.map((matches) => matches[0]), Effect.orElseSucceed(() => {
       return;
     }));
     const repo = native && path.basename(native) === ".git" ? yield* git.repo.discover(AbsolutePath.make(path.dirname(native))) : undefined;
-    if (repo && (!marker || FSUtil.contains(marker.directory, repo.worktree))) {
+    if (repo) {
       const previous = yield* cached(repo.commonDirectory);
       const id = (yield* remote(repo)) ?? previous ?? (yield* rootCommit(repo));
       const canonical = repo.gitDirectory === repo.commonDirectory ? repo.worktree : yield* git.worktree.list(repo).pipe(Effect.map((items) => items.find((item) => item.kind === "main")?.directory ?? repo.worktree), Effect.orElseSucceed(() => repo.worktree));
@@ -250,26 +245,14 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
         id: id ?? ID.global,
         directory: repo.worktree,
         canonical,
-        vcs: { type: "git", store: repo.commonDirectory },
-        ...marker?.directory === repo.worktree && marker.type !== "git" ? { vcsBackend: marker.type } : {}
+        vcs: { type: "git", store: repo.commonDirectory }
       });
     }
     const hg = native && path.basename(native) === ".hg" ? yield* hgDiscover(AbsolutePath.make(native)) : undefined;
-    if (hg && (!marker || FSUtil.contains(marker.directory, hg.directory))) {
+    if (hg) {
       return yield* persist({
         ...hg,
-        canonical: hg.directory,
-        ...marker?.directory === hg.directory && marker.type !== "hg" ? { vcsBackend: marker.type } : {}
-      });
-    }
-    if (marker) {
-      const previous = yield* cached(marker.marker);
-      return yield* persist({
-        previous,
-        id: previous ?? ID.make(Hash.fast(`vcs-repository:${marker.type}:${marker.marker}`)),
-        directory: marker.directory,
-        canonical: marker.directory,
-        vcs: { type: marker.type, store: marker.marker }
+        canonical: hg.directory
       });
     }
     return yield* persist({
@@ -284,7 +267,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
 var node = makeGlobalNode({
   service: Service,
   layer,
-  deps: [exports_bus.node, exports_database.node, FSUtil.node, exports_git.node, exports_markers.node, AppProcess.node]
+  deps: [exports_bus.node, exports_database.node, FSUtil.node, exports_git.node, AppProcess.node]
 });
 
 export { ID, Vcs, Current, Info, UpdateInput, NotFoundError, root, Service, node, exports_project };

package/dist/chunks/{workspace-w385wtt6.js → reference-2x0ckx01.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./workspace-fex42j86.js";
+} from "./reference-zq5w46q0.js";
 import {
   __require
-} from "./workspace-rvfvac9x.js";
+} from "./reference-vpjkya7h.js";
 
 // src/plugin/provider/anthropic.ts
 import { Effect } from "effect";