@every-app/sdk 0.3.0-rc.4 → 0.3.0-rc.6

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;AAE3B,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,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAIzE;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,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"}

package/dist/internal/aiProviders.js

@@ -8,6 +8,7 @@
  * rewrite the gateway has (Workers AI's numeric tokens).
  */
 import { CAPABILITIES, CAPABILITY_IDS, } from "./capabilities.js";
+import { resolveDevProvider } from "./devProviders.js";
 /** The fallback's view of one `ai` catalog entry. */
 export function devAiProviderSpec(capability) {
     const { basePath, normalize } = capability;
@@ -38,9 +39,17 @@ export const DEV_AI_PROVIDERS = Object.fromEntries(CAPABILITY_IDS.flatMap((id) =
         ? [[id, devAiProviderSpec(capability)]]
         : [];
 }));
-export function devAiProvider(name) {
-    return Object.hasOwn(DEV_AI_PROVIDERS, name)
-        ? DEV_AI_PROVIDERS[name]
+export function devAiProvider(name, 
+/** The dev Worker's bindings: a registered `ai` spec under `.everyapp/providers/<id>.json` resolves from them. */
+values) {
+    if (Object.hasOwn(DEV_AI_PROVIDERS, name)) {
+        return DEV_AI_PROVIDERS[name];
+    }
+    if (!values)
+        return undefined;
+    const resolved = resolveDevProvider(values, name);
+    return resolved.found && resolved.capability.mode === "ai"
+        ? devAiProviderSpec(resolved.capability)
         : undefined;
 }
 /** Every setting a provider needs, its key first: the names `.dev.vars` and the gateway use. */

package/dist/internal/appSettings.d.ts

@@ -15,7 +15,10 @@
  * member is set; only for an app that picks among the set members at run
  * time). Each may say `why` it is needed and where it comes from
  * (`docs`, an https URL); for providers and capabilities the registries
- * here supply a default.
+ * here supply a default. An app's plain settings (`settings`: a host, a
+ * project id, a region) are held like its secrets, on its Worker, but are
+ * values rather than keys: each says what it takes (a URL, a number, one
+ * of a list) and may give a default.
  *
  * Everything in this module is pure and tenant-neutral: a manifest ships
  * in a release, and what is set is asked of the caller (`isSet`), which
@@ -23,7 +26,7 @@
  * the app Worker's secret names.
  */
 import { type ApiKeyCapability, type CapabilityLookup } from "./capabilities.js";
