@actiondock/core 2.0.11 → 2.0.12

package/dist/utils/index.d.ts

@@ -0,0 +1,29 @@
+export { findExecutable } from "@actiondock/sdk";
+/**
+ * Parses duration strings like "500ms", "30s", "5m", "1h", "1d" or pure numbers into milliseconds.
+ */
+export declare function parseDuration(input?: string): number | undefined;
+/**
+ * Extracts a concise slug from a package or action identifier (e.g. '@scope/pkg' -> 'pkg', 'team.action' -> 'action').
+ */
+export declare function getPackageSlug(id: string): string;
+/**
+ * Resolves the root ActionDock user home directory based on customHome, ACTIONDOCK_HOME, or user homedir.
+ */
+export declare function getActionDockHome(customHome?: string): string;
+export declare const PACKAGE_ID_REGEX: RegExp;
+/**
+ * Validates packageId to ensure it adheres to valid naming conventions and prevents path traversal.
+ */
+export declare function assertValidPackageId(packageId: string): void;
+/**
+ * Ensures that a given path stays strictly within the specified root boundary,
+ * preventing relative directory escape (..) and symlink jailbreak.
+ * Traverses upward to the nearest existing ancestor directory to resolve symlinks
+ * even for non-existent paths.
+ */
+export declare function assertPathWithinRoot(rootDir: string, targetPath: string, fieldName?: string): void;
+/**
+ * Backwards-compatible alias for assertPathWithinRoot targeting project roots.
+ */
+export declare function assertWithinProjectRoot(projectRoot: string, subDir: string, fieldName: string): void;

package/dist/version.d.ts

@@ -0,0 +1,4 @@
+/**
+ * ActionDock 核心版本号单一事实源。
+ */
+export declare const ACTIONDOCK_VERSION = "2.0.12";

package/package.json

