@actiondock/cli 2.16.0 → 2.18.0

package/README.md

@@ -77,13 +77,16 @@ ad test
 ad mcp
 ```
 
-- 导出为便携式 Agent Skill 技能包：
+- 导出为便携式 Agent Skill 资产：
 ```bash
-# 导出源码模式技能
+# 默认源码模式浅导出（保留 uses 逻辑契约）
 ad export skill
 
-# 导出自包含 Node.js 目录模式技能
-ad export skill --mode node
+# 独立自包含 Node.js 目录型导出（免全局 ad 命令行）
+ad export skill --standalone --vendor-deps
+
+# 显式物化外部依赖导出（展开为微型工作区）
+ad export skill --bundle-deps
 ```
 
 - 构建 Node.js 目录交付产物：
@@ -188,7 +191,7 @@ $data | ConvertTo-Json -Depth 100 | ad run complex-action --input-file -
 | `ad test` | 执行快速单元测试 |
 | `ad build` | 构建 Node.js 目录交付产物（支持 `--vendor-deps` 与 `--archive`） |
 | `ad pack` | 打包为标准 npm tarball（`.tgz`），支持 `--dry-run` |
-| `ad export skill` | 导出 Agent Skill 技能包（支持 `--mode source` 与 `--mode node`） |
+| `ad export skill` | 导出 Agent Skill 资产（默认单包源码浅导出，支持 `--standalone` 免全局工具自包含导出与 `--bundle-deps` 物化依赖） |
 | `ad link` / `unlink` | 注册或注销工作区全局路由与符号链接 |
 | `ad profile` | 管理远程执行节点凭证与环境配置 |
 | `ad serve` | 启动远程 HTTP/HTTPS 执行调度微服务（支持 `-P` 包白名单与 `-A` 动作白名单细粒度权限控制，原生支持 `--https` 自签名与生产证书） |

package/dist/commands/export.js

@@ -17,20 +17,25 @@ 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("--bundle-deps", "Materialize and bundle external package dependencies into the exported skill")
+        .option("--standalone", "Export self-contained Node.js directory that does not require global ad CLI (alias for --mode node)")
         .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)
         .option("-z, --archive", "Create a .zip archive of the exported skill")
         .option("--skill-md <path>", "Use specified existing SKILL.md file instead of auto-generating")
-        .option("--custom-md <path>", "Custom skill declaration (SKILL.custom.md) with slot-marked sections and optional frontmatter description for composite bundles (auto-discovered at workspace root when omitted)")
+        .option("--custom-md <path>", "Custom skill declaration (SKILL.custom.md) with slot-marked sections and optional frontmatter description (auto-discovered at package or workspace root when omitted)")
         .option("--skill-md-only", "Bundle mode only: regenerate only the composite SKILL.md in place (always regenerates, ignores any existing SKILL.md)")
         .option("--vendor-deps", "Materialize locked production dependencies into the exported skill")
         .option("--allow-install-scripts", "Allow lifecycle install scripts to run during dependency materialization")
         .option("--require-reproducible", "Require reproducible build and fail if install scripts must run")
         .action(async (rawOptions, cmd) => {
         const options = getEffectiveOptions(rawOptions, cmd);
-        const mode = options.mode === "node" ? "node" : "source";
-        if (options.bundle && mode === "node") {
+        const mode = options.standalone || options.mode === "node" ? "node" : "source";
+        if (options.skillMd && options.customMd) {
+            throw new ExecutionError("Options --skill-md and --custom-md cannot be used together. Use --skill-md to reuse an existing documentation file, or --custom-md to customize the generated document with custom slots.");
+        }
+        if (options.bundle !== undefined && (options.standalone || 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.");
         }
         if (options.skillMdOnly && options.bundle === undefined) {
@@ -78,8 +83,8 @@ export function registerExportCommand(program, context) {
                 throw notInProjectError("Please specify -P, --package <id>, --workspace, --all, or cd into a project directory.");
             }
         }
-        if (roots.length > 1 && (options.actions || options.playbook)) {
-            throw new ExecutionError("Filtering options (--actions, --playbook) can only be used when exporting a single package.");
+        if ((roots.length > 1 || options.bundle !== undefined) && (options.actions || options.playbook)) {
+            throw new ExecutionError("Filtering options (--actions, --playbook) cannot be combined with composite bundle export (--bundle) or multiple packages.");
         }
         const isMachine = Boolean(options.json);
         try {
@@ -100,6 +105,8 @@ export function registerExportCommand(program, context) {
                     skillMdPath: options.skillMd,
                     customMdPath: options.customMd,
                     skillMdOnly: options.skillMdOnly,
+                    bundleDeps: Boolean(options.bundleDeps),
+                    standalone: Boolean(options.standalone),
                 });
                 renderResult(result, {
                     json: isMachine,
@@ -145,9 +152,12 @@ export function registerExportCommand(program, context) {
                         playbooks: options.playbook,
                         actions: options.actions,
                         skillMdPath: options.skillMd,
+                        customMdPath: options.customMd,
                         vendorDeps: options.vendorDeps,
                         allowInstallScripts: options.allowInstallScripts,
                         requireReproducible: options.requireReproducible,
+                        bundleDeps: Boolean(options.bundleDeps),
+                        standalone: Boolean(options.standalone),
                     });
                     results.push(res);
                 }
@@ -187,9 +197,12 @@ export function registerExportCommand(program, context) {
                 playbooks: options.playbook,
                 actions: options.actions,
                 skillMdPath: options.skillMd,
+                customMdPath: options.customMd,
                 vendorDeps: options.vendorDeps,
                 allowInstallScripts: options.allowInstallScripts,
                 requireReproducible: options.requireReproducible,
+                bundleDeps: Boolean(options.bundleDeps),
+                standalone: Boolean(options.standalone),
             });
             renderResult(result, {
                 json: isMachine,

package/dist/commands/serve.js

@@ -3,7 +3,7 @@ import { resolve } from "node:path";
 import { createActionDock, createNodePlatform, findProjectRoot, loadProjectConfig, startActionDockServer, } from "@actiondock/core";
 import { resolvePackageRoot } from "@actiondock/core/registry";
 import { parseActionRef } from "@actiondock/core/graph";
-import { formatHostForUrl, } from "@actiondock/core/server";
+import { formatHostForUrl, createServerRunOrigin, } from "@actiondock/core/server";
 import { ArgumentError, ExecutionError, packageNotFoundError } from "../errors.js";
 import { writeStderr, writeStdout } from "../renderer.js";
 import { ensureSelfSignedCertificate, getEffectiveOptions, loadViewsFromFile, mergeServerViews, normalizeCorsOrigins, registerStopSignalHandler, printServerBanner, resolveMaxBodyBytes, resolveServerHost, resolveServerPort, resolveServerToken, parseListOption, } from "../utils/index.js";
@@ -252,6 +252,7 @@ export function registerServeCommand(program, context) {
                             packageAllowlist: view.packageAllowlist,
                             packageIds: view.packageAllowlist,
                             actionAllowlist: view.actionAllowlist,
+                            origin: createServerRunOrigin(view, "mcp"),
                         });
                     }, {
                         onerror: (err) => {

package/dist/renderers/runs.js

@@ -27,6 +27,9 @@ export function renderRunDetail(run) {
         lines.push(`Package:      ${run.packageId}`);
     if (run.requestId)
         lines.push(`Request ID:   ${run.requestId}`);
+    if (run.origin) {
+        lines.push(`Origin:       channel=${run.origin.channel} view=${run.origin.viewName} authenticated=${run.origin.authenticated}`);
+    }
     lines.push(`Status:       ${run.status}`);
     if (run.parentRunId)
         lines.push(`Parent Run:   ${run.parentRunId}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/cli",
-  "version": "2.16.0",
+  "version": "2.18.0",
   "description": "ActionDock CLI facade for developing, testing, building, and exporting standalone Agent Actions and Skills",
   "type": "module",
   "bin": {
@@ -34,10 +34,10 @@
     "test": "node ../../scripts/run-tests.ts"
   },
   "dependencies": {
-    "@actiondock/builder": "^2.16.0",
-    "@actiondock/core": "^2.16.0",
-    "@actiondock/mcp": "^2.16.0",
-    "@actiondock/sdk": "^2.16.0",
+    "@actiondock/builder": "^2.18.0",
+    "@actiondock/core": "^2.18.0",
+    "@actiondock/mcp": "^2.18.0",
+    "@actiondock/sdk": "^2.18.0",
     "commander": "^13.1.0",
     "selfsigned": "^5.5.0"
   },