@bastani/atomic 0.9.11-alpha.7 → 0.9.11-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/atomic",
-  "version": "0.9.11-alpha.7",
+  "version": "0.9.11-alpha.9",
   "description": "Atomic coding agent CLI with read, bash, edit, write tools and session management",
   "type": "module",
   "atomicConfig": {
@@ -78,13 +78,13 @@
     "prepublishOnly": "bun run clean && bun run build && bun run shrinkwrap"
   },
   "dependencies": {
-    "@bastani/atomic-natives": "0.9.11-alpha.7",
-    "@dbos-inc/dbos-sdk": "4.23.6",
-    "@earendil-works/pi-agent-core": "^0.82.1",
-    "@earendil-works/pi-ai": "^0.82.1",
-    "@earendil-works/pi-tui": "^0.82.1",
-    "@modelcontextprotocol/ext-apps": "^1.7.4",
-    "@modelcontextprotocol/sdk": "^1.25.1",
+    "@bastani/atomic-natives": "0.9.11-alpha.9",
+    "@dbos-inc/dbos-sdk": "4.24.16",
+    "@earendil-works/pi-agent-core": "^0.83.0",
+    "@earendil-works/pi-ai": "^0.83.0",
+    "@earendil-works/pi-tui": "^0.83.0",
+    "@modelcontextprotocol/ext-apps": "^1.7.5",
+    "@modelcontextprotocol/sdk": "^1.30.0",
     "@mozilla/readability": "^0.6.0",
     "@silvia-odwyer/photon-node": "0.3.4",
     "chalk": "5.6.2",
@@ -94,7 +94,7 @@
     "glob": "13.0.6",
     "highlight.js": "10.7.3",
     "hosted-git-info": "9.0.3",
-    "ignore": "7.0.6",
+    "ignore": "7.0.5",
     "jiti": "2.7.0",
     "linkedom": "^0.18.13",
     "lru-cache": "11.5.2",
@@ -103,10 +103,10 @@
     "open": "^11.0.0",
     "p-limit": "^7.3.0",
     "proper-lockfile": "4.1.2",
-    "semver": "7.8.5",
+    "semver": "7.8.0",
     "tsx": "^4.23.1",
     "turndown": "^7.2.0",
-    "typebox": "1.3.6",
+    "typebox": "1.3.7",
     "undici": "8.5.0",
     "unpdf": "^1.6.2",
     "yaml": "2.9.0",

package/dist/core/model-registry-auth.d.ts

@@ -1,10 +0,0 @@
-import type { ModelAuth } from "@earendil-works/pi-ai";
-import type { Api, Model } from "@earendil-works/pi-ai/compat";
-import type { AuthStatus, AuthStorage } from "./auth-storage.ts";
-import type { ProviderRequestConfig, ResolvedRequestAuth } from "./model-registry-types.ts";
-import type { ProviderApiKeyAuthResult } from "./extensions/provider-types.ts";
-export declare function getProviderResolvedAuth(provider: string, authStorage: AuthStorage, providerRequestConfigs: Map<string, ProviderRequestConfig>): Promise<ProviderApiKeyAuthResult | undefined>;
-export declare function getModelRequestAuth(model: Model<Api>, authStorage: AuthStorage, providerRequestConfigs: Map<string, ProviderRequestConfig>, modelRequestHeaders: Map<string, Record<string, string>>, providerAuth?: ModelAuth): Promise<ResolvedRequestAuth>;
-export declare function getProviderAuthStatusFromConfig(provider: string, authStorage: AuthStorage, providerRequestConfigs: Map<string, ProviderRequestConfig>): AuthStatus;
-export declare function getApiKeyForProviderFromConfig(provider: string, authStorage: AuthStorage, providerRequestConfigs: Map<string, ProviderRequestConfig>): Promise<string | undefined>;
-//# sourceMappingURL=model-registry-auth.d.ts.map

package/dist/core/model-registry-auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-registry-auth.d.ts","sourceRoot":"","sources":["../../src/core/model-registry-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,uBAAuB,CAAC;AACxE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAS5F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAiB/E,wBAAsB,uBAAuB,CAC5C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,GACxD,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAE/C;AAkBD,wBAAsB,mBAAmB,CACxC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EACjB,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,EAC1D,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxD,YAAY,CAAC,EAAE,SAAS,GACtB,OAAO,CAAC,mBAAmB,CAAC,CA8C9B;AAED,wBAAgB,+BAA+B,CAC9C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,GACxD,UAAU,CAuBZ;AAED,wBAAsB,8BAA8B,CACnD,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,GACxD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7B"}

package/dist/core/model-registry-auth.js

@@ -1,98 +0,0 @@
-import { getConfigValueEnvVarNames, isCommandConfigValue, isConfigValueConfigured, resolveConfigValueOrThrow, resolveConfigValueUncached, resolveHeadersOrThrow, } from "./resolve-config-value.js";
-async function resolveCustomApiKeyAuth(provider, authStorage, providerRequestConfigs) {
-    const resolver = providerRequestConfigs.get(provider)?.auth?.apiKey?.resolve;
-    if (!resolver)
-        return undefined;
-    const stored = authStorage.get(provider);
-    const credential = stored?.type === "api_key" ? stored : undefined;
-    return resolver({
-        credential,
-        ctx: { env: async (name) => credential?.env?.[name] ?? process.env[name] },
-    });
-}
-export async function getProviderResolvedAuth(provider, authStorage, providerRequestConfigs) {
-    return resolveCustomApiKeyAuth(provider, authStorage, providerRequestConfigs);
-}
-function mergeHeaders(base, override) {
-    if (!base && !override)
-        return undefined;
-    const merged = {};
-    for (const source of [base, override]) {
-        for (const [name, value] of Object.entries(source ?? {})) {
-            for (const existing of Object.keys(merged)) {
-                if (existing.toLowerCase() === name.toLowerCase())
-                    delete merged[existing];
-            }
-            merged[name] = value;
-        }
-    }
-    return Object.keys(merged).length > 0 ? merged : undefined;
-}
-export async function getModelRequestAuth(model, authStorage, providerRequestConfigs, modelRequestHeaders, providerAuth) {
-    try {
-        const providerConfig = providerRequestConfigs.get(model.provider);
-        const customAuth = await resolveCustomApiKeyAuth(model.provider, authStorage, providerRequestConfigs);
-        const storedAuth = await authStorage.getModelAuth(model.provider, { includeFallback: false });
-        const apiKey = providerAuth?.apiKey ??
-            customAuth?.auth.apiKey ??
-            storedAuth?.apiKey ??
-            (providerConfig?.apiKey
-                ? resolveConfigValueOrThrow(providerConfig.apiKey, `API key for provider "${model.provider}"`)
-                : undefined);
-        const providerHeaders = resolveHeadersOrThrow(providerConfig?.headers, `provider "${model.provider}"`);
-        const modelHeaders = resolveHeadersOrThrow(modelRequestHeaders.get(`${model.provider}:${model.id}`), `model "${model.provider}/${model.id}"`);
-        let headers = providerAuth
-            ? mergeHeaders(model.headers, providerAuth.headers)
-            : mergeHeaders(storedAuth?.headers, model.headers);
-        headers = mergeHeaders(headers, customAuth?.auth.headers);
-        headers = mergeHeaders(headers, providerHeaders);
-        headers = mergeHeaders(headers, modelHeaders);
-        if (providerConfig?.authHeader) {
-            if (!apiKey) {
-                return { ok: false, error: `No API key found for "${model.provider}"` };
-            }
-            headers = { ...headers, Authorization: `Bearer ${apiKey}` };
-        }
-        return {
-            ok: true,
-            apiKey,
-            headers: headers && Object.keys(headers).length > 0 ? headers : undefined,
-            baseUrl: providerAuth?.baseUrl ?? customAuth?.auth.baseUrl ?? storedAuth?.baseUrl,
-        };
-    }
-    catch (error) {
-        return {
-            ok: false,
-            error: error instanceof Error ? error.message : String(error),
-        };
-    }
-}
-export function getProviderAuthStatusFromConfig(provider, authStorage, providerRequestConfigs) {
-    const authStatus = authStorage.getAuthStatus(provider);
-    if (authStatus.source) {
-        return authStatus;
-    }
-    const providerApiKey = providerRequestConfigs.get(provider)?.apiKey;
-    if (!providerApiKey) {
-        return authStatus;
-    }
-    if (isCommandConfigValue(providerApiKey)) {
-        return { configured: true, source: "models_json_command" };
-    }
-    const envVarNames = getConfigValueEnvVarNames(providerApiKey);
-    if (envVarNames.length > 0) {
-        return isConfigValueConfigured(providerApiKey)
-            ? { configured: true, source: "environment", label: envVarNames.join(", ") }
-            : { configured: false };
-    }
-    return { configured: true, source: "models_json_key" };
-}
-export async function getApiKeyForProviderFromConfig(provider, authStorage, providerRequestConfigs) {
-    const apiKey = await authStorage.getApiKey(provider, { includeFallback: false });
-    if (apiKey !== undefined) {
-        return apiKey;
-    }
-    const providerApiKey = providerRequestConfigs.get(provider)?.apiKey;
-    return providerApiKey ? resolveConfigValueUncached(providerApiKey) : undefined;
-}
-//# sourceMappingURL=model-registry-auth.js.map

package/dist/core/model-registry-auth.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-registry-auth.js","sourceRoot":"","sources":["../../src/core/model-registry-auth.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModelAuth, ProviderHeaders } from \"@earendil-works/pi-ai\";\nimport type { Api, Model } from \"@earendil-works/pi-ai/compat\";\nimport type { AuthStatus, AuthStorage } from \"./auth-storage.ts\";\nimport type { ProviderRequestConfig, ResolvedRequestAuth } from \"./model-registry-types.ts\";\nimport {\n\tgetConfigValueEnvVarNames,\n\tisCommandConfigValue,\n\tisConfigValueConfigured,\n\tresolveConfigValueOrThrow,\n\tresolveConfigValueUncached,\n\tresolveHeadersOrThrow,\n} from \"./resolve-config-value.ts\";\nimport type { ProviderApiKeyAuthResult } from \"./extensions/provider-types.ts\";\n\nasync function resolveCustomApiKeyAuth(\n\tprovider: string,\n\tauthStorage: AuthStorage,\n\tproviderRequestConfigs: Map<string, ProviderRequestConfig>,\n): Promise<ProviderApiKeyAuthResult | undefined> {\n\tconst resolver = providerRequestConfigs.get(provider)?.auth?.apiKey?.resolve;\n\tif (!resolver) return undefined;\n\tconst stored = authStorage.get(provider);\n\tconst credential = stored?.type === \"api_key\" ? stored : undefined;\n\treturn resolver({\n\t\tcredential,\n\t\tctx: { env: async (name) => credential?.env?.[name] ?? process.env[name] },\n\t});\n}\n\nexport async function getProviderResolvedAuth(\n\tprovider: string,\n\tauthStorage: AuthStorage,\n\tproviderRequestConfigs: Map<string, ProviderRequestConfig>,\n): Promise<ProviderApiKeyAuthResult | undefined> {\n\treturn resolveCustomApiKeyAuth(provider, authStorage, providerRequestConfigs);\n}\nfunction mergeHeaders(\n\tbase: ProviderHeaders | undefined,\n\toverride: ProviderHeaders | undefined,\n): ProviderHeaders | undefined {\n\tif (!base && !override) return undefined;\n\tconst merged: ProviderHeaders = {};\n\tfor (const source of [base, override]) {\n\t\tfor (const [name, value] of Object.entries(source ?? {})) {\n\t\t\tfor (const existing of Object.keys(merged)) {\n\t\t\t\tif (existing.toLowerCase() === name.toLowerCase()) delete merged[existing];\n\t\t\t}\n\t\t\tmerged[name] = value;\n\t\t}\n\t}\n\treturn Object.keys(merged).length > 0 ? merged : undefined;\n}\n\nexport async function getModelRequestAuth(\n\tmodel: Model<Api>,\n\tauthStorage: AuthStorage,\n\tproviderRequestConfigs: Map<string, ProviderRequestConfig>,\n\tmodelRequestHeaders: Map<string, Record<string, string>>,\n\tproviderAuth?: ModelAuth,\n): Promise<ResolvedRequestAuth> {\n\ttry {\n\t\tconst providerConfig = providerRequestConfigs.get(model.provider);\n\t\tconst customAuth = await resolveCustomApiKeyAuth(model.provider, authStorage, providerRequestConfigs);\n\t\tconst storedAuth = await authStorage.getModelAuth(model.provider, { includeFallback: false });\n\t\tconst apiKey =\n\t\t\tproviderAuth?.apiKey ??\n\t\t\tcustomAuth?.auth.apiKey ??\n\t\t\tstoredAuth?.apiKey ??\n\t\t\t(providerConfig?.apiKey\n\t\t\t\t? resolveConfigValueOrThrow(providerConfig.apiKey, `API key for provider \"${model.provider}\"`)\n\t\t\t\t: undefined);\n\n\t\tconst providerHeaders = resolveHeadersOrThrow(providerConfig?.headers, `provider \"${model.provider}\"`);\n\t\tconst modelHeaders = resolveHeadersOrThrow(\n\t\t\tmodelRequestHeaders.get(`${model.provider}:${model.id}`),\n\t\t\t`model \"${model.provider}/${model.id}\"`,\n\t\t);\n\n\t\tlet headers = providerAuth\n\t\t\t? mergeHeaders(model.headers, providerAuth.headers)\n\t\t\t: mergeHeaders(storedAuth?.headers, model.headers);\n\t\theaders = mergeHeaders(headers, customAuth?.auth.headers);\n\t\theaders = mergeHeaders(headers, providerHeaders);\n\t\theaders = mergeHeaders(headers, modelHeaders);\n\n\t\tif (providerConfig?.authHeader) {\n\t\t\tif (!apiKey) {\n\t\t\t\treturn { ok: false, error: `No API key found for \"${model.provider}\"` };\n\t\t\t}\n\t\t\theaders = { ...headers, Authorization: `Bearer ${apiKey}` };\n\t\t}\n\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\tapiKey,\n\t\t\theaders: headers && Object.keys(headers).length > 0 ? headers : undefined,\n\t\t\tbaseUrl: providerAuth?.baseUrl ?? customAuth?.auth.baseUrl ?? storedAuth?.baseUrl,\n\t\t};\n\t} catch (error) {\n\t\treturn {\n\t\t\tok: false,\n\t\t\terror: error instanceof Error ? error.message : String(error),\n\t\t};\n\t}\n}\n\nexport function getProviderAuthStatusFromConfig(\n\tprovider: string,\n\tauthStorage: AuthStorage,\n\tproviderRequestConfigs: Map<string, ProviderRequestConfig>,\n): AuthStatus {\n\tconst authStatus = authStorage.getAuthStatus(provider);\n\tif (authStatus.source) {\n\t\treturn authStatus;\n\t}\n\n\tconst providerApiKey = providerRequestConfigs.get(provider)?.apiKey;\n\tif (!providerApiKey) {\n\t\treturn authStatus;\n\t}\n\n\tif (isCommandConfigValue(providerApiKey)) {\n\t\treturn { configured: true, source: \"models_json_command\" };\n\t}\n\n\tconst envVarNames = getConfigValueEnvVarNames(providerApiKey);\n\tif (envVarNames.length > 0) {\n\t\treturn isConfigValueConfigured(providerApiKey)\n\t\t\t? { configured: true, source: \"environment\", label: envVarNames.join(\", \") }\n\t\t\t: { configured: false };\n\t}\n\n\treturn { configured: true, source: \"models_json_key\" };\n}\n\nexport async function getApiKeyForProviderFromConfig(\n\tprovider: string,\n\tauthStorage: AuthStorage,\n\tproviderRequestConfigs: Map<string, ProviderRequestConfig>,\n): Promise<string | undefined> {\n\tconst apiKey = await authStorage.getApiKey(provider, { includeFallback: false });\n\tif (apiKey !== undefined) {\n\t\treturn apiKey;\n\t}\n\n\tconst providerApiKey = providerRequestConfigs.get(provider)?.apiKey;\n\treturn providerApiKey ? resolveConfigValueUncached(providerApiKey) : undefined;\n}\n"]}

