@inkdropapp/ai 0.1.0 → 0.1.1

package/README.md

@@ -44,10 +44,8 @@ const settings: AISettings = {
       }
     ]
   },
-  slots: {
-    default: { providerId: 'anthropic', modelId: 'claude-sonnet-4-6' },
-    fast: { providerId: 'anthropic', modelId: 'claude-haiku-4-5' }
-  }
+  // Pick one provider — slot models come from its catalogue defaults.
+  providerId: 'anthropic'
 }
 
 const registry = new Registry({ settings })
@@ -102,13 +100,18 @@ Inkdrop's AI features map onto two slots:
 
 A slot resolves to `(provider, model)` via:
 
-1. Explicit binding from `settings.slots[slot]`, if both the provider id and model id resolve.
-2. The first registered provider's `defaultModel()` (for `default`) or `defaultFastModel()` (for `fast`).
-3. `undefined` if no provider can satisfy the slot.
-
-Authentication is **not** checked during slot resolution — that's
-`streamCompletion`'s job, which throws `NoApiKey` if no provider is configured
-at all and surfaces upstream auth failures inline as `'error'` events.
+1. Explicit binding from `settings.slots[slot]`, if both the provider id and model id resolve. *(Advanced — pin a specific model per slot or mix providers across slots.)*
+2. For `'fast'` only: fall back to `settings.slots.default` if that resolves.
+3. Preferred provider from `settings.providerId`, if configured — takes its `defaultModel()` (for `default`) or `defaultFastModel()` (for `fast`). *(The simple UI knob — one provider dropdown drives every slot.)*
+4. First **authenticated** registered provider in alphabetical id order, taking its `defaultModel()` / `defaultFastModel()`.
+5. `undefined` if no provider can satisfy the slot.
+
+Steps 1 and 3 do **not** check authentication — the user picked those
+explicitly, so auth errors surface inline as `'error'` events at stream time
+rather than silently swapping providers. Step 4 is a courtesy fallback for
+hosts that don't wire any preference at all; it skips unauthenticated
+providers. `streamCompletion` throws `NoApiKey` only when resolution returns
+`undefined` (i.e. no provider is configured at all).
 
 ### Credential resolution
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkdropapp/ai",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "AI integration common module",
   "type": "module",
   "main": "src/index.ts",
@@ -19,11 +19,11 @@
   "author": "Takuya Matsuyama <t@inkdrop.app>",
   "license": "UNLICENSED",
   "dependencies": {
-    "@ai-sdk/anthropic": "^4.0.0-beta.40",
-    "@ai-sdk/openai-compatible": "^3.0.0-beta.33",
+    "@ai-sdk/anthropic": "4.0.0-beta.42",
+    "@ai-sdk/openai-compatible": "3.0.0-beta.36",
     "@inkdropapp/ai-catalog": "^0.1.0",
     "@napi-rs/keyring": "^1.2.0",
-    "ai": "^7.0.0-beta.113"
+    "ai": "7.0.0-beta.116"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",

package/src/provider.ts

@@ -52,7 +52,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/src/registry.ts

@@ -84,12 +84,17 @@ export 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.
    */
   async resolveSlot(slot: SlotName): Promise<ResolvedSlot | undefined> {
@@ -101,6 +106,17 @@ export class Registry {
       if (fallback) return fallback
     }
 
+    if (this.settings.providerId) {
+      const provider = this.providers.get(this.settings.providerId)
+      if (provider) {
+        const model =
+          slot === 'fast'
+            ? provider.defaultFastModel()
+            : provider.defaultModel()
+        if (model) return { provider, model }
+      }
+    }
+
     for (const provider of this.providers.values()) {
       if (!(await provider.isAuthenticated())) continue
       const model =

package/src/settings.ts

@@ -98,8 +98,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>>
 }