@actiondock/builder 2.18.0 → 2.20.0

package/dist/dependency-resolver.d.ts

@@ -3,6 +3,8 @@ import type { ExternalDependency } from "./types.js";
  * 测试与类型声明文件后缀常量（供 fallback 清单过滤与 isIgnoredPath 共享同一口径）。
  */
 export declare const TEST_FILE_SUFFIXES: string[];
+/** 运行环境配置不得进入分发产物；普通业务 bindings.json 不受影响。 */
+export declare function isRuntimeConfigFile(relPath: string): boolean;
 /**
  * 忽略的文件模式判断（排除测试文件、类型声明文件以及构建/版本控制等私有目录）。
  */

package/dist/dependency-resolver.js

@@ -15,6 +15,11 @@ export const TEST_FILE_SUFFIXES = [
     ".spec.jsx",
     ".d.ts",
 ];
+/** 运行环境配置不得进入分发产物；普通业务 bindings.json 不受影响。 */
+export function isRuntimeConfigFile(relPath) {
+    const segments = relPath.replace(/\\/g, "/").split("/");
+    return segments.includes(".actiondock") || segments.at(-1) === "profiles.json";
+}
 /**
  * 忽略的文件模式判断（排除测试文件、类型声明文件以及构建/版本控制等私有目录）。
  */