package/dist/core/model-registry-builtins.d.ts

@@ -1,8 +0,0 @@
-import { type Api, type Model } from "@earendil-works/pi-ai/compat";
-import type { ModelOverride } from "./model-registry-schemas.ts";
-import type { ProviderOverride } from "./model-registry-types.ts";
-export declare function mergeCompat(baseCompat: Model<Api>["compat"], overrideCompat: ModelOverride["compat"] | Model<Api>["compat"]): Model<Api>["compat"] | undefined;
-export declare function applyModelOverride(model: Model<Api>, override: ModelOverride): Model<Api>;
-export declare function loadBuiltInModels(overrides: Map<string, ProviderOverride>, modelOverrides: Map<string, Map<string, ModelOverride>>, baseModels?: readonly Model<Api>[]): Model<Api>[];
-export declare function mergeCustomModels(builtInModels: Model<Api>[], customModels: Model<Api>[]): Model<Api>[];
-//# sourceMappingURL=model-registry-builtins.d.ts.map

package/dist/core/model-registry-builtins.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-registry-builtins.d.ts","sourceRoot":"","sources":["../../src/core/model-registry-builtins.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,GAAG,EAIR,KAAK,KAAK,EAEV,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAkB,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlF,wBAAgB,WAAW,CAC1B,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EAChC,cAAc,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAC5D,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,SAAS,CAiClC;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,CA4BzF;AAED,wBAAgB,iBAAiB,CAChC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,EACxC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EACvD,UAAU,CAAC,EAAE,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,GAChC,KAAK,CAAC,GAAG,CAAC,EAAE,CA4Bd;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAWvG"}

