@actiondock/cli 2.7.0 → 2.8.0

package/dist/commands/export.js

@@ -1,7 +1,8 @@
 import { existsSync } from "node:fs";
 import { basename } from "node:path";
-import { discoverProjects, findProjectRoot, listLinkedPackages, resolvePackageRoot } from "@actiondock/core";
-import { ExecutionError, notInProjectError, packageNotFoundError } from "../errors.js";
+import { discoverProjects, listLinkedPackages, resolvePackageRoot, } from "@actiondock/core/registry";
+import { findProjectRoot, } from "@actiondock/core";
+import { ExecutionError, notInProjectError, packageNotFoundError, wrapAsExecutionError } from "../errors.js";
 import { renderResult, writeStdout } from "../renderer.js";
 import { getEffectiveOptions, parseListOption } from "../utils/index.js";
 export function registerExportCommand(program, context) {
@@ -16,9 +17,6 @@ export function registerExportCommand(program, context) {
         .option("--all", "Export all linked packages from global registry")
         .option("--bundle [name]", "Export multiple packages as a unified composite Skill bundle (defaults to workspace directory name if omitted)")
         .option("-m, --mode <mode>", "Skill export mode ('source' or 'node')", "source")
-        .option("-s, --standalone", "Export standalone binary skill (removed)")
-        .option("-t, --target <target>", "Target compilation platform (removed)")
-        .option("--bytecode", "Bytecode compilation (removed)")
         .option("-o, --out <path>", "Output skill directory")
         .option("-p, --playbook <playbooks...>", "Only export specific playbook(s) and their dependent actions", parseListOption)
         .option("-a, --actions <actions...>", "Only export specific action(s)", parseListOption)
@@ -31,10 +29,6 @@ export function registerExportCommand(program, context) {
         .option("--require-reproducible", "Require reproducible build and fail if install scripts must run")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        // 彻底删除 --standalone 单文件编译选项
-        if (options.standalone || options.target !== undefined || options.bytecode !== undefined) {
-            throw new ExecutionError("The '--standalone' option and binary target flags have been removed in ActionDock 2.0. Please use '--mode node' for self-contained Node.js directory skills, or '--mode source' for source-based skills.", undefined, "UNSUPPORTED_BUILD_MODE");
-        }
         const mode = options.mode === "node" ? "node" : "source";
         if (options.bundle && mode === "node") {
             throw new ExecutionError("Composite Skill export (--bundle) currently only supports source mode. Please use '--mode source' to export as a composite workspace Skill.");
@@ -200,10 +194,8 @@ export function registerExportCommand(program, context) {
             });
         }
         catch (err) {
-            if (err?.code === "UNSUPPORTED_BUILD_MODE") {
-                throw new ExecutionError(err.message, undefined, "UNSUPPORTED_BUILD_MODE");
-            }
-            throw new ExecutionError(`Export failed: ${err.message}`);
+            // wrapAsExecutionError 保留原始错误码（含 UNSUPPORTED_BUILD_MODE）
+            throw wrapAsExecutionError(err, "Export failed: ");
         }
     });
 }

package/dist/commands/generate.js

