@actiondock/mcp 2.8.0 → 2.9.0

package/README.md

@@ -39,6 +39,14 @@ ActionDock 2.x 模型上下文协议适配器。
 - 任务主动取消：通过 `tasks/cancel` 端点向正在后台执行的长周期任务发出中止指令。
 - 任务清单列举：通过 `tasks/list` 端点批量查询当前会话及宿主下的活跃与历史任务列表。
 
+### 细粒度权限白名单与安全过滤
+
+MCP 适配层原生支持基于包与动作维度的双层白名单控制，通过 `ActionDockMcpOptions` 进行配置：
+
+- 包白名单 `packageAllowlist`（别名 `packageIds`）：限制仅暴露指定包内的工具。
+- 动作白名单 `actionAllowlist`：限制仅暴露指定的动作，支持动作短名 `actionId` 与全限定名 `packageId/actionId`。
+- 联动过滤机制：同时配置包白名单与动作白名单时自动计算权限交集。未获授权的动作不会出现在 `tools/list` 工具列表中；在 `tasks/get`、`tasks/cancel` 与 `tasks/list` 任务扩展中，涉及未授权动作的任务同样予以严格隔离与隐藏。
+
 ---
 
 ## 快速使用
@@ -60,6 +68,8 @@ import { startMcpStdioServer } from "@actiondock/mcp";
 
 await startMcpStdioServer({
   projectRoot: process.cwd(),
+  packageAllowlist: ["system-tools"],
+  actionAllowlist: ["system-tools/status", "ping"],
 });
 ```
 

package/dist/adapter.js

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { ACTIONDOCK_VERSION, createActionDock, createNodePlatform, findProjectRoot, MCP_TOOL_NAME_COLLISION, } from "@actiondock/core";
-import { createActionDockHost, LocalActionDockService, } from "@actiondock/core/server";
+import { createActionDockHost, isActionAllowed, LocalActionDockService, } from "@actiondock/core/server";
 import { resolvePackageRoot } from "@actiondock/core/registry";
 import { createNonClosingStorageView } from "@actiondock/core/package";
 import { parseActionRef } from "@actiondock/core/graph";
@@ -264,7 +264,7 @@ export async function createActionDockMcpServer(options = {}) {
         version: serverVersion,
     });
     // 任务规范扩展注册集中隔离在独立模块，本层不再直接操作 SDK 内层实例
-    registerTasksExtension(server, service, allowedPackageIds);
+    registerTasksExtension(server, service, allowedPackageIds, options.actionAllowlist);
     // 工具注册与模式映射：tools/list 纯粹委托 service.discovery.listActions()
     let rawActions = await service.discovery.listActions();
     // 引用解析单点归一：每项仅解析一次，后续各轮（白名单过滤、去重、频次统计、
@@ -292,6 +292,13 @@ export async function createActionDockMcpServer(options = {}) {
             return pkgId ? allowedPackageIds.includes(pkgId) : false;
         });
     }
+    if (options.actionAllowlist && options.actionAllowlist.length > 0) {
+        rawActions = rawActions.filter((act) => {
+            const ref = parsedRefs.get(act);
+            const pkgId = ref.explicitPkgId || ref.parsedPkgId || undefined;
+            return isActionAllowed({ packageId: pkgId, actionId: ref.baseId }, options.actionAllowlist);
+        });
+    }
     const seenActionKeys = new Map();
     for (const act of rawActions) {
         const ref = parsedRefs.get(act);

package/dist/register-tasks-extension.d.ts

@@ -31,4 +31,4 @@ export declare function toMcpTaskPayload(run: RunRecord): McpTaskPayload;
  * @param server MCP 高层服务实例
  * @param service ActionDockService 公共服务实例
  */
-export declare function registerTasksExtension(server: McpServer, service: ActionDockService, allowedPackageIds?: string[]): void;
+export declare function registerTasksExtension(server: McpServer, service: ActionDockService, allowedPackageIds?: string[], actionAllowlist?: string[]): void;

package/dist/register-tasks-extension.js

@@ -1,3 +1,4 @@
+import { isActionAllowed } from "@actiondock/core/server";
 import { fromJsonSchema } from "@modelcontextprotocol/server";
 /**
  * 将 ActionDock 内部的 RunStatus 转换为 MCP 标准的 TaskStatus。
@@ -87,7 +88,7 @@ function toTimeMillis(value) {
  * @param server MCP 高层服务实例
  * @param service ActionDockService 公共服务实例
  */
-export function registerTasksExtension(server, service, allowedPackageIds) {
+export function registerTasksExtension(server, service, allowedPackageIds, actionAllowlist) {
     server.server.registerCapabilities({
         tasks: {
             list: {},
@@ -105,16 +106,31 @@ export function registerTasksExtension(server, service, allowedPackageIds) {
             (!run.packageId || !allowedPackageIds.includes(run.packageId))) {
             throw taskNotFoundError(params.taskId);
         }
+        if (actionAllowlist &&
+            actionAllowlist.length > 0 &&
+            !isActionAllowed({ packageId: run.packageId, actionId: run.actionId }, actionAllowlist)) {
+            throw taskNotFoundError(params.taskId);
+        }
         return { task: toMcpTaskPayload(run) };
     });
     server.server.setRequestHandler("tasks/cancel", { params: TASK_ID_PARAMS }, async (params) => {
-        if (allowedPackageIds && allowedPackageIds.length > 0) {
+        const hasPackageFilter = Boolean(allowedPackageIds && allowedPackageIds.length > 0);
+        const hasActionFilter = Boolean(actionAllowlist && actionAllowlist.length > 0);
+        if (hasPackageFilter || hasActionFilter) {
             const existingRun = await service.runs.get(params.taskId);
-            if (!existingRun ||
-                !existingRun.packageId ||
-                !allowedPackageIds.includes(existingRun.packageId)) {
+            if (!existingRun) {
                 throw taskNotFoundError(params.taskId);
             }
+            if (hasPackageFilter) {
+                if (!existingRun.packageId || !allowedPackageIds.includes(existingRun.packageId)) {
+                    throw taskNotFoundError(params.taskId);
+                }
+            }
+            if (hasActionFilter) {
+                if (!isActionAllowed({ packageId: existingRun.packageId, actionId: existingRun.actionId }, actionAllowlist)) {
+                    throw taskNotFoundError(params.taskId);
+                }
+            }
         }
         const reason = params.reason || "Cancelled via MCP tasks/cancel";
         const cancelRes = await service.runs.cancel(params.taskId, reason);
@@ -146,6 +162,9 @@ export function registerTasksExtension(server, service, allowedPackageIds) {
         if (allowedPackageIds && allowedPackageIds.length > 0) {
             runs = runs.filter((r) => Boolean(r.packageId && allowedPackageIds.includes(r.packageId)));
         }
+        if (actionAllowlist && actionAllowlist.length > 0) {
+            runs = runs.filter((r) => isActionAllowed({ packageId: r.packageId, actionId: r.actionId }, actionAllowlist));
+        }
         const ordered = [...runs].sort((a, b) => toTimeMillis(b.startedAt) - toTimeMillis(a.startedAt));
         return { tasks: ordered.map(toMcpTaskPayload) };
     });

package/dist/types.d.ts

@@ -23,6 +23,8 @@ export interface ActionDockMcpOptions {
     packageIds?: string[];
     /** 允许访问执行的 Package ID 白名单列表（为空允许全部） */
     packageAllowlist?: string[];
+    /** 允许暴露执行的 Action 标识白名单列表（为空允许全部，支持短名或 packageId/actionId） */
+    actionAllowlist?: string[];
     /** 是否聚合暴露全局 Registry 中的所有 Package */
     all?: boolean;
     /** 自定义家目录路径 */
@@ -58,6 +60,8 @@ export interface ActionDockMcpOptions {
      */
     cascadeServiceClose?: boolean;
 }
+/** ActionDock MCP 适配层初始化选项别名 */
+export type ActionDockMcpServerOptions = ActionDockMcpOptions;
 /**
  * HTTP 传输协议安全配置项。
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/mcp",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "ActionDock MCP Adapter for exposing Actions as Model Context Protocol (MCP) Tools",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,8 +29,8 @@
     "test": "node ../../scripts/run-tests.ts"
   },
   "dependencies": {
-    "@actiondock/core": "^2.8.0",
-    "@actiondock/sdk": "^2.8.0",
+    "@actiondock/core": "^2.9.0",
+    "@actiondock/sdk": "^2.9.0",
     "@modelcontextprotocol/server": "^2.0.0"
   },
   "devDependencies": {