@actiondock/core 2.9.1 → 2.11.0

package/dist/execution/types.d.ts

@@ -1,14 +1,31 @@
 import type { ActionDefinition, ActionRef, ExecutionEvent, ExecutionResult, JsonValue, Logger, ProcessAPI, RunRecord, RunStatus } from "@actiondock/sdk";
 import type { ProjectConfig } from "../project/types.js";
-import type { ExecutionHandle } from "../runtime/runner.js";
-import type { Clock } from "../runtime/clock.js";
+import type { Clock } from "../storage/clock.js";
 import type { EventSink } from "../runtime/events.js";
 import type { RuntimeStorage } from "../storage/types.js";
-import type { ModuleLoader } from "../runtime/module-loader.js";
+import type { ModuleLoader } from "../platform/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 type { PackageIdentity, RunOptions, InvocationContext };
+/**
+ * 局部动作解析器委托函数契约（仅限当前包内部动作）。
+ */
+export type LocalActionResolver = (actionId: string) => ActionDefinition | undefined | Promise<ActionDefinition | undefined>;
+/**
+ * 异步执行句柄，支持获取执行结果 Promise 与主动取消操作。
+ */
+export interface ExecutionHandle {
+    /** 本次执行生成的全局唯一运行 ID */
+    runId: string;
+    /** 最终执行结果信封 Promise */
+    result: Promise<ExecutionResult>;
+    /**
+     * 取消当前正在执行的任务
+     * @param reason 取消原因
+     * @returns 是否成功触发取消
+     */
+    cancel(reason?: string): boolean;
+}
 /**
  * 跨包动作调用委托函数。
  */
@@ -47,6 +64,8 @@ export interface ExecutionTicket {
     status: RunStatus;
     /** 任务终态结果 Promise（用于需要异步等待执行结果的场景） */
     result?: Promise<ExecutionResult>;
+    /** 取消执行操作（与 ExecutionHandle 对齐） */
+    cancel?: (reason?: string) => boolean;
 }
 /**
  * 取消操作结果枚举。

package/dist/host/host.d.ts

@@ -1,10 +1,10 @@
-import type { ActionRef, ExecutionEvent, ExecutionResult, JsonValue, RunRecord } from "@actiondock/sdk";
+import type { ActionRef, ExecutionResult, JsonValue, RunRecord } from "@actiondock/sdk";
 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";
-import type { ConfigValueView, ListRunsOptions, StateScopeOptions } from "../service/types.js";
+import type { ActionDockHost, ActionDockHostOptions, HostEventsPort } from "./types.js";
+import type { ConfigPort, ConfigValueView, DiscoveryPort, ExecutionPort, ListRunsOptions, RunsPort, StatePort, StateScopeOptions } from "../service/types.js";
 import type { StateEntry } from "../storage/types.js";
 export declare class DefaultActionDockHost implements ActionDockHost {
     readonly hostSessionId: string;
@@ -24,24 +24,46 @@ export declare class DefaultActionDockHost implements ActionDockHost {
     private graph;
     private catalog;
     private globalStorage?;
+    private initPromise?;
+    private isInitialized;
+    readonly discovery: DiscoveryPort;
+    readonly execution: ExecutionPort;
+    readonly runs: RunsPort;
+    readonly events: HostEventsPort;
+    readonly management?: {
+        config: ConfigPort;
+        state: StatePort;
+    };
+    /** 自引用 host 属性，向后兼容服务实例字段访问 */
+    get host(): ActionDockHost;
+    /**
+     * @deprecated 直接使用 new DefaultActionDockHost() 构造已弃用，请迁移至 createActionDockHost() 异步工厂函数以完成完整的生命周期初始化。
+     */
     constructor(options?: ActionDockHostOptions, internalOptions?: {
-        deferInit?: boolean;
+        fromFactory?: boolean;
     });
-    private initializeSync;
-    initializeAsync(): Promise<void>;
     /**
-     * 安全回滚初始化失败时所占用的资源。
-     *
-     * 同步语境（构造函数路径）下对 runtime.close() 采用 fire-and-forget：
-     * 仅附加吞没异常的 catch 处理器，不 await，避免构造链路引入异步;
-     * 异步语境下逐个 await 全部 runtime.close() 后再依次释放全局存储与目录锁。
+     * 静态工厂方法：创建并初始化 ActionDockHost 宿主容器。
+     */
+    static create(options?: ActionDockHostOptions): Promise<ActionDockHost>;
+    /**
+     * 确保宿主容器已完成异步生命周期初始化。
+     * 当通过 ActionDockHost.create() / createActionDockHost() 创建时在工厂阶段预先就绪；
+     * 当直接通过 new DefaultActionDockHost() 构造时，在首次异步调用时惰性触发加载。
+     */
+    private ensureInitialized;
+    private performInitialization;
+    /**
+     * 持有者预热：等待内部创建的全部包完成存储准备（含运行记录恢复），
+     * 并打开共享全局存储。预热的是存储，不是执行服务、进程接口或业务模块；
+     * 任一包准备失败按既有初始化失败时机整体回滚。
+     * 外部注入的 Runtime 保持既有生命周期约定，不在此预热。
      */
-    private rollbackResources;
+    private prewarmManagedRuntimes;
     /**
      * 异步安全回滚初始化失败时所占用的资源。
      */
     rollbackInitialization(): Promise<void>;
-    private rollbackSync;
     /**
      * 阶段函数：注册显式传入的 packages 列表（PackageRuntimeOptions 配置或包目录物理路径）。
      */
@@ -84,8 +106,9 @@ export declare class DefaultActionDockHost implements ActionDockHost {
     describePlaybook(id: string): Promise<PlaybookSpec>;
     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[]>;
+    getRun(runId: string, signal?: AbortSignal): Promise<RunRecord | undefined>;
+    listRuns(query?: ListRunsOptions, signal?: AbortSignal): Promise<RunRecord[]>;
+    countRuns(query?: ListRunsOptions, signal?: AbortSignal): Promise<number>;
     clearRuns(options?: {
         packageId?: string;
         actionId?: string;
@@ -95,11 +118,7 @@ export declare class DefaultActionDockHost implements ActionDockHost {
     }): Promise<number>;
     cleanExpiredRuns(policy?: import("../storage/types.js").RunsRetentionPolicy): Promise<number>;
     cancelRun(runId: string, reason?: string): Promise<CancelResult>;
-    events(runId: string, options?: {
-        after?: number | string;
-        signal?: AbortSignal;
-        maxQueueSize?: number;
-    }): AsyncIterable<ExecutionEvent>;
+    private subscribeEvents;
     private getGlobalStorage;
     private findDeclaredConfigItem;
     private resolveRuntime;
@@ -114,8 +133,8 @@ export declare class DefaultActionDockHost implements ActionDockHost {
     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>;
+    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[]>;
     /**
      * 优雅关闭宿主容器。
@@ -123,6 +142,7 @@ export declare class DefaultActionDockHost implements ActionDockHost {
      * 外部传入借用的 Runtime 实例生命周期完全由调用方负责管理，Host 关闭时仅解绑引用并清理自身内部实例。
      */
     close(options?: {
+        timeoutMs?: number;
         graceMs?: number;
     }): Promise<void>;
 }