package/dist/core/model-registry-builtins.js

@@ -1,104 +0,0 @@
-import { getModels, getProviders, } from "@earendil-works/pi-ai/compat";
-import { normalizeGrammarToolCapability } from "./model-capabilities.js";
-export function mergeCompat(baseCompat, overrideCompat) {
-    if (!overrideCompat)
-        return normalizeGrammarToolCapability(baseCompat);
-    const base = baseCompat;
-    const override = overrideCompat;
-    const merged = { ...base, ...override };
-    const baseCompletions = base;
-    const overrideCompletions = override;
-    const mergedCompletions = merged;
-    if (baseCompletions?.openRouterRouting || overrideCompletions.openRouterRouting) {
-        mergedCompletions.openRouterRouting = {
-            ...baseCompletions?.openRouterRouting,
-            ...overrideCompletions.openRouterRouting,
-        };
-    }
-    if (baseCompletions?.vercelGatewayRouting || overrideCompletions.vercelGatewayRouting) {
-        mergedCompletions.vercelGatewayRouting = {
-            ...baseCompletions?.vercelGatewayRouting,
-            ...overrideCompletions.vercelGatewayRouting,
-        };
-    }
-    if (baseCompletions?.chatTemplateKwargs || overrideCompletions.chatTemplateKwargs) {
-        mergedCompletions.chatTemplateKwargs = {
-            ...baseCompletions?.chatTemplateKwargs,
-            ...overrideCompletions.chatTemplateKwargs,
-        };
-    }
-    return normalizeGrammarToolCapability(merged);
-}
-export function applyModelOverride(model, override) {
-    const result = { ...model };
-    if (override.name !== undefined)
-        result.name = override.name;
-    if (override.reasoning !== undefined)
-        result.reasoning = override.reasoning;
-    if (override.thinkingLevelMap !== undefined) {
-        result.thinkingLevelMap = { ...model.thinkingLevelMap, ...override.thinkingLevelMap };
-    }
-    if (override.input !== undefined)
-        result.input = override.input;
-    if (override.contextWindow !== undefined)
-        result.contextWindow = override.contextWindow;
-    if (override.maxTokens !== undefined)
-        result.maxTokens = override.maxTokens;
-    if (override.cost) {
-        result.cost = {
-            input: override.cost.input ?? model.cost.input,
-            output: override.cost.output ?? model.cost.output,
-            cacheRead: override.cost.cacheRead ?? model.cost.cacheRead,
-            cacheWrite: override.cost.cacheWrite ?? model.cost.cacheWrite,
-            ...(override.cost.tiers !== undefined
-                ? { tiers: override.cost.tiers }
-                : model.cost.tiers !== undefined
-                    ? { tiers: model.cost.tiers }
-                    : {}),
-        };
-    }
-    result.compat = mergeCompat(model.compat, override.compat);
-    return result;
-}
-export function loadBuiltInModels(overrides, modelOverrides, baseModels) {
-    const providers = baseModels
-        ? [...new Set(baseModels.map((model) => model.provider))]
-        : getProviders();
-    return providers.flatMap((provider) => {
-        const providerModels = baseModels
-            ? baseModels.filter((model) => model.provider === provider)
-            : getModels(provider);
-        const models = [...providerModels];
-        const providerOverride = overrides.get(provider);
-        const perModelOverrides = modelOverrides.get(provider);
-        return models.map((candidate) => {
-            let model = {
-                ...candidate,
-                compat: normalizeGrammarToolCapability(candidate.compat),
-            };
-            if (providerOverride) {
-                model = {
-                    ...model,
-                    baseUrl: providerOverride.baseUrl ?? model.baseUrl,
-                    compat: mergeCompat(model.compat, providerOverride.compat),
-                };
-            }
-            const modelOverride = perModelOverrides?.get(candidate.id);
-            return modelOverride ? applyModelOverride(model, modelOverride) : model;
-        });
-    });
-}
-export function mergeCustomModels(builtInModels, customModels) {
-    const merged = [...builtInModels];
-    for (const customModel of customModels) {
-        const existingIndex = merged.findIndex((m) => m.provider === customModel.provider && m.id === customModel.id);
-        if (existingIndex >= 0) {
-            merged[existingIndex] = customModel;
-        }
-        else {
-            merged.push(customModel);
-        }
-    }
-    return merged;
-}
-//# sourceMappingURL=model-registry-builtins.js.map

