@gt-fe/eap-runtime 0.0.10 → 0.0.11

package/dist/registry/deployment-snapshot.d.ts

@@ -73,13 +73,25 @@ export interface IDeploymentSnapshot {
 }
 /** 规范化摘要：去 sha256: 前缀、空白，转小写 hex */
 export declare function normalizeDigest(value: unknown): string | null;
+/**
+ * Agent 清单装配读取：现行 `skills`，兼容 CLI `skillRefs`。
+ * 项身份：`code` / `skill` / `skillId`。两边都有时现行字段先写入；同名只补 version/name 等空位。
+ */
+export declare function skillRefsFromManifest(manifest: Record<string, unknown>): SnapshotSkillRef[];
 /**
  * 装配引用 vs 内联完整 ToolManifest。
- * 含 type/execution 的视为内联定义；仅 toolset/name/version/enabledTools 等视为引用。
+ * 含 type/execution 的视为内联定义；仅 code/toolset/version/enabled 等视为引用。
  */
 export declare function isInlineToolDeclaration(item: unknown): boolean;
 /**
- * 将 agent.manifest.toolsets 上的 enabled/autoApprove 叠到 snapshot.tools[]（snapshot 未带时）。
+ * 从 Agent 清单收集工具集装配引用。
+ * 现行 `toolsets`；兼容 CLI `toolRefs` 与更旧的 `tools`（内联完整 manifest 会跳过）。
+ * 项身份：`code` / `toolset`（字符串项即 code）。不用展示名 `name`。白名单：`enabled` / `enabledTools`。
+ * 两边都有时现行字段先写入；同名条目的 enabled/autoApprove 以先写入为准。
+ */
+export declare function toolsetsFromManifest(manifest: Record<string, unknown>): SnapshotToolRef[];
+/**
+ * 将 agent.manifest 装配项上的 enabled/autoApprove 叠到 snapshot.tools[]（snapshot 未带时）。
  */
 export declare function overlayToolRefPolicies(snapTools: SnapshotToolRef[], manifest?: Record<string, unknown>): SnapshotToolRef[];
 export declare class FileSystemDeploymentSnapshot implements IDeploymentSnapshot {

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';
@@ -140,29 +140,51 @@ async function pickLatestVersionDir(parent) {
     dirs.sort();
     return path.join(parent, dirs[dirs.length - 1]);
 }
-function skillRefsFromManifest(manifest) {
-    const raw = manifest.skills;
-    if (!Array.isArray(raw))
-        return [];
+function asArray(value) {
+    return Array.isArray(value) ? value : [];
+}
+/**
+ * Agent 清单装配读取：现行 `skills`，兼容 CLI `skillRefs`。
+ * 项身份：`code` / `skill` / `skillId`。两边都有时现行字段先写入；同名只补 version/name 等空位。
+ */
+export function skillRefsFromManifest(manifest) {
     const out = [];
-    for (const item of raw) {
+    const byId = new Map();
+    const upsert = (ref) => {
+        const prev = byId.get(ref.skillId);
+        if (!prev) {
+            byId.set(ref.skillId, ref);
+            out.push(ref);
+            return;
+        }
+        if (!prev.version && ref.version)
+            prev.version = ref.version;
+        if (!prev.name && ref.name)
+            prev.name = ref.name;
+        if (!prev.description && ref.description)
+            prev.description = ref.description;
+        if (!prev.sha256 && ref.sha256)
+            prev.sha256 = ref.sha256;
+    };
+    for (const item of [...asArray(manifest.skills), ...asArray(manifest.skillRefs)]) {
         if (typeof item === 'string') {
-            out.push({ skillId: item });
+            if (item)
+                upsert({ skillId: item });
             continue;
         }
-        if (item && typeof item === 'object') {
-            const o = item;
-            const skillId = String(o.code ?? '');
-            if (!skillId)
-                continue;
-            out.push({
-                skillId,
-                name: o.name != null ? String(o.name) : undefined,
-                version: o.version != null ? String(o.version) : undefined,
-                description: o.description != null ? String(o.description) : undefined,
-                sha256: typeof o.sha256 === 'string' ? o.sha256 : undefined,
-            });
-        }
+        if (!item || typeof item !== 'object')
+            continue;
+        const o = item;
+        const skillId = String(o.code ?? o.skill ?? o.skillId ?? '');
+        if (!skillId)
+            continue;
+        upsert({
+            skillId,
+            name: o.name != null ? String(o.name) : undefined,
+            version: o.version != null ? String(o.version) : undefined,
+            description: o.description != null ? String(o.description) : undefined,
+            sha256: typeof o.sha256 === 'string' ? o.sha256 : undefined,
+        });
     }
     return out;
 }
@@ -174,7 +196,7 @@ function parseStringList(value) {
 }
 /**
  * 装配引用 vs 内联完整 ToolManifest。
- * 含 type/execution 的视为内联定义；仅 toolset/name/version/enabledTools 等视为引用。
+ * 含 type/execution 的视为内联定义；仅 code/toolset/version/enabled 等视为引用。
  */
 export function isInlineToolDeclaration(item) {
     if (!item || typeof item !== 'object' || Array.isArray(item))
@@ -191,7 +213,7 @@ function parseToolAssemblyRef(item) {
     if (isInlineToolDeclaration(item))
         return null;
     const o = item;
-    const name = String(o.code ?? o.name ?? '');
+    const name = String(o.code ?? o.toolset ?? '');
     if (!name)
         return null;
     return {
@@ -199,13 +221,17 @@ function parseToolAssemblyRef(item) {
         toolId: o.toolId != null ? String(o.toolId) : undefined,
         version: o.version != null ? String(o.version) : undefined,
         sha256: typeof o.sha256 === 'string' ? o.sha256 : undefined,
-        enabledTools: parseStringList(o.enabled),
+        enabledTools: parseStringList(o.enabled) ?? parseStringList(o.enabledTools),
         autoApprove: parseStringList(o.autoApprove),
     };
 }
 /**
-/** 从 agent.manifest.toolsets 收集工具集装配引用。 */
-function toolsetsFromManifest(manifest) {
+ * 从 Agent 清单收集工具集装配引用。
+ * 现行 `toolsets`；兼容 CLI `toolRefs` 与更旧的 `tools`（内联完整 manifest 会跳过）。
+ * 项身份：`code` / `toolset`（字符串项即 code）。不用展示名 `name`。白名单：`enabled` / `enabledTools`。
+ * 两边都有时现行字段先写入；同名条目的 enabled/autoApprove 以先写入为准。
+ */
+export function toolsetsFromManifest(manifest) {
     const out = [];
     const byName = new Map();
     const upsert = (ref) => {
@@ -215,10 +241,6 @@ function toolsetsFromManifest(manifest) {
             out.push(ref);
             return;
         }
-        if (!prev.enabledTools && ref.enabledTools)
-            prev.enabledTools = ref.enabledTools;
-        if (!prev.autoApprove && ref.autoApprove)
-            prev.autoApprove = ref.autoApprove;
         if (!prev.version && ref.version)
             prev.version = ref.version;
         if (!prev.sha256 && ref.sha256)
@@ -226,7 +248,11 @@ function toolsetsFromManifest(manifest) {
         if (!prev.toolId && ref.toolId)
             prev.toolId = ref.toolId;
     };
-    for (const item of Array.isArray(manifest.toolsets) ? manifest.toolsets : []) {
+    for (const item of [
+        ...asArray(manifest.toolsets),
+        ...asArray(manifest.toolRefs),
+        ...asArray(manifest.tools),
+    ]) {
         const ref = parseToolAssemblyRef(item);
         if (ref)
             upsert(ref);
@@ -234,7 +260,7 @@ function toolsetsFromManifest(manifest) {
     return out;
 }
 /**
- * 将 agent.manifest.toolsets 上的 enabled/autoApprove 叠到 snapshot.tools[]（snapshot 未带时）。
+ * 将 agent.manifest 装配项上的 enabled/autoApprove 叠到 snapshot.tools[]（snapshot 未带时）。
  */
 export function overlayToolRefPolicies(snapTools, manifest) {
     if (!manifest)

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';

package/dist/registry/graph-loader.js

@@ -7,6 +7,7 @@
 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 { createDeploymentSnapshotFromEnv, isInlineToolDeclaration, overlayToolRefPolicies, } from './deployment-snapshot.js';
 import { preloadGraphNotFound, preloadManifestNotFound, preloadSkillNotFound, preloadToolNotFound, } from './preload-errors.js';
 import { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, } from './definition-cache.js';
@@ -300,7 +301,7 @@ function expandPreinstallToolset(pre, options) {
                 baseUrl: st.baseUrl ?? gateway.baseUrl,
                 pathTemplate: st.pathTemplate,
                 allowedHosts: gateway.allowedHosts,
-                timeout: st.timeout ?? gateway.timeout ?? 10000,
+                timeout: st.timeout ?? gateway.timeout ?? DEFAULT_HTTP_TOOL_TIMEOUT_SEC,
             };
         }
         else if (setType === 'mcp') {
@@ -310,7 +311,7 @@ function expandPreinstallToolset(pre, options) {
                 transport: server?.transport ?? (server?.url ? 'streamable_http' : 'stdio'),
                 server,
                 toolName: name,
-                timeout: st.timeout ?? server?.timeout ?? 30000,
+                timeout: st.timeout ?? server?.timeout ?? DEFAULT_TOOL_TIMEOUT_SEC,
             };
         }
         else {
@@ -319,7 +320,7 @@ function expandPreinstallToolset(pre, options) {
                 runtime: st.runtime ?? 'node',
                 handler: st.handler,
                 args: st.args,
-                timeout: st.timeout ?? 30000,
+                timeout: st.timeout ?? DEFAULT_TOOL_TIMEOUT_SEC,
                 sandbox: st.sandbox ?? pkg?.sandbox ?? false,
                 bundlePath: pre.bundlePath,
             };
@@ -839,7 +840,6 @@ export class GraphLoader {
                 const workflow = asGraphDsl(pre.manifest.workflow) ??
                     asGraphDsl(pre.manifest.graph) ??
                     asGraphDsl(pre.manifest.definitionSnapshot);
-                // 解析 prompt：支持文件路径引用（./ 开头）
                 const prompt = await resolveSkillPrompt(pre.manifest, pre.bundlePath);
                 const entryFile = typeof pre.manifest.skillEntryFile === 'string' ? pre.manifest.skillEntryFile : undefined;
                 skills.push({

package/dist/registry/index.d.ts

@@ -3,7 +3,7 @@ export { createAgentRegistryClient, type AgentRegistryClient, type AgentRegistry
 export { GraphLoader, type GraphLoaderConfig, type LoadToolDefinitionsOptions, type LoadAgentOptions } from './graph-loader.js';
 export { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, type CachedAgentDefinitions, } from './definition-cache.js';
 export { inspectAgentSkillTree, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, watchAgentSkillDirs, watchPreinstallSkillRoot, watchSkillRoots, } from './skill-tree.js';
-export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, type IDeploymentSnapshot, type AgentSnapshotMeta, type SnapshotToolRef, type SnapshotSkillRef, type PreinstallToolManifest, type PreinstallSkillManifest, type DeploymentSnapshotOptions, } from './deployment-snapshot.js';
+export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, toolsetsFromManifest, skillRefsFromManifest, type IDeploymentSnapshot, type AgentSnapshotMeta, type SnapshotToolRef, type SnapshotSkillRef, type PreinstallToolManifest, type PreinstallSkillManifest, type DeploymentSnapshotOptions, } from './deployment-snapshot.js';
 export { preloadError, preloadMissing, preloadManifestNotFound, preloadGraphNotFound, preloadToolNotFound, preloadSkillNotFound, preloadPackageCorrupt, isRequireReady, } from './preload-errors.js';
 export { resolvePreloadBehaviorFlags, isValidateSkillIo, isRequireChecksum, type PreloadBehaviorFlags, } from './preload-flags.js';
 export { assertSkillIoIfEnabled, coerceSkillInputFromMessages, resolveSkillInputFromInvokeInput, } from './skill-io-guard.js';

package/dist/registry/index.js

@@ -3,7 +3,7 @@ export { createAgentRegistryClient } from './agent-registry-client.js';
 export { GraphLoader } from './graph-loader.js';
 export { PreinstallDefinitionCache, resolveDefinitionCacheEnabled, } from './definition-cache.js';
 export { inspectAgentSkillTree, readSkillAssembly, resolveSkillHotReload, skillAssemblyStamp, watchAgentSkillDirs, watchPreinstallSkillRoot, watchSkillRoots, } from './skill-tree.js';
-export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, } from './deployment-snapshot.js';
+export { FileSystemDeploymentSnapshot, createDeploymentSnapshotFromEnv, normalizeDigest, isInlineToolDeclaration, overlayToolRefPolicies, toolsetsFromManifest, skillRefsFromManifest, } from './deployment-snapshot.js';
 export { preloadError, preloadMissing, preloadManifestNotFound, preloadGraphNotFound, preloadToolNotFound, preloadSkillNotFound, preloadPackageCorrupt, isRequireReady, } from './preload-errors.js';
 export { resolvePreloadBehaviorFlags, isValidateSkillIo, isRequireChecksum, } from './preload-flags.js';
 export { assertSkillIoIfEnabled, coerceSkillInputFromMessages, resolveSkillInputFromInvokeInput, } from './skill-io-guard.js';

package/dist/registry/preload-errors.d.ts

@@ -1,7 +1,7 @@
 /**
  * 预装加载错误 — 对齐 runtime.preload.* / 联调契约
  */
-import { AppError, type ErrorCode } from '@gt-fe/eap-contracts';
+import { AppError, type ErrorCode } from '@eap/contracts';
 export declare function preloadError(code: ErrorCode, message: string, details?: unknown): AppError;
 export declare function preloadMissing(message: string, details?: unknown): AppError;
 export declare function preloadManifestNotFound(message: string, details?: unknown): AppError;

package/dist/registry/preload-errors.js

@@ -1,7 +1,7 @@
 /**
  * 预装加载错误 — 对齐 runtime.preload.* / 联调契约
  */
-import { AppError, ErrorCodes } from '@gt-fe/eap-contracts';
+import { AppError, ErrorCodes } from '@eap/contracts';
 export function preloadError(code, message, details) {
     return new AppError(code, message, {
         exposeMessage: true,

package/dist/registry/skill-io-guard.js

@@ -1,7 +1,7 @@
 /**
  * Skill inputDef / outputDef 轻量校验（默认开启；EAP_PRELOAD_VALIDATE_SKILL_IO=0 关闭）
  */
-import { AppError, ErrorCodes } from '@gt-fe/eap-contracts';
+import { AppError, ErrorCodes } from '@eap/contracts';
 import { isValidateSkillIo } from './preload-flags.js';
 function asRecord(value) {
     if (value && typeof value === 'object' && !Array.isArray(value)) {

package/dist/registry/skill-tree.js

@@ -10,7 +10,7 @@ import { readdir, stat, access, readFile } from 'node:fs/promises';
 import { watch } from 'node:fs';
 import { constants as fsConstants } from 'node:fs';
 import path from 'node:path';
-import { SKILL_ENTRY_CANDIDATES } from '@gt-fe/eap-contracts';
+import { SKILL_ENTRY_CANDIDATES } from '@eap/contracts';
 const SKILL_CODE = /^[a-z0-9][a-z0-9-]*$/;
 async function exists(p) {
     try {

package/dist/runtime/agent-runtime.js

@@ -7,12 +7,12 @@
  * @see 04-runtime-core/design.md §1.5 / §1.7
  */
 import { randomUUID } from 'node:crypto';
-import { HitlAlreadyTimedOutError, HitlNotWaitingError, buildHitlWaitedPayload, isHitlDeadlinePassed, readPersistedHitlWaiting, unwrapHitlPaused, } from '../graph/hitl/hitl-handler.js';
+import { HITL_TIMEOUT_ERROR_CODE, HITL_TIMEOUT_MESSAGE, HitlAlreadyTimedOutError, HitlNotWaitingError, buildHitlWaitedPayload, isHitlDeadlinePassed, readPersistedHitlWaiting, unwrapHitlPaused, } from '../graph/hitl/hitl-handler.js';
 import { toLoadedSkillMap } from '../tool/system-prompt-builder.js';
 import { assembleLoadedTools } from '../tool/harness-primitives.js';
 import { createFileLlmTurnLogFromEnv, } from '../debug/llm-turn-log.js';
 import { buildHitlWaitingTaskOutput, buildTurnGraphMessages, buildTurnTranscriptFromStreamEvents, extractHitlThreadId, extractStreamReasoning, extractStreamTextDelta, messageRecordsToGraphMessages, persistHitlWaitingPlaceholder, persistTurnTranscript, persistUserTurnMessage, } from '../session/persist-turn-messages.js';
-import { AppError, ErrorCodes } from '@gt-fe/eap-contracts';
+import { AppError, ErrorCodes } from '@eap/contracts';
 import { resolveExecutionContext } from '../governance/governance-client.js';
 import { resolveAgentCode } from '../common/agent-code.js';
 import { resolveTraceId } from '../common/trace-id.js';
@@ -268,6 +268,9 @@ export class AgentRuntime {
         const promptRoots = this.deps.graphLoader
             ? await this.deps.graphLoader.resolvePromptRoots(agentCode, params.agentVersion)
             : [];
+        const agentDir = this.deps.graphLoader
+            ? (await this.deps.graphLoader.resolveAgentDir(agentCode, params.agentVersion)) ?? undefined
+            : undefined;
         const history = messageRecordsToGraphMessages(sessionContext.messages);
         const messages = await buildTurnGraphMessages({
             history,
@@ -297,6 +300,7 @@ export class AgentRuntime {
                 loadedSkills,
                 skillDefinitions,
                 promptRoots,
+                agentDir,
                 skillInput: resolveSkillInputFromInvokeInput(params.input),
                 traceId: resolveTraceId(params),
                 traceCollector: this.deps.traceCollector,
@@ -442,7 +446,7 @@ export class AgentRuntime {
         }
         catch (err) {
             if (err instanceof HitlAlreadyTimedOutError) {
-                throw new AppError(ErrorCodes.TASK_HITL_TIMEOUT, `Task ${taskId} HITL wait exceeded deadline`, { exposeMessage: true });
+                throw new AppError(ErrorCodes.TASK_HITL_TIMEOUT, HITL_TIMEOUT_MESSAGE, { exposeMessage: true });
             }
             if (err instanceof HitlNotWaitingError) {
                 throw new AppError(ErrorCodes.TASK_HITL_INVALID_STATE, `Task ${taskId} is not waiting for HITL`, { exposeMessage: true });
@@ -482,6 +486,10 @@ export class AgentRuntime {
             taskId,
             correlationId: resumedState.correlationId ?? correlationId,
             agentVersion: agentVersion ?? resumedState.agentVersion,
+            agentDir: (typeof resumedState.agentDir === 'string' && resumedState.agentDir) ||
+                (this.deps.graphLoader
+                    ? (await this.deps.graphLoader.resolveAgentDir(agentCode, agentVersion)) ?? undefined
+                    : undefined),
             activatedSkill: resumedState.activatedSkill,
             skillRoute: resumedState.skillRoute ??
                 (typeof resumedState.activatedSkill === 'string' && resumedState.activatedSkill
@@ -640,10 +648,15 @@ export class AgentRuntime {
         const loadedToolsBase = await this.resolveLoadedTools(agentCode, agentVersion);
         const skillBundle = await this.resolveLoadedSkills(agentCode, userId, agentVersion);
         const loadedTools = assembleLoadedTools(loadedToolsBase);
+        const agentDir = (typeof forkedCheckpoint.state.agentDir === 'string' && forkedCheckpoint.state.agentDir) ||
+            (this.deps.graphLoader
+                ? (await this.deps.graphLoader.resolveAgentDir(agentCode, agentVersion)) ?? undefined
+                : undefined);
         try {
             const result = await this.deps.graphEngine.invoke(graph, {
                 ...forkedCheckpoint.state,
                 agentVersion,
+                agentDir,
                 userId,
                 delegationToken: overrides.executionContext?.delegationToken,
                 executionContext: overrides.executionContext,
@@ -740,7 +753,7 @@ export class AgentRuntime {
                 toolSpanId: persisted.toolSpanId,
                 skillSpanId: persisted.skillSpanId,
             });
-            throw new AppError(ErrorCodes.TASK_HITL_TIMEOUT, `Task ${taskId} HITL wait exceeded deadline`, { exposeMessage: true });
+            throw new AppError(ErrorCodes.TASK_HITL_TIMEOUT, HITL_TIMEOUT_MESSAGE, { exposeMessage: true });
         }
         return {
             task,
@@ -780,7 +793,7 @@ export class AgentRuntime {
             return;
         }
         const collector = this.deps.traceCollector;
-        const error = event.behavior === 'cancel' ? 'HITL cancelled by timeout' : 'HITL wait timed out';
+        const error = HITL_TIMEOUT_MESSAGE;
         if (collector) {
             if (event.toolSpanId) {
                 try {
@@ -807,6 +820,7 @@ export class AgentRuntime {
                 toolCallId: event.toolCallId,
                 toolName: event.toolName,
                 error,
+                errorCode: HITL_TIMEOUT_ERROR_CODE,
             });
         }
         catch {

package/dist/runtime/dev-runtime.d.ts

@@ -18,7 +18,7 @@
  *
  * 装配策略（与 server.ts 一致）：
  * - LLM Provider: Routing > HttpLLMProvider(OpenAI) > Echo 兜底
- * - Tool Executor: mock（显式）/ DevToolExecutor（dev+mcp，缺配置失败）/ 通用路由
+ * - Tool Executor: DevToolExecutor（dev+mcp，缺配置失败）/ 通用路由
  * - Governance: AllowAll(本地闭环默认) / HttpGovernance(显式 GOVERNANCE_DISABLED=0)
  * - 存储: EAP_RUNTIME_STORAGE_PROFILE（默认 dev = File Session/Message/Checkpoint）
  * - Registry: 本地闭环不装配，由 GraphLoader.deploymentSnapshot 兜底

package/dist/runtime/dev-runtime.js

@@ -18,7 +18,7 @@
  *
  * 装配策略（与 server.ts 一致）：
  * - LLM Provider: Routing > HttpLLMProvider(OpenAI) > Echo 兜底
- * - Tool Executor: mock（显式）/ DevToolExecutor（dev+mcp，缺配置失败）/ 通用路由
+ * - Tool Executor: DevToolExecutor（dev+mcp，缺配置失败）/ 通用路由
  * - Governance: AllowAll(本地闭环默认) / HttpGovernance(显式 GOVERNANCE_DISABLED=0)
  * - 存储: EAP_RUNTIME_STORAGE_PROFILE（默认 dev = File Session/Message/Checkpoint）
  * - Registry: 本地闭环不装配，由 GraphLoader.deploymentSnapshot 兜底
@@ -28,7 +28,6 @@ import { HttpLLMProvider } from '../providers/http-llm-provider.js';
 import { createLocalLlmProvider, requireLocalLlmConnections } from '../providers/local-llm-provider.js';
 import { RoutingLLMProvider } from '../providers/routing-llm-provider.js';
 import { createToolExecutor } from '../tool/create-tool-executor.js';
-import { MockToolExecutor } from '../tool/mock-tool-executor.js';
 import { DevToolExecutor } from '../tool/dev-tool-executor.js';
 import { withHarnessPrimitives } from '../tool/harness-primitives.js';
 import { AllowAllGovernanceClient, HttpGovernanceClient, } from '../governance/index.js';
@@ -75,14 +74,11 @@ export function createDevRuntime() {
         llmProvider = createDefaultLLMProvider(turnLog);
         llmProviderKind = 'echo';
     }
-    // ── Tool Executor（显式 mock → dev+mcp 直连，缺配置失败 → 通用路由）──
-    const needsHarnessWrap = toolExecutionMode === 'mock' ||
-        (toolExecutionMode === 'mcp' && deploymentContext === 'dev');
-    const innerExecutor = toolExecutionMode === 'mock'
-        ? new MockToolExecutor({ toolsDir: process.env.EAP_LOCAL_TOOLS_DIR })
-        : toolExecutionMode === 'mcp' && deploymentContext === 'dev'
-            ? new DevToolExecutor()
-            : createToolExecutor({ foundationUrl, deploymentContext });
+    // ── Tool Executor（dev+mcp 直连，缺配置失败 → 通用路由）──
+    const needsHarnessWrap = toolExecutionMode === 'mcp' && deploymentContext === 'dev';
+    const innerExecutor = toolExecutionMode === 'mcp' && deploymentContext === 'dev'
+        ? new DevToolExecutor()
+        : createToolExecutor({ foundationUrl, deploymentContext });
     const toolExecutor = needsHarnessWrap
         ? withHarnessPrimitives(innerExecutor)
         : innerExecutor;

package/dist/runtime/types.d.ts

@@ -6,7 +6,7 @@
  *
  * @see 04-runtime-core/design.md §1.5
  */
-import type { ExecutionContext, InvokeConfig, ResumeHitlResult } from '@gt-fe/eap-contracts';
+import type { ExecutionContext, InvokeConfig, ResumeHitlResult } from '@eap/contracts';
 import type { InvokeResponseData } from '../api/routes/agent.routes.js';
 import type { GraphMessage } from '../graph/contracts/executable-graph.js';
 import type { SSEEvent } from '../sse/contracts/sse-emitter.contract.js';
@@ -31,7 +31,7 @@ export interface ExecuteParams {
 }
 /** 同步执行结果 */
 export type ExecuteResult = InvokeResponseData;
-/** HITL 恢复结果（与 @gt-fe/eap-contracts ResumeHitlResult 对齐） */
+/** HITL 恢复结果（与 @eap/contracts ResumeHitlResult 对齐） */
 export type { ResumeHitlResult };
 /** HITL 用户响应 */
 export interface HitlResponse {

package/dist/server.js

@@ -7,7 +7,7 @@
  * TODO: Phase 2 将本文件迁移至 dev-tools/cli（作为 `eap dev` 命令实现），
  *       runtime 包不再包含 HTTP 服务代码，仅作为纯库导出。
  */
-import { ErrorCodes } from '@gt-fe/eap-contracts';
+import { ErrorCodes } from '@eap/contracts';
 import { createServer } from 'node:http';
 import { URL } from 'node:url';
 import { resolveExecutionContext } from './governance/index.js';

package/dist/sse/events/skill-events.d.ts

@@ -6,7 +6,7 @@
  * - skill.started / skill.completed / skill.failed（子图执行生命周期）
  *
  * @see design.md §1.6 SSE事件协议定义
- * @see @gt-fe/eap-contracts OPTIONAL_SSE_EVENTS
+ * @see @eap/contracts OPTIONAL_SSE_EVENTS
  */
 /** 技能匹配成功 */
 export interface SkillMatchedPayload {

package/dist/sse/events/skill-events.js

@@ -6,6 +6,6 @@
  * - skill.started / skill.completed / skill.failed（子图执行生命周期）
  *
  * @see design.md §1.6 SSE事件协议定义
- * @see @gt-fe/eap-contracts OPTIONAL_SSE_EVENTS
+ * @see @eap/contracts OPTIONAL_SSE_EVENTS
  */
 export {};

package/dist/tool/create-tool-executor.d.ts

@@ -5,7 +5,7 @@
  * `EAP_TOOL_GATEWAY_TRANSPORT=http` 时用 HttpToolExecutor（仅调试）。
  * desktop 经 ToolExecutionRouter 分流 Local / Gateway。
  */
-import type { ILocalToolInstallStore, LocalToolInstallRecord } from '@gt-fe/eap-contracts';
+import type { ILocalToolInstallStore, LocalToolInstallRecord } from '@eap/contracts';
 import { type DeploymentContext } from './tool-execution-router.js';
 import type { IToolExecutor } from './tool-executor.interface.js';
 export declare class EmptyInstallStore implements ILocalToolInstallStore {

package/dist/tool/dev-http-executor.d.ts

@@ -1,6 +1,6 @@
 /**
  * Dev 下按 type:http 清单直连出站（gateway.baseUrl + pathTemplate）。
- * URL 拼接与 host 白名单与 Tool Gateway 共用 @gt-fe/eap-contracts http-outbound。
+ * URL 拼接与 host 白名单与 Tool Gateway 共用 @eap/contracts http-outbound。
  */
 import type { IToolExecutor, ToolCallRequest, ToolCallResult } from './tool-executor.interface.js';
 export interface DevHttpExecution {

package/dist/tool/dev-http-executor.js

@@ -1,8 +1,9 @@
 /**
  * Dev 下按 type:http 清单直连出站（gateway.baseUrl + pathTemplate）。
- * URL 拼接与 host 白名单与 Tool Gateway 共用 @gt-fe/eap-contracts http-outbound。
+ * URL 拼接与 host 白名单与 Tool Gateway 共用 @eap/contracts http-outbound。
  */
-import { assertHttpHostAllowlisted, buildHttpToolUrl as buildSharedHttpToolUrl } from '@gt-fe/eap-contracts';
+import { assertHttpHostAllowlisted, buildHttpToolUrl as buildSharedHttpToolUrl, ErrorCodes } from '@eap/contracts';
+import { abortOrTimeoutMessage, DEFAULT_HTTP_TOOL_TIMEOUT_SEC, isAbortError, resolveToolTimeoutSec, toToolTimeoutMs, } from './timeout.js';
 export function resolveHttpExecutionFromRequest(request) {
     const raw = request.execution;
     if (!raw || typeof raw !== 'object')
@@ -22,7 +23,7 @@ export function resolveHttpExecutionFromRequest(request) {
         allowedHosts: Array.isArray(e.allowedHosts)
             ? e.allowedHosts.filter((item) => typeof item === 'string')
             : [],
-        timeout: typeof e.timeout === 'number' ? e.timeout : 10000,
+        timeout: resolveToolTimeoutSec(e.timeout, DEFAULT_HTTP_TOOL_TIMEOUT_SEC),
     };
 }
 export function buildHttpToolUrl(spec, args) {
@@ -48,8 +49,9 @@ export class DevHttpExecutor {
             const args = request.arguments ?? {};
             const url = buildHttpToolUrl(spec, args);
             const method = (spec.method ?? 'GET').toUpperCase();
+            const timeoutSec = resolveToolTimeoutSec(spec.timeout, DEFAULT_HTTP_TOOL_TIMEOUT_SEC);
             const controller = new AbortController();
-            const timer = setTimeout(() => controller.abort(), spec.timeout ?? 10000);
+            const timer = setTimeout(() => controller.abort(), toToolTimeoutMs(timeoutSec, DEFAULT_HTTP_TOOL_TIMEOUT_SEC));
             const headers = {
                 Accept: 'application/json, text/plain;q=0.9',
             };
@@ -81,14 +83,15 @@ export class DevHttpExecutor {
             };
         }
         catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
+            const timeoutSec = resolveToolTimeoutSec(spec?.timeout, DEFAULT_HTTP_TOOL_TIMEOUT_SEC);
+            const aborted = isAbortError(err);
             return {
                 toolCallId: request.toolCallId,
                 toolName: request.toolName,
                 content: '',
                 success: false,
-                error: message,
-                errorCode: 'EXECUTION_FAILED',
+                error: abortOrTimeoutMessage(err, timeoutSec),
+                errorCode: aborted ? ErrorCodes.TOOL_TIMEOUT : 'EXECUTION_FAILED',
                 runtime: 'local',
             };
         }

package/dist/tool/dev-mcp-executor.js

@@ -17,6 +17,8 @@
  * @see docs/workflows/local-agent-dev-loop.md
  * @see runtime/src/tool/local-mcp-client.ts
  */
+import { ErrorCodes } from '@eap/contracts';
+import { isAbortError } from './timeout.js';
 import { LocalMcpClient } from './local-mcp-client.js';
 export class DevMcpExecutor {
     client;
@@ -50,14 +52,14 @@ export class DevMcpExecutor {
             };
         }
         catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
+            const aborted = isAbortError(err);
             return {
                 toolCallId: request.toolCallId,
                 toolName: request.toolName,
                 content: '',
                 success: false,
-                error: message,
-                errorCode: 'EXECUTION_FAILED',
+                error: err instanceof Error ? err.message : String(err),
+                errorCode: aborted ? ErrorCodes.TOOL_TIMEOUT : 'EXECUTION_FAILED',
                 runtime: 'local',
             };
         }

package/dist/tool/dev-tool-executor.d.ts

@@ -7,7 +7,7 @@
  * - execution.protocol=mcp → DevMcpExecutor
  * - execution.protocol=http → DevHttpExecutor
  * - 能解析出 code handler → LocalToolExecutor
- * - 其余 → NOT_CONFIGURED（mock 只走显式 `--tool-mode mock`）
+ * - 其余 → NOT_CONFIGURED
  */
 import { DevMcpExecutor } from './dev-mcp-executor.js';
 import type { IToolExecutor, ToolCallRequest, ToolCallResult } from './tool-executor.interface.js';

package/dist/tool/dev-tool-executor.js

@@ -7,7 +7,7 @@
  * - execution.protocol=mcp → DevMcpExecutor
  * - execution.protocol=http → DevHttpExecutor
  * - 能解析出 code handler → LocalToolExecutor
- * - 其余 → NOT_CONFIGURED（mock 只走显式 `--tool-mode mock`）
+ * - 其余 → NOT_CONFIGURED
  */
 import { EmptyInstallStore } from './create-tool-executor.js';
 import { DevMcpExecutor } from './dev-mcp-executor.js';
@@ -42,7 +42,7 @@ export class DevToolExecutor {
             content: '',
             success: false,
             error: `Dev tool "${request.toolName}" is not executable: no MCP server, ` +
-                'HTTP gateway+pathTemplate, or code handler. Use --tool-mode mock for MockToolExecutor.',
+                'HTTP gateway+pathTemplate, or code handler.',
             errorCode: 'NOT_CONFIGURED',
             runtime: 'local',
         };