@@ -1,39 +1,40 @@
 {
   "name": "@actiondock/core",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "ActionDock Core Engine - Project loader, runtime execution, SQLite storage, standalone builder, and skill exporter",
   "type": "module",
-  "main": "./src/index.ts",
-  "module": "./src/index.ts",
-  "types": "./src/index.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./src/index.ts",
-      "types": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     }
   },
   "files": [
-    "src",
+    "dist",
     "README.md"
   ],
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=22.13.0"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
+    "build": "bun run ../../scripts/build.ts",
     "test": "bun test"
   },
   "dependencies": {
-    "@actiondock/sdk": "^2.0.11",
+    "@actiondock/sdk": "^2.0.12",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "yaml": "^2.7.0"
   },
   "devDependencies": {
-    "@types/bun": "latest",
     "typescript": "^5.7.0"
   },
   "keywords": [

package/src/build/templates.ts

@@ -1,59 +0,0 @@
-import { resolve } from "node:path";
-
-/**
- * 构建时 Action 导入映射。
- */
-export interface ActionImport {
-  /** Action 唯一标识符 */
-  id: string;
-  /** Action 源码文件物理路径 */
-  filePath: string;
-}
-
-/**
- * 动态生成 Standalone 独立可执行文件的 TypeScript 入口文件源码。
- * 
- * @param packageId 所属 Package ID
- * @param version 版本号
- * @param description 描述
- * @param actions 待打包 Action 列表
- * @param configDefs 声明的配置定义字典
- */
-export function generateStandaloneEntrypoint(
-  packageId: string,
-  version: string,
-  description: string | undefined,
-  actions: ActionImport[],
-  configDefs?: Record<string, unknown>
-): string {
-  // Resolve path to standalone runtime inside @actiondock/cli
-  const standaloneRuntimePath = resolve(import.meta.dirname, "../runtime/standalone");
-
-  const imports = actions
-    .map((a, idx) => `import action_${idx} from ${JSON.stringify(a.filePath)};`)
-    .join("\n");
-
-  const actionArray = actions
-    .map((_, idx) => `action_${idx}`)
-    .join(",\n    ");
-
-  return `// AUTO-GENERATED ENTRYPOINT BY ACTIONDOCK BUILDER. DO NOT EDIT.
-import { createStandaloneRuntime } from ${JSON.stringify(standaloneRuntimePath)};
-${imports}
-
-const app = createStandaloneRuntime({
-  packageId: ${JSON.stringify(packageId)},
-  version: ${JSON.stringify(version)},
-  description: ${JSON.stringify(description || "")},
-  config: ${JSON.stringify(configDefs || {})},
-  actions: [
-    ${actionArray}
-  ],
-});
-
-app.run(process.argv.slice(2)).catch((err: unknown) => {
-  console.error(err);
-  process.exit(1);
-});
-`;
-}

package/src/catalog/action-index.ts

@@ -1,92 +0,0 @@
-import { existsSync, readdirSync } from "node:fs";
-import { join } from "node:path";
-import { loadManifest } from "../project/manifest";
-import type { CatalogSnapshot, IndexedAction } from "./types";
-
-export class ActionIndex {
-  private actions = new Map<string, IndexedAction[]>(); // actionId -> IndexedAction[]
-
-  constructor(snapshot: CatalogSnapshot) {
-    this.indexSnapshot(snapshot);
-  }
-
-  private indexSnapshot(snapshot: CatalogSnapshot): void {
-    for (const [packageId, pkg] of snapshot.packages) {
-      const manifest = loadManifest(pkg.projectRoot);
-      if (manifest && manifest.actions) {
-        for (const [actionId, item] of Object.entries(manifest.actions)) {
-          const indexed: IndexedAction = {
-            packageId,
-            actionId,
-            contract: {
-              id: actionId,
-              description: item.description,
-              inputSchema: item.inputSchema,
-              outputSchema: item.outputSchema,
-              uses: item.uses,
-              tags: item.tags,
-              annotations: item.annotations as any,
-            },
-            entry: item.entry,
-            projectRoot: pkg.projectRoot,
-          };
-          this.add(indexed);
-        }
-      } else {
-        // 向后兼容回退：若未提供清单，扫描 actions 目录生成基础索引
-        const actionsDir = join(pkg.projectRoot, pkg.config.actionsDir || "actions");
-        if (existsSync(actionsDir)) {
-          try {
-            const files = readdirSync(actionsDir);
-            for (const file of files) {
-              if (file.endsWith(".ts") || file.endsWith(".js")) {
-                const actionId = file.replace(/\.(ts|js)$/, "");
-                const indexed: IndexedAction = {
-                  packageId,
-                  actionId,
-                  contract: {
-                    id: actionId,
-                  },
-                  entry: join(pkg.config.actionsDir || "actions", file),
-                  projectRoot: pkg.projectRoot,
-                };
-                this.add(indexed);
-              }
-            }
-          } catch {
-            // 忽略读取目录异常
-          }
-        }
-      }
-    }
-  }
-
-  private add(action: IndexedAction): void {
-    let list = this.actions.get(action.actionId);
-    if (!list) {
-      list = [];
-      this.actions.set(action.actionId, list);
-    }
-    list.push(action);
-  }
-
-  public list(packageId?: string): IndexedAction[] {
-    const all: IndexedAction[] = [];
-    for (const [_, list] of this.actions) {
-      for (const action of list) {
-        if (!packageId || action.packageId === packageId) {
-          all.push(action);
-        }
-      }
-    }
-    return all;
-  }
-
-  public find(actionId: string, packageId?: string): IndexedAction[] {
-    const matches = this.actions.get(actionId) || [];
-    if (packageId) {
-      return matches.filter((a) => a.packageId === packageId);
-    }
-    return matches;
-  }
-}

package/src/catalog/action-resolver.ts

@@ -1,120 +0,0 @@
-import type { ActionRef, ResolvedActionRef } from "@actiondock/sdk";
-import { ActionIndex } from "./action-index";
-import type { CatalogSnapshot, IndexedAction } from "./types";
-
-export interface ResolveOptions {
-  currentPackageId?: string;
-}
-
-export class ActionResolver {
-  private snapshot: CatalogSnapshot;
-  private index: ActionIndex;
-
-  constructor(snapshot: CatalogSnapshot, index?: ActionIndex) {
-    this.snapshot = snapshot;
-    this.index = index || new ActionIndex(snapshot);
-  }
-
-  /**
-   * 解析字符串或 ActionRef 为规范化的 ActionRef。
-   * 支持 greet、my-tools/greet、@team/github/issues.list。
-   */
-  public static parseRef(refStringOrObj: string | ActionRef): ActionRef {
-    if (typeof refStringOrObj === "object") {
-      return refStringOrObj;
-    }
-
-    const str = refStringOrObj.trim();
-    if (str.includes("/")) {
-      const lastSlashIndex = str.lastIndexOf("/");
-      const packageId = str.slice(0, lastSlashIndex);
-      const actionId = str.slice(lastSlashIndex + 1);
-
-      if (actionId.includes(":") || actionId.includes("/") || actionId.includes("..")) {
-        throw new Error(`Invalid action identifier: '${actionId}'`);
-      }
-      return { packageId, actionId };
-    }
-
-    // 处理旧语法 package:action 的兼容提醒
-    if (str.includes(":")) {
-      const parts = str.split(":");
-      throw new Error(
-        `Legacy syntax '${str}' is deprecated. Please use '${parts.join("/")}' instead.`
-      );
-    }
-
-    return { actionId: str };
-  }
-
-  public resolve(
-    refStringOrObj: string | ActionRef,
-    options: ResolveOptions = {}
-  ): { resolved: ResolvedActionRef; action: IndexedAction } {
-    const ref = ActionResolver.parseRef(refStringOrObj);
-
-    // 1. 若指定了 packageId，直接精确匹配
-    if (ref.packageId) {
-      const matches = this.index.find(ref.actionId, ref.packageId);
-      if (matches.length === 0) {
-        throw new Error(
-          `ACTION_NOT_FOUND: Action '${ref.actionId}' not found in package '${ref.packageId}'`
-        );
-      }
-      const matched = matches[0];
-      const pkg = this.snapshot.packages.get(matched.packageId);
-      return {
-        resolved: {
-          packageId: matched.packageId,
-          packageInstanceId: pkg?.packageInstanceId || matched.packageId,
-          actionId: matched.actionId,
-          generationId: this.snapshot.generationId,
-        },
-        action: matched,
-      };
-    }
-
-    // 2. 未指定 packageId：优先查找当前调用者包
-    if (options.currentPackageId) {
-      const inCurrent = this.index.find(ref.actionId, options.currentPackageId);
-      if (inCurrent.length > 0) {
-        const matched = inCurrent[0];
-        const pkg = this.snapshot.packages.get(matched.packageId);
-        return {
-          resolved: {
-            packageId: matched.packageId,
-            packageInstanceId: pkg?.packageInstanceId || matched.packageId,
-            actionId: matched.actionId,
-            generationId: this.snapshot.generationId,
-          },
-          action: matched,
-        };
-      }
-    }
-
-    // 3. 全局唯一匹配检查
-    const allMatches = this.index.find(ref.actionId);
-    if (allMatches.length === 0) {
-      throw new Error(`ACTION_NOT_FOUND: Action '${ref.actionId}' not found in any linked package`);
-    }
-
-    if (allMatches.length > 1) {
-      const candidates = allMatches.map((m) => `${m.packageId}/${m.actionId}`).join(", ");
-      throw new Error(
-        `AMBIGUOUS_ACTION_REF: Action '${ref.actionId}' is provided by multiple packages: ${candidates}. Please specify the package name.`
-      );
-    }
-
-    const matched = allMatches[0];
-    const pkg = this.snapshot.packages.get(matched.packageId);
-    return {
-      resolved: {
-        packageId: matched.packageId,
-        packageInstanceId: pkg?.packageInstanceId || matched.packageId,
-        actionId: matched.actionId,
-        generationId: this.snapshot.generationId,
-      },
-      action: matched,
-    };
-  }
-}

package/src/catalog/location-registry.ts

@@ -1,134 +0,0 @@
-import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { getActionDockHome } from "../utils";
-import type { LocationLink, LocationRegistryData } from "./types";
-
-export class LocationRegistry {
-  private filePath: string;
-
-  constructor(customHome?: string) {
-    const baseDir = getActionDockHome(customHome);
-    this.filePath = join(baseDir, ".actiondock", "registry.json");
-  }
-
-  public getFilePath(): string {
-    return this.filePath;
-  }
-
-  public load(): LocationRegistryData {
-    if (!existsSync(this.filePath)) {
-      return { schemaVersion: 1, links: [] };
-    }
-    try {
-      const raw = readFileSync(this.filePath, "utf-8");
-      const parsed = JSON.parse(raw);
-      if (!parsed || typeof parsed !== "object") {
-        return { schemaVersion: 1, links: [] };
-      }
-
-      // 处理 2.0 旧格式向 1 迁移
-      if (parsed.schemaVersion === 1 && Array.isArray(parsed.links)) {
-        return parsed as LocationRegistryData;
-      }
-
-      const links: LocationLink[] = [];
-      if (parsed.workspaces && typeof parsed.workspaces === "object") {
-        for (const [wsPath, ws] of Object.entries(parsed.workspaces as Record<string, any>)) {
-          links.push({
-            type: "workspace",
-            path: resolve(wsPath),
-            linkedAt: ws.linkedAt || new Date().toISOString(),
-            depth: 3,
-          });
-        }
-      }
-
-      if (parsed.packages && typeof parsed.packages === "object") {
-        for (const [_, pkg] of Object.entries(parsed.packages as Record<string, any>)) {
-          if (!pkg.workspaceRoot && pkg.path) {
-            links.push({
-              type: "package",
-              path: resolve(pkg.path),
-              linkedAt: pkg.linkedAt || new Date().toISOString(),
-            });
-          }
-        }
-      }
-
-      return { schemaVersion: 1, links };
-    } catch {
-      return { schemaVersion: 1, links: [] };
-    }
-  }
-
-  public save(data: LocationRegistryData): void {
-    const dir = dirname(this.filePath);
-    if (!existsSync(dir)) {
-      mkdirSync(dir, { recursive: true });
-    }
-    const tempPath = `${this.filePath}.${process.pid}.${Date.now()}.tmp`;
-    writeFileSync(tempPath, JSON.stringify(data, null, 2) + "\n", "utf-8");
-    renameSync(tempPath, this.filePath);
-  }
-
-  public addLink(path: string, options: { type?: "package" | "workspace"; depth?: number } = {}): LocationLink {
-    const absPath = resolve(path);
-    const registry = this.load();
-    const type = options.type || "package";
-    const depth = options.depth ?? (type === "workspace" ? 3 : undefined);
-
-    const existingIndex = registry.links.findIndex((l) => l.path === absPath);
-    const link: LocationLink = {
-      type,
-      path: absPath,
-      linkedAt: new Date().toISOString(),
-      depth,
-    };
-
-    if (existingIndex >= 0) {
-      registry.links[existingIndex] = link;
-    } else {
-      registry.links.push(link);
-    }
-
-    this.save(registry);
-    return link;
-  }
-
-  public removeLink(targetPathOrId: string): LocationLink | null {
-    const registry = this.load();
-    const absPath = resolve(targetPathOrId);
-
-    const idx = registry.links.findIndex(
-      (l) => l.path === absPath || l.path.endsWith(`/${targetPathOrId}`)
-    );
-
-    if (idx >= 0) {
-      const [removed] = registry.links.splice(idx, 1);
-      this.save(registry);
-      return removed;
-    }
-    return null;
-  }
-
-  public prune(): LocationLink[] {
-    const registry = this.load();
-    const valid: LocationLink[] = [];
-    const removed: LocationLink[] = [];
-
-    for (const link of registry.links) {
-      if (existsSync(link.path)) {
-        valid.push(link);
-      } else {
-        removed.push(link);
-      }
-    }
-
-    if (removed.length > 0) {
-      registry.links = valid;
-      this.save(registry);
-    }
-
-    return removed;
-  }
-}

package/src/catalog/package-catalog.ts

@@ -1,87 +0,0 @@
-import { existsSync, realpathSync } from "node:fs";
-import { randomUUID } from "node:crypto";
-import { resolve } from "node:path";
-import { findProjectRoot, loadProjectConfig } from "../project/loader";
-import { discoverProjects } from "../registry/registry";
-import { LocationRegistry } from "./location-registry";
-import type { CatalogPackageEntry, CatalogSnapshot } from "./types";
-
-export class PackageCatalog {
-  private registry: LocationRegistry;
-
-  constructor(registry?: LocationRegistry) {
-    this.registry = registry || new LocationRegistry();
-  }
-
-  public buildSnapshot(cwd: string = process.cwd()): CatalogSnapshot {
-    const packages = new Map<string, CatalogPackageEntry>();
-    const seenRealPaths = new Map<string, string>(); // realPath -> packageId
-    const seenPackageIds = new Map<string, string>(); // packageId -> realPath
-
-    const registerPackage = (root: string, isChild: boolean = false) => {
-      const abs = resolve(root);
-      if (!existsSync(abs)) return;
-      const real = realpathSync(abs);
-
-      if (seenRealPaths.has(real)) {
-        return; // 符号链接归一化去重
-      }
-
-      try {
-        const config = loadProjectConfig(abs);
-        if (seenPackageIds.has(config.id)) {
-          const existingPath = seenPackageIds.get(config.id);
-          if (existingPath !== real) {
-            throw new Error(
-              `PACKAGE_ID_CONFLICT: Package ID '${config.id}' is declared by multiple directories: '${existingPath}' and '${real}'`
-            );
-          }
-        }
-
-        const entry: CatalogPackageEntry = {
-          id: config.id,
-          packageInstanceId: `${config.id}:${real}`,
-          projectRoot: abs,
-          config,
-          isWorkspaceChild: isChild,
-        };
-
-        packages.set(config.id, entry);
-        seenRealPaths.set(real, config.id);
-        seenPackageIds.set(config.id, real);
-      } catch (e: any) {
-        if (e.message?.startsWith("PACKAGE_ID_CONFLICT")) {
-          throw e;
-        }
-        // 忽略无效项目
-      }
-    };
-
-    // 优先包含当前工作目录所在项目
-    const currentRoot = findProjectRoot(cwd);
-    if (currentRoot) {
-      registerPackage(currentRoot);
-    }
-
-    // 扫描注册表中的位置
-    const regData = this.registry.load();
-    for (const link of regData.links) {
-      if (!existsSync(link.path)) continue;
-
-      if (link.type === "package") {
-        registerPackage(link.path);
-      } else if (link.type === "workspace") {
-        const subprojects = discoverProjects(link.path, link.depth ?? 3);
-        for (const sub of subprojects) {
-          registerPackage(sub, true);
-        }
-      }
-    }
-
-    return {
-      generationId: randomUUID(),
-      createdAt: new Date().toISOString(),
-      packages,
-    };
-  }
-}

package/src/catalog/types.ts

@@ -1,75 +0,0 @@
-import type { ActionContract, ActionDefinition, ActionRef, ResolvedActionRef } from "@actiondock/sdk";
-import type { ProjectConfig } from "../project/types";
-
-/**
- * 注册的位置条目类型。
- */
-export type LocationType = "package" | "workspace";
-
-/**
- * 位置注册表中的单条链接记录。
- */
-export interface LocationLink {
-  /** 位置类型：单包或工作区 */
-  type: LocationType;
-  /** 目录绝对物理路径 */
-  path: string;
-  /** 注册时间（ISO 8601） */
-  linkedAt: string;
-  /** 扫描最大深度（工作区模式有效，默认 3） */
-  depth?: number;
-}
-
-/**
- * 物理位置注册表文件（~/.actiondock/registry.json）格式。
- */
-export interface LocationRegistryData {
-  schemaVersion: 1;
-  links: LocationLink[];
-}
-
-/**
- * 解析后的包实例快照。
- */
-export interface CatalogPackageEntry {
-  /** 逻辑包标识 */
-  id: string;
-  /** 包物理实例唯一标识 */
-  packageInstanceId: string;
-  /** 项目根目录绝对路径 */
-  projectRoot: string;
-  /** 项目配置 */
-  config: ProjectConfig;
-  /** 是否来自工作区自动发现 */
-  isWorkspaceChild?: boolean;
-}
-
-/**
- * 运行时目录与包快照。
- */
-export interface CatalogSnapshot {
-  /** 快照代次唯一标识 */
-  generationId: string;
-  /** 生成快照时间 */
-  createdAt: string;
-  /** 已发现的包集合（按 packageId 索引） */
-  packages: Map<string, CatalogPackageEntry>;
-}
-
-/**
- * 索引中的 Action 描述符。
- */
-export interface IndexedAction {
-  /** 所属逻辑包 ID */
-  packageId: string;
-  /** 动作 ID */
-  actionId: string;
-  /** 契约元数据 */
-  contract: ActionContract;
-  /** 实现入口相对路径 */
-  entry: string;
-  /** 包根目录绝对路径 */
-  projectRoot: string;
-}
-
-export type { ModuleLoader } from "../runtime/module-loader";