@@ -1,5 +1,6 @@
-import { findProjectRoot, writeActionTypes } from "@actiondock/core";
-import { ExecutionError, notInProjectError } from "../errors.js";
+import { findProjectRoot, } from "@actiondock/core";
+import { writeActionTypes, } from "@actiondock/core/project";
+import { notInProjectError, wrapAsExecutionError } from "../errors.js";
 import { renderResult } from "../renderer.js";
 import { getEffectiveOptions } from "../utils/index.js";
 /**
@@ -36,7 +37,7 @@ export function registerGenerateCommands(program, context) {
             });
         }
         catch (err) {
-            throw new ExecutionError(`Failed to generate types: ${err.message}`);
+            throw wrapAsExecutionError(err, "Failed to generate types: ");
         }
     });
 }

package/dist/commands/info.js

@@ -1,4 +1,6 @@
-import { fetchRemoteInfo, filterWithFallbackInfo, getRegistryStatus, resolvePackageRoot, } from "@actiondock/core";
+import { fetchRemoteInfo, } from "@actiondock/core/profile";
+import { filterWithFallbackInfo, } from "@actiondock/core/project";
+import { getRegistryStatus, resolvePackageRoot, } from "@actiondock/core/registry";
 import { ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE, packageNotFoundError } from "../errors.js";
 import { projectDetailToJson, renderAggregatedPackages, renderProjectDetail, renderRegistryTree, renderResult, } from "../renderer.js";
 import { getProjectDetailInfo, scanLocalAggregatedPackages } from "../services/index.js";

package/dist/commands/init.js

@@ -1,6 +1,6 @@
-import { initProject } from "@actiondock/core";
+import { initProject, } from "@actiondock/core";
 import { writeStdout } from "../renderer.js";
-import { ExecutionError } from "../errors.js";
+import { wrapAsExecutionError } from "../errors.js";
 export function registerInitCommand(program) {
     program
         .command("init [directory]")
@@ -18,7 +18,7 @@ export function registerInitCommand(program) {
             writeStdout(`Successfully initialized ActionDock project in ${dir}`);
         }
         catch (err) {
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
 }

package/dist/commands/link.js

@@ -1,5 +1,5 @@
-import { linkPackage, pruneRegistry, unlinkPackage, } from "@actiondock/core";
-import { ExecutionError } from "../errors.js";
+import { linkPackage, pruneRegistry, unlinkPackage, } from "@actiondock/core/registry";
+import { wrapAsExecutionError } from "../errors.js";
 import { writeStdout } from "../renderer.js";
 export function registerLinkCommands(program) {
     // ad link [path]
@@ -24,7 +24,7 @@ export function registerLinkCommands(program) {
             }
         }
         catch (err) {
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad unlink [id|path]
@@ -65,7 +65,7 @@ export function registerLinkCommands(program) {
             }
         }
         catch (err) {
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
 }

package/dist/commands/list.js

@@ -1,7 +1,7 @@
-import { filterWithFallbackInfo } from "@actiondock/core";
+import { filterWithFallbackInfo, } from "@actiondock/core/project";
 import { packageNotFoundError } from "../errors.js";
 import { renderActionList, renderResult } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, withTarget, } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, remoteTargetSuffix, resolveFallbackStrategy, resolveIntent, resolveLocalPackageRoot, withService, } from "../utils/index.js";
 /**
  * 挂载 list 子命令至指定 Commander 节点。
  *
@@ -28,14 +28,23 @@ export function attachListCommand(parent, context) {
         if (options.package && !targetPackageRoot) {
             throw packageNotFoundError(options.package);
         }
-        // 通过 Target 门面统一获取 Action 列表
-        await withTarget(options, context, async (target, resolved) => {
-            let rawSummaries = await target.listActions();
-            // 若指定了目标包但本地未过滤，则精确匹配包标识
+        // 通过 Service 门面统一获取 Action 列表
+        await withService(options, context, async (service, resolved) => {
+            let rawSummaries = await service.discovery.listActions();
+            // 若指定了目标包但本地未过滤，则按包归属精确过滤：
+            // 仅保留全限定名命中目标包前缀、或 packageId 归属目标包的条目；
+            // 无法归属到目标包的无前缀短 id 条目不放行，避免他包短 id 混入
             if (options.package && !options.profile && !options.server) {
-                rawSummaries = rawSummaries.filter((s) => s.id.startsWith(`${options.package}/`) ||
-                    s.packageId === options.package ||
-                    !s.id.includes("/"));
+                const targetPkg = options.package;
+                rawSummaries = rawSummaries.filter((s) => {
+                    if (s.packageId) {
+                        return (s.packageId === targetPkg ||
+                            s.id === targetPkg ||
+                            s.id.startsWith(`${targetPkg}/`));
+                    }
+                    // 无 packageId 归属信息的条目：仅全限定名前缀命中时放行
+                    return s.id === targetPkg || s.id.startsWith(`${targetPkg}/`);
+                });
             }
             const rawList = rawSummaries.map((s) => {
                 let id = s.id;
@@ -59,7 +68,7 @@ export function attachListCommand(parent, context) {
                 return;
             }
             const title = resolved.type === "remote"
-                ? `Actions on remote server ${resolved.serverUrl}${resolved.profileName ? ` (Profile: ${resolved.profileName})` : ""}`
+                ? `Actions ${remoteTargetSuffix(resolved)}`
                 : targetPackageRoot
                     ? `Actions in ${options.package || "current project"}`
                     : "Available Actions";

package/dist/commands/mcp.js

@@ -1,9 +1,22 @@
 import { resolve } from "node:path";
-import { findProjectRoot, formatHostForUrl, loadProjectConfig, parseDuration } from "@actiondock/core";
-import { createNodePlatform } from "@actiondock/runtime-node";
-import { ArgumentError, ExecutionError } from "../errors.js";
-import { writeStderr, writeStdout } from "../renderer.js";
-import { getEffectiveOptions, parseByteSize, parseListOption } from "../utils/index.js";
+import { createNodePlatform, findProjectRoot, loadProjectConfig, } from "@actiondock/core";
+import { formatHostForUrl, } from "@actiondock/core/server";
+import { ExecutionError } from "../errors.js";
+import { writeStdout } from "../renderer.js";
+import { getEffectiveOptions, normalizeCorsOrigins, parseListOption, printServerBanner, registerStopSignalHandler, resolveMaxBodyBytes, resolveServerHost, resolveServerPort, resolveServerToken, resolveTimeoutMs, } from "../utils/index.js";
+/**
+ * 解析 mcp 命令双分支共享的目标选项（目录、包、超时）。
+ */
+function resolveMcpServeOptions(options) {
+    return {
+        projectRoots: options.dir && options.dir.length > 0
+            ? options.dir.map((d) => resolve(d))
+            : undefined,
+        packageIds: options.package && options.package.length > 0 ? options.package : undefined,
+        all: Boolean(options.all),
+        timeoutMs: resolveTimeoutMs(options.timeout),
+    };
+}
 /**
  * 注册 mcp 命令（STDIO 与 HTTP 传输服务模式）。
  *
@@ -21,20 +34,7 @@ export function registerMcpCommands(program, context) {
         .option("--data-dir <path>", "Custom database storage directory")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        let timeoutMs;
-        if (options.timeout) {
-            try {
-                timeoutMs = parseDuration(options.timeout);
-            }
-            catch (err) {
-                throw new ArgumentError(`Invalid timeout format: ${err.message}`);
-            }
-        }
-        const projectRoots = options.dir && options.dir.length > 0
-            ? options.dir.map((d) => resolve(d))
-            : undefined;
-        const packageIds = options.package && options.package.length > 0 ? options.package : undefined;
-        const all = Boolean(options.all);
+        const { projectRoots, packageIds, all, timeoutMs } = resolveMcpServeOptions(options);
         try {
             const { startMcpStdio } = await import("@actiondock/mcp");
             await startMcpStdio({
@@ -69,38 +69,15 @@ export function registerMcpCommands(program, context) {
         .option("--data-dir <path>", "Custom database storage directory")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        const port = parseInt(options.port, 10) || 5178;
-        const host = options.host || "127.0.0.1";
-        const token = options.token ||
-            (options.tokenEnv && typeof process !== "undefined" ? process.env?.[options.tokenEnv] : undefined) ||
-            (typeof process !== "undefined" ? process.env?.ACTIONDOCK_TOKEN : undefined);
+        const port = resolveServerPort(options.port, 5178, true);
+        const host = resolveServerHost(options.host);
+        const token = resolveServerToken(options.token, options.tokenEnv);
         const allowInsecureNoAuth = Boolean(options.allowInsecureNoAuth);
         const allowInsecureHttp = Boolean(options.allowInsecureHttp);
         const allowQueryToken = Boolean(options.allowQueryToken);
-        const corsOrigins = options.corsOrigin && options.corsOrigin.length > 0 ? options.corsOrigin : undefined;
-        let maxBodyBytes;
-        if (options.maxBody) {
-            try {
-                maxBodyBytes = parseByteSize(options.maxBody);
-            }
-            catch (err) {
-                throw new ArgumentError(`Invalid max-body format: ${err.message}`);
-            }
-        }
-        let timeoutMs;
-        if (options.timeout) {
-            try {
-                timeoutMs = parseDuration(options.timeout);
-            }
-            catch (err) {
-                throw new ArgumentError(`Invalid timeout format: ${err.message}`);
-            }
-        }
-        const projectRoots = options.dir && options.dir.length > 0
-            ? options.dir.map((d) => resolve(d))
-            : undefined;
-        const packageIds = options.package && options.package.length > 0 ? options.package : undefined;
-        const all = Boolean(options.all);
+        const corsOrigins = normalizeCorsOrigins(options.corsOrigin);
+        const maxBodyBytes = resolveMaxBodyBytes(options.maxBody);
+        const { projectRoots, packageIds, all, timeoutMs } = resolveMcpServeOptions(options);
         let targetDescription = "ActionDock MCP Server";
         if (all) {
             targetDescription = "All Linked Packages (Global Registry Mode)";
@@ -161,30 +138,14 @@ export function registerMcpCommands(program, context) {
             });
             const displayHost = formatHostForUrl(host);
             const actualMcpHost = formatHostForUrl(host === "0.0.0.0" ? "127.0.0.1" : host);
-            writeStdout(`\n======================================================`, context);
-            writeStdout(`  ActionDock 2.0 MCP HTTP Server`, context);
-            writeStdout(`======================================================`, context);
-            writeStdout(`  * Listening on:    http://${displayHost}:${server.port}`, context);
+            printServerBanner(`ActionDock 2.0 MCP HTTP Server`, "http", displayHost, server.port, context);
             writeStdout(`  * MCP Endpoint:    http://${actualMcpHost}:${server.port}/mcp`, context);
             writeStdout(`  * Target:          ${targetDescription}`, context);
             writeStdout(`  * Authentication:  ${token ? "Bearer Token Enabled" : "Disabled (Local)"}`, context);
             writeStdout(`  * CORS Origins:    ${corsOrigins ? corsOrigins.join(", ") : "Disabled (Default)"}`, context);
             writeStdout(`======================================================\n`, context);
             writeStdout(`Press Ctrl+C to terminate.\n`, context);
-            const stopSignalHandler = () => {
-                writeStdout("\nStopping MCP HTTP server...", context);
-                Promise.resolve(server.stop())
-                    .catch((err) => {
-                    // 停止失败必须可见：写入 stderr 一行并标记失败退出码
-                    writeStderr(`[ERROR] Failed to stop MCP HTTP server gracefully: ${err instanceof Error ? err.message : String(err)}`, context);
-                    process.exitCode = 1;
-                })
-                    .finally(() => {
-                    process.exit(typeof process.exitCode === "number" ? process.exitCode : 0);
-                });
-            };
-            process.once("SIGINT", stopSignalHandler);
-            process.once("SIGTERM", stopSignalHandler);
+            registerStopSignalHandler(server, `MCP HTTP server`, context);
         }
         catch (err) {
             throw new ExecutionError(`Failed to start ActionDock MCP HTTP server: ${err.message}`, err);

package/dist/commands/pack.js

@@ -1,7 +1,6 @@
-import { findProjectRoot, resolvePackageRoot } from "@actiondock/core";
-import { ExecutionError, notInProjectError, packageNotFoundError } from "../errors.js";
+import { ExecutionError } from "../errors.js";
 import { renderResult, writeStdout } from "../renderer.js";
-import { getEffectiveOptions } from "../utils/index.js";
+import { getEffectiveOptions, requirePackageRoot } from "../utils/index.js";
 export function registerPackCommand(program, context) {
     program
         .command("pack")
@@ -12,15 +11,7 @@ export function registerPackCommand(program, context) {
         .option("--json", "Output as JSON")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        const root = options.package
-            ? resolvePackageRoot(options.package)
-            : findProjectRoot();
-        if (!root) {
-            if (options.package) {
-                throw packageNotFoundError(options.package);
-            }
-            throw notInProjectError("Please specify -P, --package <id> or cd into a project directory.");
-        }
+        const { root } = requirePackageRoot(options.package);
         const isMachine = Boolean(options.json);
         if (!isMachine && !options.dryRun) {
             writeStdout("Packing Action package...");

package/dist/commands/playbook.js

@@ -1,9 +1,13 @@
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, relative, resolve } from "node:path";
-import { assertPathWithinRoot, fetchRemotePlaybooks, fetchRemotePlaybookShow, filterWithFallbackInfo, findProjectRoot, listLinkedPackages, loadActions, loadManifest, loadPlaybooks, loadProjectConfig, resolveActionProject, resolvePackageRoot, resolvePlaybookProject, saveManifest, } from "@actiondock/core";
-import { ArgumentError, CliError, ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE, notInProjectError, packageNotFoundError, } from "../errors.js";
+import { assertPathWithinRoot, loadActions, loadManifest, loadPlaybooks, saveManifest, filterWithFallbackInfo, } from "@actiondock/core/project";
+import { DefaultActionCatalog, PackageGraphBuilder, resolveAction, resolvePlaybook, } from "@actiondock/core/graph";
+import { fetchRemotePlaybooks, fetchRemotePlaybookShow, } from "@actiondock/core/profile";
+import { findProjectRoot, loadProjectConfig, } from "@actiondock/core";
+import { listLinkedPackages, resolvePackageRoot, } from "@actiondock/core/registry";
+import { ArgumentError, CliError, ExecutionError, NO_PROJECT_NO_LINKED_MESSAGE, notInProjectError, packageNotFoundError, wrapAsExecutionError, } from "../errors.js";
 import { renderPlaybookDetail, renderPlaybookList, renderResult, writeStdout, } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveIntent, resolveTargetFromOptions, } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, remoteTargetSuffix, resolveFallbackStrategy, resolveIntent, resolveTargetFromOptions, } from "../utils/index.js";
 /**
  * 注册 Playbook 命令集合（list, show, validate, create）。
  *
@@ -20,13 +24,13 @@ export function registerPlaybookCommands(program, context) {
         .description("List playbooks in current project or linked packages")
         .option("-i, --intent <pattern>", "Regex or fuzzy intent filter; falls back to full list when no match")
         .option("-P, --package <id>", "Target package ID or path"))
+        .option("--fallback", "Enable fallback to full list when no items match intent")
         .option("--no-fallback", "Disable fallback to full list when no items match intent")
         .option("--json", "Output as JSON")
         .action(async (patterns = [], rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
         const effectiveIntent = resolveIntent(options.intent, patterns);
-        const shouldFallback = options.fallback !== false;
-        const isMachine = Boolean(options.json);
+        const { shouldFallback, isMachine } = resolveFallbackStrategy(options);
         // 1. 远端服务分支
         const target = resolveTargetFromOptions(options, context);
         if (target.type === "remote") {
@@ -38,7 +42,7 @@ export function registerPlaybookCommands(program, context) {
             });
             renderResult(remotePbs, {
                 json: options.json,
-                humanFormatter: () => renderPlaybookList(remotePbs, `Playbooks on remote server ${target.serverUrl}${target.profileName ? ` (Profile: ${target.profileName})` : ""}`, false, effectiveIntent),
+                humanFormatter: () => renderPlaybookList(remotePbs, `Playbooks ${remoteTargetSuffix(target)}`, false, effectiveIntent),
                 context,
             });
             return;
@@ -187,7 +191,12 @@ export function registerPlaybookCommands(program, context) {
         }
         let resolved;
         try {
-            resolved = resolvePlaybookProject(showTarget);
+            const graph = new PackageGraphBuilder({
+                root: findProjectRoot() || undefined,
+                customHome: context?.customHome,
+                allowDevLinks: true,
+            }).buildSync();
+            resolved = resolvePlaybook(showTarget, { graph });
         }
         catch (err) {
             throw new ArgumentError(err.message);
@@ -243,7 +252,12 @@ export function registerPlaybookCommands(program, context) {
         else if (id) {
             let resolved;
             try {
-                resolved = resolvePlaybookProject(id);
+                const graph = new PackageGraphBuilder({
+                    root: findProjectRoot() || undefined,
+                    customHome: context?.customHome,
+                    allowDevLinks: true,
+                }).buildSync();
+                resolved = resolvePlaybook(id, { graph });
             }
             catch (err) {
                 throw new ArgumentError(err.message);
@@ -277,6 +291,12 @@ export function registerPlaybookCommands(program, context) {
             }
         }
         const results = [];
+        const graph = new PackageGraphBuilder({
+            root: findProjectRoot() || undefined,
+            customHome: context?.customHome,
+            allowDevLinks: true,
+        }).buildSync();
+        const catalog = new DefaultActionCatalog(graph);
         for (const target of targets) {
             const config = loadProjectConfig(target.root);
             const manifest = loadManifest(target.root);
@@ -294,7 +314,7 @@ export function registerPlaybookCommands(program, context) {
                     for (const actRef of pb.actions) {
                         if (actRef.includes("/")) {
                             try {
-                                await resolveActionProject(actRef);
+                                resolveAction(actRef, { graph, catalog, caller: target.packageId });
                             }
                             catch (e) {
                                 errors.push(`Referenced cross-package action '${actRef}' not resolvable: ${e.message}`);
@@ -408,6 +428,6 @@ This playbook provides task execution guidance for AI Agents.
         if (err instanceof CliError) {
             throw err;
         }
-        throw new ExecutionError(err.message);
+        throw wrapAsExecutionError(err);
     }
 }

package/dist/commands/profile.js

@@ -1,5 +1,6 @@
-import { addProfile, checkRemoteHealth, filterWithFallbackInfo, getProfile, listProfiles, loadProfiles, maskSecretValue, removeProfile, resolveProfileToken, resolveTarget, toSnakeUpperCase, updateProfile, useProfile, } from "@actiondock/core";
-import { ArgumentError, CliError, ExecutionError, } from "../errors.js";
+import { addProfile, checkRemoteHealth, getProfile, listProfiles, loadProfiles, removeProfile, resolveProfileToken, resolveTarget, toSnakeUpperCase, updateProfile, useProfile, } from "@actiondock/core/profile";
+import { filterWithFallbackInfo, maskSecretValue, } from "@actiondock/core/project";
+import { ArgumentError, ExecutionError, wrapAsExecutionError, } from "../errors.js";
 import { renderResult, writeStderr, writeStdout } from "../renderer.js";
 import { getEffectiveOptions, resolveFallbackStrategy, resolveIntent } from "../utils/index.js";
 export function registerProfileCommands(program) {
@@ -76,9 +77,7 @@ export function registerProfileCommands(program) {
             });
         }
         catch (err) {
-            if (err instanceof ArgumentError || err instanceof CliError)
-                throw err;
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad profile add <name>
@@ -105,7 +104,7 @@ export function registerProfileCommands(program) {
             writeStdout(`[OK] Profile '${name}' configured for server: ${options.server}${options.insecure ? " (insecure: true)" : ""}`);
         }
         catch (err) {
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad profile update <name>
@@ -140,7 +139,7 @@ export function registerProfileCommands(program) {
             writeStdout(`[OK] Profile '${name}' updated`);
         }
         catch (err) {
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad profile use <name>
@@ -153,7 +152,7 @@ export function registerProfileCommands(program) {
             writeStdout(`[OK] Active profile switched to '${name}'`);
         }
         catch (err) {
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad profile show [name]
@@ -221,10 +220,7 @@ export function registerProfileCommands(program) {
             });
         }
         catch (err) {
-            if (err instanceof ArgumentError || err instanceof CliError) {
-                throw err;
-            }
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad profile rm / remove <name>
@@ -244,10 +240,7 @@ export function registerProfileCommands(program) {
             writeStdout(`[OK] Profile '${name}' removed`);
         }
         catch (err) {
-            if (err instanceof CliError) {
-                throw err;
-            }
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
     // ad profile test [name]
@@ -290,9 +283,7 @@ export function registerProfileCommands(program) {
             }
         }
         catch (err) {
-            if (err instanceof ArgumentError || err instanceof CliError)
-                throw err;
-            throw new ExecutionError(err.message);
+            throw wrapAsExecutionError(err);
         }
     });
 }

package/dist/commands/remove.js

@@ -1,8 +1,7 @@
-import { resolve } from "node:path";
-import { beginTransaction, findProjectRoot, getInstallCommand, loadLockfile, loadManifest, saveLockfile, saveManifest, } from "@actiondock/core";
-import { ArgumentError, ExecutionError, notInProjectError } from "../errors.js";
+import { beginTransaction, getInstallCommand, loadLockfile, saveLockfile, saveManifest, } from "@actiondock/core/project";
+import { ArgumentError, ExecutionError } from "../errors.js";
 import { renderResult, writeStderr } from "../renderer.js";
-import { assertSafePackageSpec, getEffectiveOptions, spawnAsync } from "../utils/index.js";
+import { assertSafePackageSpec, getEffectiveOptions, requireProjectManifestRoot, rollbackAndRethrow, spawnAsync, } from "../utils/index.js";
 /**
  * 注册 ad remove 依赖移除命令。
  * 遵循规范：移除依赖并更新锁文件，保留该包的历史存储数据，检查反向引用防止误删。
@@ -15,14 +14,7 @@ export function registerRemoveCommand(program, context) {
         .option("--json", "Output as JSON")
         .action(async (packageIdentifier, rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        const root = options.package ? resolve(options.package) : findProjectRoot();
-        if (!root) {
-            throw notInProjectError("Please specify -P, --package <path> or cd into a project directory.");
-        }
-        const manifest = loadManifest(root);
-        if (!manifest) {
-            throw new ArgumentError(`actiondock.json not found in ${root}`);
-        }
+        const { root, manifest } = requireProjectManifestRoot(options.package);
         // 寻址逻辑包标识
         let targetPackageId = null;
         let npmPackageName = packageIdentifier;
@@ -115,8 +107,7 @@ export function registerRemoveCommand(program, context) {
             });
         }
         catch (err) {
-            await tx.rollback({ frozenInstall: false });
-            throw new ExecutionError(err.message, err, err.code || "REMOVE_DEPENDENCY_FAILED");
+            await rollbackAndRethrow(tx, err, "REMOVE_DEPENDENCY_FAILED");
         }
     });
 }

package/dist/commands/run.d.ts

@@ -1,4 +1,4 @@
-import { type InvocationControl } from "@actiondock/core";
+import { type InvocationControl } from "@actiondock/core/server";
 import type { ExecutionResult } from "@actiondock/sdk";
 import { Command } from "commander";
 import type { CliContext } from "../types.js";
@@ -10,7 +10,10 @@ import type { CliContext } from "../types.js";
  */
 export declare function renderRawExecutionResult(targetRef: string, result: ExecutionResult, context?: CliContext): void;
 /**
- * 统一执行 Action 核心逻辑（使用 ActionDockTarget 门面）。
+ * 统一执行 Action 核心逻辑（使用 ActionDockService 服务端口）。
+ *
+ * @param id 目标 Action 标识
+ * @param options 执行选项（由 Command 统一构造）
  */
 export declare function executeAction(id: string, options: any, context?: CliContext, flatArgs?: string[], control?: InvocationControl): Promise<void>;
 /**

package/dist/commands/run.js

@@ -1,7 +1,8 @@
-import { parseDuration, resolveTarget, validateActionInputValue, mapInputValidationFailure, } from "@actiondock/core";
+import { validateActionInputValue, mapInputValidationFailure, } from "@actiondock/core/project";
+import { resolveTarget, } from "@actiondock/core/profile";
 import { ArgumentError, ExecutionError, SigintError, packageNotFoundError } from "../errors.js";
 import { writeStderr, writeStdout } from "../renderer.js";
-import { applyTargetOptions, getEffectiveOptions, resolveActionInput, resolveLocalPackageRoot, withTarget, } from "../utils/index.js";
+import { applyTargetOptions, getEffectiveOptions, resolveActionInput, resolveLocalPackageRoot, resolveTimeoutMs, withService, } from "../utils/index.js";
 /**
  * 以原始纯文本形式渲染 Action 执行终态结果（默认纯文本模式）。
  *
@@ -95,7 +96,10 @@ export function renderRawExecutionResult(targetRef, result, context) {
     }
 }
 /**
- * 统一执行 Action 核心逻辑（使用 ActionDockTarget 门面）。
+ * 统一执行 Action 核心逻辑（使用 ActionDockService 服务端口）。
+ *
+ * @param id 目标 Action 标识
+ * @param options 执行选项（由 Command 统一构造）
  */
 export async function executeAction(id, options, context, flatArgs, control) {
     if (!id) {
@@ -114,15 +118,7 @@ export async function executeAction(id, options, context, flatArgs, control) {
     if (!check.valid) {
         throw mapInputValidationFailure("cli-pre-target", check);
     }
-    let timeoutMs;
-    if (options.timeout) {
-        try {
-            timeoutMs = parseDuration(options.timeout);
-        }
-        catch (err) {
-            throw new ArgumentError(`Invalid timeout format: ${err.message}`);
-        }
-    }
+    const timeoutMs = resolveTimeoutMs(options.timeout);
     const configOverrides = {};
     if (options.config) {
         const list = Array.isArray(options.config) ? options.config : [options.config];
@@ -149,14 +145,14 @@ export async function executeAction(id, options, context, flatArgs, control) {
             throw packageNotFoundError(options.package);
         }
         let targetRef = id;
-        if (options.package && !id.includes("/") && !id.includes(":")) {
+        if (options.package && !id.includes("/")) {
             targetRef = `${options.package}/${id}`;
         }
-        // 通过 Target 统一执行
-        await withTarget(options, context, async (target) => {
+        // 通过 Service 统一执行
+        await withService(options, context, async (service) => {
             const isMachine = Boolean(options.json);
             if (options.async) {
-                const ticket = await target.startAction(targetRef, input, {
+                const ticket = await service.execution.start(targetRef, input, {
                     signal: effectiveSignal,
                     timeoutMs,
                     config: configOverrides,
@@ -182,7 +178,7 @@ export async function executeAction(id, options, context, flatArgs, control) {
                 }
             }
             else {
-                const result = await target.runAction(targetRef, input, {
+                const result = await service.execution.run(targetRef, input, {
                     signal: effectiveSignal,
                     timeoutMs,
                     config: configOverrides,
@@ -208,10 +204,13 @@ export async function executeAction(id, options, context, flatArgs, control) {
         }, { localRoot: targetPackageRoot || undefined, scanLinkedPackages: true, ownDataDir: true });
     }
     catch (err) {
+        // sigint 取消源、中断链路特征错误码或 SigintError 本身，均统一归并为 SigintError
+        // 原 if 中额外的「cancellationSource 为 sigint 且 AbortError/aborted/ACTION_CANCELLED」
+        // 子句被首项 cancellationSource === "sigint" 完全蕴含，等价化简后移除
         const isSigint = effectiveControl?.cancellationSource === "sigint" ||
-            err?.message?.includes("Interrupted by SIGINT");
-        if (isSigint &&
-            (err?.name === "AbortError" || effectiveSignal?.aborted || err?.message?.includes("SIGINT") || err instanceof SigintError)) {
+            err?.code === "SIGINT_INTERRUPTED" ||
+            err instanceof SigintError;
+        if (isSigint) {
             throw new SigintError();
         }
         throw err;