@inkdropapp/ai 0.1.2 → 0.1.4

package/README.md

@@ -370,6 +370,51 @@ const settings: AISettings = {
 `openrouter` looks up `OPENROUTER_API_KEY`; `ollama_local` looks up
 `OLLAMA_LOCAL_API_KEY`. Each gets its own keyring entry under its `baseURL`.
 
+### Adding an OpenAI-compatible provider at runtime
+
+Two-step flow: persist the new entry into `AISettings` and rebuild the
+registry, then set the API key on the resulting provider instance.
+
+```ts
+// 1. Add the entry to settings and persist (host owns the config layer).
+const next: AISettings = {
+  ...settings,
+  providers: {
+    ...settings.providers,
+    openaiCompatible: [
+      ...(settings.providers.openaiCompatible ?? []),
+      {
+        id: 'groq',
+        baseURL: 'https://api.groq.com/openai/v1',
+        models: [{ id: 'llama-3.3-70b-versatile' }]
+      }
+    ]
+  }
+}
+writeConfigFile(next) // your persistence layer
+registry.updateSettings(next)
+
+// 2. The provider now exists in the registry — set its API key.
+const provider = registry.getProvider('groq')!
+await provider.setApiKey('gsk-...')
+```
+
+`updateSettings` rebuilds the provider list but preserves the shared
+`KeyStore`, so any keys already in the keyring stay resolved.
+
+If your UX needs to **validate the key before persisting the entry**, you can
+write directly to the `KeyStore` first — keys are stored against the
+normalised `baseURL`, not the provider id, so this works without the entry
+being registered yet:
+
+```ts
+await registry.keyStore.setKey('https://api.groq.com/openai/v1', 'gsk-...')
+// later, once validated: persist the AISettings entry and updateSettings.
+```
+
+Once you add the entry and rebuild, `provider.isAuthenticated()` returns
+`true` because the key already lives under that `baseURL`.
+
 ### Mixing slots across providers
 
 ```ts

package/package.json

@@ -1,16 +1,26 @@
 {
   "name": "@inkdropapp/ai",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "AI integration common module",
   "type": "module",
   "main": "src/index.ts",
   "types": "types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "default": "./src/index.ts"
+    },
+    "./constants": {
+      "types": "./types/provider-constants.d.ts",
+      "default": "./src/provider-constants.ts"
+    }
+  },
   "scripts": {
     "lint": "eslint src __tests__",
     "test": "node --experimental-vm-modules --no-warnings=ExperimentalWarning node_modules/jest/bin/jest.js --config jest.config.cjs --runInBand",
-    "gen": "tsc --declaration --emitDeclarationOnly",
+    "build": "tsc --declaration --emitDeclarationOnly",
     "format": "prettier --write .",
-    "prepublishOnly": "npm-run-all lint test gen"
+    "prepublishOnly": "npm-run-all lint test build"
   },
   "keywords": [
     "ai",
@@ -25,7 +35,8 @@
     "@ai-sdk/provider": "4.0.0-beta.14",
     "@inkdropapp/ai-catalog": "^0.1.0",
     "@napi-rs/keyring": "^1.2.0",
-    "ai": "7.0.0-beta.116"
+    "ai": "7.0.0-beta.116",
+    "npm-run-all2": "^8.0.4"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
@@ -33,7 +44,6 @@
     "eslint": "^10.3.0",
     "eslint-config-prettier": "^10.1.8",
     "jest": "^30.4.2",
-    "npm-run-all": "^4.1.5",
     "prettier": "^3.8.3",
     "ts-jest": "^29.4.9",
     "typescript": "^6.0.3",

package/src/index.ts

@@ -36,11 +36,17 @@ export {
 } from './errors.js'
 export { KeyStore, type KeyStoreOptions } from './key-store.js'
 export { normalizeBaseURL } from './url.js'
-export { AnthropicProvider } from './providers/anthropic.js'
 export {
-  OpenAICompatibleProvider,
+  ANTHROPIC_PROVIDER_ID,
+  ANTHROPIC_PROVIDER_NAME,
+  ANTHROPIC_ENV_VAR,
+  ANTHROPIC_DEFAULT_BASE_URL,
+  OPENAI_COMPATIBLE_PROVIDER_ID,
+  OPENAI_COMPATIBLE_PROVIDER_NAME,
   deriveEnvVarName
-} from './providers/openai-compatible.js'
+} from './provider-constants.js'
+export { AnthropicProvider } from './providers/anthropic.js'
+export { OpenAICompatibleProvider } from './providers/openai-compatible.js'
 export {
   AIRegistry,
   type AIRegistryOptions,

package/src/provider-constants.ts

@@ -0,0 +1,57 @@
+/**
+ * Pure-data provider metadata for settings UIs.
+ *
+ * This module has no class or native-module imports, so it's safe to load in
+ * an Electron renderer process — unlike the main package entrypoint, which
+ * transitively pulls in `@napi-rs/keyring`.
+ *
+ * Consume via the `@inkdropapp/ai/constants` subpath:
+ *
+ *   import {
+ *     ANTHROPIC_PROVIDER_ID,
+ *     ANTHROPIC_PROVIDER_NAME,
+ *     ANTHROPIC_ENV_VAR,
+ *     ANTHROPIC_DEFAULT_BASE_URL,
+ *     OPENAI_COMPATIBLE_PROVIDER_ID,
+ *     OPENAI_COMPATIBLE_PROVIDER_NAME,
+ *     deriveEnvVarName
+ *   } from '@inkdropapp/ai/constants'
+ */
+
+export const ANTHROPIC_PROVIDER_ID = 'anthropic'
+export const ANTHROPIC_PROVIDER_NAME = 'Anthropic'
+export const ANTHROPIC_ENV_VAR = 'ANTHROPIC_API_KEY'
+export const ANTHROPIC_DEFAULT_BASE_URL = 'https://api.anthropic.com'
+
+/**
+ * The `AISettings.providers` key for OpenAI-compatible entries. Use this to
+ * tag a settings-UI row as "an OpenAI-compatible provider" (vs. the built-in
+ * Anthropic row).
+ *
+ * Runtime provider ids for OpenAI-compatible entries are user-chosen
+ * (`AISettings.providers.openaiCompatible[].id`); this constant is the
+ * *type/kind*, not an instance id.
+ */
+export const OPENAI_COMPATIBLE_PROVIDER_ID = 'openaiCompatible'
+export const OPENAI_COMPATIBLE_PROVIDER_NAME = 'OpenAI-Compatible'
+
+/**
+ * Derives the env-var name for an OpenAI-compatible provider entry from its
+ * user-chosen `id`.
+ *
+ * Rules: replace any non-alphanumeric character with `_`, collapse runs of `_`,
+ * uppercase, append `_API_KEY`.
+ *
+ * Examples:
+ *   `openrouter`     → `OPENROUTER_API_KEY`
+ *   `together_ai`    → `TOGETHER_AI_API_KEY`
+ *   `ollama-local`   → `OLLAMA_LOCAL_API_KEY`
+ *   `my.proxy`       → `MY_PROXY_API_KEY`
+ */
+export const deriveEnvVarName = (id: string): string => {
+  const sanitized = id
+    .replace(/[^a-zA-Z0-9]+/g, '_')
+    .replace(/^_+|_+$/g, '')
+    .toUpperCase()
+  return `${sanitized}_API_KEY`
+}

package/src/providers/anthropic.ts

@@ -18,6 +18,12 @@ import { NoApiKey } from '../errors.js'
 import type { KeyStore } from '../key-store.js'
 import { mapAiSdkError } from '../internal/map-ai-sdk-error.js'
 import { mapAiSdkStream } from '../internal/map-ai-sdk-stream.js'
+import {
+  ANTHROPIC_DEFAULT_BASE_URL,
+  ANTHROPIC_ENV_VAR,
+  ANTHROPIC_PROVIDER_ID,
+  ANTHROPIC_PROVIDER_NAME
+} from '../provider-constants.js'
 import type { AIModel, AIProvider, CompletionRequest } from '../provider.js'
 import type {
   AnthropicModelConfig,
@@ -25,11 +31,6 @@ import type {
 } from '../settings.js'
 import type { StreamEvent } from '../stream-events.js'
 
-const PROVIDER_ID = 'anthropic'
-const PROVIDER_NAME = 'Anthropic'
-const ENV_VAR = 'ANTHROPIC_API_KEY'
-const DEFAULT_BASE_URL = 'https://api.anthropic.com'
-
 /**
  * The Anthropic (Claude) provider.
  *
@@ -45,9 +46,9 @@ const DEFAULT_BASE_URL = 'https://api.anthropic.com'
  * `clearApiKey` is called or the resolved API key changes.
  */
 export class AnthropicProvider implements AIProvider {
-  readonly id = PROVIDER_ID
-  readonly name = PROVIDER_NAME
-  readonly envVarName = ENV_VAR
+  readonly id = ANTHROPIC_PROVIDER_ID
+  readonly name = ANTHROPIC_PROVIDER_NAME
+  readonly envVarName = ANTHROPIC_ENV_VAR
   readonly baseURL: string
 
   private readonly keyStore: KeyStore
@@ -64,7 +65,7 @@ export class AnthropicProvider implements AIProvider {
     catalog?: AnthropicCatalog
   ) {
     this.keyStore = keyStore
-    this.baseURL = config.baseURL ?? DEFAULT_BASE_URL
+    this.baseURL = config.baseURL ?? ANTHROPIC_DEFAULT_BASE_URL
 
     const baseModels = catalog?.models ?? ANTHROPIC_MODELS
     this.defaultId = catalog?.defaultModelId ?? ANTHROPIC_DEFAULT_MODEL_ID

package/src/providers/openai-compatible.ts

@@ -11,6 +11,7 @@ import { NoApiKey } from '../errors.js'
 import type { KeyStore } from '../key-store.js'
 import { mapAiSdkError } from '../internal/map-ai-sdk-error.js'
 import { mapAiSdkStream } from '../internal/map-ai-sdk-stream.js'
+import { deriveEnvVarName } from '../provider-constants.js'
 import type { AIModel, AIProvider, CompletionRequest } from '../provider.js'
 import type {
   OpenAICompatibleModelConfig,
@@ -26,26 +27,6 @@ const DEFAULT_CAPABILITIES: ModelCapabilities = {
   maxTokens: 32_000
 }
 
-/**
- * Derives the env-var name for a user-named provider entry.
- *
- * Rules: replace any non-alphanumeric character with `_`, collapse runs of `_`,
- * uppercase, append `_API_KEY`.
- *
- * Examples:
- *   `openrouter`     → `OPENROUTER_API_KEY`
- *   `together_ai`    → `TOGETHER_AI_API_KEY`
- *   `ollama-local`   → `OLLAMA_LOCAL_API_KEY`
- *   `my.proxy`       → `MY_PROXY_API_KEY`
- */
-export const deriveEnvVarName = (id: string): string => {
-  const sanitized = id
-    .replace(/[^a-zA-Z0-9]+/g, '_')
-    .replace(/^_+|_+$/g, '')
-    .toUpperCase()
-  return `${sanitized}_API_KEY`
-}
-
 const mergeCapabilities = (
   override: Partial<ModelCapabilities> | undefined
 ): ModelCapabilities => ({

package/types/index.d.ts

@@ -5,6 +5,7 @@ export { ANTHROPIC_MODELS, ANTHROPIC_DEFAULT_MODEL_ID, ANTHROPIC_DEFAULT_FAST_MO
 export { AIError, NoApiKey, AuthenticationError, RateLimitExceeded, ServerOverloaded, PromptTooLarge, UpstreamError, isAIError, type AIErrorKind } from './errors.js';
 export { KeyStore, type KeyStoreOptions } from './key-store.js';
 export { normalizeBaseURL } from './url.js';
+export { ANTHROPIC_PROVIDER_ID, ANTHROPIC_PROVIDER_NAME, ANTHROPIC_ENV_VAR, ANTHROPIC_DEFAULT_BASE_URL, OPENAI_COMPATIBLE_PROVIDER_ID, OPENAI_COMPATIBLE_PROVIDER_NAME, deriveEnvVarName } from './provider-constants.js';
 export { AnthropicProvider } from './providers/anthropic.js';
-export { OpenAICompatibleProvider, deriveEnvVarName } from './providers/openai-compatible.js';
-export { Registry, type RegistryOptions, type ResolvedSlot } from './registry.js';
+export { OpenAICompatibleProvider } from './providers/openai-compatible.js';
+export { AIRegistry, type AIRegistryOptions, type ResolvedSlot } from './registry.js';

package/types/provider-constants.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Pure-data provider metadata for settings UIs.
+ *
+ * This module has no class or native-module imports, so it's safe to load in
+ * an Electron renderer process — unlike the main package entrypoint, which
+ * transitively pulls in `@napi-rs/keyring`.
+ *
+ * Consume via the `@inkdropapp/ai/constants` subpath:
+ *
+ *   import {
+ *     ANTHROPIC_PROVIDER_ID,
+ *     ANTHROPIC_PROVIDER_NAME,
+ *     ANTHROPIC_ENV_VAR,
+ *     ANTHROPIC_DEFAULT_BASE_URL,
+ *     OPENAI_COMPATIBLE_PROVIDER_ID,
+ *     OPENAI_COMPATIBLE_PROVIDER_NAME,
+ *     deriveEnvVarName
+ *   } from '@inkdropapp/ai/constants'
+ */
+export declare const ANTHROPIC_PROVIDER_ID = "anthropic";
+export declare const ANTHROPIC_PROVIDER_NAME = "Anthropic";
+export declare const ANTHROPIC_ENV_VAR = "ANTHROPIC_API_KEY";
+export declare const ANTHROPIC_DEFAULT_BASE_URL = "https://api.anthropic.com";
+/**
+ * The `AISettings.providers` key for OpenAI-compatible entries. Use this to
+ * tag a settings-UI row as "an OpenAI-compatible provider" (vs. the built-in
+ * Anthropic row).
+ *
+ * Runtime provider ids for OpenAI-compatible entries are user-chosen
+ * (`AISettings.providers.openaiCompatible[].id`); this constant is the
+ * *type/kind*, not an instance id.
+ */
+export declare const OPENAI_COMPATIBLE_PROVIDER_ID = "openaiCompatible";
+export declare const OPENAI_COMPATIBLE_PROVIDER_NAME = "OpenAI-Compatible";
+/**
+ * Derives the env-var name for an OpenAI-compatible provider entry from its
+ * user-chosen `id`.
+ *
+ * Rules: replace any non-alphanumeric character with `_`, collapse runs of `_`,
+ * uppercase, append `_API_KEY`.
+ *
+ * Examples:
+ *   `openrouter`     → `OPENROUTER_API_KEY`
+ *   `together_ai`    → `TOGETHER_AI_API_KEY`
+ *   `ollama-local`   → `OLLAMA_LOCAL_API_KEY`
+ *   `my.proxy`       → `MY_PROXY_API_KEY`
+ */
+export declare const deriveEnvVarName: (id: string) => string;

package/types/provider.d.ts

@@ -45,7 +45,10 @@ export interface AIModel {
  * OpenAI-compatible providers (OpenRouter, Together, Ollama, …) are modelled.
  */
 export interface AIProvider {
-    /** Stable provider id; appears in `AISettings.slots[*].providerId`. */
+    /**
+     * Stable provider id; appears in both `AISettings.providerId` and
+     * `AISettings.slots[*].providerId`.
+     */
     readonly id: string;
     /** Human-readable label. */
     readonly name: string;

package/types/providers/openai-compatible.d.ts

@@ -2,19 +2,6 @@ import { type OpenAICompatibleProvider as SdkOpenAICompatibleProvider } from '@a
 import type { KeyStore } from '../key-store.js';
 import type { AIModel, AIProvider } from '../provider.js';
 import type { OpenAICompatibleProviderConfig } from '../settings.js';
-/**
- * Derives the env-var name for a user-named provider entry.
- *
- * Rules: replace any non-alphanumeric character with `_`, collapse runs of `_`,
- * uppercase, append `_API_KEY`.
- *
- * Examples:
- *   `openrouter`     → `OPENROUTER_API_KEY`
- *   `together_ai`    → `TOGETHER_AI_API_KEY`
- *   `ollama-local`   → `OLLAMA_LOCAL_API_KEY`
- *   `my.proxy`       → `MY_PROXY_API_KEY`
- */
-export declare const deriveEnvVarName: (id: string) => string;
 /**
  * Provider for any OpenAI-compatible chat-completions endpoint
  * (OpenRouter, Together, Fireworks, Groq, vLLM, Ollama via `/v1`, LiteLLM, …).

package/types/registry.d.ts

@@ -8,13 +8,13 @@ export type ResolvedSlot = {
     provider: AIProvider;
     model: AIModel;
 };
-export type RegistryOptions = {
+export type AIRegistryOptions = {
     settings: AISettings;
     /**
      * Optional server-distributed catalogue of supported models per provider.
      * When omitted, each provider uses its compiled-in defaults (e.g. `ANTHROPIC_MODELS`).
      * The host typically fetches this from an API and either passes it at
-     * construction time or swaps it in later via {@link Registry.updateCatalog}.
+     * construction time or swaps it in later via {@link AIRegistry.updateCatalog}.
      */
     catalog?: AIModelCatalog;
     /** Pass an existing `KeyStore` to share its in-memory cache across registries. */
@@ -26,25 +26,25 @@ export type RegistryOptions = {
  * Owns one instance of every configured provider, resolves task slots with
  * fallback, and is the only place feature code calls to start a completion.
  *
- * The `Registry` is stateless beyond its provider list — it doesn't observe
- * settings on its own. Call {@link Registry.updateSettings} when settings
+ * The `AIRegistry` is stateless beyond its provider list — it doesn't observe
+ * settings on its own. Call {@link AIRegistry.updateSettings} when settings
  * change to rebuild providers.
  *
  * @example
  * ```ts
- * const registry = new Registry({ settings })
+ * const registry = new AIRegistry({ settings })
  * const events = await registry.streamCompletion('default', { messages })
  * for await (const event of events) {
  *   if (event.kind === 'text-delta') process.stdout.write(event.delta)
  * }
  * ```
  */
-export declare class Registry {
+export declare class AIRegistry {
     readonly keyStore: KeyStore;
     private providers;
     private settings;
     private catalog;
-    constructor(options: RegistryOptions);
+    constructor(options: AIRegistryOptions);
     /** All configured providers, sorted alphabetically by id. */
     listProviders(): AIProvider[];
     getProvider(id: string): AIProvider | undefined;
@@ -59,12 +59,17 @@ export declare class Registry {
      * Order:
      *   1. Explicit binding `settings.slots[slot]`, if both provider and model resolve.
      *   2. For `'fast'` only: fall back to `settings.slots.default`.
-     *   3. First authenticated provider in alphabetical id order, taking that
+     *   3. Preferred provider `settings.providerId`, if that provider is configured,
+     *      taking its `defaultModel()` (or `defaultFastModel()` for the fast slot).
+     *      Authentication is not gated here — the user explicitly picked this
+     *      provider; auth errors surface at stream time rather than silently
+     *      swapping providers.
+     *   4. First authenticated provider in alphabetical id order, taking that
      *      provider's `defaultModel()` (or `defaultFastModel()` for the fast slot).
      *      Mirrors Zed's `available_fallback_model` without the Zed-Cloud preference.
-     *   4. `undefined` if no provider can satisfy the slot.
+     *   5. `undefined` if no provider can satisfy the slot.
      *
-     * Async because the third step calls `provider.isAuthenticated()`, which may
+     * Async because the fourth step calls `provider.isAuthenticated()`, which may
      * touch the keyring.
      */
     resolveSlot(slot: SlotName): Promise<ResolvedSlot | undefined>;
@@ -72,7 +77,7 @@ export declare class Registry {
     /**
      * Streams a completion for a task slot.
      *
-     * Resolves the slot via {@link Registry.resolveSlot}; throws {@link NoApiKey}
+     * Resolves the slot via {@link AIRegistry.resolveSlot}; throws {@link NoApiKey}
      * if no provider can satisfy it (no slot binding, and no authenticated
      * provider available for the implicit fallback). Otherwise returns the
      * model's stream — note that *upstream* errors (auth, rate limit, etc.)

package/types/settings.d.ts

@@ -77,7 +77,7 @@ export type AnthropicProviderConfig = CommonProviderConfig & {
 };
 /**
  * Top-level AI configuration. The host (Inkdrop main process) constructs this
- * from whichever persistence layer it uses and passes it to `Registry`.
+ * from whichever persistence layer it uses and passes it to `AIRegistry`.
  *
  * The library never reads or writes settings to disk itself.
  */
@@ -87,8 +87,17 @@ export type AISettings = {
         openaiCompatible?: OpenAICompatibleProviderConfig[];
     };
     /**
-     * Per-slot model overrides. Unset slots fall back to the first registered
-     * provider's `defaultModel` / `defaultFastModel`.
+     * Preferred provider for every task slot. When set (and the per-slot
+     * `slots[slot]` override isn't), each slot resolves to this provider's
+     * `defaultModel` / `defaultFastModel`. This is the simple UI knob — bind it
+     * to a single "AI provider" dropdown.
+     */
+    providerId?: string;
+    /**
+     * Per-slot `(provider, model)` overrides. Wins over `providerId` when set.
+     * Useful for advanced configurations that pin a specific model per slot or
+     * mix providers across slots (e.g. Claude for `default`, a local model for
+     * `fast`).
      */
     slots?: Partial<Record<SlotName, SlotConfig>>;
 };