evolcore 0.0.9 → 0.0.11

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

@@ -1,8 +1,9 @@
 /**
  * model-catalog: 模型目录与单模型元数据。
  *
- * 目录来源（按序回退）：
- *   {baseUrl}/v1/models  →  {baseUrl}/models  →  内置 mock catalog
+ * 目录来源按 baseagent 隔离：Codex 预创建优先使用 CLI 动态目录；
+ * 其他场景探测本 baseagent 的 {baseUrl}/v1/models 与 {baseUrl}/models，
+ * 最后只回退到同 baseagent 的内置目录。
  *
  * baseUrl/apiKey 复用 baseagent 凭据解析链（与发消息同源），命令不接收 url/key 参数。
  * 单模型详情（info）现阶段全部为 mock，{baseUrl}/models 接口补全字段后自动接真实数据。
@@ -10,28 +11,52 @@
  * 详见 docs/model-command-design.md。
  */
 import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../../agents/baseagent.js';
+import { buildModelRequestHeaders } 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);
-    // baseagents 现在在 config.json 中
-    const config = self ? resolveEffective({ self }, { cache: true }) : { baseagents: {} };
+    // 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 || {});
     try {
         if (baseagent === 'codex') {
             const c = block.codex;
             const r = resolveOpenaiConfig({ agents: { codex: c } }, c);
-            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+            return {
+                baseUrl: r.baseUrl,
+                apiKey: r.apiKey,
+                agentAid: self,
+                headers: buildModelRequestHeaders({ baseagent: 'codex', baseUrl: r.baseUrl, agentAid: self, configuredHeaders: r.headers }),
+            };
         }
         if (baseagent === 'ecagent') {
             const c = block.ecagent;
             const r = resolveEcagentConfig({ agents: { ecagent: c } }, c);
-            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+            return {
+                baseUrl: r.baseUrl,
+                apiKey: r.apiKey,
+                agentAid: self,
+                headers: buildModelRequestHeaders({ baseagent: 'ecagent', baseUrl: r.baseUrl, agentAid: self, configuredHeaders: r.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 };
+        return {
+            baseUrl: r.baseUrl,
+            apiKey: r.apiKey,
+            agentAid: self,
+            headers: buildModelRequestHeaders({ baseagent: 'claude', baseUrl: r.baseUrl, agentAid: self, configuredHeaders: r.headers }),
+        };
     }
     catch {
         return {};
@@ -97,15 +122,21 @@ export function parseModelList(json, url) {
     }
     return genericParse(json);
 }
-async function fetchModelList(url, apiKey) {
+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();
-        const timer = setTimeout(() => controller.abort(), 5000);
+        timer = setTimeout(() => controller.abort(), MODEL_LIST_TIMEOUT_MS);
         const resp = await fetch(url, {
             signal: controller.signal,
-            headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
+            headers: {
+                ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
+                ...requestHeaders,
+            },
         });
-        clearTimeout(timer);
         if (!resp.ok)
             return null;
         const json = await resp.json();
@@ -115,6 +146,10 @@ async function fetchModelList(url, apiKey) {
     catch {
         return null;
     }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
 }
 /** 内置 mock catalog（接口未就绪时的兜底；实测可用模型，见 docs 附录 A）。 */
 const MOCK_CATALOG = [
@@ -131,6 +166,53 @@ const MOCK_CATALOG = [
     { 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();
+}
+/** 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 function modelMatches(agent, candidate, current) {
     if (!current)
         return false;
@@ -166,24 +248,61 @@ function withAliases(models, ba) {
         .map(a => ({ id: a, owned_by: 'alias' }));
     return [...aliasEntries, ...models];
 }
-/** 拉取模型目录：v1/models → models → 远端接口 → mock，并并入别名。 */
+/** 拉取模型目录，并按 self + baseagent 缓存短时间结果。 */
 export async function getCatalog(self, ba) {
     const baseagent = ba || activeBaseagent(self);
-    const { baseUrl, apiKey } = resolveCreds(self, baseagent);
+    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 } = resolveCreds(self, baseagent);
     if (baseUrl) {
         const base = baseUrl.replace(/\/+$/, '');
-        const v1 = await fetchModelList(base.endsWith('/v1') ? `${base}/models` : `${base}/v1/models`, apiKey);
-        if (v1)
-            return { models: withAliases(v1, baseagent), source: 'v1/models' };
-        const plain = await fetchModelList(`${base}/models`, apiKey);
-        if (plain)
-            return { models: withAliases(plain, baseagent), source: 'models' };
+        const urls = [...new Set([
+                base.endsWith('/v1') ? `${base}/models` : `${base}/v1/models`,
+                `${base}/models`,
+            ])];
+        // 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',
+            };
+        }
+    }
+    // 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' };
     }
-    // 本地接口未实现 → 降级到远端目录接口（无需鉴权）
-    const remote = await fetchModelList(REMOTE_CATALOG_URL, apiKey);
-    if (remote)
-        return { models: withAliases(remote, baseagent), source: 'remote' };
-    return { models: withAliases(MOCK_CATALOG, baseagent), source: 'mock' };
+    return { models: withAliases(builtinCatalog(baseagent), baseagent), source: 'builtin' };
 }
 /** claude 系判定：完整 ID 或别名（opus/sonnet/haiku）。 */
 function isClaudeFamily(id) {

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

@@ -1,4 +1,5 @@
-import { resolveAnthropicConfig, resolveOpenaiConfig } from '../../agents/baseagent.js';
+import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../../agents/baseagent.js';
+import { buildModelRequestHeaders } from '../../agents/request-identity.js';
 import { resolveEffective, resolveEffectiveFieldWithSource } from '../../config/config-manager.js';
 import { constrainResolvedModelForRole } from './model-permission.js';
 import { getCatalog } from './model-catalog.js';
@@ -17,17 +18,34 @@ async function fetchWithTimeout(url, opts, timeoutMs) {
 }
 function resolveGatewayCreds(self, baseagent) {
     try {
-        const config = self ? resolveEffective({ self }, { cache: true }) : { baseagents: {} };
+        const config = self ? resolveEffective({ self }, { cache: true, expand: true }) : { baseagents: {} };
         const block = config.baseagents || {};
         if (baseagent === 'codex') {
             const codexCfg = block.codex || {};
             const resolved = resolveOpenaiConfig({ agents: { codex: codexCfg } }, codexCfg);
-            return { baseUrl: resolved.baseUrl, apiKey: resolved.apiKey };
+            return {
+                baseUrl: resolved.baseUrl,
+                apiKey: resolved.apiKey,
+                headers: buildModelRequestHeaders({ baseagent: 'codex', baseUrl: resolved.baseUrl, agentAid: self, configuredHeaders: resolved.headers }),
+            };
         }
         if (baseagent === 'claude') {
             const claudeCfg = block.claude || {};
             const resolved = resolveAnthropicConfig({ agents: { claude: claudeCfg } }, claudeCfg);
-            return { baseUrl: resolved.baseUrl, apiKey: resolved.apiKey };
+            return {
+                baseUrl: resolved.baseUrl,
+                apiKey: resolved.apiKey,
+                headers: buildModelRequestHeaders({ baseagent: 'claude', baseUrl: resolved.baseUrl, agentAid: self, configuredHeaders: resolved.headers }),
+            };
+        }
+        if (baseagent === 'ecagent') {
+            const ecagentCfg = block.ecagent || {};
+            const resolved = resolveEcagentConfig({ agents: { ecagent: ecagentCfg } }, ecagentCfg);
+            return {
+                baseUrl: resolved.baseUrl,
+                apiKey: resolved.apiKey,
+                headers: buildModelRequestHeaders({ baseagent: 'ecagent', baseUrl: resolved.baseUrl, agentAid: self, configuredHeaders: resolved.headers }),
+            };
         }
     }
     catch {
@@ -46,7 +64,7 @@ async function responseError(resp) {
     }
     return String(message).slice(0, 80);
 }
-export async function probeModel(baseUrl, apiKey, modelId, timeoutMs) {
+export async function probeModel(baseUrl, apiKey, modelId, timeoutMs, requestHeaders) {
     const base = baseUrl.replace(/\/+$/, '');
     const authHeaders = apiKey
         ? { 'x-api-key': apiKey, Authorization: `Bearer ${apiKey}` }
@@ -56,7 +74,7 @@ export async function probeModel(baseUrl, apiKey, modelId, timeoutMs) {
     const anthropicStartedAt = Date.now();
     const anthropic = await fetchWithTimeout(`${base}/v1/messages`, {
         method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'anthropic-version': '2023-06-01', ...authHeaders },
+        headers: { 'Content-Type': 'application/json', 'anthropic-version': '2023-06-01', ...authHeaders, ...requestHeaders },
         body: JSON.stringify({ model: modelId, max_tokens: 5, messages: [{ role: 'user', content: 'ok' }] }),
     }, Math.min(5000, remainingMs()));
     const anthropicMs = Date.now() - anthropicStartedAt;
@@ -74,7 +92,7 @@ export async function probeModel(baseUrl, apiKey, modelId, timeoutMs) {
     const openaiStartedAt = Date.now();
     const openai = await fetchWithTimeout(`${base}/v1/chat/completions`, {
         method: 'POST',
-        headers: { 'Content-Type': 'application/json', ...authHeaders },
+        headers: { 'Content-Type': 'application/json', ...authHeaders, ...requestHeaders },
         body: JSON.stringify({ model: modelId, max_tokens: 5, messages: [{ role: 'user', content: 'ok' }] }),
     }, Math.min(5000, remainingMs()));
     const openaiMs = Date.now() - openaiStartedAt;
@@ -99,7 +117,7 @@ export async function runModelCheck(input) {
         steps.push(step);
         input.onStep?.(step);
     };
-    const { baseUrl, apiKey } = resolveGatewayCreds(input.self, input.baseagent);
+    const { baseUrl, apiKey, headers } = resolveGatewayCreds(input.self, input.baseagent);
     if (!baseUrl) {
         log({ label: '网关地址', ok: false, detail: '未配置受支持的自定义网关，跳过 API 探测' });
     }
@@ -107,7 +125,7 @@ export async function runModelCheck(input) {
         const startedAt = Date.now();
         const ping = await fetchWithTimeout(`${baseUrl.replace(/\/+$/, '')}/v1/models`, {
             method: 'GET',
-            headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
+            headers: { ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}), ...headers },
         }, 4000);
         const elapsed = Date.now() - startedAt;
         log(ping
@@ -151,7 +169,7 @@ export async function runModelCheck(input) {
         ];
         for (let index = 0; index < targets.length; index += 2) {
             const batch = await Promise.all(targets.slice(index, index + 2).map(async (target) => {
-                const result = await probeModel(baseUrl, apiKey, target.probe, 10_000);
+                const result = await probeModel(baseUrl, apiKey, target.probe, 10_000, headers);
                 return { id: target.display, ...result };
             }));
             for (const result of batch) {

package/dist/core/permission/index.js

@@ -1,5 +1,6 @@
 export * from './tool-policy.js';
 export * from './ec-command-parser.js';
+export * from './readonly-shell-query.js';
 export * from './approval-gateway.js';
 export * from './execution-sandbox.js';
 // Tool summaries live in utils; keep the historical permission import path compatible.