package/dist/core/model-registry-builtins.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-registry-builtins.js","sourceRoot":"","sources":["../../src/core/model-registry-builtins.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\ttype Api,\n\tgetModels,\n\tgetProviders,\n\ttype BuiltinProvider,\n\ttype Model,\n\ttype OpenAICompletionsCompat,\n} from \"@earendil-works/pi-ai/compat\";\nimport { normalizeGrammarToolCapability } from \"./model-capabilities.ts\";\nimport type { ModelOverride } from \"./model-registry-schemas.ts\";\nimport type { ProviderCompat, ProviderOverride } from \"./model-registry-types.ts\";\n\n\nexport function mergeCompat(\n\tbaseCompat: Model<Api>[\"compat\"],\n\toverrideCompat: ModelOverride[\"compat\"] | Model<Api>[\"compat\"],\n): Model<Api>[\"compat\"] | undefined {\n\tif (!overrideCompat) return normalizeGrammarToolCapability(baseCompat);\n\n\tconst base = baseCompat as ProviderCompat | undefined;\n\tconst override = overrideCompat as ProviderCompat;\n\tconst merged = { ...base, ...override } as ProviderCompat;\n\n\tconst baseCompletions = base as OpenAICompletionsCompat | undefined;\n\tconst overrideCompletions = override as OpenAICompletionsCompat;\n\tconst mergedCompletions = merged as OpenAICompletionsCompat;\n\n\tif (baseCompletions?.openRouterRouting || overrideCompletions.openRouterRouting) {\n\t\tmergedCompletions.openRouterRouting = {\n\t\t\t...baseCompletions?.openRouterRouting,\n\t\t\t...overrideCompletions.openRouterRouting,\n\t\t};\n\t}\n\n\tif (baseCompletions?.vercelGatewayRouting || overrideCompletions.vercelGatewayRouting) {\n\t\tmergedCompletions.vercelGatewayRouting = {\n\t\t\t...baseCompletions?.vercelGatewayRouting,\n\t\t\t...overrideCompletions.vercelGatewayRouting,\n\t\t};\n\t}\n\n\tif (baseCompletions?.chatTemplateKwargs || overrideCompletions.chatTemplateKwargs) {\n\t\tmergedCompletions.chatTemplateKwargs = {\n\t\t\t...baseCompletions?.chatTemplateKwargs,\n\t\t\t...overrideCompletions.chatTemplateKwargs,\n\t\t};\n\t}\n\n\treturn normalizeGrammarToolCapability(merged);\n}\n\nexport function applyModelOverride(model: Model<Api>, override: ModelOverride): Model<Api> {\n\tconst result = { ...model };\n\n\tif (override.name !== undefined) result.name = override.name;\n\tif (override.reasoning !== undefined) result.reasoning = override.reasoning;\n\tif (override.thinkingLevelMap !== undefined) {\n\t\tresult.thinkingLevelMap = { ...model.thinkingLevelMap, ...override.thinkingLevelMap };\n\t}\n\tif (override.input !== undefined) result.input = override.input as (\"text\" | \"image\")[];\n\tif (override.contextWindow !== undefined) result.contextWindow = override.contextWindow;\n\tif (override.maxTokens !== undefined) result.maxTokens = override.maxTokens;\n\n\tif (override.cost) {\n\t\tresult.cost = {\n\t\t\tinput: override.cost.input ?? model.cost.input,\n\t\t\toutput: override.cost.output ?? model.cost.output,\n\t\t\tcacheRead: override.cost.cacheRead ?? model.cost.cacheRead,\n\t\t\tcacheWrite: override.cost.cacheWrite ?? model.cost.cacheWrite,\n\t\t\t...(override.cost.tiers !== undefined\n\t\t\t\t? { tiers: override.cost.tiers }\n\t\t\t\t: model.cost.tiers !== undefined\n\t\t\t\t\t? { tiers: model.cost.tiers }\n\t\t\t\t\t: {}),\n\t\t};\n\t}\n\n\tresult.compat = mergeCompat(model.compat, override.compat);\n\treturn result;\n}\n\nexport function loadBuiltInModels(\n\toverrides: Map<string, ProviderOverride>,\n\tmodelOverrides: Map<string, Map<string, ModelOverride>>,\n\tbaseModels?: readonly Model<Api>[],\n): Model<Api>[] {\n\tconst providers = baseModels\n\t\t? [...new Set(baseModels.map((model) => model.provider))]\n\t\t: getProviders();\n\treturn providers.flatMap((provider) => {\n\t\tconst providerModels = baseModels\n\t\t\t? baseModels.filter((model) => model.provider === provider)\n\t\t\t: getModels(provider as BuiltinProvider) as Model<Api>[];\n\t\tconst models = [...providerModels];\n\t\tconst providerOverride = overrides.get(provider);\n\t\tconst perModelOverrides = modelOverrides.get(provider);\n\n\t\treturn models.map((candidate) => {\n\t\t\tlet model: Model<Api> = {\n\t\t\t\t...candidate,\n\t\t\t\tcompat: normalizeGrammarToolCapability(candidate.compat),\n\t\t\t};\n\t\t\tif (providerOverride) {\n\t\t\t\tmodel = {\n\t\t\t\t\t...model,\n\t\t\t\t\tbaseUrl: providerOverride.baseUrl ?? model.baseUrl,\n\t\t\t\t\tcompat: mergeCompat(model.compat, providerOverride.compat),\n\t\t\t\t};\n\t\t\t}\n\t\t\tconst modelOverride = perModelOverrides?.get(candidate.id);\n\t\t\treturn modelOverride ? applyModelOverride(model, modelOverride) : model;\n\t\t});\n\t});\n}\n\nexport function mergeCustomModels(builtInModels: Model<Api>[], customModels: Model<Api>[]): Model<Api>[] {\n\tconst merged = [...builtInModels];\n\tfor (const customModel of customModels) {\n\t\tconst existingIndex = merged.findIndex((m) => m.provider === customModel.provider && m.id === customModel.id);\n\t\tif (existingIndex >= 0) {\n\t\t\tmerged[existingIndex] = customModel;\n\t\t} else {\n\t\t\tmerged.push(customModel);\n\t\t}\n\t}\n\treturn merged;\n}\n"]}

