evolcore 0.0.21 → 0.0.23

package/dist/core/model/model-catalog.js

@@ -1,359 +1,149 @@
 /**
- * model-catalog: 模型目录与单模型元数据。
- *
- * 目录来源按 baseagent 隔离：Codex 预创建优先使用 CLI 动态目录；
- * 其他场景探测本 baseagent 的 {baseUrl}/v1/models 与 {baseUrl}/models，
- * 最后只回退到同 baseagent 的内置目录。
- *
- * baseUrl/apiKey 复用 baseagent 凭据解析链（与发消息同源），命令不接收 url/key 参数。
- * 单模型详情（info）现阶段全部为 mock，{baseUrl}/models 接口补全字段后自动接真实数据。
- *
- * 详见 docs/model-command-design.md。
+ * Public model catalog facade. Online consumers query the daemon; its service
+ * owns refreshes and snapshots. Runners in the daemon use that same instance.
  */
-import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../../agents/baseagent.js';
+import path from 'node:path';
+import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig, loadCodexSettings } from '../../agents/baseagent.js';
 import { buildModelRequestHeaders } from '../../agents/request-identity.js';
-import { appendRequestPath, appendV1RequestPath } from '../../agents/request-identity.js';
 import { activeBaseagent } from './config-scope.js';
 import { resolveEffective } from '../../config/config-manager.js';
 import { loadDefaults } from '../../config-store.js';
