@gt-fe/eap-runtime 0.0.12 → 0.0.14

package/dist/memory/index.d.ts

@@ -1,4 +1,4 @@
 export { LongTermMemoryService, InMemoryMemoryRepository, type IMemoryRepository, type MemoryRecord, type MemoryType, type CompressionResult, } from './long-term-memory.service.js';
 export { PostgresMemoryRepository } from './pg-memory.repository.js';
-export { SlidingWindowCompression, TruncateCompression, type IMessageCompressionService, type CompressionConfig, type SummarizeFunction, DEFAULT_COMPRESSION_CONFIG, estimateMessagesTokens, countRounds, } from './compression/index.js';
+export { SlidingWindowCompression, TruncateCompression, type IMessageCompressionService, type CompressionConfig, type SummarizeFunction, DEFAULT_COMPRESSION_CONFIG, COMPRESSION_WINDOW_FACTOR, resolveCompressionMaxTokens, estimateMessagesTokens, countRounds, } from './compression/index.js';
 export { SemanticRetrievalService, InMemoryVectorStore, type RetrievalConfig, type RetrievalStrategy, type RetrievalResult, type IVectorStore, type VectorResult, type EmbeddingFunction, DEFAULT_RETRIEVAL_CONFIG, } from './semantic-retrieval.service.js';

package/dist/memory/index.js

@@ -2,6 +2,6 @@
 export { LongTermMemoryService, InMemoryMemoryRepository, } from './long-term-memory.service.js';
 export { PostgresMemoryRepository } from './pg-memory.repository.js';
 // 消息压缩模块
-export { SlidingWindowCompression, TruncateCompression, DEFAULT_COMPRESSION_CONFIG, estimateMessagesTokens, countRounds, } from './compression/index.js';
+export { SlidingWindowCompression, TruncateCompression, DEFAULT_COMPRESSION_CONFIG, COMPRESSION_WINDOW_FACTOR, resolveCompressionMaxTokens, estimateMessagesTokens, countRounds, } from './compression/index.js';
 // 语义检索模块
 export { SemanticRetrievalService, InMemoryVectorStore, DEFAULT_RETRIEVAL_CONFIG, } from './semantic-retrieval.service.js';

package/dist/memory/message-compression.service.d.ts