-import { type AiDefaultChoice, type IsSet } from "./aiDefault.js";
+import { type IsSet } from "./aiDefault.js";
 /** A provider as `providers` lists it: its id, or an entry with a need. */
 export interface ProviderEntry extends SettingNeedFields {
     id: string;
@@ -32,6 +35,32 @@ export interface ProviderEntry extends SettingNeedFields {
 export interface SecretEntry extends SettingNeedFields {
     name: string;
 }
+/** What a plain setting's value is: text by default, or a URL, a number, a switch. */
+export type SettingValueType = "text" | "url" | "number" | "boolean";
+/**
+ * An app's plain setting as `settings` lists it: a value that isn't a
+ * secret (a PostHog host, a project id, a region) and differs per
+ * install, set like a secret with `everyapp configure <app>` and read
+ * from `env` as a string.
+ */
+export interface SettingEntry {
+    name: string;
+    why?: string;
+    docs?: string;
+    optional?: boolean;
+    /** What it takes; `text` when not given. */
+    type?: SettingValueType;
+    /** The values it may take, for a `text` setting that is one of a list. */
+    values?: readonly string[];
+    /** What the deploy sets it to while nobody has set it. */
+    default?: string;
+}
+/** What a plain setting's value must be: what `configure` checks and every surface says. */
+export interface SettingValueRule {
+    type: SettingValueType;
+    values?: string[];
+    default?: string;
+}
 /** What any declaration may say about its need. */
 export interface SettingNeedFields {
     /** Why the app needs it, for whoever sets it (200 characters at most). */
@@ -61,6 +90,7 @@ export interface SettingsManifestLike {
         readonly [id: string]: unknown;
     };
     readonly secrets?: ReadonlyArray<string | SecretEntry>;
+    readonly settings?: ReadonlyArray<SettingEntry>;
     readonly ai?: {
         readonly routes?: readonly string[];
         /** The app needs the Gateway's default chat model (`/api/ai/default`): `true`, or an entry with its need. */
@@ -70,7 +100,9 @@ export interface SettingsManifestLike {
     readonly remote?: unknown;
     readonly name?: string;
 }
-export type SettingKind = "provider" | "capability" | "secret" | "ai-routes"
+export type SettingKind = "provider" | "capability" | "secret"
+/** An app's plain setting (`settings`): a value on its Worker, not a key. */
+ | "setting" | "ai-routes"
 /** The Gateway's default model provider (`ai.chat`): one key of any provider in the order, or the operator's choice. */
  | "ai-default"
 /** A remote MCP app's credential (./remoteMcp.ts): one Gateway setting named by the row. */
@@ -87,8 +119,8 @@ export type SettingNeed = {
 };
 /** What `appSettings` may be told about the Gateway, for the default model provider. */
 export interface AppSettingsOptions {
-    /** The operator's stored default (`everyapp ai default`), or none. */
-    aiDefault?: AiDefaultChoice | null;
+    /** The operator's stored default provider (`everyapp ai default`), or none. */
+    aiDefault?: string | null;
     /** What is set, to put the configured provider first; absent, the order decides. */
     isSet?: IsSet;
 }
@@ -129,6 +161,12 @@ export interface AppSetting {
      * has no guide, so this is what an agent reads for it.
      */
     hint?: string;
+    /**
+     * For an app's plain setting (`kind: "setting"`): what its value must
+     * be, and its default. A setting without one is a credential, never
+     * shown.
+     */
+    value?: SettingValueRule;
 }
 /** A setting with whether it is set, and whether that keeps the app closed. */
 export interface EvaluatedSetting extends AppSetting {
@@ -166,6 +204,28 @@ export declare function providerIds(manifest: Pick<SettingsManifestLike, "provid
 export declare function secretEntries(manifest: Pick<SettingsManifestLike, "secrets">): SecretEntry[];
 /** The names of the app's own secrets, in order. */
 export declare function secretNames(manifest: Pick<SettingsManifestLike, "secrets">): string[];
+/** The app's plain settings the manifest lists, each as an entry. */
+export declare function settingEntries(manifest: Pick<SettingsManifestLike, "settings">): SettingEntry[];
+/** The names of the app's plain settings, in order. */
+export declare function settingNames(manifest: Pick<SettingsManifestLike, "settings">): string[];
+/**
+ * Every name the manifest puts on the app's own Workers: its secrets,
+ * then its plain settings. What `secret set` routes to the app and what
+ * `apps.secret_names` records.
+ */
+export declare function appWorkerNames(manifest: Pick<SettingsManifestLike, "secrets" | "settings">): string[];
+/** A plain setting's rule, from its entry. */
+export declare function settingValueRule(entry: SettingEntry): SettingValueRule;
+/**
+ * What a plain setting takes, completing "Takes …": "an http or https
+ * URL", "one of us or eu", with ", default <value>" when it has one.
+ */
+export declare function settingValueTakes(rule: SettingValueRule): string;
+/**
+ * Why `value` won't do for a plain setting (one sentence), or null when
+ * it will: never empty, and of its type, or one of its values exactly.
+ */
+export declare function settingValueProblem(rule: Pick<SettingValueRule, "type" | "values">, value: string): string | null;
 /**
  * Every setting the manifest declares, in manifest order: its AI
  * providers, its capabilities, the AI proxy's extra routes when `ai.routes`

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

@@ -1 +1 @@
-{"version":3,"file":"appSettings.d.ts","sourceRoot":"","sources":["../../src/internal/appSettings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appSettings.d.ts","sourceRoot":"","sources":["../../src/internal/appSettings.ts"],"names":[],"mappings":"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"}

package/dist/internal/appSettings.js

@@ -15,7 +15,10 @@
  * member is set; only for an app that picks among the set members at run
  * time). Each may say `why` it is needed and where it comes from
  * (`docs`, an https URL); for providers and capabilities the registries
- * here supply a default.
+ * here supply a default. An app's plain settings (`settings`: a host, a
+ * project id, a region) are held like its secrets, on its Worker, but are
+ * values rather than keys: each says what it takes (a URL, a number, one
+ * of a list) and may give a default.
  *
  * Everything in this module is pure and tenant-neutral: a manifest ships
  * in a release, and what is set is asked of the caller (`isSet`), which
@@ -81,6 +84,115 @@ export function secretEntries(manifest) {
 export function secretNames(manifest) {
     return secretEntries(manifest).map((entry) => entry.name);
 }
+/** The app's plain settings the manifest lists, each as an entry. */
+export function settingEntries(manifest) {
+    return (manifest.settings ?? []).flatMap((entry) => {
+        if (!entry || typeof entry !== "object" || typeof entry.name !== "string") {
+            return [];
+        }
+        const record = entry;
+        const type = record["type"];
+        const values = record["values"];
+        return [
+            {
+                name: entry.name,
+                ...needFields(entry),
+                ...(type === "url" ||
+                    type === "number" ||
+                    type === "boolean" ||
+                    type === "text"
+                    ? { type }
+                    : {}),
+                ...(Array.isArray(values) &&
+                    values.every((value) => typeof value === "string")
+                    ? { values: values }
+                    : {}),
+                ...(typeof record["default"] === "string"
+                    ? { default: record["default"] }
+                    : {}),
+            },
+        ];
+    });
+}
+/** The names of the app's plain settings, in order. */
+export function settingNames(manifest) {
+    return settingEntries(manifest).map((entry) => entry.name);
+}
+/**
+ * Every name the manifest puts on the app's own Workers: its secrets,
+ * then its plain settings. What `secret set` routes to the app and what
+ * `apps.secret_names` records.
+ */
+export function appWorkerNames(manifest) {
+    return [...secretNames(manifest), ...settingNames(manifest)];
+}
+/** A plain setting's rule, from its entry. */
+export function settingValueRule(entry) {
+    return {
+        type: entry.type ?? "text",
+        ...(entry.values?.length ? { values: [...entry.values] } : {}),
+        ...(entry.default !== undefined ? { default: entry.default } : {}),
+    };
+}
+/** `a, b or c`. */
+function either(values) {
+    return values.length < 2
+        ? (values[0] ?? "")
+        : `${values.slice(0, -1).join(", ")} or ${values.at(-1)}`;
+}
+/**
+ * What a plain setting takes, completing "Takes …": "an http or https
+ * URL", "one of us or eu", with ", default <value>" when it has one.
+ */
+export function settingValueTakes(rule) {
+    const what = rule.values?.length
+        ? `${rule.values.length > 2 ? "one of " : ""}${either(rule.values)}`
+        : {
+            text: "any text",
+            url: "an http or https URL",
+            number: "a number",
+            boolean: "true or false",
+        }[rule.type];
+    return rule.default !== undefined ? `${what}, default ${rule.default}` : what;
+}
+/**
+ * Why `value` won't do for a plain setting (one sentence), or null when
+ * it will: never empty, and of its type, or one of its values exactly.
+ */
+export function settingValueProblem(rule, value) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return "Enter a value.";
+    if (rule.values?.length) {
+        return rule.values.includes(trimmed)
+            ? null
+            : `Not ${rule.values.length > 2 ? "one of " : ""}${either(rule.values)}.`;
+    }
+    switch (rule.type) {
+        case "text":
+            return null;
+        case "url": {
+            let url = null;
+            try {
+                url = new URL(trimmed);
+            }
+            catch {
+                url = null;
+            }
+            return url && (url.protocol === "http:" || url.protocol === "https:")
+                ? null
+                : `"${trimmed}" isn't an http or https URL.`;
+        }
+        case "number":
+            return /^-?\d+(\.\d+)?$/.test(trimmed)
+                ? null
+                : `"${trimmed}" isn't a number.`;
+        case "boolean":
+            return trimmed === "true" || trimmed === "false"
+                ? null
+                : "Not true or false.";
+    }
+}
 /**
  * The Gateway settings an AI provider needs, the install's left out (set
  * already). A catalog provider's names are settable by definition; a
@@ -103,26 +215,21 @@ function capabilityNames(capability) {
                 names: settable(capability.settings),
                 alsoReads: settable(capability.optionalSettings),
             };
-        case "oauth_client": {
-            const names = [
-                capability.secrets.clientId,
-                ...(capability.secrets.clientSecret
-                    ? [capability.secrets.clientSecret]
-                    : []),
-            ];
-            const host = capability.hostSetting ? [capability.hostSetting] : [];
-            // An instance setting with a default is read when set; without one
-            // the provider has no origin until it is set.
-            return capability.defaultOrigin
-                ? { names, alsoReads: host }
-                : { names: [...names, ...host], alsoReads: [] };
-        }
+        case "oauth_client":
+            return {
+                names: [
+                    capability.secrets.clientId,
+                    ...(capability.secrets.clientSecret
+                        ? [capability.secrets.clientSecret]
+                        : []),
+                ],
+                alsoReads: [],
+            };
     }
 }
 /**
  * Where a capability's key or client comes from, when the registry knows:
- * an API-key provider's access page, or an OAuth client's console (a path
- * on the default instance for a provider with no fixed host).
+ * an API-key provider's access page, or an OAuth client's console.
  */
 function capabilityDocs(capability) {
     switch (capability.mode) {
@@ -130,11 +237,7 @@ function capabilityDocs(capability) {
         case "ai":
             return capability.docs;
         case "oauth_client":
-            if (capability.console.startsWith("https://"))
-                return capability.console;
-            return capability.defaultOrigin
-                ? `${capability.defaultOrigin}${capability.console}`
-                : undefined;
+            return capability.console;
         case "service":
             return undefined;
     }
@@ -184,7 +287,7 @@ export function appSettings(manifest, lookup = CATALOG, options = {}) {
         // ask for; with one configured, that provider's. `isSet` here only
         // orders the candidates; evaluateAppSettings decides what is set.
         const resolution = resolveAiDefault({
-            choice: options.aiDefault ?? null,
+            provider: options.aiDefault ?? null,
             isSet: options.isSet ?? (() => false),
             lookup,
         });
@@ -286,6 +389,21 @@ export function appSettings(manifest, lookup = CATALOG, options = {}) {
             alsoReads: [],
         }, entry));
     }
+    for (const entry of settingEntries(manifest)) {
+        // A setting with a default is never unset for long: the deploy writes it.
+        const need = entry.default !== undefined ? { ...entry, optional: true } : entry;
+        settings.push({
+            ...withNeed({
+                kind: "setting",
+                id: entry.name,
+                label: entry.name,
+                holder: "app",
+                names: [entry.name],
+                alsoReads: [],
+            }, need),
+            value: settingValueRule(entry),
+        });
+    }
     return settings;
 }
 /** Whether each name of `setting` is set: all → true, one unset → false, else unknown. */