@actiondock/core 2.7.0 → 2.8.0

package/dist/execution/types.d.ts

@@ -1,57 +1,26 @@
-import type { ActionDefinition, ActionRef, ExecutionEvent, ExecutionResult, JsonValue, Logger, ProcessAPI, ProgressReporter, RunRecord, RunStatus } from "@actiondock/sdk";
+import type { ActionDefinition, ActionRef, ExecutionEvent, ExecutionResult, JsonValue, Logger, ProcessAPI, RunRecord, RunStatus } from "@actiondock/sdk";
 import type { ProjectConfig } from "../project/types.js";
-import type { ActionRunner, ExecutionHandle } from "../runtime/runner.js";
+import type { ExecutionHandle } from "../runtime/runner.js";
 import type { Clock } from "../runtime/clock.js";
 import type { EventSink } from "../runtime/events.js";
 import type { RuntimeStorage } from "../storage/types.js";
-import type { RuntimePlatform } from "../platform/types.js";
-import type { ProcessOwner } from "../process/process-manager.js";
+import type { ModuleLoader } from "../runtime/module-loader.js";
+import { type PackageIdentity, type RunOptions, type InvocationContext, createInvocationContext, createRootInvocationContext } from "../invocation/types.js";
+import type { LocalActionResolver } from "../runtime/runner.js";
+export { createInvocationContext, createRootInvocationContext };
+export type { PackageIdentity, RunOptions, InvocationContext, LocalActionResolver };
 /**
- * 执行参数选项。
+ * 跨包动作调用委托函数。
  */