@@ -18,8 +18,10 @@ export type CompressionStrategy = 'sliding-window' | 'truncate' | 'headroom';
 export interface CompressionConfig {
     /** 压缩策略（默认 sliding-window） */
     strategy: CompressionStrategy;
-    /** 触发压缩的 Token 上限（默认模型 context window 的 70%） */
+    /** 触发压缩的 Token 上限。有 maxContextTokens 且未显式传 maxTokens 时按 window×系数 */
     maxTokens: number;
+    /** 模型上下文窗。有则 maxTokens = floor(window × COMPRESSION_WINDOW_FACTOR) */
+    maxContextTokens?: number;
     /** 备用：按轮次触发（默认 20 轮） */
     maxRounds: number;
     /** 压缩后保留的最近轮次（默认 5 轮） */
@@ -29,6 +31,15 @@ export interface CompressionConfig {
     /** 用于摘要的模型（可选，默认使用当前 Agent 的模型） */
     summaryModel?: string;
 }
+/** 触发阈值 = 模型窗口 × 此系数（与原先 100000/128000 一致） */
+export declare const COMPRESSION_WINDOW_FACTOR = 0.7;
+/** 无模型窗口时的触发阈值（旧默认，按 128k×0.7） */
+export declare const COMPRESSION_MAX_TOKENS_FALLBACK = 100000;
+export declare function resolveCompressionMaxTokens(window?: number, factor?: number): number;
+/**
+ * 合并压缩配置。未显式传 maxTokens 且有 maxContextTokens 时，按窗口×系数。
+ */
+export declare function mergeCompressionConfig(base: CompressionConfig, override?: Partial<CompressionConfig>): CompressionConfig;
 /**
  * 默认压缩配置
  */

package/dist/memory/message-compression.service.js

@@ -7,12 +7,40 @@
  * @see design.md §1.1 记忆管理
  * @see requirements.md Requirement 4.3
  */
+/** 触发阈值 = 模型窗口 × 此系数（与原先 100000/128000 一致） */
+export const COMPRESSION_WINDOW_FACTOR = 0.7;
+/** 无模型窗口时的触发阈值（旧默认，按 128k×0.7） */
+export const COMPRESSION_MAX_TOKENS_FALLBACK = 100000;
+export function resolveCompressionMaxTokens(window, factor = COMPRESSION_WINDOW_FACTOR) {
+    if (typeof window === 'number' && Number.isFinite(window) && window > 0) {
+        const f = typeof factor === 'number' && Number.isFinite(factor) && factor > 0 && factor <= 1
+            ? factor
+            : COMPRESSION_WINDOW_FACTOR;
+        return Math.max(1, Math.floor(window * f));
+    }
+    return COMPRESSION_MAX_TOKENS_FALLBACK;
+}
+/**
+ * 合并压缩配置。未显式传 maxTokens 且有 maxContextTokens 时，按窗口×系数。
+ */
+export function mergeCompressionConfig(base, override) {
+    if (!override)
+        return { ...base };
+    const merged = { ...base, ...override };
+    if (Object.prototype.hasOwnProperty.call(override, 'maxTokens')) {
+        return merged;
+    }
+    if (override.maxContextTokens) {
+        merged.maxTokens = resolveCompressionMaxTokens(override.maxContextTokens);
+    }
+    return merged;
+}
 /**
  * 默认压缩配置
  */
 export const DEFAULT_COMPRESSION_CONFIG = {
     strategy: 'sliding-window',
-    maxTokens: 100000, // 约 70% of 128k context
+    maxTokens: COMPRESSION_MAX_TOKENS_FALLBACK,
     maxRounds: 20,
     preserveRecentRounds: 5,
     compressionRatio: 0.3,

package/dist/providers/http-llm-provider.d.ts

@@ -9,6 +9,7 @@
 import type { GraphMessage } from '../graph/contracts/executable-graph.js';
 import type { ILLMProvider, LLMNodeConfig, LLMResponse, LLMChunk } from '../graph/nodes/llm-node.js';
 import { type ILlmTurnLog } from '../debug/llm-turn-log.js';
+export declare const DEFAULT_LLM_HTTP_TIMEOUT_MS = 180000;
 export interface HttpLLMProviderConfig {
     apiKey: string;
     baseUrl?: string;

package/dist/providers/http-llm-provider.js

@@ -8,6 +8,8 @@
  */
 import { resolveLlmModelName } from './resolve-llm-model.js';
 import { createFileLlmTurnLogFromEnv, maskApiKey } from '../debug/llm-turn-log.js';
+import { buildContextUsage, turnSectionChars } from '../token/context-window.js';
+export const DEFAULT_LLM_HTTP_TIMEOUT_MS = 180_000;
 export class HttpLLMProvider {
     apiKey;
     baseUrl;
@@ -18,7 +20,7 @@ export class HttpLLMProvider {
         this.apiKey = config.apiKey;
         this.baseUrl = (config.baseUrl ?? 'https://api.openai.com/v1').replace(/\/$/, '');
         this.defaultModel = config.defaultModel ?? 'DeepSeek-V4-Pro';
-        this.timeoutMs = config.timeoutMs ?? 60000;
+        this.timeoutMs = config.timeoutMs ?? DEFAULT_LLM_HTTP_TIMEOUT_MS;
         this.turnLog = 'turnLog' in config ? config.turnLog : createFileLlmTurnLogFromEnv();
     }
     async writeTurn(args) {
@@ -57,6 +59,7 @@ export class HttpLLMProvider {
                     error: args.response.error,
                 },
                 latencyMs: Date.now() - args.startedAt,
+                context: buildContextUsage(args.response.inputTokens, args.config.maxContextTokens, turnSectionChars(args.config, args.messages)),
             });
         }
         catch (err) {

package/dist/providers/index.d.ts

@@ -1,5 +1,5 @@
 export { EchoLLMProvider, createDefaultLLMProvider } from './echo-llm-provider.js';
-export { HttpLLMProvider, type HttpLLMProviderConfig } from './http-llm-provider.js';
+export { HttpLLMProvider, DEFAULT_LLM_HTTP_TIMEOUT_MS, type HttpLLMProviderConfig } from './http-llm-provider.js';
 export { RoutingLLMProvider, type RoutingLLMProviderConfig } from './routing-llm-provider.js';
 export { resolveLlmModelName, canOverrideGraphModel } from './resolve-llm-model.js';
 export { createLocalLlmProvider, requireLocalLlmConnections, resolveLocalLlmConnection, parseLocalLlmConnectionRefs, hydrateLocalLlmConnections, LLM_CONNECTIONS_ENV, } from './local-llm-provider.js';

package/dist/providers/index.js

@@ -1,5 +1,5 @@
 export { EchoLLMProvider, createDefaultLLMProvider } from './echo-llm-provider.js';
-export { HttpLLMProvider } from './http-llm-provider.js';
+export { HttpLLMProvider, DEFAULT_LLM_HTTP_TIMEOUT_MS } from './http-llm-provider.js';
 export { RoutingLLMProvider } from './routing-llm-provider.js';
 export { resolveLlmModelName, canOverrideGraphModel } from './resolve-llm-model.js';
 export { createLocalLlmProvider, requireLocalLlmConnections, resolveLocalLlmConnection, parseLocalLlmConnectionRefs, hydrateLocalLlmConnections, LLM_CONNECTIONS_ENV, } from './local-llm-provider.js';

package/dist/providers/local-llm-provider.d.ts

@@ -4,16 +4,19 @@
  */
 import type { ILLMProvider } from '../graph/nodes/llm-node.js';
 import type { ILlmTurnLog } from '../debug/llm-turn-log.js';
-import { type ModelCallDefaults } from '@gt-fe/eap-contracts';
+import { type ModelCallDefaults } from '@eap/contracts';
 export interface LocalLlmConnection {
     baseUrl: string;
     apiKey: string;
     defaults?: ModelCallDefaults;
+    /** HttpLLMProvider 超时（毫秒）；缺省用 DEFAULT_LLM_HTTP_TIMEOUT_MS */
+    timeoutMs?: number;
 }
 export interface LocalLlmConnectionRef {
     baseUrl: string;
     apiKeyEnv: string;
     defaults?: ModelCallDefaults;
+    timeoutMs?: number;
 }
 export interface LocalLlmConnectionRefs {
     default?: LocalLlmConnectionRef;

package/dist/providers/local-llm-provider.js

@@ -2,8 +2,13 @@
  * 本地多模型 LLM：按节点 model 选网关。仅 dev。
  * 连接表里只带 apiKeyEnv，密钥从 process.env 读取，不进 JSON。
  */
-import { mergeModelCallParams } from '@gt-fe/eap-contracts';
+import { mergeModelCallParams } from '@eap/contracts';
 import { HttpLLMProvider } from './http-llm-provider.js';
+function parseTimeoutMs(value) {
+    if (typeof value !== 'number' || !Number.isFinite(value) || value < 1000)
+        return undefined;
+    return Math.min(3_600_000, Math.trunc(value));
+}
 export const LLM_CONNECTIONS_ENV = 'EAP_LLM_CONNECTIONS';
 export function parseLocalLlmConnectionRefs(env = process.env) {
     const raw = env[LLM_CONNECTIONS_ENV]?.trim();
@@ -42,7 +47,13 @@ export function hydrateLocalLlmConnections(refs, env = process.env) {
         const apiKey = env[ref.apiKeyEnv]?.trim();
         if (!apiKey)
             return undefined;
-        return { baseUrl: ref.baseUrl, apiKey, defaults: ref.defaults };
+        const timeoutMs = parseTimeoutMs(ref.timeoutMs);
+        return {
+            baseUrl: ref.baseUrl,
+            apiKey,
+            defaults: ref.defaults,
+            ...(timeoutMs !== undefined ? { timeoutMs } : {}),
+        };
     };
     const byModel = {};
     for (const [name, ref] of Object.entries(refs.byModel ?? {})) {
@@ -97,7 +108,7 @@ class LocalLlmProvider {
     }
     providerFor(model) {
         const connection = resolveLocalLlmConnection(this.connections, model);
-        const cacheKey = `${connection.baseUrl}\0${connection.apiKey}\0${model ?? ''}`;
+        const cacheKey = `${connection.baseUrl}\0${connection.apiKey}\0${model ?? ''}\0${connection.timeoutMs ?? ''}`;
         const cached = this.cache.get(cacheKey);
         if (cached)
             return cached;
@@ -105,6 +116,7 @@ class LocalLlmProvider {
             apiKey: connection.apiKey,
             baseUrl: connection.baseUrl,
             defaultModel: model,
+            timeoutMs: connection.timeoutMs,
             turnLog: this.turnLog,
         });
         this.cache.set(cacheKey, provider);

package/dist/providers/routing-llm-provider.js

@@ -11,9 +11,9 @@
  * - 支持任意 OpenAI 兼容 API（OpenAI / DeepSeek / 本地 Ollama 等）
  * - 连接配置由 Foundation 统一管理，Runtime 无感知
  */
-import { mergeModelCallParams } from '@gt-fe/eap-contracts';
+import { mergeModelCallParams } from '@eap/contracts';
 import { EchoLLMProvider } from './echo-llm-provider.js';
-import { HttpLLMProvider } from './http-llm-provider.js';
+import { DEFAULT_LLM_HTTP_TIMEOUT_MS, HttpLLMProvider } from './http-llm-provider.js';
 export class RoutingLLMProvider {
     foundationUrl;
     fallback;
@@ -35,7 +35,12 @@ export class RoutingLLMProvider {
     }
     withCallDefaults(config, selected) {
         const merged = mergeModelCallParams(config, selected.defaults);
-        return { ...config, ...merged, model: selected.name };
+        return {
+            ...config,
+            ...merged,
+            model: selected.name,
+            maxContextTokens: selected.maxContextTokens ?? config.maxContextTokens,
+        };
     }
     async selectModel(config) {
         try {
@@ -50,11 +55,14 @@ export class RoutingLLMProvider {
             if (res.ok) {
                 const body = await res.json();
                 if (body.data?.name) {
+                    const window = body.data.maxContextTokens
+                        ?? body.data.capabilities?.maxContextTokens;
                     return {
                         name: body.data.name,
                         provider: body.data.provider,
                         connection: body.data.connection ?? null,
                         defaults: body.data.defaults ?? null,
+                        ...(typeof window === 'number' && window > 0 ? { maxContextTokens: window } : {}),
                     };
                 }
             }
@@ -71,7 +79,7 @@ export class RoutingLLMProvider {
                 apiKey: selected.connection.apiKey ?? '',
                 baseUrl: selected.connection.baseUrl,
                 defaultModel: selected.name,
-                timeoutMs: selected.connection.timeoutMs,
+                timeoutMs: selected.connection.timeoutMs ?? DEFAULT_LLM_HTTP_TIMEOUT_MS,
                 turnLog: this.turnLog,
             });
         }
@@ -81,6 +89,7 @@ export class RoutingLLMProvider {
                 apiKey: process.env.OPENAI_API_KEY,
                 baseUrl: process.env.OPENAI_BASE_URL,
                 defaultModel: selected.name,
+                timeoutMs: DEFAULT_LLM_HTTP_TIMEOUT_MS,
                 turnLog: this.turnLog,
             });
         }

package/dist/registry/agent-models.d.ts

@@ -1 +1 @@
-export { resolveDeclaredModels, resolveAgentDefaultModel, resolveAgentModelAllowlist, } from '@gt-fe/eap-contracts';
+export { resolveDeclaredModels, resolveAgentDefaultModel, resolveAgentModelAllowlist, } from '@eap/contracts';

package/dist/registry/agent-models.js

@@ -1 +1 @@
-export { resolveDeclaredModels, resolveAgentDefaultModel, resolveAgentModelAllowlist, } from '@gt-fe/eap-contracts';
+export { resolveDeclaredModels, resolveAgentDefaultModel, resolveAgentModelAllowlist, } from '@eap/contracts';

package/dist/registry/agent-registry-client.d.ts

@@ -1,7 +1,7 @@
 /**
  * Agent Registry 客户端 — 从 foundation-service 拉取 Agent 定义
  */
-/** Agent 清单（与 @gt-fe/eap-contracts AgentManifest 对齐） */
+/** Agent 清单（与 @eap/contracts AgentManifest 对齐） */
 export interface AgentManifest {
     id: string;
     name: string;

package/dist/registry/deployment-snapshot.js

@@ -13,7 +13,7 @@ import { readdir, readFile, access } from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
 import { constants as fsConstants } from 'node:fs';
-import { parseSkillMd } from '@gt-fe/eap-contracts';
+import { parseSkillMd } from '@eap/contracts';
 import { findSkillEntryFile } from './skill-tree.js';
 import { preloadMissing, preloadPackageCorrupt, } from './preload-errors.js';
 import { isRequireChecksum, resolvePreloadBehaviorFlags, } from './preload-flags.js';
@@ -538,35 +538,37 @@ export class FileSystemDeploymentSnapshot {
                     break;
                 }
             }
-            if (!manifest && entryFile) {
-                const parsed = parseSkillMd(await readFile(entryFile, 'utf8'));
-                if (!parsed)
+            const parsedMd = entryFile
+                ? parseSkillMd(await readFile(entryFile, 'utf8'))
+                : null;
+            if (!manifest) {
+                if (!parsedMd)
                     continue;
                 manifest = {
-                    code: parsed.frontmatter.name,
-                    name: parsed.frontmatter.name,
-                    description: parsed.frontmatter.description,
-                    ...(parsed.frontmatter.license ? { license: parsed.frontmatter.license } : {}),
+                    code: ref.skillId,
+                    name: parsedMd.frontmatter.name,
+                    description: parsedMd.frontmatter.description,
+                    ...(parsedMd.frontmatter.license ? { license: parsedMd.frontmatter.license } : {}),
                 };
                 manifestPath = entryFile;
             }
+            else if (parsedMd) {
+                manifest = {
+                    ...manifest,
+                    name: parsedMd.frontmatter.name,
+                    description: parsedMd.frontmatter.description,
+                    ...(parsedMd.frontmatter.license ? { license: parsedMd.frontmatter.license } : {}),
+                };
+            }
             if (!manifest || !manifestPath)
                 continue;
-            if (!manifest.description && entryFile) {
-                const parsed = parseSkillMd(await readFile(entryFile, 'utf8'));
-                if (parsed?.frontmatter.description) {
-                    manifest = { ...manifest, description: parsed.frontmatter.description };
-                    if (!manifest.name)
-                        manifest.name = parsed.frontmatter.name;
-                }
-            }
             const isUserOverridePath = bundlePath.includes('/users/') || bundlePath.includes('\\users\\');
             const isAuthorOverlay = extraRoots.some((root) => root && isPathInside(root, bundlePath));
             if (ref.sha256 && !isUserOverridePath && !isAuthorOverlay && manifestPath.endsWith('.json')) {
                 const actual = await sha256OfFile(manifestPath);
                 await assertDigestMatch(ref.sha256, actual, `skill ${ref.skillId}`, { path: manifestPath });
             }
-            const skillId = String(manifest.code ?? ref.skillId);
+            const skillId = String(ref.skillId);
             return {
                 skillId,
                 name: String(manifest.name ?? ref.name ?? skillId),

package/dist/registry/graph-loader.d.ts

@@ -7,7 +7,7 @@
 import type { GraphDSL } from '../graph/contracts/executable-graph.js';
 import type { AgentRegistryClient } from './agent-registry-client.js';
 import type { DeploymentContext } from '../tool/tool-execution-router.js';
-import type { ILocalToolInstallStore } from '@gt-fe/eap-contracts';
+import type { ILocalToolInstallStore } from '@eap/contracts';
 import { type LoadedToolDefinition } from '../tool/loaded-tool-definition.js';
 import type { LoadedSkillInfo } from '../tool/system-prompt-builder.js';
 import { type IDeploymentSnapshot } from './deployment-snapshot.js';
@@ -17,6 +17,11 @@ export interface LoadAgentOptions {
     /** 跳过读写进程内定义缓存 */
     bypassCache?: boolean;
 }
+export declare function resolveAgentSystemPromptFromLoader(loader: {
+    resolveAgentSystemPrompt?: (agentCode: string, version?: string) => Promise<string | undefined>;
+} | undefined, agentCode: string, version?: string): Promise<string | undefined>;
+/** manifest.prompts.system；空白视为缺省。 */
+export declare function extractAgentSystemPrompt(manifest: unknown): string | undefined;
 export interface GraphLoaderConfig {
     registryClient?: AgentRegistryClient;
     deploymentContext?: DeploymentContext;
@@ -104,6 +109,11 @@ export declare class GraphLoader {
     private cloneCached;
     loadGraph(agentCode: string, options?: LoadAgentOptions): Promise<GraphDSL>;
     private loadGraphFromSource;
+    /**
+     * Agent 基线系统提示词（manifest.prompts.system）。
+     * 每轮 execute/stream 注入 GraphState.agentSystemPrompt；不写进节点 config。
+     */
+    resolveAgentSystemPrompt(agentCode: string, version?: string): Promise<string | undefined>;
     /**
      * 解析 agent tools[] + graph tool 节点 union；
      * server+预装：以预装 manifest 为准；desktop 合并 ILocalToolInstallStore。

package/dist/registry/graph-loader.js

@@ -8,10 +8,12 @@ import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { resolveAgentModelAllowlist, resolveAgentDefaultModel } from './agent-models.js';
 import { DEFAULT_HTTP_TOOL_TIMEOUT_SEC, DEFAULT_TOOL_TIMEOUT_SEC } from '../tool/timeout.js';
+import { isMcpDiscoverStub } from '../tool/mcp-list.js';
 import { createDeploymentSnapshotFromEnv, isInlineToolDeclaration, overlayToolRefPolicies, } from './deployment-snapshot.js';
 import { preloadGraphNotFound, preloadManifestNotFound, preloadSkillNotFound, preloadToolNotFound, } from './preload-errors.js';
 import { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, } from './definition-cache.js';
 import { inspectAgentSkillTree, listSkillDirs, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, } from './skill-tree.js';
+import { emitRuntimeLog } from '../common/logger.js';
 function applyDefaultModelToGraph(graph, defaultModel) {
     if (!defaultModel)
         return graph;
@@ -56,6 +58,24 @@ function asGraphDsl(value) {
     }
     return undefined;
 }
+export async function resolveAgentSystemPromptFromLoader(loader, agentCode, version) {
+    if (!loader || typeof loader.resolveAgentSystemPrompt !== 'function')
+        return undefined;
+    return loader.resolveAgentSystemPrompt(agentCode, version);
+}
+/** manifest.prompts.system；空白视为缺省。 */
+export function extractAgentSystemPrompt(manifest) {
+    if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest))
+        return undefined;
+    const prompts = manifest.prompts;
+    if (!prompts || typeof prompts !== 'object' || Array.isArray(prompts))
+        return undefined;
+    const system = prompts.system;
+    if (typeof system !== 'string')
+        return undefined;
+    const trimmed = system.trim();
+    return trimmed ? trimmed : undefined;
+}
 function extractSkillPrompt(manifest) {
     const prompt = manifest.prompt;
     if (typeof prompt === 'string' && prompt.trim())
@@ -95,35 +115,6 @@ async function resolveSkillPrompt(manifest, bundlePath) {
     }
     return raw;
 }
-function extractSkillToolsets(manifest) {
-    const refs = manifest.toolsets;
-    if (!Array.isArray(refs))
-        return undefined;
-    const out = [];
-    for (const item of refs) {
-        if (typeof item === 'string') {
-            out.push(item);
-            continue;
-        }
-        if (!item || typeof item !== 'object')
-            continue;
-        const o = item;
-        const code = o.code != null ? String(o.code) : undefined;
-        const enabled = Array.isArray(o.enabled)
-            ? o.enabled.filter((x) => typeof x === 'string')
-            : undefined;
-        out.push({
-            name: o.name != null ? String(o.name) : code,
-            version: o.version != null ? String(o.version) : undefined,
-            code,
-            enabled,
-            autoApprove: Array.isArray(o.autoApprove)
-                ? o.autoApprove.filter((x) => typeof x === 'string')
-                : undefined,
-        });
-    }
-    return out.length > 0 ? out : undefined;
-}
 function extractEmbeddedGraph(manifest) {
     const candidates = [
         manifest.graph,
@@ -223,6 +214,67 @@ function toLoadedToolDefinition(record) {
         inputSchema: m.input,
     };
 }
+function resolveMcpServer(manifest) {
+    if (manifest.server && typeof manifest.server === 'object' && !Array.isArray(manifest.server)) {
+        return manifest.server;
+    }
+    const execution = manifest.execution;
+    if (execution && typeof execution === 'object' && !Array.isArray(execution)) {
+        const exec = execution;
+        if (exec.server && typeof exec.server === 'object' && !Array.isArray(exec.server)) {
+            return exec.server;
+        }
+        const mcp = exec.mcp;
+        if (mcp && typeof mcp === 'object' && !Array.isArray(mcp)) {
+            const nested = mcp.server;
+            if (nested && typeof nested === 'object' && !Array.isArray(nested)) {
+                return nested;
+            }
+        }
+    }
+    return undefined;
+}
+function mcpDiscoverStub(pre, options) {
+    const m = pre.manifest;
+    const server = resolveMcpServer(m);
+    const toolRuntime = (m.toolRuntime ?? m.runtime);
+    const timeout = (typeof server?.timeout === 'number' ? server.timeout : undefined)
+        ?? DEFAULT_TOOL_TIMEOUT_SEC;
+    const transport = (typeof server?.transport === 'string' && server.transport)
+        || (server?.url ? 'streamable_http' : 'stdio');
+    const execution = {
+        protocol: 'mcp',
+        transport,
+        server,
+        timeout,
+        discover: true,
+        bundlePath: pre.bundlePath,
+    };
+    if (options?.enabledTools && options.enabledTools.length > 0) {
+        execution.enabledTools = options.enabledTools;
+    }
+    if (options?.autoApprove && options.autoApprove.length > 0) {
+        execution.autoApprove = options.autoApprove;
+    }
+    return {
+        toolId: pre.toolId,
+        name: pre.name,
+        manifest: {
+            id: pre.toolId,
+            name: pre.name,
+            version: pre.version,
+            type: 'mcp',
+            status: 'active',
+            description: m.description,
+            toolRuntime,
+            dataScope: normalizeDataScope(m.permissions && typeof m.permissions === 'object' && !Array.isArray(m.permissions)
+                ? m.permissions.dataScope
+                : m.dataScope),
+            requireConfirmation: false,
+            execution,
+        },
+    };
+}
 function fromPreinstallTool(pre) {
     const m = pre.manifest;
     const permissions = m.permissions;
@@ -254,14 +306,16 @@ function fromPreinstallTool(pre) {
     };
 }
 /**
- * 展开预装工具集（toolset.manifest.json，含 tools[]）为多个 LoadedToolDefinition。
- * 以工具集为管理单元：单个 MCP 服务 / 单个代码包 = 一个工具集，可含多个子工具；
- * 子工具继承集级 server/package 配置，合成各自的 execution。
- * 无 tools[] 时回退为单工具 manifest（tool.manifest.json 结构）。
+ * 展开预装工具集为 LoadedToolDefinition。
+ * - type=mcp：忽略清单 tools[]，产出一条 discover stub；子工具在执行期 tools/list。
+ * - type=code/http：展开 tools[]；无 tools[] 时回退单工具 manifest。
  * enabled 为可选白名单（agent.manifest toolsets[].enabled）；缺省启用全部子工具。
  */
 function expandPreinstallToolset(pre, options) {
     const m = pre.manifest;
+    if (m.type === 'mcp') {
+        return [mcpDiscoverStub(pre, options)];
+    }
     const tools = m.tools;
     const enabled = options?.enabledTools;
     const enabledSet = enabled && enabled.length > 0 ? new Set(enabled) : null;
@@ -280,7 +334,6 @@ function expandPreinstallToolset(pre, options) {
     }
     const setType = m.type;
     const toolRuntime = (m.toolRuntime ?? m.runtime);
-    const server = m.server;
     const pkg = m.package;
     const out = [];
     for (const raw of tools) {
@@ -301,19 +354,10 @@ function expandPreinstallToolset(pre, options) {
                 baseUrl: st.baseUrl ?? gateway.baseUrl,
                 pathTemplate: st.pathTemplate,
                 allowedHosts: gateway.allowedHosts,
+                header: gateway.header,
                 timeout: st.timeout ?? gateway.timeout ?? DEFAULT_HTTP_TOOL_TIMEOUT_SEC,
             };
         }
-        else if (setType === 'mcp') {
-            type = 'mcp';
-            execution = {
-                protocol: 'mcp',
-                transport: server?.transport ?? (server?.url ? 'streamable_http' : 'stdio'),
-                server,
-                toolName: name,
-                timeout: st.timeout ?? server?.timeout ?? DEFAULT_TOOL_TIMEOUT_SEC,
-            };
-        }
         else {
             type = 'code';
             execution = {
@@ -512,28 +556,24 @@ export class GraphLoader {
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
             skillWarnings.push(message);
-            console.warn(JSON.stringify({
+            emitRuntimeLog('warn', 'graph-loader', message, {
                 event: 'runtime.warmAgent.skills_failed',
-                level: 'warn',
                 agentCode,
                 agentVersion: version ?? null,
-                message,
-            }));
+            });
         }
         // 预期跳过（无 userId 的 users 层 Skill）用 debug，避免单测/生产噪音
         if (skippedSkills.length > 0) {
-            console.debug(JSON.stringify({
+            emitRuntimeLog('debug', 'graph-loader', 'warmAgent skipped user skills', {
                 event: 'runtime.warmAgent.skills_skipped',
-                level: 'debug',
                 agentCode,
                 agentVersion: version ?? null,
                 userId: options?.userId ?? null,
                 skippedSkillIds: skippedSkills,
-            }));
+            });
         }
-        console.info(JSON.stringify({
+        emitRuntimeLog('info', 'graph-loader', 'warmAgent ok', {
             event: 'runtime.warmAgent.ok',
-            level: 'info',
             agentCode,
             agentVersion: version ?? null,
             graph: true,
@@ -541,7 +581,7 @@ export class GraphLoader {
             skills: skillsOk,
             skillWarningCount: skillWarnings.length,
             skillWarnings,
-        }));
+        });
         return {
             graph: true,
             tools: true,
@@ -622,7 +662,6 @@ export class GraphLoader {
                     type: 'llm',
                     config: {
                         model,
-                        systemPrompt: manifest.prompts?.system,
                     },
                 },
             ],
@@ -632,6 +671,24 @@ export class GraphLoader {
             },
         };
     }
+    /**
+     * Agent 基线系统提示词（manifest.prompts.system）。
+     * 每轮 execute/stream 注入 GraphState.agentSystemPrompt；不写进节点 config。
+     */
+    async resolveAgentSystemPrompt(agentCode, version) {
+        if (this.deploymentSnapshot) {
+            const snap = await this.deploymentSnapshot.loadAgentSnapshot(agentCode, version);
+            if (snap) {
+                return extractAgentSystemPrompt(snap.manifest);
+            }
+            if (this.blockRegistryDefinitions)
+                return undefined;
+        }
+        if (this.blockRegistryDefinitions || !this.registryClient)
+            return undefined;
+        const record = await this.registryClient.getAgent(agentCode);
+        return extractAgentSystemPrompt(record?.manifest);
+    }
     /**
      * 解析 agent tools[] + graph tool 节点 union；
      * server+预装：以预装 manifest 为准；desktop 合并 ILocalToolInstallStore。
@@ -743,6 +800,9 @@ export class GraphLoader {
                     continue;
                 const pre = await this.deploymentSnapshot.loadToolManifest({ name: toolName }, agentDir);
                 if (!pre) {
+                    // MCP 子工具名在 tools/list 后才出现，图内 type:tool 节点不必对应预装目录
+                    if (definitions.some(isMcpDiscoverStub))
+                        continue;
                     missing.push(toolName);
                     continue;
                 }
@@ -851,7 +911,6 @@ export class GraphLoader {
                     prompt,
                     bundlePath: pre.bundlePath,
                     entryFile,
-                    toolsets: extractSkillToolsets(pre.manifest),
                     inputDef: pre.manifest.inputDef,
                     outputDef: pre.manifest.outputDef,
                 });