-import { execCodexCliSync } from '../../utils/codex-cli.js';
-/** 取指定 baseagent 的 baseUrl + apiKey（复用现有解析链）。 */
-function resolveCreds(self, ba) {
-    const baseagent = ba || activeBaseagent(self);
-    // A new Agent has no self config yet, so resolve its gateway from defaults.
-    const config = self
-        ? resolveEffective({ self }, { cache: true, expand: true })
-        : { baseagents: loadDefaults()?.baseagents ?? {} };
-    const block = (config.baseagents || {});
+import net from 'node:net';
+import fs from 'node:fs';
+import { getWindowsInstanceSocketPathCandidates, resolvePaths } from '../../paths.js';
+import { ModelCatalogService, catalogEfforts, resolveCatalogModel } from './catalog-service.js';
+export * from './catalog-service.js';
+let daemonOwner = false;
+export function setModelCatalogDaemonOwner(value) { daemonOwner = value; }
+/** Only a refused/missing socket means offline. A busy/rejecting daemon must
+ * never cause another process to create an independent online catalog. */
+export async function queryDaemonCatalog(self, baseagent, refresh = false) {
+    const paths = resolvePaths();
+    let controlToken;
     try {
-        if (baseagent === 'codex') {
-            const c = block.codex;
-            const r = resolveOpenaiConfig({ agents: { codex: c } }, c);
-            return {
-                baseUrl: r.baseUrl,
-                apiKey: r.apiKey,
-                agentAid: self,
-                headers: buildModelRequestHeaders({ baseagent: 'codex', baseUrl: r.baseUrl, agentAid: self, configuredHeaders: r.headers }),
-                queryParams: r.queryParams,
-            };
-        }
-        if (baseagent === 'ecagent') {
-            const c = block.ecagent;
-            const r = resolveEcagentConfig({ agents: { ecagent: c } }, c);
-            return {
-                baseUrl: r.baseUrl,
-                apiKey: r.apiKey,
-                agentAid: self,
-                headers: buildModelRequestHeaders({ baseagent: 'ecagent', baseUrl: r.baseUrl, agentAid: self, configuredHeaders: r.headers }),
-                queryParams: r.queryParams,
+        controlToken = fs.readFileSync(paths.controlToken, 'utf8').trim();
+    }
+    catch { /* Server returns the authorization error. */ }
+    const candidates = process.platform === 'win32' ? getWindowsInstanceSocketPathCandidates(paths.root) : [paths.instanceSocket];
+    for (const socket of [...new Set([paths.instanceSocket, ...candidates])]) {
+        const response = await new Promise((resolve, reject) => {
+            const connection = net.connect(socket);
+            let buffer = '';
+            let done = false;
+            const finish = (error, value = null) => {
+                if (done)
+                    return;
+                done = true;
+                connection.destroy();
+                if (error)
+                    reject(error);
+                else
+                    resolve(value);
             };
+            connection.setTimeout(25_000, () => finish(new Error('模型目录 daemon 查询超时')));
+            connection.on('connect', () => connection.write(JSON.stringify({ type: 'model.catalog', self, baseagent, refresh, controlToken }) + '\n'));
+            connection.on('error', (error) => {
+                if (error.code === 'ENOENT' || error.code === 'ECONNREFUSED')
+                    finish();
+                else
+                    finish(new Error('无法连接模型目录 daemon'));
+            });
+            connection.on('data', chunk => {
+                buffer += chunk.toString();
+                if (buffer.length > 8 * 1024 * 1024)
+                    return finish(new Error('模型目录响应过大'));
+                const end = buffer.indexOf('\n');
+                if (end < 0)
+                    return;
+                try {
+                    const data = JSON.parse(buffer.slice(0, end));
+                    if (!data.ok || !data.snapshot)
+                        return finish(new Error(data.error || 'daemon 不支持统一模型目录，请更新并重启'));
+                    finish(undefined, data.snapshot);
+                }
+                catch {
+                    finish(new Error('模型目录 daemon 返回无效响应'));
+                }
+            });
+            connection.on('end', () => finish(new Error('模型目录 daemon 提前关闭连接')));
+        });
+        if (response)
+            return response;
+    }
+    return null;
+}
+const service = new ModelCatalogService({
+    storageDir: () => path.join(path.dirname(resolvePaths().claudeModelCache), 'model-catalog'),
+    legacyAliasFile: () => resolvePaths().claudeModelCache,
+    native: async (context) => (await import('../../agents/codex/catalog.js')).codexNativeCatalog(context),
+});
+export function resolveCatalogContext(self, ba) {
+    const baseagent = ba || activeBaseagent(self);
+    const context = { scope: self || '<defaults>', baseagent };
+    try {
+        const config = self ? resolveEffective({ self }, { cache: true, expand: true }) : { baseagents: loadDefaults()?.baseagents ?? {} };
+        const block = (config.baseagents ?? {});
+        const cfg = { agents: block };
+        const resolved = baseagent === 'codex' ? resolveOpenaiConfig(cfg, block.codex)
+            : baseagent === 'claude' ? resolveAnthropicConfig(cfg, block.claude)
+                : baseagent === 'ecagent' ? resolveEcagentConfig(cfg, block.ecagent) : undefined;
+        if (resolved) {
+            Object.assign(context, { baseUrl: resolved.baseUrl, apiKey: resolved.apiKey, queryParams: resolved.queryParams,
+                provider: 'provider' in resolved ? resolved.provider : undefined,
+                headers: buildModelRequestHeaders({ baseagent: baseagent, baseUrl: resolved.baseUrl, agentAid: self, configuredHeaders: resolved.headers }) });
         }
-        if (baseagent === 'gemini')
-            return {};
-        if (baseagent !== 'claude')
-            return {};
-        const c = block.claude;
-        const r = resolveAnthropicConfig({ agents: { claude: c } }, c);
-        return {
-            baseUrl: r.baseUrl,
-            apiKey: r.apiKey,
-            agentAid: self,
-            headers: buildModelRequestHeaders({ baseagent: 'claude', baseUrl: r.baseUrl, agentAid: self, configuredHeaders: r.headers }),
-            queryParams: r.queryParams,
-        };
     }
     catch {
-        return {};
-    }
-}
-/** 从对象/字符串条目里提取 id（兼容 id/name/model 字段）。 */
-function pickId(item) {
-    if (typeof item === 'string')
-        return item;
-    if (item && typeof item === 'object') {
-        const v = item.id ?? item.name ?? item.model;
-        return typeof v === 'string' ? v : undefined;
-    }
-    return undefined;
-}
-/** 从对象条目里提取厂商（兼容 owned_by/owner/provider）。 */
-function pickOwner(item) {
-    if (item && typeof item === 'object') {
-        const v = item.owned_by ?? item.owner ?? item.provider;
-        return typeof v === 'string' ? v : undefined;
+        // Codex account login may not have an API key. Native listing still works,
+        // but do not replace a configured Agent gateway with the host connection.
+        const defaults = self ? resolveEffective({ self }, { cache: true, expand: true }) : { baseagents: loadDefaults()?.baseagents ?? {} };
+        const block = defaults.baseagents?.[baseagent];
+        const settings = baseagent === 'codex' ? loadCodexSettings() : undefined;
+        if (baseagent === 'codex' && !block?.baseUrl && !process.env.OPENAI_BASE_URL && !settings?.baseUrl && !block?.apiKey)
+            Object.assign(context, { provider: settings?.provider });
+        else
+            Object.assign(context, { configUnavailable: true, baseUrl: block?.baseUrl, headers: block?.headers, queryParams: block?.queryParams, apiKey: block?.apiKey });
     }
-    return undefined;
+    return context;
 }
-/**
- * 通用容错解析：
- *   - 容器：json.data[] | json.models[] | json.data.models[] | 裸数组
- *   - 条目：字符串 或 {id|name|model, owned_by|owner|provider, created}
- */
-function genericParse(json) {
-    const arr = Array.isArray(json) ? json
-        : Array.isArray(json?.data) ? json.data
-            : Array.isArray(json?.models) ? json.models
-                : Array.isArray(json?.data?.models) ? json.data.models
-                    : [];
-    const out = [];
-    for (const item of arr) {
-        const id = pickId(item);
-        if (!id)
-            continue;
-        out.push({ id, owned_by: pickOwner(item), created: typeof item?.created === 'number' ? item.created : undefined });
-    }
-    return out;
+/** Used by the IPC handler and the owner process. Never calls IPC recursively. */
+export async function getLocalCatalog(self, ba, refresh = false) {
+    return service.get(resolveCatalogContext(self, ba), refresh);
 }
-/**
- * 网关专用 parser 注册表（扩展点）。
- * 当前为空：ModelGate 是标准 OpenAI list 风格，genericParse 已覆盖。
- * 示例（接入异形网关时取消注释并按实际格式实现）：
- *   {
- *     name: 'some-gateway',
- *     match: (url) => url.includes('some-gateway.example.com'),
- *     parse: (json) => (json?.result?.modelList ?? []).map((m: any) => ({ id: m.code, owned_by: m.vendor })),
- *   }
- */
-const GATEWAY_PARSERS = [];
-/** 选择 parser 并解析（专用优先，否则通用容错）。 */
-export function parseModelList(json, url) {
-    for (const rule of GATEWAY_PARSERS) {
-        try {
-            if (rule.match(url, json))
-                return rule.parse(json);
-        }
-        catch { /* 专用 parser 失败则继续尝试通用解析 */ }
+export async function getCatalog(self, ba, refresh = false) {
+    if (!daemonOwner) {
+        const snapshot = await queryDaemonCatalog(self, ba, refresh);
+        if (snapshot)
+            return snapshot;
     }
-    return genericParse(json);
+    return getLocalCatalog(self, ba, refresh);
 }
-const MODEL_LIST_TIMEOUT_MS = 2000;
-const MODEL_CATALOG_TTL_MS = 30_000;
-const CODEX_CLI_CATALOG_TIMEOUT_MS = 2000;
-async function fetchModelList(url, apiKey, requestHeaders) {
-    let timer;
-    try {
-        const controller = new AbortController();
-        timer = setTimeout(() => controller.abort(), MODEL_LIST_TIMEOUT_MS);
-        const resp = await fetch(url, {
-            signal: controller.signal,
-            headers: {
-                ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
-                ...requestHeaders,
-            },
-        });
-        if (!resp.ok)
-            return null;
-        const json = await resp.json();
-        const entries = parseModelList(json, url);
-        return entries.length > 0 ? entries : null;
-    }
-    catch {
-        return null;
-    }
-    finally {
-        if (timer)
-            clearTimeout(timer);
-    }
+/** Connection-bound runner wrapper; effective Agent scope wins when available. */
+export function getRunnerCatalog(baseagent, self, connection) {
+    if (self)
+        return getCatalog(self, baseagent);
+    return service.get({ ...connection, scope: '<defaults>', baseagent });
 }
-/** 内置 mock catalog（接口未就绪时的兜底；实测可用模型，见 docs 附录 A）。 */
-const MOCK_CATALOG = [
-    { id: 'claude-opus-4-7', owned_by: 'anthropic' },
-    { id: 'claude-opus-4-6', owned_by: 'anthropic' },
-    { id: 'claude-sonnet-4-6', owned_by: 'anthropic' },
-    { id: 'claude-haiku-4-5-20251001', owned_by: 'anthropic' },
-    { id: 'deepseek-v4-pro', owned_by: 'deepseek' },
-    { id: 'deepseek-v4-flash', owned_by: 'deepseek' },
-    { id: 'kimi-k2.6', owned_by: 'moonshot' },
-    { id: 'kimi-k2.5', owned_by: 'moonshot' },
-    { id: 'glm-5.1', owned_by: 'zhipu' },
-    { id: 'glm-5', owned_by: 'zhipu' },
-    { id: 'glm-4.7', owned_by: 'zhipu' },
-    { id: 'MiniMax-M2.7', owned_by: 'minimax' },
-];
-const CODEX_BUILTIN_CATALOG = [
-    { id: 'gpt-5.5', owned_by: 'openai' },
-    { id: 'gpt-5.4', owned_by: 'openai' },
-    { id: 'gpt-5.4-mini', owned_by: 'openai' },
-    { id: 'gpt-5.3-codex', owned_by: 'openai' },
-    { id: 'gpt-5.2', owned_by: 'openai' },
-];
-const GEMINI_BUILTIN_CATALOG = [
-    { id: 'gemini-2.5-pro', owned_by: 'google' },
-    { id: 'gemini-2.5-flash', owned_by: 'google' },
-    { id: 'gemini-2.5-flash-lite', owned_by: 'google' },
-];
-const catalogCache = new Map();
-const catalogInFlight = new Map();
-export function clearModelCatalogCache() {
-    catalogCache.clear();
-    catalogInFlight.clear();
+export function peekRunnerCatalog(baseagent, self, connection) {
+    return service.peek(self ? resolveCatalogContext(self, baseagent) : { ...connection, scope: '<defaults>', baseagent });
 }
-/** A failed gateway may only fall back within the selected baseagent. */
-export function builtinCatalog(baseagent) {
-    if (baseagent === 'codex')
-        return CODEX_BUILTIN_CATALOG.map(model => ({ ...model }));
-    if (baseagent === 'gemini')
-        return GEMINI_BUILTIN_CATALOG.map(model => ({ ...model }));
-    if (baseagent === 'ecagent')
-        return [{ id: 'claude-sonnet-4-6', owned_by: 'anthropic' }];
-    return MOCK_CATALOG.map(model => ({ ...model }));
-}
-function codexCliCatalog() {
-    try {
-        const output = execCodexCliSync(['debug', 'models'], {
-            encoding: 'utf-8',
-            timeout: CODEX_CLI_CATALOG_TIMEOUT_MS,
-            stdio: ['pipe', 'pipe', 'pipe'],
-        });
-        const payload = JSON.parse(String(output));
-        const models = Array.isArray(payload?.models)
-            ? payload.models
-                .filter((model) => model?.visibility === 'list' && typeof model?.slug === 'string')
-                .map((model) => ({ id: model.slug, owned_by: 'openai' }))
-            : [];
-        return models.length > 0 ? models : null;
-    }
-    catch {
-        return null;
-    }
+export async function getModelEfforts(model, self, ba) {
+    const baseagent = ba || activeBaseagent(self);
+    return catalogEfforts(await getCatalog(self, baseagent), model, baseagent);
 }
+export function clearModelCatalogCache() { service.clear(); }
 export function modelMatches(agent, candidate, current) {
     if (!current)
         return false;
-    if (candidate === current)
-        return true;
-    const resolve = typeof agent?.resolveModelId === 'function'
-        ? (value) => agent.resolveModelId(value) ?? value
-        : (value) => value;
-    const resolvedCandidate = resolve(candidate);
-    const resolvedCurrent = resolve(current);
-    return candidate === resolvedCurrent || resolvedCandidate === current || resolvedCandidate === resolvedCurrent;
-}
-/**
- * 远端模型目录接口（临时）。本地 baseUrl 的 /v1/models、/models 尚未实现，
- * 自动降级到此接口拉取真实可用模型列表；待本地接口就绪后此级自然不再命中。
- */
-const REMOTE_CATALOG_URL = 'https://mg-new.evolai.cn/claude-proxy/models';
-/**
- * 各 baseagent 的稳定别名（cc/SDK 自动解析到最新版本）。
- * 这些是一等公民——defaults.json 默认就存别名（如 "opus"），必须可选可校验。
- */
-const KNOWN_ALIASES = {
-    claude: ['opus', 'sonnet', 'haiku'],
-    codex: [],
-    gemini: [],
-};
-/** 把别名作为虚拟条目并入目录头部（owned_by 标 alias，便于展示与校验）。 */
-function withAliases(models, ba) {
-    const aliases = KNOWN_ALIASES[ba] || [];
-    const existing = new Set(models.map(m => m.id));
-    const aliasEntries = aliases
-        .filter(a => !existing.has(a))
-        .map(a => ({ id: a, owned_by: 'alias' }));
-    return [...aliasEntries, ...models];
+    const resolve = (value) => agent?.resolveModelId?.(value) ?? value;
+    return resolve(candidate) === resolve(current);
 }
-/** 拉取模型目录，并按 self + baseagent 缓存短时间结果。 */
-export async function getCatalog(self, ba) {
-    const baseagent = ba || activeBaseagent(self);
-    const cacheKey = `${self ?? '<defaults>'}:${baseagent}`;
-    const cached = catalogCache.get(cacheKey);
-    if (cached && cached.expiresAt > Date.now())
-        return cached.value;
-    const pending = catalogInFlight.get(cacheKey);
-    if (pending)
-        return pending;
-    const promise = loadCatalog(self, baseagent)
-        .then(value => {
-        catalogCache.set(cacheKey, { value, expiresAt: Date.now() + MODEL_CATALOG_TTL_MS });
-        return value;
-    })
-        .finally(() => catalogInFlight.delete(cacheKey));
-    catalogInFlight.set(cacheKey, promise);
-    return promise;
-}
-async function loadCatalog(self, baseagent) {
-    // Pre-create has no runner yet. Mirror CodexRunner's dynamic CLI fallback
-    // without changing existing self-scoped catalog resolution.
-    if (!self && baseagent === 'codex') {
-        const cliModels = codexCliCatalog();
-        if (cliModels)
-            return { models: cliModels, source: 'codex-cli' };
-    }
-    const { baseUrl, apiKey, headers, queryParams } = resolveCreds(self, baseagent);
-    if (baseUrl) {
-        try {
-            const urls = [...new Set([
-                    appendV1RequestPath(baseUrl, 'models', queryParams),
-                    appendRequestPath(baseUrl, 'models', queryParams),
-                ])];
-            // Probe compatible routes concurrently so a dead route does not add
-            // another full timeout before the other route is attempted.
-            const results = await Promise.all(urls.map(url => fetchModelList(url, apiKey, headers)));
-            const hitIndex = results.findIndex((models) => !!models);
-            if (hitIndex >= 0) {
-                return {
-                    models: withAliases(results[hitIndex], baseagent),
-                    source: hitIndex === 0 ? 'v1/models' : 'models',
-                };
-            }
-        }
-        catch {
-            // Invalid configured URLs behave like other unavailable gateways.
-        }
-    }
-    // This remote directory is Claude-only. Never use it for Codex or Gemini.
-    if (baseagent === 'claude') {
-        const remote = await fetchModelList(REMOTE_CATALOG_URL, undefined, buildModelRequestHeaders({
-            baseagent: 'claude',
-            baseUrl: REMOTE_CATALOG_URL,
-        }));
-        if (remote)
-            return { models: withAliases(remote, baseagent), source: 'remote' };
-    }
-    return { models: withAliases(builtinCatalog(baseagent), baseagent), source: 'builtin' };
-}
-/** claude 系判定：完整 ID 或别名（opus/sonnet/haiku）。 */
-function isClaudeFamily(id) {
-    return /^claude-/.test(id) || ['opus', 'sonnet', 'haiku'].includes(id);
-}
-/** 单模型详情（现阶段 mock）。 */
 export async function getModelInfo(modelId, self, ba) {
-    const cat = await getCatalog(self, ba);
-    const entry = cat.models.find(m => m.id === modelId);
-    const claudeFamily = isClaudeFamily(modelId);
-    // 远端目录把所有模型的 owned_by 标成网关名 'ModelGate'，别名标成 'alias'，
-    // 两者都不是真实厂商 → 回退到按 ID 推断。
-    const NON_VENDOR = new Set(['alias', 'ModelGate', '']);
-    const rawOwner = entry?.owned_by;
-    const owner = claudeFamily
-        ? 'anthropic'
-        : (rawOwner && !NON_VENDOR.has(rawOwner) ? rawOwner : inferOwner(modelId));
-    return {
-        id: modelId,
-        owned_by: owner,
-        context_window: claudeFamily ? 200000 : 128000,
-        max_output_tokens: 8192,
-        pricing: { input_per_mtok: null, output_per_mtok: null, currency: 'USD' },
-        modalities: ['text'],
-        supports_effort: claudeFamily,
-        status: entry ? 'available' : 'unknown',
-        mocked: true,
-    };
-}
-function inferOwner(id) {
-    if (/^claude-/.test(id))
-        return 'anthropic';
-    if (/^gpt-/.test(id))
-        return 'openai';
-    if (/^gemini-/.test(id))
-        return 'google';
-    if (/^deepseek-/.test(id))
-        return 'deepseek';
-    if (/^kimi-/.test(id))
-        return 'moonshot';
-    if (/^glm-/.test(id))
-        return 'zhipu';
-    if (/^MiniMax-/i.test(id))
-        return 'minimax';
-    return 'unknown';
+    const baseagent = ba || activeBaseagent(self);
+    const catalog = await getCatalog(self, baseagent);
+    const entry = catalog.models.find(m => m.id === resolveCatalogModel(catalog, modelId));
+    return { id: modelId, owned_by: entry?.owned_by || 'unknown',
+        context_window: entry?.contextWindow ?? null, max_output_tokens: entry?.maxOutputTokens ?? null,
+        pricing: null, modalities: [], supports_effort: catalogEfforts(catalog, modelId, baseagent).length > 0,
+        status: entry ? entry.verification : 'not-listed', mocked: false };
 }

package/dist/core/model/model-diagnostics.js

@@ -152,8 +152,8 @@ export async function runModelCheck(input) {
     }
     const catalog = await getCatalog(input.self, input.baseagent);
     const modelIds = catalog.models.filter(model => model.owned_by !== 'alias').map(model => model.id);
-    log(catalog.source === 'mock'
-        ? { label: '模型列表', ok: false, detail: `无法获取远端列表，使用内置 mock（${modelIds.length} 个）` }
+    log(catalog.freshness !== 'fresh'
+        ? { label: '模型列表', ok: false, detail: `目录已降级，来源 ${catalog.source}（${modelIds.length} 个）` }
         : { label: '模型列表', ok: true, detail: `来源: ${catalog.source}，共 ${modelIds.length} 个模型` });
     const selector = { self: input.self, peerKey: input.peerKey };
     const modelResolution = resolveEffectiveFieldWithSource(`baseagents.${input.baseagent}.model`, selector, { cache: true });
@@ -176,9 +176,8 @@ export async function runModelCheck(input) {
         for (const entry of catalog.models) {
             if (entry.owned_by !== 'alias')
                 continue;
-            const matched = catalog.models.find(model => model.owned_by !== 'alias' && model.id.includes(entry.id));
-            if (matched)
-                aliases.set(entry.id, matched.id);
+            if (entry.aliasFor)
+                aliases.set(entry.id, entry.aliasFor);
         }
         const resolvedConfiguredModel = configuredModel ? aliases.get(configuredModel) ?? configuredModel : undefined;
         const targets = [

package/dist/core/model/model-fallback.js

@@ -1,4 +1,4 @@
-import { getCodexEfforts } from '../../agents/codex-runner.js';
+import { catalogEfforts, getCatalog, resolveCatalogModel } from './model-catalog.js';
 import { ConfigTarget, read } from '../../config/config-manager.js';
 export const MAX_FALLBACK_MODELS = 3;
 function isRecord(value) {
@@ -40,27 +40,20 @@ export function configuredFallbackModels(baseagent) {
     }
     return { candidates, rejected };
 }
-function supportsEffort(baseagent, model, effort) {
-    if (!effort)
-        return true;
-    if (baseagent === 'codex')
-        return getCodexEfforts(model).includes(effort);
-    if (baseagent === 'claude')
-        return ['low', 'medium', 'high', 'xhigh', 'max'].includes(effort);
-    if (baseagent === 'ecagent')
-        return ['minimal', 'low', 'medium', 'high', 'xhigh', 'max'].includes(effort);
-    return false;
-}
-export function eligibleFallbackModels(input) {
+export async function eligibleFallbackModels(input) {
     const configured = configuredFallbackModels(input.baseagent);
     const candidates = [];
     const rejected = [...configured.rejected];
-    const key = (model) => (input.resolveModelId?.(model) ?? model).trim().toLowerCase();
+    if (!configured.candidates.length)
+        return { candidates, rejected };
+    const catalog = await (input.catalog?.() ?? getCatalog(input.selfAid, input.baseagent));
+    const resolve = (model) => resolveCatalogModel(catalog, model);
+    const key = (model) => resolve(model).trim();
     const seen = new Set();
     if (input.currentModel)
         seen.add(key(input.currentModel));
     for (const candidate of configured.candidates) {
-        const resolvedModel = input.resolveModelId?.(candidate.model) ?? candidate.model;
+        const resolvedModel = resolve(candidate.model);
         const candidateKey = key(candidate.model);
         if (seen.has(candidateKey)) {
             rejected.push({ model: candidate.model, reason: candidateKey === key(input.currentModel ?? '') ? 'current_model' : 'duplicate' });
@@ -70,7 +63,7 @@ export function eligibleFallbackModels(input) {
             rejected.push({ model: candidate.model, reason: 'not_allowed' });
             continue;
         }
-        if (!supportsEffort(input.baseagent, resolvedModel, candidate.effort)) {
+        if (candidate.effort && !catalogEfforts(catalog, resolvedModel, input.baseagent).includes(candidate.effort)) {
             rejected.push({ model: candidate.model, reason: 'unsupported_effort' });
             continue;
         }

package/dist/core/model/model-permission.js

@@ -49,7 +49,7 @@ export function validateModelSelectionForRole(opts) {
         : opts.models?.includes(opts.requestedModel)
             ? opts.requestedModel
             : undefined;
-    if (opts.models && opts.models.length > 0 && !catalogModel) {
+    if (opts.models && !catalogModel) {
         return {
             ok: false,
             code: 'INVALID_VALUE',