@every-app/sdk 0.3.0-rc.9 → 0.3.1

package/dist/internal/aiDefault.js

@@ -1,13 +1,15 @@
 /**
  * The Gateway's default model provider: what an app that says "I need a
- * chat model" (manifest `ai: { chat: true }`, the SDK's `ai()`, the route
+ * chat model" (manifest `ai: { chat: true }`, the SDK's `aiBaseUrl()`, the route
  * `/api/ai/default/…`) is served (docs/design/2026-10-model-providers.md).
  *
- * The default is resolved, never assumed: the operator's choice when one
- * is stored (`everyapp ai default <provider>[/<model>]`, Manage workspace
- * → Usage → AI default), else the shipped order below, first provider
- * whose Gateway settings are all set; with none set, the first of the
- * order with the settings it needs, so "Needs setup" asks for one key.
+ * The default is one setting per workspace, `<provider>[/<model>]`
+ * (`everyapp ai default`, Manage workspace → Usage → AI default, the
+ * `everyapp_ai_default` tool; `org_settings.ai_default`): the provider is
+ * everything up to the first slash, the model everything after it. With
+ * no setting, the shipped order below decides: the first provider whose
+ * Gateway settings are all set; with none set, the first of the order
+ * with the settings it needs, so "Needs setup" asks for one key.
  * OpenRouter comes first because one key reaches many models; Workers AI
  * second because it needs no provider account (the Gateway's own
  * Cloudflare token), with weaker models; then the single-vendor keys.
@@ -15,15 +17,14 @@
  * and fronts whichever provider the default resolves to when
  * `AI_GATEWAY_ID` is set (./capabilities.ts, `aig`).
  *
- * The models resolve the same way: the operator's model setting for the
- * provider (`everyapp ai model <provider> --chat … --embeddings …`,
- * `org_settings.ai_models`), else the catalog entry's seed (`chat.seedModel`,
- * `embeddings.seedModel`). Nothing reads a seed except through here.
+ * The chat model is the setting's model, else the catalog entry's seed
+ * (`chat.seedModel`); embeddings always use the entry's seed
+ * (`embeddings.seedModel`). Nothing reads a seed except through here.
  *
  * Everything here is pure: what is set is asked of the caller (`isSet`),
  * which reads the Gateway's env, the Worker's secret names, or `.dev.vars`.
  */
-import { CATALOG, } from "./capabilities.js";
+import { CATALOG, authSettingNames, } from "./capabilities.js";
 /** The reserved provider id apps call for the default: `/api/ai/default/…`. */
 export const AI_DEFAULT_PROVIDER = "default";
 /** The catalog id of Cloudflare AI Gateway, the proxy entry. */
@@ -60,74 +61,6 @@ export function isAiModelName(value) {
         value.trim() === value &&
         !/[\u0000-\u001f\u007f]/.test(value));
 }