-export interface ExecuteOptions {
-    /** 外部取消信号 */
-    signal?: AbortSignal;
-    /** 超时时间（毫秒） */
-    timeoutMs?: number;
-    /** 配置临时覆盖字典 */
-    config?: Record<string, JsonValue>;
-    /** 幂等请求去重标识 */
-    requestId?: string;
-    /** 父运行 ID */
-    parentRunId?: string;
-    /** 根运行 ID */
-    rootRunId?: string;
-    /** 最大调用嵌套深度限制 */
-    maxCallDepth?: number;
-    /** 外部日志注入 */
-    logger?: Logger;
-    /** 外部进度报告器注入 */
-    progress?: ProgressReporter;
-    /** 外部进程执行器注入 */
-    process?: ProcessAPI;
-    /** 可选的底层运行平台契约 */
-    platform?: RuntimePlatform;
-    /** 执行宿主会话标识 */
-    hostSessionId?: string;
-    /** 包物理实例标识 */
-    packageInstanceId?: string;
-    /** 快照代次标识 */
-    generationId?: string;
-    /** 租户标识 */
-    tenantId?: string;
-    /** 主体标识 */
-    principalId?: string;
-    /** 执行归属所有者契约 */
-    owner?: ProcessOwner;
-}
+export type ActionInvoker = (childAction: ActionRef | string, childInput: unknown, context: InvocationContext) => Promise<unknown>;
 /**
  * 统一执行协调服务配置选项。
  */
 export interface ExecutionServiceOptions {
-    packageId: string;
+    /** 包物理与快照身份标识值对象（必填单一事实源） */
+    identity: PackageIdentity;
     hostSessionId?: string;
-    storage?: RuntimeStorage;
+    storage: RuntimeStorage;
     globalStorage?: RuntimeStorage;
     projectRoot?: string;
     projectConfig?: ProjectConfig;
@@ -62,30 +31,11 @@ export interface ExecutionServiceOptions {
     logger?: Logger;
     eventSink?: EventSink;
     maxActiveRuns?: number;
-    maxCallDepth?: number;
-    maxSubRuns?: number;
     ownerId?: string;
-    actionResolver?: (ref: ActionRef | string) => ActionDefinition | undefined | Promise<ActionDefinition | undefined>;
-    packageInstanceId?: string;
-    generationId?: string;
-    getStorageForPackage?: (packageId: string, projectRoot?: string) => RuntimeStorage;
-    packageContextResolver?: (packageId: string) => Promise<{
-        projectRoot?: string;
-        projectConfig?: ProjectConfig;
-        storage: RuntimeStorage;
-        actions?: Map<string, ActionDefinition>;
-        packageInstanceId?: string;
-        generationId?: string;
-    } | undefined> | {
-        projectRoot?: string;
-        projectConfig?: ProjectConfig;
-        storage: RuntimeStorage;
-        actions?: Map<string, ActionDefinition>;
-        packageInstanceId?: string;
-        generationId?: string;
-    } | undefined;
+    actionResolver?: LocalActionResolver;
     customHome?: string;
-    platform?: RuntimePlatform;
+    moduleLoader?: ModuleLoader;
+    actionInvoker?: ActionInvoker;
 }
 /**
  * 异步任务执行票据。
@@ -119,12 +69,16 @@ export type CancelResult = {
  * 统一执行协调服务接口。
  */
 export interface ExecutionService {
-    /** 底层 Action 执行引擎（用于跨包上下文注入与动态解析委托） */
-    readonly runner: ActionRunner;
+    /** 包物理与快照身份标识值对象 */
+    readonly identity: PackageIdentity;
+    /** 解析指定 Action 定义（支持本地注册、局部解析器及工程目录扫描） */
+    resolveAction?(ref: ActionRef | string): Promise<ActionDefinition | undefined>;
     /** 同步执行 Action 并等待终态结果 */
-    execute(ref: ActionRef | string, input: JsonValue, options?: ExecuteOptions): Promise<ExecutionResult>;
+    execute(ref: ActionRef | string, input: JsonValue, context: InvocationContext): Promise<ExecutionResult>;
+    /** 同步执行 Action 并等待终态结果（execute 统一别名） */
+    run(ref: ActionRef | string, input: JsonValue, context: InvocationContext): Promise<ExecutionResult>;
     /** 异步启动 Action 并立即返回任务票据 */
-    start(ref: ActionRef | string, input: JsonValue, options?: ExecuteOptions): Promise<ExecutionTicket>;
+    start(ref: ActionRef | string, input: JsonValue, context: InvocationContext): Promise<ExecutionTicket>;
     /** 根据 ID 获取运行记录 */
     get(runId: string): Promise<RunRecord | undefined>;
     /** 取消指定的在运行任务 */
@@ -141,6 +95,8 @@ export interface ExecutionService {
     registerAction(id: string, action: ActionDefinition): void;
     /** 按 ID 检索已注册的 Action 定义 */
     getAction(id: string): ActionDefinition | undefined;
+    /** 设置子任务动作调用委托器 */
+    setActionInvoker?(invoker?: ActionInvoker): void;
     /** 优雅关闭服务并等待活跃任务收尾 */
     close(options?: {
         graceMs?: number;

package/dist/execution/types.js

@@ -1 +1,2 @@
-export {};
+import { createInvocationContext, createRootInvocationContext, } from "../invocation/types.js";
+export { createInvocationContext, createRootInvocationContext };

package/dist/filter/intent.d.ts

@@ -3,18 +3,17 @@
  */
 export type Extractor<T> = (item: T) => unknown;
 /**
- * 安全地将模式字符串、数组或现有正则编译为不区分大小写的 RegExp 正则表达式。
- * 若正则语法不合法，自动对特殊字符进行转义并降级为字面量匹配正则，保证零 Crash。
+ * 安全地将模式字符串、数组或现有正则编译为不区分大小写的匹配正则。
  *
- * @param intent 意图关键词、正则或数组
- */
-export declare function compileIntentRegex(intent?: string | string[] | RegExp | null): RegExp | null;
-/**
- * 递归检查某个值（包括嵌套的数组或对象结构）是否匹配给定的正则表达式。
+ * 编译策略：
+ * - 显式传入 RegExp 实例：原样使用（调用方自担回溯风险）
+ * - 字符串以 re: 前缀声明：按正则编译，语法非法时转义降级为字面量
+ * - 其余字符串与数组：一律转义为字面量子串匹配（多关键词以 | 分隔时保留 OR 语义），
+ *   消除用户可控输入的重灾回溯面
  *
- * @param value 待检测的任意数据类型
- * @param regex 正则表达式
+ * @param intent 意图关键词、显式正则（re: 前缀）或数组
  */
+export declare function compileIntentRegex(intent?: string | string[] | RegExp | null): RegExp | null;
 export declare function matchIntent(value: unknown, regex: RegExp): boolean;
 export interface FilterResult<T> {
     items: T[];

package/dist/filter/intent.js

@@ -1,8 +1,29 @@
 /**
- * 安全地将模式字符串、数组或现有正则编译为不区分大小写的 RegExp 正则表达式。
- * 若正则语法不合法，自动对特殊字符进行转义并降级为字面量匹配正则，保证零 Crash。
+ * 显式开启正则模式的意图前缀：以此前缀声明的意图才按正则编译，其余一律按字面子串匹配。
+ * 目的：意图参数来自用户输入（CLI 与 HTTP 查询参数），直接编译正则存在灾难性回溯（ReDoS）风险。
+ */
+const REGEX_MODE_PREFIX = "re:";
+/**
+ * 将任意字符串转义为字面量匹配正则（保留 | 分隔的多关键词 OR 语义）。
+ */
+function escapeAsLiteralPattern(patternStr) {
+    return patternStr
+        .split("|")
+        .map((part) => part.trim())
+        .filter(Boolean)
+        .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+        .join("|");
+}
+/**
+ * 安全地将模式字符串、数组或现有正则编译为不区分大小写的匹配正则。
+ *
+ * 编译策略：
+ * - 显式传入 RegExp 实例：原样使用（调用方自担回溯风险）
+ * - 字符串以 re: 前缀声明：按正则编译，语法非法时转义降级为字面量
+ * - 其余字符串与数组：一律转义为字面量子串匹配（多关键词以 | 分隔时保留 OR 语义），
+ *   消除用户可控输入的重灾回溯面
  *
- * @param intent 意图关键词、正则或数组
+ * @param intent 意图关键词、显式正则（re: 前缀）或数组
  */
 export function compileIntentRegex(intent) {
     if (!intent)
@@ -10,6 +31,7 @@ export function compileIntentRegex(intent) {
     if (intent instanceof RegExp)
         return intent;
     let patternStr;
+    let regexMode = false;
     if (Array.isArray(intent)) {
         const valid = intent.map((s) => s.trim()).filter(Boolean);
         if (valid.length === 0)
@@ -20,25 +42,39 @@ export function compileIntentRegex(intent) {
         patternStr = intent.trim();
         if (!patternStr)
             return null;
+        if (patternStr.startsWith(REGEX_MODE_PREFIX)) {
+            const rest = patternStr.slice(REGEX_MODE_PREFIX.length).trim();
+            if (!rest)
+                return null;
+            patternStr = rest;
+            regexMode = true;
+        }
     }
-    try {
-        return new RegExp(patternStr, "i");
-    }
-    catch {
-        const escaped = patternStr.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        return new RegExp(escaped, "i");
+    if (regexMode) {
+        try {
+            return new RegExp(patternStr, "i");
+        }
+        catch {
+            // 正则语法非法时降级为字面量匹配，保证零 Crash
+        }
     }
+    return new RegExp(escapeAsLiteralPattern(patternStr), "i");
 }
 /**
  * 递归检查某个值（包括嵌套的数组或对象结构）是否匹配给定的正则表达式。
  *
+ * 防护：对象序列化长度超过 MATCH_TEXT_LIMIT 时拒绝全文匹配，避免对超大对象执行回溯敏感的正则扫描。
+ *
  * @param value 待检测的任意数据类型
  * @param regex 正则表达式
  */
+const MATCH_TEXT_LIMIT = 64 * 1024;
 export function matchIntent(value, regex) {
     if (value === undefined || value === null)
         return false;
     if (typeof value === "string") {
+        if (value.length > MATCH_TEXT_LIMIT)
+            return false;
         return regex.test(value);
     }
     if (typeof value === "number" || typeof value === "boolean") {
@@ -53,7 +89,10 @@ export function matchIntent(value, regex) {
     }
     if (typeof value === "object") {
         try {
-            return regex.test(JSON.stringify(value));
+            const text = JSON.stringify(value);
+            if (text === undefined || text.length > MATCH_TEXT_LIMIT)
+                return false;
+            return regex.test(text);
         }
         catch {
             return false;

package/dist/graph/index.d.ts

@@ -0,0 +1,4 @@
+export * from "../catalog/graph.js";
+export { parseActionRef, resolveAction } from "../catalog/resolve-action.js";
+export { resolvePlaybook } from "../catalog/resolve-playbook.js";
+export { DefaultActionCatalog, type ActionCatalog } from "../catalog/action-catalog.js";

package/dist/graph/index.js

@@ -0,0 +1,4 @@
+export * from "../catalog/graph.js";
+export { parseActionRef, resolveAction } from "../catalog/resolve-action.js";
+export { resolvePlaybook } from "../catalog/resolve-playbook.js";
+export { DefaultActionCatalog } from "../catalog/action-catalog.js";

package/dist/host/host.d.ts

@@ -1,19 +1,17 @@
 import type { ActionRef, ExecutionEvent, ExecutionResult, JsonValue, RunRecord } from "@actiondock/sdk";
-import type { ActionDockApp, ActionSpec, ActionSummary, ListActionsOptions, PackageInfo, PlaybookSpec, PlaybookSummary } from "../app/types.js";
-import type { CancelResult, ExecuteOptions, ExecutionTicket } from "../execution/types.js";
+import type { PackageInfo, PackageRuntime, ActionSpec, ActionSummary, ListActionsOptions, PlaybookSpec, PlaybookSummary } from "../package/types.js";
+import type { CancelResult, ExecutionTicket } from "../execution/types.js";
+import { type RunOptions } from "../invocation/types.js";
+import { InvocationPolicy } from "../invocation/policy.js";
 import type { ActionDockHost, ActionDockHostOptions } from "./types.js";
-/**
- * ActionDock 统一多包宿主容器默认实现。
- * 负责聚合与调度多个 ActionDockApp 实例，提供跨包引用路由、依赖声明校验与资源配额控制。
- */
+import type { ConfigValueView, ListRunsOptions, StateScopeOptions } from "../service/types.js";
+import type { StateEntry } from "../storage/types.js";
 export declare class DefaultActionDockHost implements ActionDockHost {
     readonly hostSessionId: string;
     readonly options: ActionDockHostOptions;
-    private apps;
-    private readonly internallyCreatedApps;
-    private activeSubRunsPerRoot;
+    private runtimes;
+    readonly policy: InvocationPolicy;
     private hostPublicPackageIds;
-    private resolver?;
     private maxCallDepth;
     private maxSubRuns;
     private eventSink;
@@ -21,11 +19,31 @@ export declare class DefaultActionDockHost implements ActionDockHost {
     private dataDirLock?;
     private failedLinkedPackages;
     private failedAutoLoad?;
-    /** 透传给内部创建 App 的存储收割开关（Host 默认持有者身份，显式可关） */
+    /** 透传给内部创建 Runtime 的存储收割开关（Host 默认持有者身份，显式可关） */
     private recoverOrphans;
-    constructor(options?: ActionDockHostOptions);
+    private graph;
+    private catalog;
+    private globalStorage?;
+    constructor(options?: ActionDockHostOptions, internalOptions?: {
+        deferInit?: boolean;
+    });
+    private initializeSync;
+    initializeAsync(): Promise<void>;
+    /**
+     * 安全回滚初始化失败时所占用的资源。
+     *
+     * 同步语境（构造函数路径）下对 runtime.close() 采用 fire-and-forget：
+     * 仅附加吞没异常的 catch 处理器，不 await，避免构造链路引入异步;
+     * 异步语境下逐个 await 全部 runtime.close() 后再依次释放全局存储与目录锁。
+     */
+    private rollbackResources;
     /**
-     * 阶段函数：注册显式传入的 packages 列表（现成 App 实例或 AppOptions 配置）。
+     * 异步安全回滚初始化失败时所占用的资源。
+     */
+    rollbackInitialization(): Promise<void>;
+    private rollbackSync;
+    /**
+     * 阶段函数：注册显式传入的 packages 列表（PackageRuntimeOptions 配置或包目录物理路径）。
      */
     private registerExplicitPackages;
     /**
@@ -43,40 +61,64 @@ export declare class DefaultActionDockHost implements ActionDockHost {
      * 加载失败的链接包记录至 failedLinkedPackages 诊断并在调阅时透传精准失败原因。
      */
     private registerLinkedPackages;
-    private resolvePackageContext;
-    private bindApp;
-    /** 路由可见性上下文（公开包集合与依赖解析器） */
-    private visibility;
-    getApp(packageId: string): ActionDockApp | undefined;
-    listApps(): ActionDockApp[];
+    private bindRuntime;
     /**
-     * 获取自动加载工程的失败诊断信息。
-     * 仅自动探测场景会记录此诊断；显式传入 projectRoot 的加载失败会直接抛出，不产生此诊断。
+     * 构造应用专属动作调用委托器。
+     * 铁律 2：跨包调用改走 ActionInvoker 回到 Host 执行主链，经由唯一的 InvocationPolicy 授权后调用目标 Package 的 ExecutionService。
      */
-    getAutoLoadFailure(): {
-        projectRoot: string;
-        error: string;
-    } | undefined;
-    private registerAppInternal;
-    registerApp(app: ActionDockApp): void;
+    private createActionInvoker;
+    /** 路由可见性上下文（公开包集合与包依赖图） */
+    private visibility;
+    private rebuildGraphAndCatalog;
+    getRuntime(packageId: string): PackageRuntime | undefined;
+    listRuntimes(): PackageRuntime[];
+    private registerRuntimeInternal;
+    registerRuntime(runtime: PackageRuntime): void;
     info(): Promise<PackageInfo[]>;
     listActions(options?: ListActionsOptions): Promise<ActionSummary[]>;
     describeAction(ref: ActionRef | string): Promise<ActionSpec>;
-    listPlaybooks(): Promise<PlaybookSummary[]>;
+    listPlaybooks(options?: {
+        intent?: string;
+        package?: string;
+    }): Promise<PlaybookSummary[]>;
     describePlaybook(id: string): Promise<PlaybookSpec>;
-    runAction(ref: ActionRef | string, input: JsonValue, options?: ExecuteOptions): Promise<ExecutionResult>;
-    startAction(ref: ActionRef | string, input: JsonValue, options?: ExecuteOptions): Promise<ExecutionTicket>;
+    runAction(ref: ActionRef | string, input: JsonValue, options?: RunOptions): Promise<ExecutionResult>;
+    startAction(ref: ActionRef | string, input: JsonValue, options?: RunOptions): Promise<ExecutionTicket>;
     getRun(runId: string): Promise<RunRecord | undefined>;
+    listRuns(query?: ListRunsOptions): Promise<RunRecord[]>;
+    clearRuns(options?: {
+        packageId?: string;
+        actionId?: string;
+        status?: string;
+        olderThanMs?: number;
+    }): Promise<number>;
     cancelRun(runId: string, reason?: string): Promise<CancelResult>;
     events(runId: string, options?: {
         after?: number | string;
         signal?: AbortSignal;
         maxQueueSize?: number;
     }): AsyncIterable<ExecutionEvent>;
+    private getGlobalStorage;
+    private findDeclaredConfigItem;
+    private resolveRuntime;
+    /**
+     * 解析目标包运行时：未命中时抛出统一的包未找到错误。
+     */
+    private requireRuntime;
+    getConfig(packageId: string, key: string): Promise<ConfigValueView>;
+    setConfig(packageId: string, key: string, value: JsonValue): Promise<void>;
+    deleteConfig(packageId: string, key: string): Promise<boolean>;
+    listConfig(packageId: string): Promise<ConfigValueView[]>;
+    getState<T extends JsonValue = JsonValue>(packageId: string, actionId: string, key: string, options?: StateScopeOptions): Promise<T | undefined>;
+    setState<T extends JsonValue = JsonValue>(packageId: string, actionId: string, key: string, value: T, options?: StateScopeOptions): Promise<void>;
+    deleteState(packageId: string, actionId: string, key: string, options?: StateScopeOptions): Promise<boolean>;
+    listStateKeys(packageId: string, actionId: string, options?: StateScopeOptions): Promise<string[]>;
+    clearState(packageId: string, actionId: string, options?: StateScopeOptions): Promise<number>;
+    listStateEntries(packageId: string, options?: any): Promise<StateEntry[]>;
     /**
      * 优雅关闭宿主容器。
-     * 仅对内部创建的 App 实例执行 close 并安全释放底层资源；
-     * 外部传入借用的 App 实例生命周期完全由调用方负责管理，Host 关闭时仅解绑引用并清理自身内部实例。
+     * 仅对内部创建的 Runtime 实例执行 close 并安全释放底层资源；
+     * 外部传入借用的 Runtime 实例生命周期完全由调用方负责管理，Host 关闭时仅解绑引用并清理自身内部实例。
      */
     close(options?: {
         graceMs?: number;