@skaile/forge-settings 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.2.0
+
+- `@skaile/forge-settings/ai-sdk`: `resolveRegistryLanguageModel(selector, { …, registry? })` takes an already merged registry (e.g. one routed through the Workspaces transform proxy). When set, `projectDir` is not read for providers (so no `registry_invalid` from disk), the selector and the credential policy are checked against that registry, and it is forwarded to Workspaces' `resolveLanguageModel({ registry })`.
+- Needs `@skaile/workspaces` ^7.8.0 (the `registry` option of `resolveLanguageModel`); the 6.x range is dropped.
+
+## 1.1.1
+
+- Accepts `@skaile/workspaces` 7: dependency range `^6.14.0 || ^7.0.0` (checked against 7.1.0; nothing this package imports changed). No code change.
+
 ## 1.1.0
 
 - `@skaile/forge-settings/server`: `HarnessRow` carries `detection: HarnessDetection` (installed / version / login, from `@skaile/workspaces` `detectHarnesses()`). `buildHarnessRows(harnesses, settings, detections?)` takes the host's detections as an optional third argument; a harness it does not mention, or every harness when it is omitted, reports `{ id, status: "unknown" }`.

package/README.md

@@ -66,6 +66,8 @@ const { model } = await resolveRegistryLanguageModel('assistant-default/some-mod
 
 Role-to-selector mapping belongs to the host's settings document; there is no global model locator. Failures are `ModelResolutionError` with a `code`; messages never carry a secret.
 
+Pass `registry` (an already merged registry, e.g. one routed through the Workspaces transform proxy) to resolve against it instead of the providers on disk; the policy check runs on it and Workspaces receives it unchanged.
+
 ## Providers panel
 
 ```ts

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@skaile/forge-settings",
   "configKey": "forgeSettings",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/runtime/ai-sdk/index.d.ts

@@ -13,6 +13,7 @@
  * `@ai-sdk/openai-compatible`) are optional peers of Workspaces: install the
  * one the selected surface needs.
  */
+import { type MergedAIProviderRegistry } from "@skaile/workspaces/core";
 import { type ResolvedLanguageModel } from "@skaile/workspaces/ai-sdk";
 import type { CredentialPolicy } from "../server/credential-policy.js";
 export { ModelResolutionError } from "../model/errors.js";
@@ -34,13 +35,21 @@ export interface ResolveRegistryLanguageModelOptions {
      * before anything is read; a refused one is a `policy_refused` failure.
      */
     policy?: CredentialPolicy;
+    /**
+     * An already merged (e.g. transform-proxy-routed) registry. When set,
+     * `projectDir` is not read for providers, the policy check runs on this
+     * registry, and it is handed to Workspaces as the registry to resolve against.
+     */
+    registry?: MergedAIProviderRegistry;
 }
 /**
  * The AI SDK model for `selector` (`<providerId>/<modelId>`, a bare model id or
- * `@role`), resolved by Workspaces against the registry on disk.
+ * `@role`), resolved by Workspaces against the registry on disk, or the given
+ * `registry`.
  *
- * @throws {ModelResolutionError} `registry_invalid` · `unknown_selector` ·
- *   `policy_refused` · `unresolved` (credential, endpoint or provider SDK; the
- *   message is fixed and never carries Workspaces' text, which stays on `cause`).
+ * @throws {ModelResolutionError} `registry_invalid` (only when read from disk) ·
+ *   `unknown_selector` · `policy_refused` · `unresolved` (credential, endpoint or
+ *   provider SDK; the message is fixed and never carries Workspaces' text, which
+ *   stays on `cause`).
  */
 export declare function resolveRegistryLanguageModel(selector: string, options: ResolveRegistryLanguageModelOptions): Promise<ResolvedLanguageModel>;

package/dist/runtime/ai-sdk/index.js

@@ -4,11 +4,7 @@ import { loadMergedProviderRegistry } from "@skaile/workspaces/sdk/bridge";
 import { ModelResolutionError, assertEntryAllowed } from "../model/errors.js";
 export { ModelResolutionError } from "../model/errors.js";
 export async function resolveRegistryLanguageModel(selector, options) {
-  const { merged, diagnostics } = loadMergedProviderRegistry({ projectDir: options.projectDir });
-  const errors = diagnostics.filter((d) => d.severity === "error").map((d) => d.path ? `${d.path}: ${d.message}` : d.message);
-  if (errors.length > 0) {
-    throw new ModelResolutionError("registry_invalid", `providers registry: ${errors.join("; ")}`);
-  }
+  const merged = options.registry ?? loadRegistry(options.projectDir);
   const ref = parseModelRef(selector, merged, options.roles);
   if (!ref) {
     throw new ModelResolutionError("unknown_selector", `no provider serves '${selector}'`);
@@ -19,7 +15,8 @@ export async function resolveRegistryLanguageModel(selector, options) {
     return await resolveLanguageModel(selector, {
       projectDir: options.projectDir,
       env: options.env,
-      ...options.roles ? { roles: options.roles } : {}
+      ...options.roles ? { roles: options.roles } : {},
+      ...options.registry ? { registry: options.registry } : {}
     });
   } catch (cause) {
     throw new ModelResolutionError(
@@ -29,3 +26,11 @@ export async function resolveRegistryLanguageModel(selector, options) {
     );
   }
 }
+function loadRegistry(projectDir) {
+  const { merged, diagnostics } = loadMergedProviderRegistry({ projectDir });
+  const errors = diagnostics.filter((d) => d.severity === "error").map((d) => d.path ? `${d.path}: ${d.message}` : d.message);
+  if (errors.length > 0) {
+    throw new ModelResolutionError("registry_invalid", `providers registry: ${errors.join("; ")}`);
+  }
+  return merged;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skaile/forge-settings",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Provider and settings operations for Skaile forge apps: provider registry layers, credential store, env layers, model discovery, the providers panel, and editor / AI SDK model adapters.",
   "type": "module",
   "packageManager": "bun@1.3.9",
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "^4.0.0",
-    "@skaile/workspaces": "^6.14.0",
+    "@skaile/workspaces": "^7.8.0",
     "ofetch": "^1.4.0",
     "yaml": "^2.9.0"
   },

package/src/runtime/ai-sdk/index.ts

@@ -14,7 +14,7 @@
  * one the selected surface needs.
  */
 
-import { parseModelRef } from "@skaile/workspaces/core";
+import { type MergedAIProviderRegistry, parseModelRef } from "@skaile/workspaces/core";
 import { type ResolvedLanguageModel, resolveLanguageModel } from "@skaile/workspaces/ai-sdk";
 import { loadMergedProviderRegistry } from "@skaile/workspaces/sdk/bridge";
 import type { CredentialPolicy } from "../server/credential-policy";
@@ -40,27 +40,29 @@ export interface ResolveRegistryLanguageModelOptions {
    * before anything is read; a refused one is a `policy_refused` failure.
    */
   policy?: CredentialPolicy;
+  /**
+   * An already merged (e.g. transform-proxy-routed) registry. When set,
+   * `projectDir` is not read for providers, the policy check runs on this
+   * registry, and it is handed to Workspaces as the registry to resolve against.
+   */
+  registry?: MergedAIProviderRegistry;
 }
 
 /**
  * The AI SDK model for `selector` (`<providerId>/<modelId>`, a bare model id or
- * `@role`), resolved by Workspaces against the registry on disk.
+ * `@role`), resolved by Workspaces against the registry on disk, or the given
+ * `registry`.
  *
- * @throws {ModelResolutionError} `registry_invalid` · `unknown_selector` ·
- *   `policy_refused` · `unresolved` (credential, endpoint or provider SDK; the
- *   message is fixed and never carries Workspaces' text, which stays on `cause`).
+ * @throws {ModelResolutionError} `registry_invalid` (only when read from disk) ·
+ *   `unknown_selector` · `policy_refused` · `unresolved` (credential, endpoint or
+ *   provider SDK; the message is fixed and never carries Workspaces' text, which
+ *   stays on `cause`).
  */
 export async function resolveRegistryLanguageModel(
   selector: string,
   options: ResolveRegistryLanguageModelOptions,
 ): Promise<ResolvedLanguageModel> {
-  const { merged, diagnostics } = loadMergedProviderRegistry({ projectDir: options.projectDir });
-  const errors = diagnostics
-    .filter((d) => d.severity === "error")
-    .map((d) => (d.path ? `${d.path}: ${d.message}` : d.message));
-  if (errors.length > 0) {
-    throw new ModelResolutionError("registry_invalid", `providers registry: ${errors.join("; ")}`);
-  }
+  const merged = options.registry ?? loadRegistry(options.projectDir);
 
   const ref = parseModelRef(selector, merged, options.roles);
   if (!ref) {
@@ -74,6 +76,7 @@ export async function resolveRegistryLanguageModel(
       projectDir: options.projectDir,
       env: options.env,
       ...(options.roles ? { roles: options.roles } : {}),
+      ...(options.registry ? { registry: options.registry } : {}),
     });
   } catch (cause) {
     // Workspaces' message is not ours to vouch for: it can echo a resolved
@@ -86,3 +89,15 @@ export async function resolveRegistryLanguageModel(
     );
   }
 }
+
+/** The merged registry of `projectDir`; `registry_invalid` on any error diagnostic. */
+function loadRegistry(projectDir: string): MergedAIProviderRegistry {
+  const { merged, diagnostics } = loadMergedProviderRegistry({ projectDir });
+  const errors = diagnostics
+    .filter((d) => d.severity === "error")
+    .map((d) => (d.path ? `${d.path}: ${d.message}` : d.message));
+  if (errors.length > 0) {
+    throw new ModelResolutionError("registry_invalid", `providers registry: ${errors.join("; ")}`);
+  }
+  return merged;
+}