package/dist/core/model-registry-custom-loader.d.ts

@@ -1,3 +0,0 @@
-import type { CustomModelsResult } from "./model-registry-types.ts";
-export declare function loadCustomModelsFromPaths(modelsJsonPaths: string[]): CustomModelsResult;
-//# sourceMappingURL=model-registry-custom-loader.d.ts.map

package/dist/core/model-registry-custom-loader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-registry-custom-loader.d.ts","sourceRoot":"","sources":["../../src/core/model-registry-custom-loader.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACX,kBAAkB,EAIlB,MAAM,2BAA2B,CAAC;AA0SnC,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAYvF"}

package/dist/core/model-registry-custom-loader.js

@@ -1,255 +0,0 @@
-import { getModels, getProviders } from "@earendil-works/pi-ai/compat";
-import { radiusProvider } from "@earendil-works/pi-ai/providers/all";
-import { existsSync, readFileSync } from "fs";
-import { validateContextWindowValue } from "./model-registry-validation.js";
-import { mergeCompat, mergeCustomModels } from "./model-registry-builtins.js";
-import { formatValidationPath, stripJsonComments, validateModelsConfig, } from "./model-registry-schemas.js";
-function modelRequestKey(provider, modelId) {
-    return `${provider}:${modelId}`;
-}
-function emptyCustomModelsResult(error) {
-    return {
-        models: [],
-        overrides: new Map(),
-        modelOverrides: new Map(),
-        providerRequestConfigs: new Map(),
-        modelRequestHeaders: new Map(),
-        modelRequestHeaderSources: new Map(),
-        configuredProviders: new Map(),
-        error,
-    };
-}
-function mergeModelOverrides(base, incoming) {
-    const merged = new Map([...base].map(([providerName, overrides]) => [providerName, new Map(overrides)]));
-    for (const [providerName, incomingOverrides] of incoming) {
-        const providerOverrides = new Map(merged.get(providerName) ?? []);
-        for (const [modelId, modelOverride] of incomingOverrides) {
-            providerOverrides.set(modelId, modelOverride);
-        }
-        merged.set(providerName, providerOverrides);
-    }
-    return merged;
-}
-function mergeModelRequestHeaders(base, incoming) {
-    const headers = new Map(base.modelRequestHeaders);
-    const sources = new Map(base.modelRequestHeaderSources);
-    const invalidate = (key, source) => {
-        if (sources.get(key) !== source)
-            return;
-        headers.delete(key);
-        sources.delete(key);
-    };
-    for (const model of incoming.models) {
-        invalidate(modelRequestKey(model.provider, model.id), "model");
-    }
-    for (const [providerName, overrides] of incoming.modelOverrides) {
-        for (const modelId of overrides.keys()) {
-            invalidate(modelRequestKey(providerName, modelId), "modelOverride");
-        }
-    }
-    for (const [key, value] of incoming.modelRequestHeaders)
-        headers.set(key, value);
-    for (const [key, source] of incoming.modelRequestHeaderSources)
-        sources.set(key, source);
-    return { headers, sources };
-}
-function mergeCustomModelResults(base, incoming) {
-    const mergedHeaders = mergeModelRequestHeaders(base, incoming);
-    return {
-        models: mergeCustomModels(base.models, incoming.models),
-        overrides: new Map([...base.overrides, ...incoming.overrides]),
-        modelOverrides: mergeModelOverrides(base.modelOverrides, incoming.modelOverrides),
-        providerRequestConfigs: new Map([...base.providerRequestConfigs, ...incoming.providerRequestConfigs]),
-        modelRequestHeaders: mergedHeaders.headers,
-        modelRequestHeaderSources: mergedHeaders.sources,
-        configuredProviders: new Map([...base.configuredProviders, ...incoming.configuredProviders]),
-        error: undefined,
-    };
-}
-function collectProviderRequestConfig(providerName, config, requestConfigs) {
-    if (!config.apiKey && !config.headers && !config.authHeader)
-        return;
-    requestConfigs.set(providerName, {
-        apiKey: config.apiKey,
-        headers: config.headers,
-        authHeader: config.authHeader,
-    });
-}
-function collectModelHeaders(providerName, modelId, headers, modelHeaders, modelHeaderSources, source) {
-    if (!headers || Object.keys(headers).length === 0)
-        return;
-    const key = modelRequestKey(providerName, modelId);
-    modelHeaders.set(key, headers);
-    modelHeaderSources.set(key, source);
-}
-function validateConfig(config) {
-    const builtInProviders = new Set(getProviders());
-    for (const [providerName, providerConfig] of Object.entries(config.providers)) {
-        const isBuiltIn = builtInProviders.has(providerName);
-        const hasProviderApi = !!providerConfig.api;
-        const models = providerConfig.models ?? [];
-        const hasModelOverrides = providerConfig.modelOverrides && Object.keys(providerConfig.modelOverrides).length > 0;
-        if (models.length === 0) {
-            if (!providerConfig.baseUrl && !providerConfig.headers && !providerConfig.compat && !hasModelOverrides) {
-                throw new Error(`Provider ${providerName}: must specify "baseUrl", "headers", "compat", "modelOverrides", or "models".`);
-            }
-        }
-        else if (!isBuiltIn) {
-            if (!providerConfig.baseUrl) {
-                throw new Error(`Provider ${providerName}: "baseUrl" is required when defining custom models.`);
-            }
-            if (!providerConfig.apiKey) {
-                throw new Error(`Provider ${providerName}: "apiKey" is required when defining custom models.`);
-            }
-        }
-        for (const modelDef of models) {
-            const hasModelApi = !!modelDef.api;
-            if (!hasProviderApi && !hasModelApi && !isBuiltIn) {
-                throw new Error(`Provider ${providerName}, model ${modelDef.id}: no "api" specified. Set at provider or model level.`);
-            }
-            if (!modelDef.id)
-                throw new Error(`Provider ${providerName}: model missing "id"`);
-            if (modelDef.contextWindow !== undefined && validateContextWindowValue(modelDef.contextWindow)) {
-                throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid contextWindow`);
-            }
-            if (modelDef.maxTokens !== undefined && modelDef.maxTokens <= 0) {
-                throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid maxTokens`);
-            }
-        }
-        for (const [modelId, modelOverride] of Object.entries(providerConfig.modelOverrides ?? {})) {
-            if (modelOverride.contextWindow !== undefined && validateContextWindowValue(modelOverride.contextWindow)) {
-                throw new Error(`Provider ${providerName}, model ${modelId}: invalid contextWindow`);
-            }
-            if (modelOverride.maxTokens !== undefined && modelOverride.maxTokens <= 0) {
-                throw new Error(`Provider ${providerName}, model ${modelId}: invalid maxTokens`);
-            }
-        }
-    }
-}
-function parseModels(config, modelHeaders, modelHeaderSources) {
-    const models = [];
-    const builtInProviders = new Set(getProviders());
-    const builtInDefaultsCache = new Map();
-    const getBuiltInDefaults = (providerName) => {
-        if (!builtInProviders.has(providerName))
-            return undefined;
-        if (builtInDefaultsCache.has(providerName))
-            return builtInDefaultsCache.get(providerName);
-        const builtIn = getModels(providerName);
-        if (builtIn.length === 0)
-            return undefined;
-        const defaults = { api: builtIn[0].api, baseUrl: builtIn[0].baseUrl };
-        builtInDefaultsCache.set(providerName, defaults);
-        return defaults;
-    };
-    for (const [providerName, providerConfig] of Object.entries(config.providers)) {
-        const modelDefs = providerConfig.models ?? [];
-        if (modelDefs.length === 0)
-            continue;
-        const builtInDefaults = getBuiltInDefaults(providerName);
-        for (const modelDef of modelDefs) {
-            const api = modelDef.api ?? providerConfig.api ?? builtInDefaults?.api;
-            if (!api)
-                continue;
-            const baseUrl = modelDef.baseUrl ?? providerConfig.baseUrl ?? builtInDefaults?.baseUrl;
-            if (!baseUrl)
-                continue;
-            const compat = mergeCompat(providerConfig.compat, modelDef.compat);
-            collectModelHeaders(providerName, modelDef.id, modelDef.headers, modelHeaders, modelHeaderSources, "model");
-            const defaultCost = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-            const contextWindow = modelDef.contextWindow ?? 128000;
-            models.push({
-                id: modelDef.id,
-                name: modelDef.name ?? modelDef.id,
-                api: api,
-                provider: providerName,
-                baseUrl,
-                reasoning: modelDef.reasoning ?? false,
-                thinkingLevelMap: modelDef.thinkingLevelMap,
-                input: (modelDef.input ?? ["text"]),
-                cost: modelDef.cost ?? defaultCost,
-                contextWindow,
-                maxTokens: modelDef.maxTokens ?? 16384,
-                headers: undefined,
-                compat,
-            });
-        }
-    }
-    return models;
-}
-function loadCustomModels(modelsJsonPath) {
-    if (!existsSync(modelsJsonPath)) {
-        return emptyCustomModelsResult();
-    }
-    try {
-        const content = readFileSync(modelsJsonPath, "utf-8");
-        const parsed = JSON.parse(stripJsonComments(content));
-        if (!validateModelsConfig.Check(parsed)) {
-            const errors = validateModelsConfig
-                .Errors(parsed)
-                .map((error) => `  - ${formatValidationPath(error)}: ${error.message}`)
-                .join("\n") || "Unknown schema error";
-            return emptyCustomModelsResult(`Invalid models.json schema:\n${errors}\n\nFile: ${modelsJsonPath}`);
-        }
-        const config = parsed;
-        validateConfig(config);
-        const overrides = new Map();
-        const modelOverrides = new Map();
-        const providerRequestConfigs = new Map();
-        const modelRequestHeaders = new Map();
-        const modelRequestHeaderSources = new Map();
-        const configuredProviders = new Map();
-        for (const [providerName, providerConfig] of Object.entries(config.providers)) {
-            if (providerConfig.oauth === "radius" && providerConfig.baseUrl) {
-                configuredProviders.set(providerName, radiusProvider({
-                    id: providerName,
-                    name: providerConfig.name ?? providerName,
-                    gateway: providerConfig.baseUrl.replace(/\/v1\/?$/u, ""),
-                }));
-            }
-            if ((providerConfig.baseUrl && providerConfig.oauth !== "radius") || providerConfig.compat) {
-                overrides.set(providerName, {
-                    baseUrl: providerConfig.oauth === "radius" ? undefined : providerConfig.baseUrl,
-                    compat: providerConfig.compat,
-                });
-            }
-            collectProviderRequestConfig(providerName, providerConfig, providerRequestConfigs);
-            if (providerConfig.modelOverrides) {
-                modelOverrides.set(providerName, new Map(Object.entries(providerConfig.modelOverrides)));
-                for (const [modelId, modelOverride] of Object.entries(providerConfig.modelOverrides)) {
-                    collectModelHeaders(providerName, modelId, modelOverride.headers, modelRequestHeaders, modelRequestHeaderSources, "modelOverride");
-                }
-            }
-        }
-        return {
-            models: parseModels(config, modelRequestHeaders, modelRequestHeaderSources),
-            overrides,
-            modelOverrides,
-            providerRequestConfigs,
-            modelRequestHeaders,
-            modelRequestHeaderSources,
-            configuredProviders,
-            error: undefined,
-        };
-    }
-    catch (error) {
-        if (error instanceof SyntaxError) {
-            return emptyCustomModelsResult(`Failed to parse models.json: ${error.message}\n\nFile: ${modelsJsonPath}`);
-        }
-        return emptyCustomModelsResult(`Failed to load models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsJsonPath}`);
-    }
-}
-export function loadCustomModelsFromPaths(modelsJsonPaths) {
-    let combined = emptyCustomModelsResult();
-    const errors = [];
-    for (let i = modelsJsonPaths.length - 1; i >= 0; i--) {
-        const result = loadCustomModels(modelsJsonPaths[i]);
-        if (result.error) {
-            errors.push(result.error);
-            continue;
-        }
-        combined = mergeCustomModelResults(combined, result);
-    }
-    return { ...combined, error: errors.length > 0 ? errors.join("\n\n") : undefined };
-}
-//# sourceMappingURL=model-registry-custom-loader.js.map