-/**
- * `org_settings.ai_models` as stored: a JSON object of provider id →
- * `{ chat?, embeddings? }`. Anything else (null, malformed JSON, a field
- * that isn't a model name) reads as no setting, so the seed serves.
- */
-export function parseAiModelSettings(value) {
-    if (typeof value !== "string" || value.trim() === "")
-        return {};
-    let parsed;
-    try {
-        parsed = JSON.parse(value);
-    }
-    catch {
-        return {};
-    }
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
-        return {};
-    const settings = {};
-    for (const [provider, entry] of Object.entries(parsed)) {
-        if (!entry || typeof entry !== "object" || Array.isArray(entry))
-            continue;
-        const setting = {};
-        for (const kind of ["chat", "embeddings"]) {
-            const model = entry[kind];
-            if (typeof model === "string" && isAiModelName(model)) {
-                setting[kind] = model;
-            }
-        }
-        if (setting.chat !== undefined || setting.embeddings !== undefined) {
-            settings[provider] = setting;
-        }
-    }
-    return settings;
-}
-/** The stored text of the settings, providers sorted; null when nothing is set. */
-export function formatAiModelSettings(settings) {
-    const providers = Object.keys(settings)
-        .filter((id) => settings[id]?.chat !== undefined ||
-        settings[id]?.embeddings !== undefined)
-        .sort();
-    if (providers.length === 0)
-        return null;
-    return JSON.stringify(Object.fromEntries(providers.map((id) => {
-        const { chat, embeddings } = settings[id];
-        return [
-            id,
-            {
-                ...(chat === undefined ? {} : { chat }),
-                ...(embeddings === undefined ? {} : { embeddings }),
-            },
-        ];
-    })));
-}
-/** `settings` with one provider's models changed by `patch`. */
-export function withAiModelSetting(settings, provider, patch) {
-    const next = { ...settings[provider] };
-    for (const kind of ["chat", "embeddings"]) {
-        const value = patch[kind];
-        if (value === null)
-            delete next[kind];
-        else if (value !== undefined)
-            next[kind] = value;
-    }
-    const rest = Object.fromEntries(Object.entries(settings).filter(([id]) => id !== provider));
-    return next.chat === undefined && next.embeddings === undefined
-        ? rest
-        : { ...rest, [provider]: next };
-}
 /** A choice must name a provider id; the model is free text after the first slash. */
 const CHOICE = /^([a-z][a-z0-9-]{1,39})(?:\/(.{1,200}))?$/;
 /**
@@ -148,27 +81,20 @@ export function parseAiDefaultChoice(value) {
 export function formatAiDefaultChoice(choice) {
     return choice.model ? `${choice.provider}/${choice.model}` : choice.provider;
 }
-/**
- * The provider id `org_settings.ai_default` holds, or null. The column
- * holds the provider alone (its models are in `ai_models`); text after a
- * first slash is not read.
- */
-export function parseAiDefaultProvider(value) {
-    return parseAiDefaultChoice(value)?.provider ?? null;
-}
 export function canBeAiDefault(capability) {
     return (capability?.mode === "ai" &&
         capability.kind !== "proxy" &&
         capability.chat !== undefined);
 }
 /**
- * The Gateway settings an `ai` entry needs before it serves: its key
- * (unless the entry works without one, `authOptional`) and what its URL
- * needs besides (`alsoNeeds`).
+ * The Gateway settings an `ai` entry needs before it serves: every setting
+ * its `auth` names, the key and a Basic username held as a setting (unless
+ * the entry works without them, `authOptional`), and what its URL needs
+ * besides (`alsoNeeds`).
  */
 export function aiRequiredSettings(capability) {
     return [
-        ...(capability.authOptional ? [] : [capability.auth.secret]),
+        ...(capability.authOptional ? [] : authSettingNames(capability.auth)),
         ...(capability.alsoNeeds ?? []),
     ];
 }
