evolcore 0.0.10 → 0.0.12

package/dist/core/message/response-engine.js

@@ -11,7 +11,7 @@ import { StreamIdleMonitor } from './stream-idle-monitor.js';
 import { logger } from '../../utils/logger.js';
 import { isHostChinese } from '../../utils/locale.js';
 import { getErrorMessage, classifyError, ErrorType, ERROR_PREFIX, isInfraError, isAbortTerminalReason, prefixErrorType, isRetryableError, isContextTooLongText } from '../../utils/error-utils.js';
-import { isEvolcoreSendCommandForSession } from '../permission/ec-command-parser.js';
+import { isExactEvolcoreSendCommandForSession } from '../permission/ec-command-parser.js';
 import { summarizeToolInput } from '../../utils/tool-summary.js';
 import { getPackageRoot, resolveRoot, resolvePaths } from '../../paths.js';
 import { renderKitSections } from '../../eck/kit-renderer.js';
@@ -33,7 +33,6 @@ import { eligibleFallbackModels } from '../model/model-fallback.js';
 import { RetryScheduler } from './retry-scheduler.js';
 import { constrainRuntimePermissionMode, resolveRuntimeStringField } from '../role/runtime-policy.js';
 import { resolveEffective, resolveEffectiveFieldWithSource } from '../../config/config-manager.js';
-import { dispatchToMentionMode } from '../../config/mention-mode.js';
 import { authorizationConfigRevision, checkRoleAccess, getFirstStaticAgentOwner, listStaticAgentAdmins, listStaticAgentOwners, resolvePeerRoleDetail, roleToSessionIdentity, } from '../../config/peer-role-resolver.js';
 import { insertUsageEvent, insertContextBreakdown, insertModelCalls } from '../../stats/writer.js';
 import { normalizeUsage } from '../../stats/normalizer.js';