@@ -24,7 +29,7 @@ export function isIgnoredPath(relPath) {
         normalized.includes("/node_modules/") ||
         normalized.startsWith(".git/") ||
         normalized.startsWith("dist/") ||
-        normalized.startsWith(".actiondock/") ||
+        isRuntimeConfigFile(normalized) ||
         TEST_FILE_SUFFIXES.some((suffix) => normalized.endsWith(suffix)));
 }
 /**

package/dist/planner.js

@@ -1,12 +1,12 @@
 import { existsSync, statSync } from "node:fs";
 import { basename, join, relative, resolve } from "node:path";
-import { ActionDockError, ACTION_NOT_FOUND, UNDECLARED_ACTION_DEPENDENCY, loadProjectConfig, } from "@actiondock/core";
-import { assertPathWithinRoot, traverseDirectory, loadManifest, loadPlaybooks, validateManifest, } from "@actiondock/core/project";
+import { ActionDockError, ACTION_NOT_FOUND, PACKAGE_NOT_FOUND, UNDECLARED_ACTION_DEPENDENCY, loadProjectConfig, } from "@actiondock/core";
+import { assertPathWithinRoot, traverseDirectory, loadManifest, loadPlaybooks, validateManifest, loadActionBindings, hasRemoteActionBinding, validateCanonicalActionRef, } from "@actiondock/core/project";
 import { DefaultActionCatalog, PackageGraphBuilder, resolveAction, } from "@actiondock/core/graph";
 import { PlannerError } from "./errors.js";
 import { assertRelativeDependenciesIntegrity } from "./dependency-check.js";
 import { computeLockfileInfo } from "./lockfile-resolver.js";
-import { extractExternalDependencies, isIgnoredPath } from "./dependency-resolver.js";
+import { extractExternalDependencies, isIgnoredPath, isRuntimeConfigFile } from "./dependency-resolver.js";
 /**
  * 递归扫描指定目录下的文件，返回绝对路径列表。
  * 目录遍历统一复用 core 的 traverseDirectory 单一事实源，
@@ -15,6 +15,19 @@ import { extractExternalDependencies, isIgnoredPath } from "./dependency-resolve
 function walkDirectory(dir) {
     return traverseDirectory(dir).map((entry) => entry.fullPath);
 }
+/**
+ * 判断动作引用是否为完全限定标识符（包含包命名空间与动作名，且不含通配符与非法字符）。
+ * 统一复用 core 的 validateCanonicalActionRef 单一事实源。
+ */
+function isFullyQualifiedActionRef(ref) {
+    try {
+        validateCanonicalActionRef(ref);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * 构造备用清单映射，仅读取文件系统条目与配置声明，杜绝 AST 源码分析与动态代码执行。
  */
@@ -181,81 +194,138 @@ export class SelectionPlanner {
      */
     resolveClosure(root, manifest, config, initialActionIds) {
         const resolvedActionIds = new Set();
-        // queued 与 resolvedActionIds 联合判重，避免高入度节点在 uses 图中被重复入队导致 O(边数) 重复解析
-        const queued = new Set(initialActionIds);
-        const queue = Array.from(initialActionIds);
+        const remoteActionRefs = new Set();
+        const visitedEdges = new Set();
+        const queuedEdges = new Set();
+        const queue = [];
+        const enqueueDependency = (ref, callerRoot, callerPkgId) => {
+            const edgeKey = `${callerRoot}:::${ref}`;
+            if (!visitedEdges.has(edgeKey) && !queuedEdges.has(edgeKey)) {
+                queuedEdges.add(edgeKey);
+                queue.push({ ref, callerRoot, callerPkgId });
+            }
+        };
+        for (const id of initialActionIds) {
+            enqueueDependency(id, root, config?.id);
+        }
         const externalActionRoots = new Map();
         const externalActionEntries = new Map();
         const manifestActions = manifest.actions || {};
         const graph = new PackageGraphBuilder({ root, allowDevLinks: true }).buildSync();
         const catalog = new DefaultActionCatalog(graph);
         while (queue.length > 0) {
-            const currentId = queue.shift();
-            queued.delete(currentId);
-            if (resolvedActionIds.has(currentId)) {
-                continue;
-            }
-            let entry = manifestActions[currentId] || config?.actions?.[currentId];
-            let entryRoot = root;
+            const currentItem = queue.shift();
+            const currentId = currentItem.ref;
+            const currentCallerRoot = currentItem.callerRoot;
+            const currentCallerPkgId = currentItem.callerPkgId;
+            const currentEdgeKey = `${currentCallerRoot}:::${currentId}`;
+            queuedEdges.delete(currentEdgeKey);
+            visitedEdges.add(currentEdgeKey);
+            let entry = currentCallerRoot === root
+                ? (manifestActions[currentId] || config?.actions?.[currentId])
+                : undefined;
+            let entryRoot = currentCallerRoot;
+            let targetPkgId = currentCallerRoot === root ? config?.id : undefined;
             if (!entry) {
-                const resolved = resolveAction(currentId, { graph, catalog, caller: config?.id });
-                const resolvedPkgId = resolved.package.id;
-                const resolvedActionId = resolved.ref.actionId;
-                const extNode = graph.packages.get(resolvedPkgId);
-                if (extNode && existsSync(extNode.root)) {
-                    const extRoot = extNode.root;
-                    let extConfig;
-                    try {
-                        extConfig = loadProjectConfig(extRoot);
-                    }
-                    catch {
-                        extConfig = {
-                            id: resolvedPkgId,
-                            name: resolvedPkgId,
-                            version: "0.1.0",
-                        };
+                let localResolved = null;
+                let resolveError = null;
+                try {
+                    localResolved = resolveAction(currentId, {
+                        graph,
+                        catalog,
+                        caller: currentCallerPkgId || config?.id,
+                    });
+                }
+                catch (err) {
+                    resolveError = err;
+                }
+                if (localResolved) {
+                    const resolvedPkgId = localResolved.package.id;
+                    const resolvedActionId = localResolved.ref.actionId;
+                    const extNode = graph.packages.get(resolvedPkgId);
+                    if (extNode && existsSync(extNode.root)) {
+                        const extRoot = extNode.root;
+                        let extConfig;
+                        try {
+                            extConfig = loadProjectConfig(extRoot);
+                        }
+                        catch {
+                            extConfig = {
+                                id: resolvedPkgId,
+                                name: resolvedPkgId,
+                                version: "0.1.0",
+                            };
+                        }
+                        const externalManifest = loadManifest(extRoot);
+                        const externalEntry = externalManifest?.actions?.[resolvedActionId] ||
+                            extConfig?.actions?.[resolvedActionId];
+                        if (!externalEntry) {
+                            resolveError = new ActionDockError(UNDECLARED_ACTION_DEPENDENCY, `UNDECLARED_ACTION_DEPENDENCY: Action '${resolvedActionId}' is not declared in package '${resolvedPkgId}' manifest`);
+                        }
+                        else {
+                            entry = externalEntry;
+                            entryRoot = extRoot;
+                            targetPkgId = resolvedPkgId;
+                            // 依赖包 actiondock.json 中声明的传递依赖闭包（按外部包自身作用域入队，不继承根配置）
+                            const extPkgUses = extConfig?.uses;
+                            if (Array.isArray(extPkgUses)) {
+                                for (const u of extPkgUses) {
+                                    const trimmedUse = typeof u === "string" ? u.trim() : "";
+                                    if (trimmedUse) {
+                                        enqueueDependency(trimmedUse, extRoot, resolvedPkgId);
+                                    }
+                                }
+                            }
+                        }
                     }
-                    const externalManifest = loadManifest(extRoot);
-                    const externalEntry = externalManifest?.actions?.[resolvedActionId] ||
-                        extConfig?.actions?.[resolvedActionId];
-                    if (!externalEntry) {
-                        throw new ActionDockError(UNDECLARED_ACTION_DEPENDENCY, `UNDECLARED_ACTION_DEPENDENCY: Action '${resolvedActionId}' is not declared in package '${resolvedPkgId}' manifest`);
+                }
+                if (!entry) {
+                    // 仅在明确为包未找到或动作未找到时允许回退至远端绑定检查；严禁掩盖损坏清单、无效引用或版本冲突等非缺失异常
+                    const isMissing = !resolveError ||
+                        (resolveError instanceof ActionDockError &&
+                            (resolveError.code === PACKAGE_NOT_FOUND ||
+                                resolveError.code === ACTION_NOT_FOUND));
+                    if (!isMissing) {
+                        throw resolveError;
                     }
-                    entry = externalEntry;
-                    entryRoot = extRoot;
-                    // 依赖包 actiondock.json 中声明的传递依赖闭包（入队前查重，避免重复膨胀）
-                    const extPkgUses = extConfig?.uses;
-                    if (Array.isArray(extPkgUses)) {
-                        for (const u of extPkgUses) {
-                            const trimmedUse = typeof u === "string" ? u.trim() : "";
-                            if (trimmedUse &&
-                                !resolvedActionIds.has(trimmedUse) &&
-                                !queued.has(trimmedUse)) {
-                                queued.add(trimmedUse);
-                                queue.push(trimmedUse);
-                            }
+                    // 仅对完全限定依赖（pkg/action），且发起调用的当前包根目录绑定配置中包含精确 remote 条目时，识别为远端依赖
+                    if (isFullyQualifiedActionRef(currentId)) {
+                        const bindings = loadActionBindings(currentCallerRoot);
+                        if (hasRemoteActionBinding(bindings, currentId)) {
+                            remoteActionRefs.add(currentId);
+                            continue;
                         }
                     }
+                    if (resolveError) {
+                        throw resolveError;
+                    }
+                    throw new ActionDockError(ACTION_NOT_FOUND, `Action '${currentId}' referenced in dependency closure (uses) was not found in manifest or linked packages`);
                 }
             }
-            if (!entry) {
-                throw new ActionDockError(ACTION_NOT_FOUND, `Action '${currentId}' referenced in dependency closure (uses) was not found in manifest or linked packages`);
+            // 验证本地 entry 文件物理存在，不得跳过本地 entry 缺失
+            const resolvedPath = resolve(entryRoot, entry.entry);
+            if (!existsSync(resolvedPath)) {
+                throw new PlannerError(`Action '${currentId}' entry file not found on disk: ${entry.entry}`, "ENTRY_FILE_NOT_FOUND");
             }
             if (entryRoot !== root) {
                 externalActionRoots.set(currentId, entryRoot);
                 externalActionEntries.set(currentId, entry);
             }
+            // 物化 action 按既有唯一集合去重，若已物化则跳过重复 uses 展开
+            if (resolvedActionIds.has(currentId)) {
+                continue;
+            }
             resolvedActionIds.add(currentId);
             if (entry.uses && Array.isArray(entry.uses)) {
                 for (const depId of entry.uses) {
-                    if (!resolvedActionIds.has(depId) && !queued.has(depId)) {
-                        queued.add(depId);
-                        queue.push(depId);
+                    const trimmedDep = typeof depId === "string" ? depId.trim() : "";
+                    if (trimmedDep) {
+                        enqueueDependency(trimmedDep, entryRoot, targetPkgId || currentCallerPkgId);
                     }
                 }
             }
         }
-        return { resolvedActionIds, externalActionRoots, externalActionEntries };
+        return { resolvedActionIds, externalActionRoots, externalActionEntries, remoteActionRefs };
     }
     /**
      * 构造 Action 依赖结构（闭包结果物化为 ActionDependency 列表）。
@@ -312,6 +382,9 @@ export class SelectionPlanner {
                 declaredFiles.add(f);
         }
         for (const declaredRel of declaredFiles) {
+            if (isRuntimeConfigFile(declaredRel)) {
+                throw new PlannerError(`Runtime configuration file '${declaredRel}' cannot be explicitly declared as build asset or file`, "RESTRICTED_CONFIG_ASSET");
+            }
             const resolvedFile = resolve(root, declaredRel);
             assertPathWithinRoot(root, resolvedFile, "files");
             if (!existsSync(resolvedFile)) {
@@ -322,7 +395,10 @@ export class SelectionPlanner {
                 const walked = walkDirectory(resolvedFile);
                 for (const f of walked) {
                     const rel = relative(root, f).replace(/\\/g, "/");
-                    if (!isIgnoredPath(rel) && !actionPathSet.has(f) && !filePathSet.has(rel)) {
+                    if (!isIgnoredPath(rel) &&
+                        !isRuntimeConfigFile(rel) &&
+                        !actionPathSet.has(f) &&
+                        !filePathSet.has(rel)) {
                         filePathSet.add(rel);
                         modulesAndAssets.push({
                             path: rel,
@@ -334,7 +410,10 @@ export class SelectionPlanner {
             }
             else if (stat.isFile()) {
                 const rel = relative(root, resolvedFile).replace(/\\/g, "/");
-                if (!actionPathSet.has(resolvedFile) && !filePathSet.has(rel)) {
+                if (!isIgnoredPath(rel) &&
+                    !isRuntimeConfigFile(rel) &&
+                    !actionPathSet.has(resolvedFile) &&
+                    !filePathSet.has(rel)) {
                     filePathSet.add(rel);
                     modulesAndAssets.push({
                         path: rel,
@@ -359,6 +438,9 @@ export class SelectionPlanner {
                 declaredAssets.add(a);
         }
         for (const declaredRel of declaredAssets) {
+            if (isRuntimeConfigFile(declaredRel)) {
+                throw new PlannerError(`Runtime configuration file '${declaredRel}' cannot be explicitly declared as build asset or file`, "RESTRICTED_CONFIG_ASSET");
+            }
             const resolvedAsset = resolve(root, declaredRel);
             assertPathWithinRoot(root, resolvedAsset, "assets");
             if (!existsSync(resolvedAsset)) {
@@ -369,7 +451,7 @@ export class SelectionPlanner {
                 const walked = walkDirectory(resolvedAsset);
                 for (const f of walked) {
                     const rel = relative(root, f).replace(/\\/g, "/");
-                    if (!assetPathSet.has(rel)) {
+                    if (!isIgnoredPath(rel) && !isRuntimeConfigFile(rel) && !assetPathSet.has(rel)) {
                         assetPathSet.add(rel);
                         modulesAndAssets.push({
                             path: rel,
@@ -381,7 +463,7 @@ export class SelectionPlanner {
             }
             else if (stat.isFile()) {
                 const rel = relative(root, resolvedAsset).replace(/\\/g, "/");
-                if (!assetPathSet.has(rel)) {
+                if (!isIgnoredPath(rel) && !isRuntimeConfigFile(rel) && !assetPathSet.has(rel)) {
                     assetPathSet.add(rel);
                     modulesAndAssets.push({
                         path: rel,
@@ -397,7 +479,7 @@ export class SelectionPlanner {
             const assetFiles = walkDirectory(defaultAssetsDir);
             for (const file of assetFiles) {
                 const rel = relative(root, file).replace(/\\/g, "/");
-                if (!assetPathSet.has(rel)) {
+                if (!isIgnoredPath(rel) && !isRuntimeConfigFile(rel) && !assetPathSet.has(rel)) {
                     assetPathSet.add(rel);
                     modulesAndAssets.push({
                         path: rel,
@@ -458,7 +540,7 @@ export class SelectionPlanner {
             finalPlaybooks = selectedPlaybooks.filter((pb) => {
                 if (!pb.actions || pb.actions.length === 0)
                     return true;
-                return pb.actions.every((a) => closure.resolvedActionIds.has(a));
+                return pb.actions.every((a) => closure.resolvedActionIds.has(a) || closure.remoteActionRefs.has(a));
             });
         }
         const actionDependencies = this.buildActionDependencies(root, closure, manifest);
@@ -498,6 +580,7 @@ export class SelectionPlanner {
             configDefs: config.config,
             lockfile: lockfileInfo,
             externalProjectRoots: externalRoots,
+            remoteActionRefs: Array.from(closure.remoteActionRefs || []).sort(),
             metadata: {
                 plannedAt: new Date().toISOString(),
                 schemaVersion: 2,

package/dist/types.d.ts

@@ -131,6 +131,8 @@ export interface BuildPlan {
     configDefs?: Record<string, unknown>;
     /** 依赖闭包包含的外部已链接包项目根目录列表（去重） */
     externalProjectRoots?: string[];
+    /** 经由远端绑定配置解析的外部依赖 Action 引用列表（只读展示，不加入本地源码构建闭包） */
+    remoteActionRefs?: string[];
     /** 检测到的锁文件信息 */
     lockfile?: LockfileInfo;
     /** 规划元数据 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/builder",
-  "version": "2.18.0",
+  "version": "2.20.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.18.0",
-    "@actiondock/sdk": "^2.18.0"
+    "@actiondock/core": "^2.20.0",
+    "@actiondock/sdk": "^2.20.0"
   },
   "keywords": [
     "actiondock",