@actiondock/builder 2.10.0 → 2.12.0

package/dist/vendor.js

@@ -0,0 +1,76 @@
+import { copyFileSync, existsSync, lstatSync, mkdirSync, readdirSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+/**
+ * 物化锁定生产依赖到产物 node_modules 目录（vendorDeps 开启时）。
+ */
+export function vendorDependencies(root, stagingDir, plan) {
+    const destNodeModules = join(stagingDir, "node_modules");
+    mkdirSync(destNodeModules, { recursive: true });
+    // 尝试复制本地已解析的生产依赖
+    const sourceCandidates = [
+        join(root, "node_modules"),
+        resolve(import.meta.dirname, "../../../node_modules"),
+    ];
+    // 嵌套 node_modules 不再跳过：多版本共存时传递依赖必须完整物化，
+    // 否则产物运行时 Cannot find module 且构建阶段无任何警告；
+    // 保留 .git、.bin 等目录排除（.bin 为平台相关的命令行 shim，不参与运行时模块解析）
+    const copyVendorPackage = (srcDir, destDir) => {
+        if (!existsSync(srcDir))
+            return;
+        mkdirSync(destDir, { recursive: true });
+        const entries = readdirSync(srcDir);
+        for (const entry of entries) {
+            if (entry === ".git" ||
+                entry === ".actiondock" ||
+                entry === ".bin" ||
+                entry === "test" ||
+                entry === "tests") {
+                continue;
+            }
+            const srcPath = join(srcDir, entry);
+            const destPath = join(destDir, entry);
+            try {
+                const stat = lstatSync(srcPath);
+                if (stat.isSymbolicLink()) {
+                    // 软链接不进行递归物理穿越，避免链接环路死锁
+                    continue;
+                }
+                if (stat.isDirectory()) {
+                    copyVendorPackage(srcPath, destPath);
+                }
+                else if (stat.isFile()) {
+                    copyFileSync(srcPath, destPath);
+                }
+            }
+            catch (err) {
+                // 防御与透明：记录系统读取异常日志
+                console.warn(`[actiondock] Warning: Failed to vendor file ${srcPath}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+    };
+    for (const dep of plan.dependencies.external) {
+        if (dep.isDev)
+            continue;
+        for (const baseModules of sourceCandidates) {
+            const srcDep = join(baseModules, dep.name);
+            if (existsSync(srcDep)) {
+                const targetDep = join(destNodeModules, dep.name);
+                mkdirSync(dirname(targetDep), { recursive: true });
+                copyVendorPackage(srcDep, targetDep);
+                break;
+            }
+        }
+    }
+    // 复制 ActionDock 内部依赖
+    for (const internalPkg of ["@actiondock/core", "@actiondock/sdk"]) {
+        for (const baseModules of sourceCandidates) {
+            const srcDep = join(baseModules, internalPkg);
+            if (existsSync(srcDep)) {
+                const targetDep = join(destNodeModules, internalPkg);
+                mkdirSync(dirname(targetDep), { recursive: true });
+                copyVendorPackage(srcDep, targetDep);
+                break;
+            }
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/builder",
-  "version": "2.10.0",
+  "version": "2.12.0",
   "description": "ActionDock Build Planner, distribution packaging, and Skill exporter",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,8 +29,8 @@
     "test": "node ../../scripts/run-tests.ts"
   },
   "dependencies": {
-    "@actiondock/core": "^2.10.0",
-    "@actiondock/sdk": "^2.10.0"
+    "@actiondock/core": "^2.12.0",
+    "@actiondock/sdk": "^2.12.0"
   },
   "keywords": [
     "actiondock",

package/dist/export-batch.d.ts

@@ -1,13 +0,0 @@
-import type { BatchSkillExportOptions, BatchSkillExportResult, SkillExportResult, SkillExporterOptions } from "./types.js";
-/**
- * 批量 Skill 导出装配层。
- *
- * 职责：按项目根目录列表逐一执行单包导出并聚合统计结果，
- * 目录名冲突时回退为原始 Package ID 的安全形式。
- */
-/** 单包导出回调：由 SkillExporter 注入自身导出能力，避免模块间循环依赖 */
-export type SingleSkillExporter = (options: SkillExporterOptions) => Promise<SkillExportResult>;
-/**
- * 执行批量导出多个 Skill。
- */
-export declare function exportBatchImpl(options: BatchSkillExportOptions, exportSingle: SingleSkillExporter): Promise<BatchSkillExportResult>;

package/dist/export-batch.js

@@ -1,37 +0,0 @@
-import { mkdirSync } from "node:fs";
-import { join, resolve } from "node:path";
-import { loadProjectConfig } from "@actiondock/core";
-import { BuilderError } from "./errors.js";
-import { allocatePackageDirName } from "./manifest.js";
-/**
- * 执行批量导出多个 Skill。
- */
-export async function exportBatchImpl(options, exportSingle) {
-    if (!options.projectRoots || options.projectRoots.length === 0) {
-        throw new BuilderError("No project roots provided for batch skill export.");
-    }
-    const results = [];
-    const baseOutDir = resolve(options.outDir || join(process.cwd(), "dist", "skills"));
-    mkdirSync(baseOutDir, { recursive: true });
-    const usedDirNames = new Set();
-    for (const projectRoot of options.projectRoots) {
-        const config = loadProjectConfig(projectRoot);
-        // 目录名分配统一复用 manifest 的 allocatePackageDirName，回退后仍冲突会追加数字后缀
-        const pkgSlug = allocatePackageDirName(usedDirNames, config.id);
-        const pkgOutDir = join(baseOutDir, `${pkgSlug}-skill`);
-        const res = await exportSingle({
-            ...options,
-            projectRoot,
-            outDir: pkgOutDir,
-        });
-        results.push(res);
-    }
-    const totalActions = results.reduce((sum, r) => sum + r.actionsCount, 0);
-    const totalPlaybooks = results.reduce((sum, r) => sum + r.playbooksCount, 0);
-    return {
-        results,
-        outDir: baseOutDir,
-        totalActions,
-        totalPlaybooks,
-    };
-}

package/dist/export-node.d.ts

@@ -1,11 +0,0 @@
-import type { SelectionPlan, SkillExporterOptions, SkillExportResult } from "./types.js";
-/**
- * Node 目录型 Skill 导出装配层。
- *
- * 职责：复用 Node 目录型构建产出可执行交付目录，
- * 并在目录内生成调用该入口的 SKILL.md 说明书。
- */
-/**
- * 执行 Node 目录型 Skill 导出。
- */
-export declare function exportNodeSkill(root: string, targetSkillDir: string, plan: SelectionPlan, options: SkillExporterOptions, pkgSlug: string): Promise<SkillExportResult>;

package/dist/export-node.js

@@ -1,48 +0,0 @@
-import { generateStandaloneSkillMd } from "./skill/index.js";
-import { buildProject } from "./build.js";
-import { collectRelativeFiles } from "./fs-utils.js";
-import { buildConfigForTemplates, toPlaybookDefinitions, toSkillActionItems, writeSkillMd, } from "./skill-md.js";
-import { createArchive, resolveArchiveFormat } from "./export-archive.js";
-/**
- * Node 目录型 Skill 导出装配层。
- *
- * 职责：复用 Node 目录型构建产出可执行交付目录，
- * 并在目录内生成调用该入口的 SKILL.md 说明书。
- */
-/**
- * 执行 Node 目录型 Skill 导出。
- */
-export async function exportNodeSkill(root, targetSkillDir, plan, options, pkgSlug) {
-    await buildProject({
-        projectRoot: root,
-        outDir: targetSkillDir,
-        actions: options.actions,
-        playbooks: options.playbooks,
-        config: options.config,
-        manifest: options.manifest,
-        vendorDeps: Boolean(options.vendorDeps),
-        allowInstallScripts: options.allowInstallScripts,
-        requireReproducible: options.requireReproducible,
-    });
-    const usedExistingSkillMd = writeSkillMd(root, targetSkillDir, plan, { skipSkillMd: options.skipSkillMd, skillMdPath: options.skillMdPath, pkgSlug }, () => {
-        const configForTemplates = buildConfigForTemplates(plan, plan.actionsDir || "actions", plan.playbooksDir || "playbooks");
-        return generateStandaloneSkillMd(configForTemplates, toSkillActionItems(plan.actions), toPlaybookDefinitions(plan.playbooks), "node ./entry.mjs");
-    });
-    let archivePath;
-    if (options.archive) {
-        archivePath = await createArchive(targetSkillDir, resolveArchiveFormat(options));
-    }
-    return {
-        packageId: plan.packageId,
-        version: plan.version,
-        mode: "node",
-        skillDir: targetSkillDir,
-        archivePath,
-        actionsCount: plan.actions.length,
-        playbooksCount: plan.playbooks.length,
-        actions: plan.actions.map((a) => a.id),
-        playbooks: plan.playbooks.map((p) => p.id),
-        files: collectRelativeFiles(targetSkillDir),
-        usedExistingSkillMd,
-    };
-}