@xandreed/plugin-models 0.11.0 → 0.12.0

package/README.md

@@ -1,5 +1,5 @@
 # @xandreed/plugin-models
 
-Efferent composable agent framework, 0.11.0. Node 24 or Bun.
+Efferent composable agent framework, 0.12.0. Node 24 or Bun.
 
 Documentation: https://github.com/xandreeddev/efferent

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export { fromChatCompletion, makeCompatLanguageModel, toChatMessages, toChatTool
 export type { CompatConfig } from "./llm/compat.js";
 export { makeOpenAiCodexLanguageModel, OPENAI_CODEX_API_URL, toOpenAiCodexRequestBody } from "./llm/openAiCodex.js";
 export { normalizeOpenAiCodexWebSocketEvent, openAiCodexUuidV7, OpenAiCodexWebSocketHttpClient } from "./llm/openAiCodexWebSocket.js";
-export { buildProvider, OPENCODE_CHAT_URL, OPENCODE_RESPONSES_API_URL, prependClaudeCode, usesOpenCodeResponses, withAnthropicCacheBreakpoints, } from "./llm/providers.js";
+export { buildProvider, chatCompletionsUrl, OPENCODE_CHAT_URL, OPENCODE_RESPONSES_API_URL, prependClaudeCode, usesOpenCodeResponses, withAnthropicCacheBreakpoints, } from "./llm/providers.js";
 export { classifyLlmError, LLM_REQUEST_TIMEOUT_MS, MAX_HONORED_RETRY_AFTER_MS, rejectEmptyResponse, retryableLlm, } from "./llm/retry.js";
 export type { ErrorClass } from "./llm/retry.js";
 export { generateWith, LanguageModelLive, LanguageModelSelectionLive } from "./llm/router.js";
@@ -17,3 +17,4 @@ export { configuredModelCatalog, ConfiguredModelCatalogLive, reasoningEffortsFor
 export type { ReasoningEffort } from "./llm/modelCatalog.js";
 export { UtilityLlmLive } from "./llm/utilityLlm.js";
 export { modelsPlugin, default } from "./plugin.adapter.js";
+export { CurrentModelEndpoints, ModelEndpoint, ModelEndpoints } from "./ports/model-endpoints.port.js";

package/dist/index.js

@@ -30,6 +30,7 @@ export { makeOpenAiCodexLanguageModel, OPENAI_CODEX_API_URL, toOpenAiCodexReques
 export { normalizeOpenAiCodexWebSocketEvent, openAiCodexUuidV7, OpenAiCodexWebSocketHttpClient } from "./llm/openAiCodexWebSocket.js";
 export {
   buildProvider,
+  chatCompletionsUrl,
   OPENCODE_CHAT_URL,
   OPENCODE_RESPONSES_API_URL,
   prependClaudeCode,
@@ -51,3 +52,4 @@ export {
 } from "./llm/modelCatalog.js";
 export { UtilityLlmLive } from "./llm/utilityLlm.js";
 export { modelsPlugin, default } from "./plugin.adapter.js";
+export { CurrentModelEndpoints, ModelEndpoint, ModelEndpoints } from "./ports/model-endpoints.port.js";

package/dist/llm/compat.d.ts

@@ -19,8 +19,8 @@ export interface CompatConfig {
     readonly moduleName: string;
     /** Full chat-completions endpoint. */
     readonly chatUrl: string;
-    /** Bearer key (already resolved from the AuthStore). */
-    readonly apiKey: string;
+    /** Bearer key (already resolved). Omit for keyless endpoints such as a local server. */
+    readonly apiKey?: string;
     /** Provider-native model id. */
     readonly model: string;
     /** Host-selected thinking mode. Omit to retain family defaults. */

package/dist/llm/compat.js

@@ -142,7 +142,7 @@ const requestSettings = (config, cacheKey, policy) => ({
         method: "POST",
         headers: {
           "content-type": "application/json",
-          authorization: `Bearer ${config.apiKey}`
+          ...config.apiKey === void 0 || config.apiKey.length === 0 ? {} : { authorization: `Bearer ${config.apiKey}` }
         },
         body: JSON.stringify(body)
       });

package/dist/llm/providers.d.ts

@@ -11,8 +11,9 @@ import type { Credential, ModelSelection } from "@xandreed/core";
  *
  * v1 providers: opencode (OpenAI-compatible gateway — the default), google
  * (Gemini's OpenAI-compatible endpoint), anthropic (api key or subscription
- * OAuth), openai (api key). OpenAI-OAuth
- * (Codex) and ollama are deferred until an agent needs them.
+ * OAuth), openai (api key), openai-codex (subscription OAuth). A configured
+ * endpoint, or a `local` credential with a `baseUrl`, sends its provider's
+ * models to that OpenAI-compatible URL, with or without a key.
  */
 export declare const OPENCODE_CHAT_URL = "https://opencode.ai/zen/go/v1/chat/completions";
 /** OpenCode serves GPT models through the OpenAI Responses protocol. */
@@ -37,5 +38,7 @@ export declare const prependClaudeCode: (options: unknown) => unknown;
  * alone.
  */
 export declare const withAnthropicCacheBreakpoints: (options: unknown) => unknown;
+/** `<url>/chat/completions` of an OpenAI-compatible base URL. */
+export declare const chatCompletionsUrl: (baseUrl: string) => string;
 /** Preserve adapter descriptors and describe the public configuration of SDK-backed models. */
 export declare const buildProvider: (selection: ModelSelection, credential: Credential | undefined, key: Redacted.Redacted<string> | undefined) => Effect.Effect<BuiltProvider, AuthError, HttpClient.HttpClient | Scope.Scope>;

package/dist/llm/providers.js

@@ -8,6 +8,7 @@ import { ANTHROPIC_OAUTH_BETA, CLAUDE_CODE_SYSTEM } from "../auth/anthropicOAuth
 import { makeCompatLanguageModel } from "./compat.js";
 import { makeOpenAiCodexLanguageModel } from "./openAiCodex.js";
 import { openAiCodexAccountId } from "../auth/openAiCodexOAuth.js";
+import { CurrentModelEndpoints } from "../ports/model-endpoints.port.js";
 export const OPENCODE_CHAT_URL = "https://opencode.ai/zen/go/v1/chat/completions", OPENCODE_RESPONSES_API_URL = "https://opencode.ai/zen/v1", GOOGLE_CHAT_URL = "https://generativelanguage.googleapis.com/v1beta/openai/chat/completions", usesOpenCodeResponses = (modelId) => /^gpt-/i.test(modelId);
 const anthropicOAuthTransform = (access) => (client) => client.pipe(HttpClient.mapRequest((req) => req.pipe(HttpClientRequest.setHeaders({
   Authorization: `Bearer ${Redacted.value(access)}`,
@@ -57,7 +58,22 @@ const missingKey = (selection) => new AuthError({
       }
     })
   })
-}), buildProviderService = (selection, credential, key) => {
+});
+export const chatCompletionsUrl = (baseUrl) => `${baseUrl.replace(/\/+$/, "")}/chat/completions`;
+const endpointKey = (endpoint, stored) => Option.fromNullishOr(endpoint.apiKey).pipe(Option.orElse(() => Option.flatMap(Option.fromNullishOr(endpoint.apiKeyEnv), (name) => Option.fromNullishOr(process.env[name]))), Option.orElse(() => Option.map(Option.fromNullishOr(stored), Redacted.value)), Option.filter((value) => value.length > 0)), endpointModel = (selection, url, key, standardOnly) => makeCompatLanguageModel({
+  moduleName: selection.provider,
+  chatUrl: chatCompletionsUrl(url),
+  model: selection.modelId,
+  standardOnly,
+  ...Option.match(key, { onNone: () => ({}), onSome: (apiKey) => ({ apiKey }) })
+}).pipe(Effect.map((svc) => ({ svc, prependClaudeCode: !1 }))), buildProviderService = (selection, credential, key) => Effect.flatMap(Effect.service(CurrentModelEndpoints), (endpoints) => {
+  const endpoint = Option.fromNullishOr(endpoints[selection.provider]);
+  if (Option.isSome(endpoint))
+    return endpointModel(selection, endpoint.value.url, endpointKey(endpoint.value, key), endpoint.value.standardOnly ?? !0);
+  if (credential?.type === "local" && credential.baseUrl !== void 0)
+    return endpointModel(selection, credential.baseUrl, Option.none(), !0);
+  return buildBuiltInProvider(selection, credential, key);
+}), buildBuiltInProvider = (selection, credential, key) => {
   const oauth = credential?.type === "oauth";
   if (selection.provider === "opencode") {
     if (key === void 0)
@@ -110,7 +126,7 @@ const missingKey = (selection) => new AuthError({
     }).pipe(Effect.provideService(OpenAiClient.OpenAiClient, client))), Effect.map((svc) => ({ svc, prependClaudeCode: !1 }))));
   return Effect.fail(new AuthError({
     provider: selection.provider,
-    message: `provider "${selection.provider}" is not wired on the new line (v1: opencode, google, anthropic, openai, openai-codex)`
+    message: `provider "${selection.provider}" is not wired (built in: opencode, google, anthropic, openai, openai-codex; add others as models plugin endpoints)`
   }));
 };
 export const buildProvider = (selection, credential, key) => buildProviderService(selection, credential, key).pipe(Effect.flatMap((built) => Effect.gen(function* () {

package/dist/plugin.adapter.d.ts

@@ -5,10 +5,26 @@ export declare const modelsPlugin: import("@xandreed/core").TypedPlugin<{
     readonly fastModel: string;
     readonly fallbackModel: string;
     readonly inheritPrevious: boolean;
+    readonly endpoints: {
+        readonly [x: string]: {
+            readonly url: string;
+            readonly apiKey?: string;
+            readonly apiKeyEnv?: string;
+            readonly standardOnly?: boolean;
+        };
+    };
 }, {
     readonly model: string;
     readonly fastModel: string;
     readonly fallbackModel: string;
     readonly inheritPrevious: boolean;
+    readonly endpoints: {
+        readonly [x: string]: {
+            readonly url: string;
+            readonly apiKey?: string;
+            readonly apiKeyEnv?: string;
+            readonly standardOnly?: boolean;
+        };
+    };
 }, SettingsStore | AuthStore | ModelCatalog | UtilityLlm | LanguageModel.LanguageModel, SettingsError, SessionEnvironment>;
 export default modelsPlugin;

package/dist/plugin.adapter.js

@@ -7,12 +7,13 @@ import { LanguageModelLive } from "./llm/router.js";
 import { UtilityLlmLive } from "./llm/utilityLlm.js";
 import { ConfiguredModelCatalogLive } from "./llm/modelCatalog.js";
 import { LocalSettingsStoreLive } from "./settings/localSettings.js";
-const Config = Schema.Struct({ model: Schema.String, fastModel: Schema.String, fallbackModel: Schema.String, inheritPrevious: Schema.Boolean });
+import { CurrentModelEndpoints, ModelEndpoints } from "./ports/model-endpoints.port.js";
+const Config = Schema.Struct({ model: Schema.String, fastModel: Schema.String, fallbackModel: Schema.String, inheritPrevious: Schema.Boolean, endpoints: ModelEndpoints });
 export const modelsPlugin = definePlugin({
   id: "@xandreed/plugin-models",
-  version: "0.11.0",
+  version: "0.12.0",
   config: Config,
-  defaults: { model: "", fastModel: "", fallbackModel: "", inheritPrevious: !0 },
+  defaults: { model: "", fastModel: "", fallbackModel: "", inheritPrevious: !0, endpoints: {} },
   requires: [SessionEnvironment],
   provides: [LanguageModel.LanguageModel, UtilityLlm, AuthStore, SettingsStore, ModelCatalog],
   layer: (config) => Layer.unwrap(Effect.gen(function* () {
@@ -20,7 +21,7 @@ export const modelsPlugin = definePlugin({
       load: Effect.succeed(new EngineSettings({ ...previous, model: Option.orElse(optional(config.model), () => previous.model), fastModel: Option.orElse(optional(config.fastModel), () => previous.fastModel), fallbackModel: Option.orElse(optional(config.fallbackModel), () => previous.fallbackModel) })),
       setRole: () => Effect.fail(new SettingsError({ message: "Edit the models plugin configuration to change a model" })),
       set: () => Effect.fail(new SettingsError({ message: "Edit the models plugin configuration to change settings" }))
-    }), base = Layer.merge(settings, LocalAuthStoreLive(workspace, homedir(), ".efferent/runtime", config.inheritPrevious ? ".efferent" : void 0));
+    }), base = Layer.mergeAll(settings, LocalAuthStoreLive(workspace, homedir(), ".efferent/runtime", config.inheritPrevious ? ".efferent" : void 0), Layer.succeed(CurrentModelEndpoints, config.endpoints));
     return Layer.mergeAll(LanguageModelLive, UtilityLlmLive, ConfiguredModelCatalogLive).pipe(Layer.provideMerge(base));
   }))
 });

package/dist/ports/model-endpoints.port.d.ts

@@ -0,0 +1,33 @@
+import { Context, Schema } from "effect";
+/**
+ * An OpenAI-compatible endpoint a host names in configuration: the model
+ * `<name>:<model id>` is sent to `<url>/chat/completions`. The key is
+ * optional — a local server or a private gateway may need none. It comes
+ * from `apiKey`, then the environment variable `apiKeyEnv` names, then the
+ * AuthStore's key for `<name>`; with none, no Authorization header is sent.
+ * `standardOnly` (default true) sends only standard chat-completions fields.
+ */
+export declare const ModelEndpoint: Schema.Struct<{
+    readonly url: Schema.String;
+    readonly apiKey: Schema.optionalKey<Schema.String>;
+    readonly apiKeyEnv: Schema.optionalKey<Schema.String>;
+    readonly standardOnly: Schema.optionalKey<Schema.Boolean>;
+}>;
+export type ModelEndpoint = typeof ModelEndpoint.Type;
+/** Endpoints by provider name; a name that matches a built-in provider replaces it. */
+export declare const ModelEndpoints: Schema.$Record<Schema.String, Schema.Struct<{
+    readonly url: Schema.String;
+    readonly apiKey: Schema.optionalKey<Schema.String>;
+    readonly apiKeyEnv: Schema.optionalKey<Schema.String>;
+    readonly standardOnly: Schema.optionalKey<Schema.Boolean>;
+}>>;
+export type ModelEndpoints = typeof ModelEndpoints.Type;
+/** The endpoints the models plugin was configured with; none by default. */
+export declare const CurrentModelEndpoints: Context.Reference<{
+    readonly [x: string]: {
+        readonly url: string;
+        readonly apiKey?: string;
+        readonly apiKeyEnv?: string;
+        readonly standardOnly?: boolean;
+    };
+}>;

package/dist/ports/model-endpoints.port.js

@@ -0,0 +1,9 @@
+import { Context, Schema } from "effect";
+export const ModelEndpoint = Schema.Struct({
+  url: Schema.String,
+  apiKey: Schema.optionalKey(Schema.String),
+  apiKeyEnv: Schema.optionalKey(Schema.String),
+  standardOnly: Schema.optionalKey(Schema.Boolean)
+}), ModelEndpoints = Schema.Record(Schema.String, ModelEndpoint), CurrentModelEndpoints = Context.Reference("@xandreed/plugin-models/CurrentModelEndpoints", {
+  defaultValue: () => ({})
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xandreed/plugin-models",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "@xandreed/core": "0.11.0",
+    "@xandreed/core": "0.12.0",
     "effect": "4.0.0-rc.118",
     "@effect/ai-anthropic": "4.0.0-rc.118",
     "@effect/ai-openai": "4.0.0-rc.118",