@@ -727,7 +726,19 @@ export class ResponseEngine {
         const selfAid = runtime?.selfAid || session?.selfAID;
         if (!selfAid)
             return { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'self agent not found' };
-        return this.handoffRuntime.returnHandoff({
+        return this.returnAuthorizedHandoffResult({
+            sessionId: params.sessionId,
+            handoffId: params.handoffId,
+            content: params.content,
+        }, selfAid);
+    }
+    /** Execute a handoff return after the daemon IPC boundary has authorized the task delegation. */
+    async returnAuthorizedHandoffResult(params, selfAid) {
+        if (!this.handoffRuntime) {
+            return { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff runtime not configured' };
+        }
+        const runtime = this.activeTaskRuntimeContexts.get(params.sessionId);
+        return await this.handoffRuntime.returnHandoff({
             selfAid,
             currentSessionId: params.sessionId,
             handoffId: params.handoffId,
@@ -1152,6 +1163,14 @@ export class ResponseEngine {
     async processMessage(message) {
         const idleMs = (this.globalSettings.idleMonitor?.timeout ?? 120) * 1000;
         const totalExecutionMs = this.totalExecutionLimitMs();
+        if (message.handoffDelivery
+            && this.handoffRuntime
+            && this.handoffRuntime.isDiscardedDelivery(message)) {
+            logger.info(`[ResponseEngine] Skip stale handoff delivery before session resolution:`
+                + ` direction=${message.handoffDelivery.direction}`
+                + ` handoff=${message.handoffDelivery.handoffId}`);
+            return;
+        }
         // 先解析会话，再优先用 session.metadata.channelKey 精确定位实例级 adapter
         // message.channel 现在存实例名（channelName），可直接用于精确路由
         const { session, absoluteProjectPath } = await this.resolveSession(message);
@@ -1720,11 +1739,11 @@ export class ResponseEngine {
                 messageId: message.messageId, peerId: message.peerId, content: message.content,
                 peerType: message.peerType || session.metadata?.peerType,
                 chatType: chatType, isMentioned: message.isMentioned,
-                mentionAids: message.mentionAids, source: message.source,
+                mentions: message.mentions, mentionAids: message.mentionAids, source: message.source,
             },
             modeConfig: resolvedMode.context.modeConfig,
             state: modeState,
-            isSendCommand: (toolName, toolInput) => isEvolcoreSendCommandForSession(toolName, toolInput, session.channelId),
+            isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, chatType, session.selfAID || message.selfAID),
             logger,
         } : null;
         if (resolvedMode?.mode.beforeProcess && modeProcessCtx) {
@@ -2118,11 +2137,21 @@ export class ResponseEngine {
                     },
                 };
             })();
+            let effectivePermissionMode = 'readonly';
             const recordExecutionAnomaly = triggerRunId
                 ? (anomaly) => {
-                    recordTriggerExecutionAnomaly(triggerRunId, anomaly);
+                    recordTriggerExecutionAnomaly(triggerRunId, {
+                        ...anomaly,
+                        agentAid: anomaly.agentAid ?? session.selfAID ?? message.selfAID,
+                        sessionId: anomaly.sessionId ?? session.id,
+                        permissionMode: anomaly.permissionMode ?? effectivePermissionMode,
+                    });
                 }
                 : undefined;
+            const runModeConfig = resolvedMode?.mode.configureRun && modeProcessCtx
+                ? resolvedMode.mode.configureRun(modeProcessCtx)
+                : undefined;
+            const pureSessionPolicyHook = runModeConfig?.policyHook;
             // 设置权限审批的交互上下文（支持交互卡片）
             agent.setPermissionContext?.(session.id, {
                 sendPrompt: permissionPromptForOrigin,
@@ -2144,6 +2173,7 @@ export class ResponseEngine {
                 approvalRouting,
                 approvalInteractionPolicy: authorizationIdentity ? 'deny' : 'interactive',
                 recordExecutionAnomaly,
+                preToolUsePolicyHook: pureSessionPolicyHook,
                 armApprovedDelegationCommand: this.agentDelegationRegistry
                     ? (carrierToken, commandHash) => this.agentDelegationRegistry.armApprovedCommand({
                         carrierToken,
@@ -2233,10 +2263,7 @@ export class ResponseEngine {
                 // [迁移点2] policyHook 由 ProactiveMode.configureRun 提供（插件决策）；
                 // 引擎补充副作用：违规时注入提醒到模型上下文 + 行为探针。
                 policyHook: (() => {
-                    const runConfig = resolvedMode?.mode.configureRun && modeProcessCtx
-                        ? resolvedMode.mode.configureRun(modeProcessCtx)
-                        : undefined;
-                    const pluginHook = runConfig?.policyHook;
+                    const pluginHook = pureSessionPolicyHook;
                     if (!pluginHook)
                         return undefined;
                     return (toolName, toolInput) => {
@@ -2250,9 +2277,9 @@ export class ResponseEngine {
                             agent.injectUserMessage?.(session.id, errorMsg);
                             return result;
                         }
-                        // 首工具检查通过（firstToolDone 从 false 翻成 true 且未拦截）
-                        const stAfter = modeState.get('proactive');
-                        if (wasFirstPending && stAfter?.firstToolDone) {
+                        // 这里只记录审批结果。firstToolDone 必须等真实 tool_use 事件再推进，
+                        // 避免伪造 managed hook IPC 提前解除门禁。
+                        if (wasFirstPending) {
                             snapshot.set(session.id, taskId, { policyHook: { triggered: true, blocked: false, toolName } });
                         }
                         return undefined;
@@ -2290,8 +2317,6 @@ export class ResponseEngine {
             let handoffPromptRendered = false;
             let runtimeEnv;
             try {
-                // 动态构建运行时上下文提示
-                const contextParts = [];
                 // 通道能力
                 const supportsFileMarker = currentChannelType !== 'aun' && !isProactive && !!channelInfo.adapter.capabilities?.file;
                 const capParts = [];
@@ -2301,14 +2326,11 @@ export class ResponseEngine {
                     capParts.push('图片输出');
                 if (!isProactive && channelInfo.adapter.capabilities?.file)
                     capParts.push('文件发送');
-                // Personal layer
+                // Personal state is exposed to the manifest as vars. The manifest owns
+                // loading persona.md and working.md into the system prompt.
                 const owningAgent = owningAgentForTask;
                 const persona = owningAgent?.getPersona?.() || undefined;
                 const working = owningAgent?.getWorkingMemory?.() || undefined;
-                if (persona)
-                    contextParts.push(persona);
-                if (working)
-                    contextParts.push(`[当前关注]\n${working}`);
                 // 计算 peerKey：群聊固定按 groupId/channelId，私聊按发送者 peerId。
                 // 这样单条和积压合并批次不会因队列状态不同而切换关系级配置。
                 const normalizedBaseagent = normalizeBaseagent(agent.name);
@@ -2316,7 +2338,6 @@ export class ResponseEngine {
                 // Trigger 只能降低本次调用权限，不能突破当前角色的权限上限。
                 // 作为 per-call 入参随 modelOverride 传入 runQuery —— 与 model/effort 同构，
                 // 不写 AgentRunner 实例字段，多对端/多会话并发共享同一 runner 实例时互不污染。
-                let effectivePermissionMode;
                 const triggerPermissionModeOverride = message.triggerMeta?.permissionModeOverride;
                 try {
                     effectivePermissionMode = constrainRuntimePermissionMode({
@@ -2532,9 +2553,10 @@ export class ResponseEngine {
                         channel: currentChannelType || null,
                         venueUid: undefined,
                         // 群 @ 处理模式 / 客户端类型 / 权限模式
-                        // 优先 agent/relation mentionMode 配置，fallback 到服务器 dispatch_mode 缓存（协议词汇需翻译）。
+                        // 优先 agent/relation mentionMode 配置，fallback 到服务器 mention_mode 缓存。
                         mentionMode: effectiveAgentConfig?.mentionMode
-                            ?? dispatchToMentionMode(session.metadata?.dispatchMode ?? message.dispatchMode)
+                            ?? session.metadata?.mentionMode
+                            ?? message.mentionMode
                             ?? undefined,
                         clientType: message.clientType || undefined,
                         permissionMode: effectivePermissionMode,
@@ -2583,17 +2605,13 @@ export class ResponseEngine {
                 const sessionManifests = this.agentRegistry?.resolveByChannel(channelKey)?.config?.sessionManifests;
                 const manifestFile = sessionManifests?.[sessionType] ?? 'eck_manifest.json';
                 const kitContext = renderKitSections(kitCtx, manifestFile);
-                if (kitContext)
-                    contextParts.push(kitContext);
-                effectiveSystemPrompt = [options?.systemPromptAppend, ...contextParts].filter(Boolean).join('\n') || undefined;
+                effectiveSystemPrompt = [options?.systemPromptAppend, kitContext].filter(Boolean).join('\n') || undefined;
                 // ── Stats: context_breakdown 旁路采集（各段估算 token 数，字符数/4 近似） ──
                 try {
                     const estTokens = (s) => s ? Math.ceil(s.length / 4) : 0;
                     const cbModel = effectiveModel || agentModel || 'unknown';
                     const cbMaxTokens = 200000; // 保守默认，后续可从 model-catalog 取
                     const systemPromptTokens = estTokens(options?.systemPromptAppend);
-                    const personaTokens = estTokens(persona);
-                    const workingTokens = estTokens(working);
                     const kitTokens = estTokens(kitContext);
                     const totalEst = estTokens(effectiveSystemPrompt);
                     insertContextBreakdown(resolveRoot(), {
@@ -2603,7 +2621,7 @@ export class ResponseEngine {
                         turn_count: 0, // 按 ts 排序得轮次
                         model: cbModel,
                         max_tokens: cbMaxTokens,
-                        system_prompt: systemPromptTokens + personaTokens + workingTokens,
+                        system_prompt: systemPromptTokens,
                         system_tools: 0, // 工具 schema 不在此层，留 0（后续 runner 层补）
                         mcp_tools: 0,
                         custom_agents: 0,
@@ -2629,6 +2647,7 @@ export class ResponseEngine {
                                 encrypted: message.encrypted,
                                 content: message.content, timestamp: message.timestamp,
                                 images: message.images,
+                                mentions: message.mentions,
                                 mentionAids: message.mentionAids,
                             }];
                     const peerItems = (() => {
@@ -3916,12 +3935,10 @@ export class ResponseEngine {
                 await this.sessionManager.updateSession(session.id, { metadata: session.metadata });
             }
         }
-        // 群聊分发模式同步：aun.ts 从服务器信封解析的 dispatchMode 注入到 message，
-        // 此处写入 session.metadata，确保 ECK 上下文的 venue fragment 正确渲染 dispatch 变量。
-        // 仅当 message.dispatchMode 有值且与 session 记录不一致时更新。
-        if (message.chatType === 'group' && message.dispatchMode && session.metadata?.dispatchMode !== message.dispatchMode) {
-            logger.info(`[ResponseEngine] dispatchMode sync: sessionId=${session.id} ${session.metadata?.dispatchMode ?? 'none'} -> ${message.dispatchMode}`);
-            session.metadata = { ...(session.metadata || {}), dispatchMode: message.dispatchMode };
+        // 同步服务端 mention_mode，供同一群会话的上下文和菜单展示使用。
+        if (message.chatType === 'group' && message.mentionMode && session.metadata?.mentionMode !== message.mentionMode) {
+            logger.info(`[ResponseEngine] mentionMode sync: sessionId=${session.id} ${session.metadata?.mentionMode ?? 'none'} -> ${message.mentionMode}`);
+            session.metadata = { ...(session.metadata || {}), mentionMode: message.mentionMode };
             await this.sessionManager.updateSession(session.id, { metadata: session.metadata });
         }
         // chatMode 策略由 agent/relation behavior 配置在处理阶段解析；此处不再写 session 级参数。
@@ -4293,6 +4310,7 @@ export class ResponseEngine {
                         }
                         // [迁移点4] 工具汇报提醒：由 ProactiveMode.onToolUse 实现
                         if (modeHooks?.mode?.onToolUse) {
+                            const proactiveState = modeHooks.state.get('proactive');
                             modeHooks.mode.onToolUse({
                                 session,
                                 state: modeHooks.state,
@@ -4300,7 +4318,7 @@ export class ResponseEngine {
                                 toolInput: event.input || {},
                                 injectToModel: (text) => { agent.injectUserMessage?.(session.id, text); },
                                 getQueueLength: () => this.messageQueue?.getQueueLength(session.id) ?? 0,
-                                isSendCommand: (toolName, toolInput) => isEvolcoreSendCommandForSession(toolName, toolInput, session.channelId),
+                                isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', session.selfAID),
                                 logger,
                             });
                         }

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) {