@@ -184,28 +110,16 @@ export function aiGatewayConfigured(isSet) {
 export function viaAiGateway(capability, isSet) {
     return capability.aig !== undefined && aiGatewayConfigured(isSet);
 }
-/** The provider's models: the operator's setting, else the seed. */
-function modelsOf(id, capability, models) {
-    const setting = models[id];
-    const { chat, embeddings } = capability;
-    return {
-        model: setting?.chat ?? chat.seedModel,
-        ...(embeddings
-            ? { embeddingsModel: setting?.embeddings ?? embeddings.seedModel }
-            : {}),
-        seed: {
-            chat: chat.seedModel,
-            ...(embeddings ? { embeddings: embeddings.seedModel } : {}),
-        },
-    };
-}
-function candidateOf(id, capability, isSet, models) {
+function candidateOf(id, capability, isSet) {
     return {
         id,
         label: capability.label,
         settings: aiRequiredSettings(capability),
         configured: aiProviderConfigured(capability, isSet),
-        ...modelsOf(id, capability, models),
+        model: capability.chat.seedModel,
+        ...(capability.embeddings
+            ? { embeddingsModel: capability.embeddings.seedModel }
+            : {}),
         viaAiGateway: viaAiGateway(capability, isSet),
         embeddings: capability.embeddings !== undefined,
     };
@@ -215,7 +129,7 @@ function candidateOf(id, capability, isSet, models) {
  * then any other `ai` entry of `lookup` with a chat route (a registered
  * row, one day), each with its state.
  */
-export function aiDefaultCandidates(isSet, lookup = CATALOG, models = {}) {
+export function aiDefaultCandidates(isSet, lookup = CATALOG) {
     const ids = [
         ...AI_DEFAULT_ORDER,
         ...lookup.ids().filter((id) => !AI_DEFAULT_ORDER.includes(id)),
@@ -225,12 +139,10 @@ export function aiDefaultCandidates(isSet, lookup = CATALOG, models = {}) {
         // A registered row whose key isn't bound to the hosts it has now reads
         // as unset everywhere (`providers.value-bound-to-hosts`).
         const set = lookup.bound && !lookup.bound(id) ? () => false : isSet;
-        return canBeAiDefault(capability)
-            ? [candidateOf(id, capability, set, models)]
-            : [];
+        return canBeAiDefault(capability) ? [candidateOf(id, capability, set)] : [];
     });
 }
-/** Why `choice.provider` can't be the default, or null when it can. */
+/** Why `choice` can't be the default, or null when it can. */
 export function aiDefaultChoiceProblem(choice, lookup = CATALOG) {
     const capability = lookup.get(choice.provider);
     if (!capability)
@@ -244,47 +156,29 @@ export function aiDefaultChoiceProblem(choice, lookup = CATALOG) {
     if (!capability.chat) {
         return `${capability.label} has no OpenAI-shaped chat route, so it can't serve the default; an app pins it by listing it under providers`;
     }
-    return null;
-}
-/**
- * Why `patch` can't be stored for `provider`, or null when it can: the
- * provider must be one the default can be, a model name must be a model
- * name, and an embeddings model needs the entry's embeddings route.
- */
-export function aiModelPatchProblem(provider, patch, lookup = CATALOG) {
-    const why = aiDefaultChoiceProblem({ provider }, lookup);
-    if (why)
-        return why;
-    const capability = lookup.get(provider);
-    if (!canBeAiDefault(capability))
-        return `${provider} can't serve the default`;
-    for (const kind of ["chat", "embeddings"]) {
-        const value = patch[kind];
-        if (typeof value === "string" && !isAiModelName(value)) {
-            return `${JSON.stringify(value)} isn't a model id: 1 to 200 characters, no surrounding spaces`;
-        }
-    }
-    if (typeof patch.embeddings === "string" && !capability.embeddings) {
-        return `${capability.label} has no embeddings route, so it serves no embeddings model`;
+    if (choice.model !== undefined && !isAiModelName(choice.model)) {
+        return `${JSON.stringify(choice.model)} isn't a model id: 1 to 200 characters, no surrounding spaces`;
     }
     return null;
 }
 /**
- * The Gateway's effective default, from the stored choice (or none) and
- * what is set. A choice that names a provider which isn't configured
+ * The Gateway's effective default, from the workspace's setting (or none)
+ * and what is set. A setting that names a provider which isn't configured
  * still wins (the operator chose it: `configured` is false and `settings`
- * says what to set); a choice the default can't be is reported as
+ * says what to set); a setting the default can't be is reported as
  * `problem` and the order decides.
  */
 export function resolveAiDefault(input) {
     const lookup = input.lookup ?? CATALOG;
-    const models = input.models ?? {};
-    const { isSet } = input;
-    const candidates = aiDefaultCandidates(isSet, lookup, models);
-    const resolve = (id, capability, source, problem) => ({
+    const { isSet, choice } = input;
+    const candidates = aiDefaultCandidates(isSet, lookup);
+    const resolve = (id, capability, source, extra = {}) => ({
         provider: id,
         label: capability.label,
-        ...modelsOf(id, capability, models),
+        model: extra.model ?? capability.chat.seedModel,
+        ...(capability.embeddings
+            ? { embeddingsModel: capability.embeddings.seedModel }
+            : {}),
         source,
         configured: aiProviderConfigured(capability, isSet),
         settings: aiRequiredSettings(capability),
@@ -295,14 +189,16 @@ export function resolveAiDefault(input) {
             ...candidates.filter((candidate) => candidate.id === id),
             ...candidates.filter((candidate) => candidate.id !== id),
         ],
-        ...(problem ? { problem } : {}),
+        ...(extra.problem ? { problem: extra.problem } : {}),
     });
     let problem;
-    if (input.provider) {
-        const capability = lookup.get(input.provider);
-        const why = aiDefaultChoiceProblem({ provider: input.provider }, lookup);
+    if (choice) {
+        const capability = lookup.get(choice.provider);
+        const why = aiDefaultChoiceProblem(choice, lookup);
         if (!why && canBeAiDefault(capability)) {
-            return resolve(input.provider, capability, "setting");
+            return resolve(choice.provider, capability, "setting", {
+                ...(choice.model ? { model: choice.model } : {}),
+            });
         }
         problem = why ?? undefined;
     }
@@ -314,7 +210,9 @@ export function resolveAiDefault(input) {
     const capability = lookup.get(first.id);
     if (!canBeAiDefault(capability))
         throw new Error("unreachable");
-    return resolve(first.id, capability, configured ? "order" : "none", problem);
+    return resolve(first.id, capability, configured ? "order" : "none", {
+        ...(problem ? { problem } : {}),
+    });
 }
 /**
  * The sentence setup shows for an unconfigured default: the one key to

package/dist/internal/aiProviders.d.ts

@@ -19,7 +19,7 @@ export interface DevAiProviderSpec {
     auth: ApiKeyAuth;
     /** Where an operator gets the key: the provider's API keys page. */
     docs: string;
-    /** The everyapp skill's setup guide for it, relative to the skill (`setup/openai.md`). */
+    /** Its setup guide, relative to the agent docs (`setup/openai.md`: https://everyapp.com/docs/agent/setup/openai.md). */
     setup?: string;
     /** Gateway settings the provider's URL needs besides the key, under the same names. */
     alsoNeeds?: readonly string[];

package/dist/internal/aiProviders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aiProviders.d.ts","sourceRoot":"","sources":["../../src/internal/aiProviders.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,+GAA+G;IAC/G,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,IAAI,EAAE,UAAU,CAAC;IACjB,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,0FAA0F;IAC1F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,MAAM,CAAC;IAClE,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC;CACpE;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC;AAEzC,qDAAqD;AACrD,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,GAC/B,iBAAiB,CAoBnB;AAED,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CACrC,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAUG,CAAC;AAE9C,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM;AACZ,kHAAkH;AAClH,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACzC,iBAAiB,GAAG,SAAS,CAS/B;AAED,gGAAgG;AAChG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,EAAE,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,kBAAkB,GAC3B,MAAM,GAAG,IAAI,CAcf;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,kBAAkB,GAC3B,MAAM,GAAG,IAAI,CAIf;AAED,6DAA6D;AAC7D,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,SAAK,GACV,GAAG,GAAG,IAAI,CAOZ;AAWD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,GACjB,QAAQ,CAqBV"}
+{"version":3,"file":"aiProviders.d.ts","sourceRoot":"","sources":["../../src/internal/aiProviders.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,+GAA+G;IAC/G,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,IAAI,EAAE,UAAU,CAAC;IACjB,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,wHAAwH;IACxH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,MAAM,CAAC;IAClE,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC;CACpE;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC;AAEzC,qDAAqD;AACrD,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,GAC/B,iBAAiB,CAoBnB;AAED,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CACrC,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAUG,CAAC;AAE9C,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM;AACZ,kHAAkH;AAClH,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACzC,iBAAiB,GAAG,SAAS,CAS/B;AAED,gGAAgG;AAChG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,EAAE,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,kBAAkB,GAC3B,MAAM,GAAG,IAAI,CAcf;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,kBAAkB,GAC3B,MAAM,GAAG,IAAI,CAIf;AAED,6DAA6D;AAC7D,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,SAAK,GACV,GAAG,GAAG,IAAI,CAOZ;AAWD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,GACjB,QAAQ,CAqBV"}

package/dist/internal/aiProviders.js

@@ -7,7 +7,7 @@
  * this derives the fallback's view of each, and holds the one response
  * rewrite the gateway has (Workers AI's numeric tokens).
  */
-import { CAPABILITIES, CAPABILITY_IDS, } from "./capabilities.js";
+import { CAPABILITIES, CAPABILITY_IDS, authSettingNames, } from "./capabilities.js";
 import { resolveDevProvider } from "./devProviders.js";
 /** The fallback's view of one `ai` catalog entry. */
 export function devAiProviderSpec(capability) {
@@ -54,7 +54,7 @@ values) {
 }
 /** Every setting a provider needs, its key first: the names `.dev.vars` and the gateway use. */
 export function aiProviderSettings(spec) {
-    return [spec.keyEnv, ...(spec.alsoNeeds ?? [])];
+    return [...authSettingNames(spec.auth), ...(spec.alsoNeeds ?? [])];
 }
 /**
  * An `ai` entry's `basePath` with each `{SETTING}` filled from the